zxhxx před 3 roky
rodič
revize
1a6cafa740

+ 8 - 0
app/admin/model/system/SystemUserTask.php

@@ -105,6 +105,14 @@ class SystemUserTask extends BaseModel
             'min_number' => 0,
             'unit' => '元'
         ],
+        [
+            'type' => 'PackAmount',
+            'name' => '批发业绩{$num}',
+            'real_name' => '批发业绩',
+            'max_number' => 0,
+            'min_number' => 0,
+            'unit' => '元'
+        ],
     ];
 
     public function profile()

+ 0 - 1
app/models/store/StoreOrder.php

@@ -380,7 +380,6 @@ class StoreOrder extends BaseModel
             //积分抵扣
             $res2 = true;
             $SurplusIntegral = 0;
-            @file_put_contents("cart.txt",$useIntegral.'--'.$userInfo['integral'].'---'.$use_max_integral);
             if ($useIntegral && $userInfo['integral'] > 0 && $use_max_integral>0) {
                 $deductionPrice = (float)bcmul($userInfo['integral'], $other['integralRatio'], 2);
                 if($deductionPrice>$use_max_integral) $deductionPrice = $use_max_integral;

+ 16 - 1
app/models/system/SystemUserTask.php

@@ -112,6 +112,14 @@ class SystemUserTask extends BaseModel
             'min_number' => 0,
             'unit' => '元'
         ],
+        [
+            'type' => 'PackAmount',
+            'name' => '批发业绩{$num}',
+            'real_name' => '批发业绩',
+            'max_number' => 0,
+            'min_number' => 0,
+            'unit' => '元'
+        ],
     ];
 
     public function profile()
@@ -170,6 +178,13 @@ class SystemUserTask extends BaseModel
         if ($SumPayPrice >= $number) $isComplete = UserTaskFinish::setFinish($uid, $task_id) ? true : false;
         return ['还需消费{$num}元', $SumPayPrice, $isComplete];
     }
+    public static function PackAmount($task_id, $uid = 0, $start_time = 0, $number = 0)
+    {
+        $isComplete = false;
+        $SumPayPrice = User::where('uid',$uid)->value('PackAmount');
+        if ($SumPayPrice >= $number) $isComplete = UserTaskFinish::setFinish($uid, $task_id) ? true : false;
+        return ['还需消费{$num}元', $SumPayPrice, $isComplete];
+    }
     public static function TremConsumptionAmount($task_id, $uid = 0, $start_time = 0, $number = 0)
     {
         $isComplete = false;
@@ -358,7 +373,7 @@ class SystemUserTask extends BaseModel
             case 'InviteGoodFriends':
             case 'UserConsumptionAmount':
             case 'TremConsumptionAmount':
-            case 'InviteGoodFriendsLevel':
+            case 'InviteGoodFriendsLevel':case 'PackAmount':
                 try {
                     list($task_type_title, $num, $isComplete) = self::$task_type($item['id'], $uid, $startTime, $item['number']);
                     if ($isComplete) {