Kirin 4 년 전
부모
커밋
ca075f892e
2개의 변경된 파일33개의 추가작업 그리고 31개의 파일을 삭제
  1. 17 15
      app/models/system/SystemUserTask.php
  2. 16 16
      app/models/user/User.php

+ 17 - 15
app/models/system/SystemUserTask.php

@@ -6,6 +6,7 @@ use app\admin\model\store\StoreProductCate;
 use app\models\lala\LalaPinkJoin;
 use app\models\store\StoreCart;
 use app\models\store\StoreOrder;
+use app\models\user\Achievement;
 use app\models\user\User;
 use app\models\user\UserBill;
 use app\models\user\UserLevel;
@@ -233,21 +234,22 @@ class SystemUserTask extends BaseModel
     public static function BuySomeProductNum($task_id, $uid = 0, $start_time = 0, $number = 0)
     {
         $isComplete = false;
-        $orders = StoreOrder::where('paid', 1)
-            ->where('refund_status', 0)
-            ->where('is_del', 0)
-            ->where('uid', $uid)
-            ->select();
-        $count = 0;
-        foreach ($orders as $v) {
-            $product_ids = StoreCart::where('id', 'in', $v['cart_id'])->select();
-            foreach ($product_ids as $vv) {
-                $cates = StoreProductCate::where('product_id', $vv['product_id'])->column('cate_id');
-                if (in_array(49, $cates)) {
-                    $count += $vv['cart_num'];
-                }
-            }
-        }
+//        $orders = StoreOrder::where('paid', 1)
+//            ->where('refund_status', 0)
+//            ->where('is_del', 0)
+//            ->where('uid', $uid)
+//            ->select();
+//        $count = 0;
+//        foreach ($orders as $v) {
+//            $product_ids = StoreCart::where('id', 'in', $v['cart_id'])->select();
+//            foreach ($product_ids as $vv) {
+//                $cates = StoreProductCate::where('product_id', $vv['product_id'])->column('cate_id');
+//                if (in_array(49, $cates)) {
+//                    $count += $vv['cart_num'];
+//                }
+//            }
+//        }
+        $count = Achievement::where('uid', $uid)->where('from_uid', $uid)->sum('achievement');
         if ($number <= $count) $isComplete = UserTaskFinish::setFinish($uid, $task_id) ? true : false;
         return ['还需购买升级商品{$num}台', 0, $isComplete];
     }

+ 16 - 16
app/models/user/User.php

@@ -598,22 +598,22 @@ class User extends BaseModel
         if ($list) {
             $list = $list->toArray();
             foreach ($list as &$v) {
-                $orders = StoreOrder::where('paid', 1)
-                    ->where('refund_status', 0)
-                    ->where('is_del', 0)
-                    ->where('uid', $v['uid'])
-                    ->select();
-                $count = 0;
-                foreach ($orders as $vv) {
-                    $product_ids = StoreCart::where('id', 'in', $vv['cart_id'])->select();
-                    foreach ($product_ids as $vvv) {
-                        $cates = StoreProductCate::where('product_id', $vvv['product_id'])->column('cate_id');
-                        if (in_array(49, $cates)) {
-                            $count += $vvv['cart_num'];
-                        }
-                    }
-                }
-                $v['level_shop_num'] = $count;
+//                $orders = StoreOrder::where('paid', 1)
+//                    ->where('refund_status', 0)
+//                    ->where('is_del', 0)
+//                    ->where('uid', $v['uid'])
+//                    ->select();
+//                $count = 0;
+//                foreach ($orders as $vv) {
+//                    $product_ids = StoreCart::where('id', 'in', $vv['cart_id'])->select();
+//                    foreach ($product_ids as $vvv) {
+//                        $cates = StoreProductCate::where('product_id', $vvv['product_id'])->column('cate_id');
+//                        if (in_array(49, $cates)) {
+//                            $count += $vvv['cart_num'];
+//                        }
+//                    }
+//                }
+                $v['level_shop_num'] = Achievement::where('uid', $v['uid'])->where('from_uid', $v['uid'])->sum('achievement');
             }
             return $list;
         } else