commit

app/admin/model/system/SystemStore.php

@@ -4,6 +4,7 @@
 namespace app\admin\model\system;
 
 use app\models\store\StoreOrder;
+use app\models\store\StoreOrderIncrement;
 use app\models\system\SystemStoreStaff;
 use app\models\user\User;
 use crmeb\traits\ModelTrait;
@@ -127,7 +128,9 @@ class SystemStore extends BaseModel
                     }
                 }
             }
-            $item['count'] = StoreOrder::where('uid', 'in',$userUid)->where('pay_type', 'weixin')->where('status', '>=', 0)->where('paid', 1)->count();
+            $zz = StoreOrderIncrement::where('increment_uid', 'in', $userUid)->count();
+            $js = StoreOrderIncrement::where('uid', 'in', $userUid)->count();
+            $item['count'] = (StoreOrder::where('uid', 'in',$userUid)->where('pay_type', 'weixin')->where('status', '>=', 0)->where('paid', 1)->count() + $zz) - $js;
         }
 
         return compact('count', 'data');

app/admin/model/user/UserExtract.php

@@ -85,7 +85,7 @@ class UserExtract extends BaseModel
     {
         $fail_time = time();
         $data = self::get($id);
-        $extract_number = $data['extract_price'];
+        $extract_number = $data['money'];
         $mark = '提现失败,退回佣金' . $extract_number . '元';
         $uid = $data['uid'];
         $status = -1;

app/api/controller/user/UserBillController.php

@@ -7,6 +7,7 @@ use app\admin\model\system\SystemStoreStaff;
 use app\models\routine\RoutineCode;
 use app\models\routine\RoutineQrcode;
 use app\models\store\StoreOrder;
+use app\models\store\StoreOrderIncrement;
 use app\models\user\User;
 use app\models\user\UserBill;
 use app\models\user\UserExtract;
@@ -80,8 +81,29 @@ class UserBillController
         $user = SystemStoreStaff::where('uid', $request->uid())->find();
         if ($user){
             if ($user['is_total'] > 0){
-                $uids = get_downline(User::select(), $uid);
-                $data['order'] = StoreOrder::where('id', 'in', $uids)->count();
+                $store_id = \app\models\system\SystemStoreStaff::where('uid', $uid)->value('store_id');
+                $uids = \app\models\system\SystemStoreStaff::where('store_id', $store_id)->column('uid');
+                $userUid = $uids;
+                if ($uids){
+                    $users = User::select();
+                    foreach ($uids as $v)
+                    {
+                        $list = get_downline($users,$v);
+                        if ($list){
+                            foreach ($list as $value){
+                                $userUid[$value] = $value;
+                            }
+                        }
+                    }
+                }
+                $zz = StoreOrderIncrement::where('increment_uid', 'in', $userUid)->count();
+                $js = StoreOrderIncrement::where('uid', 'in', $userUid)->count();
+                $data['order'] = (StoreOrder::where('uid', 'in', $userUid)->where('pay_type', 'weixin')->where('status', '>=', 0)->where('paid', 1)->count() + $zz) - $js;
+                $zt_uid = User::where('spread_uid', $uid)->column('uid');
+                $zzs = StoreOrderIncrement::where('increment_uid', 'in', $zt_uid)->count();
+                $jss = StoreOrderIncrement::where('uid', 'in', $zt_uid)->count();
+                $data['zt_order'] = (StoreOrder::where('uid', $zt_uid)->where('pay_type', 'weixin')->where('status', '>=', 0)->where('paid', 1)->count() + $zzs) - $jss;
+                $data['jt_order'] = $data['order'] - $data['zt_order'];
             }else{
                 $data['order'] = 0;
             }

app/models/user/UserExtract.php

@@ -72,7 +72,8 @@ class UserExtract extends BaseModel
             'extract_price' => $data['money']*0.97,
             'add_time' => time(),
             'balance' => $balance,
-            'status' => self::AUDIT_STATUS
+            'status' => self::AUDIT_STATUS,
+            'money' => $data['money']
         ];
         if(isset($data['name']) && strlen(trim($data['name']))) $insertData['real_name'] = $data['name'];
         else $insertData['real_name'] = $userInfo['nickname'];