Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into rose

app/admin/lists/user/UserLists.php

@@ -13,6 +13,7 @@ use app\common\model\user\UserAddress;
 use app\common\model\vip_flow\VipFlow;
 use support\Db;
 use app\common\lists\ListsSearchInterface;
+use app\common\model\system_store\SystemStore;
 
 class UserLists extends BaseAdminDataLists implements ListsExcelInterface,ListsSearchInterface
 {
@@ -44,7 +45,7 @@ class UserLists extends BaseAdminDataLists implements ListsExcelInterface,ListsS
     public function lists(): array
     {
         $field = "id,nickname,real_name,sex,avatar,account,mobile,channel,create_time,purchase_funds,user_ship,
-                   label_id,integral,now_money,total_recharge_amount,vip_time";
+                   label_id,integral,now_money,total_recharge_amount,vip_time,store_id";
         $lists = User::where($this->searchWhere)
             ->with(['user_ship','user_label'])
             ->limit($this->limitOffset, $this->limitLength)
@@ -68,6 +69,10 @@ class UserLists extends BaseAdminDataLists implements ListsExcelInterface,ListsS
             if($item['label_name']== null){
                 $item['label_name'] = '无';
             }
+            $item['store_name']='';
+            if($item['store_id']>0){
+                $item['store_name'] = SystemStore::where('id',$item['store_id'])->value('name');
+            }
             $item['return_money'] = VipFlow::
             where(['user_id'=>$item['id'],'status'=>0])
                 ->sum('number')??0;
@@ -135,12 +140,17 @@ class UserLists extends BaseAdminDataLists implements ListsExcelInterface,ListsS
     public function setExcelFields(): array
     {
         return [
-            'sn' => '用户编号',
             'nickname' => '用户昵称',
+            'real_name' => '真实姓名',
             'account' => '账号',
             'mobile' => '手机号码',
-            'channel' => '注册来源',
-            'create_time' => '注册时间',
+            'now_money' => '用户余额',
+            'integral' => '礼品券',
+            'vip_name' => '会员类型',
+            'store_name' => '门店',
+            'total_recharge_amount' => '累计消费',
+            'purchase_funds' => '采购款',
+            'format_address'=>'地址'
         ];
     }
 }

app/common/controller/BaseLikeController.php

@@ -22,8 +22,11 @@ class BaseLikeController extends BaseController
      * @author 乔峰
      * @date 2021/12/27 14:21
      */
-    protected function success(string $msg = 'success', array $data = [], int $code = 1, int $show = 0)
+    protected function success(string $msg = 'success', $data = [], int $code = 1, int $show = 0)
     {
+        if(is_object($data)){
+            $data = $data->toArray();
+        }
         return JsonService::success($msg, $data, $code, $show);
     }
 
@@ -36,6 +39,9 @@ class BaseLikeController extends BaseController
      */
     protected function data($data)
     {
+        if(is_object($data)){
+            $data = $data->toArray();
+        }
         return JsonService::data($data);
     }
 

app/store/logic/WorkbenchLogic.php

@@ -910,6 +910,7 @@ class WorkbenchLogic extends BaseLogic
             ->select()->toArray();
         foreach ($list as $key => &$item) {
             $find = StoreProduct::where('id', $item['product_id'])->field('store_name,image')->find();
+            if(!$find) continue;
             $item['store_name'] = $find['store_name'];
             $item['image'] = $find['image'];
             if ($item['profit'] == null) $item['profit'] = 0;