feat(StoreOrderLists, UserRechargeLists, OrderLogic): updated lists, logic for orders & refunds, fixed bugs, improved code quality

app/admin/lists/store_order/StoreOrderLists.php

@@ -148,6 +148,8 @@ class StoreOrderLists extends BaseAdminDataLists implements ListsSearchInterface
             'nickname' => '用户',
             'total_price' => '总金额',
             'pay_price' => '实际支付',
+            'status_name' => '状态',
+            'refund_price' => '退款金额',
             'pay_time' => '支付时间',
         ];
         return $data;

app/admin/lists/user_recharge/UserRechargeLists.php

@@ -7,13 +7,14 @@ use app\admin\lists\BaseAdminDataLists;
 use app\common\model\user_recharge\UserRecharge;
 use app\common\lists\ListsSearchInterface;
 use app\common\model\user\User;
+use app\common\lists\ListsExcelInterface;
 
 /**
  * 充值记录列表
  * Class UserRechargeLists
  * @package app\admin\listsuser_recharge
  */
-class UserRechargeLists extends BaseAdminDataLists implements ListsSearchInterface
+class UserRechargeLists extends BaseAdminDataLists implements ListsSearchInterface,ListsExcelInterface
 {
 
 
@@ -88,4 +89,34 @@ class UserRechargeLists extends BaseAdminDataLists implements ListsSearchInterfa
         return UserRecharge::where($this->searchWhere)->count();
     }
 
+           /**
+     * @notes 导出文件名
+     * @return string
+     * @author 乔峰
+     * @date 2022/11/24 16:17
+     */
+    public function setFileName(): string
+    {
+        return '订单列表';
+    }
+
+
+    /**
+     * @notes 导出字段
+     * @return string[]
+     * @author 乔峰
+     * @date 2022/11/24 16:17
+     */
+    public function setExcelFields(): array
+    {
+        $data = [
+            'id' => 'ID',
+            'order_id'=>'订单号',
+            'nickname' => '用户',
+            'price' => '实际支付',
+            'paid_name' => '状态',
+            'pay_time' => '支付时间',
+        ];
+        return $data;
+    }
 }

app/api/logic/order/OrderLogic.php

@@ -302,8 +302,6 @@ class OrderLogic extends BaseLogic
         if ($uid > 0) {
             $address = UserAddress::where(['uid' => $uid])->find();
             if ($address) {
-                $_order['real_name'] = $address['real_name'];
-                $_order['user_phone'] = $address['phone'];
                 if ($address['area']) {
                     $_order['user_address'] = Db::name('geo_area')->where('area_code', $address['area'])->value('area_name') ?? '';
                 }