Merge branch 'coupon_rebate' of ssh://120.24.33.109:11022/hyzjshwo/lanzu_api_hyperf into coupon_rebate

# Conflicts:
#	app/Controller/CouponRebateController.php
优惠券返券--修改返回数据

app/Controller/CouponRebateController.php

@@ -28,6 +28,9 @@ class CouponRebateController extends BaseController
      * @var CouponRebateInterface
      */
     protected $CouponRebate;
+    /**
+     * 用户是否领取过领取优惠券
+     */
     public function isCouponRebate()
     {
         $user_id = $this->request->input('user_id', 0);
@@ -36,8 +39,19 @@ class CouponRebateController extends BaseController
     }
 
     /**
+     * 返回活动信息
+     */
+    public function getActiveInfo()
+    {
+        $res = $this->CouponRebate->getActiveInfo();
+        return $this->success($res);
+    }
+
+    
+    /**
+     * 用户领取优惠券
      * 用户领取优惠券 2020.08.04 只领一张
-    */
+	*/
     public function userReceiveCoupon(CouponRebateReceiveRequest $validator)
     {
         $userId      = $this->request->input("user_id", 0);
@@ -65,12 +79,12 @@ class CouponRebateController extends BaseController
             return $this->success($return);
         }
 
-        Db::transaction( function () use ($id,$receiveType,$userId,$sendUserId,$phone,&$success,&$fail,$now) {
+        Db::transaction( function () use ($id,$receiveType,$userId,$sendUserId,$phone,&$return,$now) {
             //读写锁，完全控制，性能低
             $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,
             ];

app/CouponRebate/CouponRebate.php

@@ -24,4 +24,14 @@ class CouponRebate implements CouponRebateInterface
         return $res;
     }
 
+    public function getActiveInfo()
+    {
+        $res = Db::table('ims_system_coupon_user')
+            ->where([
+                ['active_type','=',2],
+            ])
+            ->get();
+        return $res;
+    }
+
 }

app/CouponRebate/CouponRebateInterface.php

@@ -7,4 +7,6 @@ interface CouponRebateInterface
 
     public function isCouponRebate($user_id);
 
+    public function getActiveInfo();
+
 }

config/routes.php

@@ -28,4 +28,5 @@ Router::addGroup('/v1/',function (){
     Router::post('Ad/banners', 'App\Controller\AdController@banners');
     Router::post('CouponRebate/isCouponRebate', 'App\Controller\CouponRebateController@isCouponRebate');
     Router::post('CouponRebate/userReceiveCoupon', 'App\Controller\CouponRebateController@userReceiveCoupon');
+    Router::post('CouponRebate/getActiveInfo', 'App\Controller\CouponRebateController@getActiveInfo');
 });