|
@@ -2,6 +2,7 @@
|
|
|
|
|
|
namespace app\models\system;
|
|
|
|
|
|
+use app\models\store\Package;
|
|
|
use app\models\store\StoreOrder;
|
|
|
use app\models\user\User;
|
|
|
use app\models\user\UserBill;
|
|
@@ -120,6 +121,14 @@ class SystemUserTask extends BaseModel
|
|
|
'min_number' => 0,
|
|
|
'unit' => '元'
|
|
|
],
|
|
|
+ [
|
|
|
+ 'type' => 'TakePack',
|
|
|
+ 'name' => '批发提货{$num}',
|
|
|
+ 'real_name' => '批发提货',
|
|
|
+ 'max_number' => 0,
|
|
|
+ 'min_number' => 0,
|
|
|
+ 'unit' => '元'
|
|
|
+ ],
|
|
|
];
|
|
|
|
|
|
public function profile()
|
|
@@ -185,6 +194,13 @@ class SystemUserTask extends BaseModel
|
|
|
if ($SumPayPrice >= $number) $isComplete = UserTaskFinish::setFinish($uid, $task_id) ? true : false;
|
|
|
return ['还需消费{$num}元', $SumPayPrice, $isComplete];
|
|
|
}
|
|
|
+ public static function TakePack($task_id, $uid = 0, $start_time = 0, $number = 0)
|
|
|
+ {
|
|
|
+ $isComplete = false;
|
|
|
+ $SumPayPrice = Package::where('uid',$uid)->where('status',5)->value('sum(price)')?:0;
|
|
|
+ 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;
|
|
@@ -373,7 +389,7 @@ class SystemUserTask extends BaseModel
|
|
|
case 'InviteGoodFriends':
|
|
|
case 'UserConsumptionAmount':
|
|
|
case 'TremConsumptionAmount':
|
|
|
- case 'InviteGoodFriendsLevel':case 'PackAmount':
|
|
|
+ case 'InviteGoodFriendsLevel':case 'PackAmount':case 'TakePack':
|
|
|
try {
|
|
|
list($task_type_title, $num, $isComplete) = self::$task_type($item['id'], $uid, $startTime, $item['number']);
|
|
|
if ($isComplete) {
|