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

app/Request/CouponRebateReceiveRequest.php

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

app/Service/CommonService.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Service;
+
+class CommonService
+{
+
+    /**
+     * 请求参数判空
+     * @param mixed $var 参数
+    */
+    public function empty($var)
+    {
+        return ! (
+            isset($var)
+            && $var
+            && !empty($var)
+            && !is_null($var)
+            && $var != 'undefined'
+            && $var != 'unknown'
+            && $var != 'null'
+            && $var != 'false'
+        );
+    }
+}

app/Service/CouponRebateService.php

@@ -13,6 +13,7 @@ use Hyperf\Utils\ApplicationContext;
 use App\TaskWorker\SSDBTask;
 use App\Constants\SsdbKeysPrefix;
 use Exception;
+use App\Service\CommonService;
 
 use function AlibabaCloud\Client\json;
 
@@ -24,6 +25,12 @@ class CouponRebateService implements CouponRebateServiceInterface
      */
     protected $log;
 
+    /**
+     * @Inject
+     * @var CommonService
+     */
+    protected $commonService;
+
     /**
      * 领取优惠券
      * 返券活动领取
@@ -34,16 +41,22 @@ class CouponRebateService implements CouponRebateServiceInterface
     {
         $userId         = $params["user_id"];
         $receiveType    = $params["receive_type"];
-        $ids            = $params["ids"];
         $sendUserId     = $params["send_user_id"];
         $phone          = $params["phone"];
-        $idsData        = is_array($ids) ? $ids : explode(',',$ids);
+        
 
         // status: 0领取成功  >0领取失败
         $result = [
             'status'        => 1,
             'coupon_text'   => '活动已过期~'
         ];
+        /* 如果请求的优惠券ids为空，则返回过期提示 */
+        if($this->commonService->empty($params["ids"])){
+            return $result;
+        }
+
+        $ids     = $params["ids"];
+        $idsData = is_array($ids) ? $ids : explode(',',$ids);
 
         // 错误日志记录
         $errorData = [
@@ -150,7 +163,7 @@ class CouponRebateService implements CouponRebateServiceInterface
             }
 
             if(count($receiveSsdb) > 0){
-;
+
                 $saveSsdb = [
                     $ssdbKey,
                     implode(',',$receiveSsdb)
@@ -381,8 +394,6 @@ class CouponRebateService implements CouponRebateServiceInterface
                 return ( $ssdb->exec('hclear', SsdbKeysPrefix::COUPON_REBATE_RECEIVE) === false) ? false : true ;
             }
         }else {
-            $ssdb->exec('hclear', SsdbKeysPrefix::COUPON_REBATE_RECEIVE . $activity . $userId );
-
             if($get > 0){
                 return $ssdb->exec('hget', SsdbKeysPrefix::COUPON_REBATE_RECEIVE, $key);
             }else{

app/Service/CouponService.php

@@ -70,8 +70,8 @@ class CouponService implements CouponServiceInterface
         // 当前用户可领的优惠券ID
         $couponIds = array_diff($c_ids, $cr_ids);
 
-        // 获取领取型优惠券 
-        $couponIds = $couponActivity['forward'] === false ? $couponIds : array_merge($couponIds,explode(',',$couponActivity['forward']));
+        // 转发型优惠券 
+        $couponReceiveIds = $couponActivity === false ? [] : explode(',',$couponActivity['forward']);
 
         $whereC = [
             ['u.end_time','>',$nowTime],
@@ -97,7 +97,7 @@ class CouponService implements CouponServiceInterface
 
             if($v->active_type == 1){
                 $result['not_receive'][] = $v;
-            }else if($v->active_type == 2){
+            }else if($v->active_type == 2 && in_array($v->id,$couponReceiveIds)){
                 $result['jump_data']['coupons'][] = $v->id;
             }