合并

app/Service/CouponRebateService.php

@@ -64,8 +64,8 @@ class CouponRebateService implements CouponRebateServiceInterface
 
                 //读写锁，完全控制，性能低
                 $coupons = Coupon::whereIn('id', $ids)->lockForUpdate()
-                        ->select('id','title','status','inventory','inventory_use','start_time','end_time','full_amount','discounts','active_type')
-                        ->get();
+                    ->select('id','title','status','inventory','inventory_use','start_time','end_time','full_amount','discounts','active_type')
+                    ->get();
 
                 foreach($coupons as $coupon){
                     $errorData['coupon_id'] = $coupon->id;
@@ -81,7 +81,7 @@ class CouponRebateService implements CouponRebateServiceInterface
                         $coupon->end_time >= $now
                         &&
                         $coupon->active_type == 2
-                        )
+                    )
                     {
 
                         // 查询一次能领取的数量
@@ -96,9 +96,9 @@ class CouponRebateService implements CouponRebateServiceInterface
 
                             // 判断是否领取过 存在记录则领取过
                             $isReceive = CouponRec::select('id')
-                                        ->where('system_coupon_user_id',$coupon->id)
-                                        ->where('user_id',$userId)
-                                        ->exists();
+                                ->where('system_coupon_user_id',$coupon->id)
+                                ->where('user_id',$userId)
+                                ->exists();
 
                             if(!$isReceive){
                                 //记录已领取的数量
@@ -161,6 +161,13 @@ class CouponRebateService implements CouponRebateServiceInterface
                     $result['coupon_text'] = '恭喜您领取成功！';
                 }
             });
+        } catch (Exception $e){
+            $errorData['msg'] = $e->getMessage();
+            $this->log->event(
+                LogLabel::COUPON_LOG,
+                $errorData
+            );
+        }
         if(count($receiveSsdb) > 0){
             $saveSsdb = [];
             foreach($receiveSsdb as $kssdb => $vssdb){
@@ -186,11 +193,11 @@ class CouponRebateService implements CouponRebateServiceInterface
     public function isCouponRebate($user_id)
     {
         $res = Db::table('ims_system_coupon_user as u')
-            ->leftjoin('ims_system_coupon_user_receive as r','u.id','=','r.system_coupon_user_id')
+            ->leftjoin('ims_system_coupon_user_receive as r', 'u.id', '=', 'r.system_coupon_user_id')
             ->where([
-                ['r.user_id'     ,'=', $user_id],
-                ['r.receive_type','=', 4],
-                ['u.active_type' ,'=', 2],
+                ['r.user_id', '=', $user_id],
+                ['r.receive_type', '=', 4],
+                ['u.active_type', '=', 2],
             ])
             ->select('r.id')
             ->first();
@@ -205,13 +212,13 @@ class CouponRebateService implements CouponRebateServiceInterface
         $time = time();
         $res = Db::table('ims_system_coupon_user')
             ->where([
-                ['status'      ,'=',  1],
-                ['active_type' ,'=',  2],
-                ['start_time'  ,'<=',  $time],
-                ['end_time'    ,'>',   $time],
+                ['status', '=', 1],
+                ['active_type', '=', 2],
+                ['start_time', '<=', $time],
+                ['end_time', '>', $time],
             ])
             ->whereRaw('inventory > inventory_use')
-            ->orderBy('addtime','desc')
+            ->orderBy('addtime', 'desc')
             ->get();
         return $res;
     }
@@ -220,47 +227,47 @@ class CouponRebateService implements CouponRebateServiceInterface
      * 将优惠券绑定活动
      * 领取优惠券 COUPON_REBATE_FORWARD  可多张
      * 返还优惠券 COUPON_REBATE_REPAY    只一张
-    */
-    public function tieCouponActive($couponActivity,$couponForward,$couponRepay)
+     */
+    public function tieCouponActive($couponActivity, $couponForward, $couponRepay)
     {
         $result = [
             'forward' => true,
-            'repay'   => true,
+            'repay' => true,
         ];
 
         $ssdb = ApplicationContext::getContainer()->get(SSDBTask::class);
-        $rrss1 = $ssdb->exec('hgetall',SsdbKeysPrefix::COUPON_REBATE_FORWARD.$couponActivity);
-        $rrss2 = $ssdb->exec('get',SsdbKeysPrefix::COUPON_REBATE_REPAY.$couponActivity);
-        return [$rrss1,$rrss2];
+        $rrss1 = $ssdb->exec('hgetall', SsdbKeysPrefix::COUPON_REBATE_FORWARD . $couponActivity);
+        $rrss2 = $ssdb->exec('get', SsdbKeysPrefix::COUPON_REBATE_REPAY . $couponActivity);
+        return [$rrss1, $rrss2];
         // 记录领取类型优惠券
         $forwardData = [];
-        foreach($couponForward as $kForward => $vForward){
+        foreach ($couponForward as $kForward => $vForward) {
             $forwardData[] = $kForward;
             $forwardData[] = $vForward;
         }
 
-        if(false === $ssdb->exec('multi_hset',SsdbKeysPrefix::COUPON_REBATE_FORWARD.$couponActivity,$forwardData)){
+        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失败'
+                    'coupon_forward' => $forwardData,
+                    'msg' => '绑定-领取-优惠券到ssdb失败'
                 ]
             );
             $result['forward'] = false;
         };
 
         // 记录返还类型优惠券
-        if(false === $ssdb->exec('set',SsdbKeysPrefix::COUPON_REBATE_REPAY.$couponActivity,$couponRepay)){
+        if (false === $ssdb->exec('set', SsdbKeysPrefix::COUPON_REBATE_REPAY . $couponActivity, $couponRepay)) {
 
             $this->log->event(
                 LogLabel::COUPON_LOG,
                 [
                     'coupon_activity' => $couponActivity,
-                    'coupon_Repay'    => $couponRepay,
-                    'msg'             => '绑定-返还-优惠券到ssdb失败'
+                    'coupon_Repay' => $couponRepay,
+                    'msg' => '绑定-返还-优惠券到ssdb失败'
                 ]
             );
             $result['repay'] = false;
@@ -344,4 +351,5 @@ class CouponRebateService implements CouponRebateServiceInterface
 
 
         return '返券成功';
-    }}
+    }
+}