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

app/Controller/CouponRebateController.php

@@ -73,10 +73,20 @@ class CouponRebateController extends BaseController
     public function tieCouponActive(CouponRebateTieRequest $validator)
     {
         $couponForward = $this->request->input('coupon_forward_ids',[]);
-        $couponForward = is_array($couponForward) ? $couponForward : explode(',',$couponForward) ;
+        $couponForward = is_array($couponForward) ? implode(',',$couponForward)  : $couponForward ;
         $couponRepay = $this->request->input('coupon_repay_id',0);
         $couponActivity = $this->request->input('coupon_activity',0);
         $res = $this->CouponRebateService->tieCouponActive($couponActivity,$couponForward,$couponRepay);
         return $this->success($res);
     }
+
+     /**
+     * 清优惠券领取记录（SSDB）
+    */
+    public function clearSsdbCouponReceiveByName(){
+        $activity = $this->request->input('activity_type',0);
+        $userId = $this->request->input('user_id',0);
+        $get = $this->request->input('get',0);
+        return $this->success($this->CouponRebateService->clearSsdbCouponReceiveByName($activity,$userId, $get));
+    }
 }

app/Model/OrderMain.php

@@ -0,0 +1,10 @@
+<?php
+
+
+namespace App\Model;
+
+
+class OrderMain extends Model
+{
+    protected $table = 'ims_cjdc_order_main';
+}

app/Service/CouponRebateService.php

@@ -14,6 +14,8 @@ use App\TaskWorker\SSDBTask;
 use App\Constants\SsdbKeysPrefix;
 use Exception;
 
+use function AlibabaCloud\Client\json;
+
 class CouponRebateService implements CouponRebateServiceInterface
 {
     /**
@@ -35,7 +37,6 @@ class CouponRebateService implements CouponRebateServiceInterface
         $ids            = $params["ids"];
         $sendUserId     = $params["send_user_id"];
         $phone          = $params["phone"];
-        $now            = time();
         $idsData        = is_array($ids) ? $ids : explode(',',$ids);
 
         // status: 0领取成功  >0领取失败
@@ -54,119 +55,85 @@ class CouponRebateService implements CouponRebateServiceInterface
         ];
 
         $ssdb = ApplicationContext::getContainer()->get(SSDBTask::class);
+        $activity = $ssdb->exec('hget', SsdbKeysPrefix::COUPON_REBATE_ACTIVITY ,'activity');
         $receiveSsdb = [];
 
-        // 判断是否已全部领取
-        $couponActivity = $ssdb->exec('hget', SsdbKeysPrefix::COUPON_REBATE_ACTIVITY,0);
-        $userReceiveCouponIds = $ssdb->exec('hgetall', SsdbKeysPrefix::COUPON_REBATE_RECEIVE . $couponActivity . $userId);
-        if($userReceiveCouponIds !== false){
+        // 判断是否已全部领取过
+        $userReceive = $ssdb->exec('hgetall', SsdbKeysPrefix::COUPON_REBATE_RECEIVE . $activity . $userId);
+        if($userReceive === false){
+            $ids = $idsData;
+        }else{
+            $userReceiveCouponIds = empty($userReceive) ? [] : $userReceive ; 
             $ids = array_diff($idsData, $userReceiveCouponIds);
             $receiveSsdb = $userReceiveCouponIds;
-        }else{
-            $ids = $idsData;
         }
 
         if(count($ids) > 0){
             try{
-                Db::transaction( function() use ($ids,$receiveType,$userId,$sendUserId,$phone,$now,&$result,&$errorData,&$receiveSsdb) {
+                Db::transaction( function() use ($ids,$receiveType,$userId,$sendUserId,$phone,&$result,&$errorData,&$receiveSsdb) {
 
+                    $now     = time();
                     $success = [];
-                    $fail    = [];
     
-                    //读写锁，完全控制，性能低
+                    //获取优惠券信息 （读写锁，完全控制，性能低）
                     $coupons = Coupon::whereIn('id', $ids)->lockForUpdate()
-                        ->select('id','title','status','inventory','inventory_use','start_time','end_time','full_amount','discounts','active_type')
+                        ->where('active_type',2)
+                        ->where('status',1)
+                        ->where('start_time', '<=', $now)
+                        ->where('end_time', '>=', $now)
+                        ->whereRaw('inventory > inventory_use')
+                        ->select('id','title','inventory','inventory_use','full_amount','discounts','active_type')
                         ->get();
     
                     foreach($coupons as $coupon){
                         $errorData['coupon_id'] = $coupon->id;
 
-                        //如果优惠卷库存小于等于已领取的数量 或者 未在活动时间内可领取, 否则返回领取失败的优惠券
-                        if (
-                            $coupon->status == 1
-                            &&
-                            $coupon->inventory > $coupon->inventory_use
-                            &&
-                            $coupon->start_time <= $now
-                            &&
-                            $coupon->end_time >= $now
-                            &&
-                            $coupon->active_type == 2
-                        )
-                        {
-    
-                            // 查询一次能领取的数量
-                            $couponReceiveType = CouponUserRecType::where('system_coupon_user_id',$coupon->id)->select('one_receive_number');
-                            if (env('SUB_CHANNEL') == 1) {
-                                $couponReceiveType->where('receive_type',$receiveType);
-                            }
-                            $couponReceiveType = $couponReceiveType->first();
-    
-                            // 优惠券可领取数量 >= 本次领取数量
-                            if($coupon->inventory - $coupon->inventory_use >= $couponReceiveType->one_receive_number){
-    
-                                // 判断是否领取过 存在记录则领取过
-                                $isReceive = CouponRec::select('id')
-                                    ->where('system_coupon_user_id',$coupon->id)
-                                    ->where('user_id',$userId)
-                                    ->exists();
-    
-                                if(!$isReceive){
-                                    //记录已领取的数量
-                                    $coupon->inventory_use += $couponReceiveType->number;
-    
-                                    $couponReceive                        = new CouponRec;
-                                    $couponReceive->user_id               = $userId;
-                                    $couponReceive->system_coupon_user_id = $coupon->id;
-                                    $couponReceive->order_main_id         = 0;
-                                    $couponReceive->receive_time          = $now;
-                                    $couponReceive->number                = $couponReceiveType->one_receive_number;
-                                    $couponReceive->number_remain         = $couponReceiveType->one_receive_number;
-                                    $couponReceive->status                = 0;
-                                    $couponReceive->update_time           = $now;
-                                    $couponReceive->receive_type          = $receiveType;
-                                    $couponReceive->send_user_id          = $sendUserId;
-                                    $couponReceive->phone                 = $phone;
-    
-                                    if ( $couponReceive->save() && $coupon->save() ) {
-                                        $success[] = $coupon;
-                                        $receiveSsdb[] = $coupon->id;
-                                    }
+                        // 查询一次能领取的数量
+                        $couponReceiveType = CouponUserRecType::where('system_coupon_user_id',$coupon->id)->select('one_receive_number');
+                        if (env('SUB_CHANNEL') == 1) {
+                            $couponReceiveType->where('receive_type',$receiveType);
+                        }
+                        $couponReceiveType = $couponReceiveType->first();
+
+                        // 优惠券可领取数量 >= 本次领取数量
+                        if($coupon->inventory - $coupon->inventory_use >= $couponReceiveType->one_receive_number){
+
+                            // 判断是否领取过 存在记录则领取过
+                            $isReceive = CouponRec::select('id')
+                                ->where('system_coupon_user_id',$coupon->id)
+                                ->where('user_id',$userId)
+                                ->exists();
+
+                            if(!$isReceive){
+                                //记录已领取的数量
+                                $coupon->inventory_use += $couponReceiveType->number;
+
+                                $couponReceive                        = new CouponRec;
+                                $couponReceive->user_id               = $userId;
+                                $couponReceive->system_coupon_user_id = $coupon->id;
+                                $couponReceive->order_main_id         = 0;
+                                $couponReceive->receive_time          = $now;
+                                $couponReceive->number                = $couponReceiveType->one_receive_number;
+                                $couponReceive->number_remain         = $couponReceiveType->one_receive_number;
+                                $couponReceive->status                = 0;
+                                $couponReceive->update_time           = $now;
+                                $couponReceive->receive_type          = $receiveType;
+                                $couponReceive->send_user_id          = $sendUserId;
+                                $couponReceive->phone                 = $phone;
+
+                                if ( $couponReceive->save() && $coupon->save() ) {
+                                    $success[]      = $coupon;
+                                    $receiveSsdb[]  = $coupon->id;
                                 }else{
-                                    $fail[] = $coupon;
-                                    $receiveSsdb[] = $coupon->id;
-                                    $result['status']       = 3;
-                                    $result['coupon_text']  = '您已领取！赶快去下单吧~';
-    
-                                    $errorData['msg']       = '用户已经领取了优惠券';
+                                    $errorData['msg'] = '添加优惠券到用户领取表或者记录已领取数量失败';
                                     $this->log->event(
                                         LogLabel::COUPON_LOG,
                                         $errorData
                                     );
                                 }
-                            }else{
-                                $fail[] = $coupon;
-                                $errorData['remain_receive_number'] = $coupon->inventory - $coupon->inventory_use;
-                                $errorData['one_receive_number']    = $couponReceiveType->one_receive_number;
-                                $errorData['msg']                   = '优惠券剩余数量不足';
-                                $this->log->event(
-                                    LogLabel::COUPON_LOG,
-                                    $errorData
-                                );
                             }
-                        }else{
-                            $fail[] = $coupon;
-                            $errorData['msg'] = '优惠券已经过期或者被禁用或者已领完';
-                            $this->log->event(
-                                LogLabel::COUPON_LOG,
-                                $errorData
-                            );
                         }
                     }
-                    $result['data'] = [
-                        'success' => $success,
-                        'fail'    => $fail
-                    ];
                     if(count($success) > 0){
                         $result['status'] = 0;
                         $result['coupon_text'] = '恭喜您领取成功！';
@@ -187,8 +154,8 @@ class CouponRebateService implements CouponRebateServiceInterface
                     $saveSsdb[] = $vssdb;
                 }
                 // 记录到ssdb
-                if(false === $ssdb->exec('multi_hset',SsdbKeysPrefix::COUPON_REBATE_RECEIVE . $couponActivity . $userId, $saveSsdb)){
-                    $errorData['msg']       = '记录领取优惠券到ssdb失败';
+                if(false === $ssdb->exec('multi_hset',SsdbKeysPrefix::COUPON_REBATE_RECEIVE . $activity . $userId, $saveSsdb)){
+                    $errorData['msg']  = '记录领取优惠券到ssdb失败';
                     $this->log->event(
                         LogLabel::COUPON_LOG,
                         $errorData
@@ -257,64 +224,19 @@ class CouponRebateService implements CouponRebateServiceInterface
      */
     public function tieCouponActive($couponActivity, $couponForward, $couponRepay)
     {
-        $result = [
-            'forward' => true,
-            'repay' => true,
-            'activity' => true,
-        ];
         
         $ssdb = ApplicationContext::getContainer()->get(SSDBTask::class);
-        // $rrss1 = $ssdb->exec('hgetall', SsdbKeysPrefix::COUPON_REBATE_FORWARD . $couponActivity);
-        // $rrss2 = $ssdb->exec('hget', SsdbKeysPrefix::COUPON_REBATE_REPAY . $couponActivity,0);
-        // $rrss3 = $ssdb->exec('hget', SsdbKeysPrefix::COUPON_REBATE_ACTIVITY,0);
-        // return [$rrss1,$rrss2,$rrss3];
-
-        // 记录活动本次 activity_type 活动标志值
-        if (false === $ssdb->exec('hset', SsdbKeysPrefix::COUPON_REBATE_ACTIVITY, [0,$couponActivity])) {
-
-            $this->log->event(
-                LogLabel::COUPON_LOG,
-                [
-                    'coupon_activity' => $couponActivity,
-                    'msg' => '记录活动标志值（activity_type）到ssdb失败'
-                ]
-            );
-            $result['activity'] = false;
-        };
-
-        // 记录领取类型优惠券
-        $forwardData = [];
-        foreach ($couponForward as $kForward => $vForward) {
-            $forwardData[] = $kForward;
-            $forwardData[] = $vForward;
-        }
 
-        if (false === $ssdb->exec('multi_hset', SsdbKeysPrefix::COUPON_REBATE_FORWARD . $couponActivity, $forwardData)) {
-
-            $this->log->event(
-                LogLabel::COUPON_LOG,
-                [
-                    'coupon_activity' => $couponActivity,
-                    'coupon_forward' => $forwardData,
-                    'msg' => '绑定-领取-优惠券到ssdb失败'
-                ]
-            );
-            $result['forward'] = false;
-        };
-
-        // 记录返还类型优惠券
-        if (false === $ssdb->exec('hset', SsdbKeysPrefix::COUPON_REBATE_REPAY . $couponActivity, [0,$couponRepay])) {
-
-            $this->log->event(
-                LogLabel::COUPON_LOG,
-                [
-                    'coupon_activity' => $couponActivity,
-                    'coupon_Repay' => $couponRepay,
-                    'msg' => '绑定-返还-优惠券到ssdb失败'
-                ]
-            );
-            $result['repay'] = false;
-        };
+        $data = [
+            'activity', $couponActivity,
+            'forward' , $couponForward,
+            'repay'   , $couponRepay
+        ];
+
+        $result = [
+            'result' => ($ssdb->exec('multi_hset', SsdbKeysPrefix::COUPON_REBATE_ACTIVITY, $data) === false) ? false : true ,
+            'data'   => $ssdb->exec('hgetall', SsdbKeysPrefix::COUPON_REBATE_ACTIVITY)
+        ];
 
         return $result;
     }
@@ -445,4 +367,22 @@ class CouponRebateService implements CouponRebateServiceInterface
         );
         return '返券成功';
     }
+    
+    /**
+     * 清优惠券领取记录（SSDB）
+    */
+    public function clearSsdbCouponReceiveByName($activity, $userId, $get = 0){
+
+        $ssdb = ApplicationContext::getContainer()->get(SSDBTask::class);
+
+        if($get > 0){
+            return [
+                $ssdb->exec('hgetAll', SsdbKeysPrefix::COUPON_REBATE_RECEIVE . $activity . $userId ),
+                $ssdb->exec('hgetAll', SsdbKeysPrefix::COUPON_REBATE_RECEIVE . $userId ),
+                SsdbKeysPrefix::COUPON_REBATE_RECEIVE . $activity . $userId  
+            ];
+        }
+        
+        return ( $ssdb->exec('hclear', SsdbKeysPrefix::COUPON_REBATE_RECEIVE . $activity . $userId ) === false) ? false : true;
+    }
 }

app/Service/CouponRebateServiceInterface.php

@@ -15,6 +15,8 @@ interface CouponRebateServiceInterface
 
     public function tieCouponActive($couponActivity,$couponForward,$couponRepay);
 
-	public function couponRebate($order_id);
+    public function couponRebate($order_id);
+    
+    public function clearSsdbCouponReceiveByName($activity, $userId, $get = 0);
 
 }

app/Service/CouponService.php

@@ -29,14 +29,15 @@ class CouponService implements CouponServiceInterface
     {
         /* 优惠券活动标志 2 */ 
         $ssdb = ApplicationContext::getContainer()->get(SSDBTask::class);
-        $couponActivity = $ssdb->exec('hget', SsdbKeysPrefix::COUPON_REBATE_ACTIVITY,0);
+        $couponActivity = $ssdb->exec('hgetall', SsdbKeysPrefix::COUPON_REBATE_ACTIVITY);
+        $activityType = $couponActivity === false ? 0 : $couponActivity['activity'];
 
         $result = [
             'active_type' => 1,
             'not_receive' => [],
             'jump_data'   => [
-                'src'       => "/zh_cjdianc/pages/couponrebate/index?activity_type=".$couponActivity,
-                'src2'       => "/zh_cjdianc/pages/couponrebate/index?activity_type=".$couponActivity,
+                'src'       => "/zh_cjdianc/pages/couponrebate/index?activity_type=".$activityType,
+                'src2'       => "/zh_cjdianc/pages/couponrebate/index?activity_type=".$activityType,
                 'coupons'   => []
             ]
         ];
@@ -68,9 +69,7 @@ class CouponService implements CouponServiceInterface
         $couponIds = array_diff($c_ids, $cr_ids);
 
         // 获取领取型优惠券 
-        $couponRebateIds = $ssdb->exec('hgetall',SsdbKeysPrefix::COUPON_REBATE_FORWARD.$couponActivity);
-       
-        $couponIds = ($couponRebateIds === false || empty($couponRebateIds)) ? $couponIds : array_merge($couponIds,$couponRebateIds) ;
+        $couponIds = $couponActivity['forward'] === false ? $couponIds : array_merge($couponIds,explode(',',$couponActivity['forward']));
 
         $whereC = [
             ['u.end_time','>',$nowTime],

app/Service/UserService.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Service;
+
+use App\Model\OrderMain;
+use App\Model\User;
+
+class UserService implements UserServiceInterface
+{
+
+    /**
+     * 是否平台新用户
+     * 在很多奖励的地方会需要用到这个查询
+     * 判定条件：
+     * 没有在平台下过单（包括线上和线下）
+     * @param $user_id
+     * @return mixed|void
+     */
+    public function isStageNewUser($user_id): bool
+    {
+        $exist = OrderMain::query()
+            ->where(['user_id' => $user_id])
+            ->where(function ($query){
+                $query->where('state', 'in', [4,5,10])
+                        ->orWhere('dm_state', 'in', [2,3]);
+            })
+            ->exists();
+
+        return !$exist;
+    }
+}

app/Service/UserServiceInterface.php

@@ -0,0 +1,15 @@
+<?php
+
+
+namespace App\Service;
+
+
+interface UserServiceInterface
+{
+    /**
+     * 是否平台新用户
+     * @param $user_id
+     * @return mixed
+     */
+    public function isStageNewUser($user_id): bool;
+}

config/autoload/dependencies.php

@@ -16,4 +16,5 @@ return [
     \App\Service\AdServiceInterface::class => \App\Service\AdService::class,
     \App\Commons\Log::class => \App\Commons\Log::class,
     \App\Service\CouponRebateServiceInterface::class => \App\Service\CouponRebateService::class,
+    \App\Service\UserServiceInterface::class => \App\Service\UserService::class,
 ];

config/autoload/middlewares.php

@@ -11,8 +11,8 @@ declare(strict_types=1);
  */
 return [
     'http' => [
+        \App\Middleware\CorsMiddleware::class,
         \App\Middleware\Auth\ApiMiddleware::class,
         \Hyperf\Validation\Middleware\ValidationMiddleware::class,
-        \App\Middleware\CorsMiddleware::class,
     ],
 ];

config/routes.php

@@ -31,5 +31,7 @@ Router::addGroup('/v1/',function (){
     Router::post('CouponRebate/getActiveInfo', 'App\Controller\CouponRebateController@getActiveInfo');
     Router::post('CouponRebate/tieCouponActive', 'App\Controller\CouponRebateController@tieCouponActive');
 
-	Router::post('CouponRebate/couponRebate', 'App\Controller\CouponRebateController@couponRebate');
+    Router::post('CouponRebate/couponRebate', 'App\Controller\CouponRebateController@couponRebate');
+    Router::post('CouponRebate/clearSsdbReceive', 'App\Controller\CouponRebateController@clearSsdbCouponReceiveByName');
+    
 });