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

app/api/controller/user/UserController.php

@@ -187,7 +187,7 @@ class UserController extends BaseApiController
         $remark = $this->userId.'_payPassword';
         $code = Cache::get($remark);
         if ($code && isset($params['code']) && $code !== $params['code']) {
-            throw new Exception('验证码错误');
+            return $this->fail('验证码错误');
         }
         if ($params['rePassword'] !== $params['password'])
             return $this->fail('两次密码不一致');

app/api/lists/order/OrderList.php

@@ -46,7 +46,8 @@ class OrderList extends BaseAdminDataLists implements ListsSearchInterface
     {
         $userId = $this->request->userId;
         if (!$userId) return [];
-        $data =  StoreOrder::with(['store'])->where($this->searchWhere)->where('uid', $userId)
+        $data =  StoreOrder::with(['store'])->where($this->searchWhere)->where(['uid'=>$userId])
+            ->whereIn('shipping_type',[1,2])
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
             ->select()
@@ -86,6 +87,6 @@ class OrderList extends BaseAdminDataLists implements ListsSearchInterface
     public function count(): int
     {
         $userId = $this->request->userId;
-        return StoreOrder::where($this->searchWhere)->where('uid', $userId)->count();
+        return StoreOrder::where($this->searchWhere)->whereIn('shipping_type',[1,2])->where('uid', $userId)->count();
     }
 }

app/api/logic/user/UserLogic.php

@@ -117,8 +117,8 @@ class UserLogic extends BaseLogic
             $data['integral']=bcadd($data['integral'],$number,2);
             $number = UserSign::where('uid',$uid)->where('status',0)->sum('number');
             $GetNumber = UserSign::where('uid',$uid)->where('status',1)->sum('number');
-            $data['number'] =$number;
+            $data['number'] =bcadd($number,0,2);
-            $data['GetNumber'] =$GetNumber;
+            $data['GetNumber'] =bcadd($GetNumber,0,2);
         }else{
             $data = [];
         }

app/store/lists/user/UserLists.php

@@ -5,6 +5,7 @@ namespace app\store\lists\user;
 
 
 use app\common\model\store_finance_flow\StoreFinanceFlow;
+use app\common\model\user_sign\UserSign;
 use app\store\lists\BaseAdminDataLists;
 use app\common\model\user\User;
 use app\common\model\user\UserShip;
@@ -50,6 +51,8 @@ class UserLists extends BaseAdminDataLists  implements ListsSearchInterface
                 $data['return_money'] = StoreFinanceFlow::
                 where(['user_id'=>$data['id'],'status'=>0,'financial_pm'=>0])
                     ->sum('number');
+                $data['amount_frozen']  = UserSign::where('uid',$data['id'])->where('status',0)->sum('number');
+                $data['get_frozen']  = UserSign::where('uid',$data['id'])->where('status',1)->sum('number');
 
 	        })->toArray();
         return $lists;