记录

application/api/service/CouponService.php

@@ -30,14 +30,12 @@ class CouponService{
      * 发券
      *
      * @param int $user_id
-     * @param int $type 奖励动作 0首次登陆 1邀请登陆 2邀请成交
-     * @param int $report_id
-     * @param int $bargain_id
-     * @param int $order_id
+     * @param int $referrer_id
+     * @param int $type
      * @return mixed
      * @throws \think\exception\PDOException
      */
-    public function sendCoupon(int $user_id, int $type, $report_id = 0, $bargain_id = 0, $order_id = 0) {
+    public function sendCoupon(int $user_id, int $referrer_id,int $type) {
         $result['status'] = 'successful';
         $result['msg'] = '发券成功';
         $result['data'] = [];
@@ -49,7 +47,7 @@ class CouponService{
             $result['msg'] = '正在发券中，请稍等...';
             return $result;
         } else {
-            $this->redis_->set($key, $user_id, 3); //上线后改为120
+            $this->redis_->set($key, $user_id, 3);
         }
 
         try {
@@ -60,7 +58,7 @@ class CouponService{
                 return $result;
             }
 
-            $activity_data = $this->checkUserCoupon($user_id, $type, $order_id);
+            $activity_data = $this->checkUserCoupon($user_id, $type, $referrer_id);
             if (empty($activity_data)) {
                 $result['status'] = 'fail';
                 $result['msg'] = '没有可参加的活动';
@@ -68,14 +66,8 @@ class CouponService{
             }
             $save_data = [];
             $save_data['user_id'] = $user_id;
-            if ($report_id) {
-                $save_data['report_id'] = $report_id;
-            }
-            if ($bargain_id) {
-                $save_data['bargain_id'] = $bargain_id;
-            }
-            if ($order_id) {
-                $save_data['order_id'] = $order_id;
+            if ($referrer_id) {
+                $save_data['referrer_id'] = $referrer_id;
             }
             $save_data['status'] = 0;
             $save_data['create_time'] = date('Y-m-d H:i:s');
@@ -137,7 +129,7 @@ class CouponService{
      * @throws \think\db\exception\ModelNotFoundException
      * @throws \think\exception\DbException
      */
-    public function checkUserCoupon(int $user_id, int $type, $order_id)
+    public function checkUserCoupon(int $user_id, int $type, $referrer_id)
     {
         $return_activity = [];
         $time = time();
@@ -145,14 +137,14 @@ class CouponService{
         $field .= ',available,get_number,create_time';
         $activity_data = $this->selectActivity($field, $type);
         $count_where['user_id'] = $user_id;
+
         foreach ($activity_data as $k=>$v) {
             if ($v['total'] - $v['get_number'] <= 0 ) {
                 continue;
             }
 
-            //单个订单只奖励一次
-            if ($type == 2) {
-                $count_where['order_id'] = $order_id;
+            if ($type == 0) {
+                $count_where['referrer_id'] = $referrer_id;
                 $num = $this->m_coupon->getCount($count_where);
                 if ($num > 0) {
                     continue;

application/api/service/RegisterService.php

@@ -125,11 +125,11 @@ class RegisterService
 
         $coupon_service = new CouponService();
         if (!empty($first_login_time)) {
-            $coupon_service->sendCoupon((int)$id, 0);
+            $coupon_service->sendCoupon((int)$id, $user_info[0]['referrer_id'], 0);
         }
 
         if (!empty($registration_time) && $referrer_source == 10 && $referrer_id) {
-            $coupon_service->sendCoupon((int)$referrer_id, 2);
+            $coupon_service->sendCoupon((int)$referrer_id, 0, 2);
         }
 
         $jwt = new JwtUntils();

application/index/controller/Finance.php

@@ -1423,7 +1423,7 @@ class Finance extends Basic
      */
     public function addRealIncome()
     {
-        if (empty($this->params['bargain_id']) || !isset($this->params['is_account_commission']) || !isset($this->params['is_account_commission'])) {
+        if (empty($this->params['bargain_id']) || !isset($this->params['is_account_commission'])) {
             return $this->response(101, '请求参数错误');
         }
 
@@ -1473,7 +1473,7 @@ class Finance extends Basic
                             $user_id = $m_report->getFieldValue('user_id',['id'=>$this->params['report_id']]);
                             if ($user_id) {
                                 $service = new ConvertCouponService();
-                                $service->convertCoupon($user_id);  //核销红包
+                                $service->convertCoupon($user_id, $this->params['report_id'], $this->params['bargain_id'], $this->params['order_id']);  //核销红包
                             }
                         }
                     }