Merge branch 'coupon_rebate' of http://120.24.33.109:11081/hyzjshwo/lanzu_api_hyperf into coupon_rebate

app/Controller/CouponRebateController.php

@@ -47,41 +47,32 @@ class CouponRebateController extends BaseController
         return $this->success($res);
     }
 
+    
     /**
      * 用户领取优惠券
+     * 2020.08.04 只领一张优惠券
 	*/
     public function userReceiveCoupon(CouponRebateReceiveRequest $validator)
     {
         $userId      = $this->request->input("user_id", 0);
         $receiveType = $this->request->input("receive_type", 0);
-        $ids         = $this->request->input("ids", '');
+        $id         = $this->request->input("id", 0);
         $sendUserId  = $this->request->input("send_user_id", 0);
         $phone       = $this->request->input("phone", '');
-        $ids     = explode(',', $ids);
         $now     = time();
         
-        // mock 数据 给前端用
-        $test       = $this->request->input("test", 0);
-        if($test){
-            $cps     = Coupon::whereIn('id', $ids)->lockForUpdate()
-            ->select('id','title','status','inventory','inventory_use','start_time','end_time')
-            ->first();
-            return $this->success([
-                'success' => [$cps],
-                'fail'    => [],
-            ]);
-        }
-
-        $success = [];
-        $fail    = [];
+        // status : 0 领取成功  >0 领取失败
+        $return = [
+            'status'        => 1,
+            'data'          => [],
+            'coupon_text'   => '继续努力~'
+        ];
 
-        Db::transaction( function () use ($ids,$receiveType,$userId,$sendUserId,$phone,&$success,&$fail,$now) {
+        Db::transaction( function () use ($id,$receiveType,$userId,$sendUserId,$phone,&$return,$now) {
             //读写锁，完全控制，性能低
-            $cps   = Coupon::whereIn('id', $ids)->lockForUpdate()
-                    ->select('id','title','status','inventory','inventory_use','start_time','end_time')
-                    ->get();
-
-            foreach ($cps as $key => $cp) {
+            $cp   = Coupon::where('id', $id)->lockForUpdate()
+                    ->select('id','title','status','inventory','inventory_use','start_time','end_time','full_amount','discounts')
+                    ->first();
         
             $where = [
                 'system_coupon_user_id' => $cp->id,
@@ -90,7 +81,7 @@ class CouponRebateController extends BaseController
             if (env('SUB_CHANNEL') == 1) {
                 $where['receive_type'] = $receiveType;
             }
-
+            // 查询领取类型一次能领取的数量
             $crt = CouponUserRecType::where($where)->first();
            
             $cr                        = new CouponRec;
@@ -105,6 +96,7 @@ class CouponRebateController extends BaseController
             $cr->receive_type          = $receiveType;
             $cr->send_user_id          = $sendUserId;
             $cr->phone                 = $phone;
+           
             //如果优惠卷库存小于等于已领取的数量 或者 未在活动时间内, 则返回领取失败的优惠券
             if ( 
                 $cp->status != 1
@@ -113,26 +105,24 @@ class CouponRebateController extends BaseController
                 ||
                 $cp->inventory < ($cp->inventory_use+$cr->number)
                 ||
-                    $cp->start_time < $now
+                $cp->start_time > $now
                 ||
-                    $cp->end_time > $now
+                $cp->end_time < $now
                 )
             {
-                    $fail[] = $cp;
+                $return['status'] = 2;
+                $return['coupon_text'] = '红包已经领完~';
             }else{
                 $cp->inventory_use += $cr->number;//记录已领取的数量
                 if ( $cr->save() && $cp->save() ) {
-                        $success[] = $cp;
-                    } else {
-                        $fail[] = $cp;
-                    }
+                    $return['status'] = 0;
+                    $return['data'] = $cp;
+                    $return['coupon_text'] = $cp['discounts'].'元红包';
                 }
             }
+
         });
 
-        return $this->success([
-            'success' => $success,
-            'fail'    => $fail,
-        ]);
+        return $this->success($return);
     }
 }

app/Request/CouponRebateReceiveRequest.php

@@ -24,7 +24,7 @@ class CouponRebateReceiveRequest extends FormRequest
         return [
             'user_id' => 'required|nonempty|integer|exists_enable:ims_cjdc_user,id',
             'receive_type' => 'required|nonempty|integer',
-            'ids' => 'required|nonempty',
+            'id' => 'required|nonempty',
         ];
     }
 
@@ -33,7 +33,7 @@ class CouponRebateReceiveRequest extends FormRequest
         return [
             'user_id.*' => ':attribute信息不正确',
             'receive_type.*' => ':attribute必须',
-            'ids.*' => ':attribute必须',
+            'id.*' => ':attribute必须',
         ];
     }
 
@@ -42,7 +42,7 @@ class CouponRebateReceiveRequest extends FormRequest
         return [
             'user_id' => '领取用户ID',
             'receive_type' => '领取方式',
-            'ids' => '优惠券',
+            'id' => '优惠券',
         ];
     }
 }