commit

app/admin/model/ump/StoreCouponUser.php

@@ -64,8 +64,9 @@ class StoreCouponUser extends BaseModel
             $data[$k]['coupon_title'] = $coupon['title'];
             $data[$k]['coupon_price'] = $coupon['coupon_price'];
             $data[$k]['use_min_price'] = $coupon['use_min_price'];
-            $data[$k]['add_time'] = time();
-            $data[$k]['end_time'] = $data[$k]['add_time'] + $coupon['coupon_time'] * 86400;
+            $data[$k]['add_time'] = $coupon['start_time'];
+            $data[$k]['end_time'] = $coupon['end_time'];
+            $data[$k]['code'] = generate_promotion_code(1);
         }
         $data_num = array_chunk($data, 30);
         self::beginTrans();

app/admin/model/ump/WriteOff.php

@@ -43,6 +43,7 @@ class WriteOff extends BaseModel
         $model = new self;
         $model = $model->alias('a')
             ->field('a.*,b.nickname,c.coupon_title,c.coupon_price,d.name as d_name')
+            ->order('a.id DESC ')
             ->leftJoin('user b', 'b.uid = a.uid')
             ->leftJoin('store_coupon_user c', 'c.id = a.coupon_id')
             ->leftJoin('system_store d', 'd.id = c.store_id');

app/admin/view/ump/store_coupon/grant.php

@@ -43,7 +43,7 @@
                                 {$vo.use_min_price}
                             </td>
                             <td class="text-center">
-                                {$vo.coupon_time}天
+                                {$vo.add_time|date='Y-m-d H:i:s'}---{$vo.end_time|date='Y-m-d H:i:s'}
                             </td>
                             <td class="text-center">
                                 <button class="btn btn-primary btn-xs grant" data-url="{:Url('ump.storeCouponUser/grant',array('id'=>$vo['id'],'uid'=>$uid))}" type="button"><i class="fa  fa-arrow-circle-o-right"></i> 发放

app/api/controller/user/UserController.php

@@ -71,6 +71,7 @@ class UserController
         }else{
             $info['level_name'] = '普通用户';
         }
+        $info['spread_nickname'] = User::where('uid', $info['spread_uid'])->value('nickname')?? '';
         $info['clerk_type'] = 0;
         if (SystemStoreStaff::where('uid', $info['uid'])->find()) $info['clerk_type'] = 1;
         return app('json')->success($info);
@@ -673,6 +674,7 @@ class UserController
 
         $coupon = StoreCouponUser::alias('a')
             ->field('a.*,c.id as c_id,c.name,c.image,c.latitude,c.longitude,c.detailed_address')
+            ->order('a.id DESC')
             ->leftJoin('store_coupon b', 'a.cid = b.id')
             ->leftJoin('system_store c', 'b.store_id = c.id')
             ->where('a.uid', $request->uid())

app/api/controller/user/UserExtractController.php

@@ -68,7 +68,7 @@ class UserExtractController
             ['cardnum', ''],
             ['weixin', ''],
         ], $request);
-        if (time() - CacheService::get('UserExtract_' . $request->uid(), time()) < 10) return app('json')->fail('请勿连续多次提交');
+        if (time() - CacheService::get('UserExtract_' . $request->uid(), time()) < 3) return app('json')->fail('请勿连续多次提交');
         else CacheService::set('UserExtract_' . $request->uid(), time());
         if (!preg_match('/^(([1-9]\d*)|0)(\.\d{1-2})?$/', $extractInfo['money'])) return app('json')->fail('提现金额输入有误');
         $user = $request->user();
@@ -92,8 +92,8 @@ class UserExtractController
             $data['broken_commission'] = 0;
         $data['brokerage_price'] = $user['brokerage_price'];
         //可提现佣金
-        $commissionCount = $data['brokerage_price'] - $data['broken_commission'];
-        if ($extractInfo['money'] > $commissionCount) return app('json')->fail('可提现佣金不足');
+//        $commissionCount = $data['brokerage_price'] - $data['broken_commission'];
+//        if ($extractInfo['money'] > $commissionCount) return app('json')->fail('可提现佣金不足');
         if (!$extractInfo['cardnum'] == '')
             if (!preg_match('/^([1-9]{1})(\d{14}|\d{18})$/', $extractInfo['cardnum']))
                 return app('json')->fail('银行卡号输入有误');

app/models/store/StoreOrder.php

@@ -317,6 +317,13 @@ class StoreOrder extends BaseModel
             $totalNum = 0;
             $gainIntegral = 0;
             foreach ($cartInfo as $cart) {
+                $product = StoreProduct::where('id', $cart['productInfo']['id'])->find();
+                if ($product['cate_id'] == 2){
+                    if ($cart['cart_num'] > 1) return self::setErrorInfo('限购一个', true);
+                    $orderId = StoreOrder::where('uid', $uid)->where('status', '>', 0)->column('id');
+                    $orderCart = StoreOrderCartInfo::where([['oid', 'in', $orderId], ['product_id', '=', $product['id']]])->find();
+                    if ($orderCart) return self::setErrorInfo('该礼包只能购买一次', true);
+                }
                 $cartIds[] = $cart['id'];
                 $totalNum += $cart['cart_num'];
                 if (!$seckill_id) $seckill_id = $cart['seckill_id'];
@@ -852,7 +859,7 @@ class StoreOrder extends BaseModel
                 $order->save();
                 if ($user['spread_uid']) self::superior_push($user['spread_uid']);
                 if ($user['level'] < 2) $user['level'] = 2;
-            }else if ($product['id'] == 2){
+            }else if ($product['price'] == 399 and $product['cate_id'] == 2){
                 if ($user['spread_uid']) self::superior($user['spread_uid']);
                 if ($user['level'] < 1) $user['level'] = 1;
             }

app/models/user/UserExtract.php

@@ -69,7 +69,7 @@ class UserExtract extends BaseModel
         $insertData = [
             'uid' => $userInfo['uid'],
             'extract_type' => $data['extract_type'],
-            'extract_price' => $data['money'],
+            'extract_price' => $data['money']*0.97,
             'add_time' => time(),
             'balance' => $balance,
             'status' => self::AUDIT_STATUS