æ›ç§修改三方订单问题

app/command/PensionTasks.php

@@ -129,9 +129,6 @@ class PensionTasks extends Command
                     default:
                         $online = Db::table('rrx_store_order')->where('uid', $bill['uid'])->where('order_sn', $bill['order_sn'])->where('paid', 1)->find();
                 }
-                if($bill['uid'] == 1611){
-                    var_dump($online);die;
-                }
                 if (!$online) {
                     Log::info($bill['uid'] . '查询不到订单');
                     continue;

app/common/repositories/user/UserRepository.php

@@ -884,7 +884,7 @@ class UserRepository extends BaseRepository
                         'uid' => $user['id'],
                         'reward_socre' => $num,
                         'status' => 1,
-                        'mark' => $mark ?? '管理员增加pv值',
+                        'mark' => $mark ?? '管理员增加积分',
                         'addtime' => time(),
                         'surplus' => $user['score'],
                         'settlement_time' => date('Y-m-d H:i:s'),
@@ -902,15 +902,90 @@ class UserRepository extends BaseRepository
                     break;
                 // 复购金
                 case 4:
+                    $isert_data = [
+                        'uid' => $user['id'],
+                        'number' => $num,
+                        'status' => 1,
+                        'mark' => $mark ?? '管理员增加复购金',
+                        'addtime' => time(),
+                        'surplus' => $user['fugou'],
+                        'settlement_time' => date('Y-m-d H:i:s'),
+                    ];
+                    if($award_type == 1){
+                        // 增加
+                        $isert_data['type'] = 1;
+                        Db::name('user')->inc('fugou', $num)->update();
+                    }else{
+                        // 减少
+                        $isert_data['type'] = 2;
+                        Db::name('user')->dec('fugou', $num)->update();
+                    }
+                    Db::name('user_sign_fugou')->insert($isert_data);
                     break;
                 // 红包
                 case 5:
+                    $isert_data = [
+                        'uid' => $user['id'],
+                        'number' => $num,
+                        'status' => 1,
+                        'mark' => $mark ?? '管理员增加红包',
+                        'addtime' => time(),
+                        'surplus' => $user['hongbao'],
+                        'settlement_time' => date('Y-m-d H:i:s'),
+                    ];
+                    if($award_type == 1){
+                        // 增加
+                        $isert_data['type'] = 1;
+                        Db::name('user')->inc('hongbao', $num)->update();
+                    }else{
+                        // 减少
+                        $isert_data['type'] = 2;
+                        Db::name('user')->dec('hongbao', $num)->update();
+                    }
+                    Db::name('user_sign_hongbao')->insert($isert_data);
                     break;
                 // 贡献值
                 case 8:
+                    $isert_data = [
+                        'uid' => $user['id'],
+                        'number' => $num,
+                        'status' => 1,
+                        'mark' => $mark ?? '管理员增加贡献值',
+                        'addtime' => time(),
+                        'surplus' => $user['contribute'],
+                        'settlement_time' => date('Y-m-d H:i:s'),
+                    ];
+                    if($award_type == 1){
+                        // 增加
+                        $isert_data['type'] = 1;
+                        Db::name('user')->inc('contribute', $num)->update();
+                    }else{
+                        // 减少
+                        $isert_data['type'] = 2;
+                        Db::name('user')->dec('contribute', $num)->update();
+                    }
+                    Db::name('user_sign_gongxian')->insert($isert_data);
                     break;
                 // vr
                 case 9:
+                    $isert_data = [
+                        'uid' => $user['id'],
+                        'number' => $num,
+                        'mark' => $mark ?? '管理员增加贡献值',
+                        'addtime' => time(),
+                        'surplus' => $user['vr'],
+                        'settlement_time' => date('Y-m-d H:i:s'),
+                    ];
+                    if($award_type == 1){
+                        // 增加
+                        $isert_data['type'] = 1;
+                        Db::name('user')->inc('vr', $num)->update();
+                    }else{
+                        // 减少
+                        $isert_data['type'] = 2;
+                        Db::name('user')->dec('vr', $num)->update();
+                    }
+                    Db::name('user_sign_vr')->insert($isert_data);
                     break;
                 // 京豆
                 case 10:

app/common/repositories/user/UserThirdRepository.php

@@ -747,7 +747,7 @@ class UserThirdRepository extends BaseRepository
     /**
      * 添加预估积分记录
      */
-    public function yuguJifen($price,$user_id,$order_sn,$type_shop)
+    public function yuguJifen($order_id,$price,$user_id,$order_sn,$type_shop)
     {
         if (empty($user_id)) {
             Db::name('log')->insert(['data' => "type_shop:{$type_shop}, $order_sn, $order_sn, 赠送积分, 不存在用户ID"]);
@@ -757,7 +757,7 @@ class UserThirdRepository extends BaseRepository
         $user_sign_score_list = Db::name('user_sign_score')
             ->where('uid', $user_id)
             ->where('order_type', $type_shop)
-            ->where('order_id', $order_sn)
+            ->where('order_id', $order_id)
             ->find();
         if (!empty($user_sign_score_list)) {
             Db::name('log')->insert(['data' => "type_shop:{$type_shop}, $order_sn, $order_sn, 赠送积分, 订单已存在积分发放记录"]);
@@ -805,7 +805,7 @@ class UserThirdRepository extends BaseRepository
                 "addtime"       =>  time(),
                 "status"        =>  -1,
                 "order_type"    =>  $type_shop,
-                "order_id"      =>  $order_sn,
+                "order_id"      =>  $order_id,
                 "mark"          =>  "购买{$make}商品赠送积分",
                 "surplus"       =>  $surplus,
                 "pm"            =>  1,
@@ -823,7 +823,7 @@ class UserThirdRepository extends BaseRepository
                 "addtime"       =>time(),
                 "status"        =>-1,
                 "order_type"    =>$type_shop,
-                "order_id"      =>$order_sn,
+                "order_id"      =>$order_id,
                 "mark"          =>"购买{$make}商品赠送贡献值",
                 "desc"          =>'',
                 "surplus"       =>$surplusgongxian+$gxzongwei,
@@ -839,7 +839,7 @@ class UserThirdRepository extends BaseRepository
                 "addtime"       =>time(),
                 "status"        =>-1,
                 "order_type"    =>$type_shop,
-                "order_id"      =>$order_sn,
+                "order_id"      =>$order_id,
                 "mark"          =>"购买{$make}商品获得的PV",
             ];
             Db::name("user_pv_log")->insert($pv_data);//添加pv记录
@@ -854,7 +854,7 @@ class UserThirdRepository extends BaseRepository
                     "addtime"       =>time(),
                     "status"        =>-1,
                     "order_type"    =>$type_shop,
-                    "order_id"      =>$order_sn,
+                    "order_id"      =>$order_id,
                     "mark"          =>"购买{$make}商品赠送红包",
                     "desc"          =>'',
                     "surplus"       =>$hongbao,
@@ -884,7 +884,7 @@ class UserThirdRepository extends BaseRepository
                     "addtime"       =>  time(),
                     "status"        =>  -1,
                     "order_type"    =>  $type_shop,
-                    "order_id"      =>  $order_sn,
+                    "order_id"      =>  $order_id,
                     "mark"          =>  "推广{$make}商品赠送积分",
                     "surplus"       =>  $sprerdUser['score'] + $tuiguanyongjin,
                     "pm"            =>  1,
@@ -904,7 +904,7 @@ class UserThirdRepository extends BaseRepository
                     "addtime"       =>time(),
                     "status"        =>-1,
                     "order_type"    =>$type_shop,
-                    "order_id"      =>$order_sn,
+                    "order_id"      =>$order_id,
                     "mark"          =>"推广{$make}商品赠送贡献值",
                     "desc"          =>'',
                     "surplus"       => $sprerdUser['contribute'] + $gongxian,

app/controller/api/store/product/DaTaoKe.php

@@ -389,6 +389,7 @@ class DaTaoKe
                 //预估积分
                 log::info("===待进入积分");
                 $orderThird->yuguJifen(
+                    $localOrder['order_tb_id'],
                     $localOrder['commission'],
                     $localOrder['uid'],
                     $localOrder['order_sn'],

app/controller/api/store/product/Jd.php

@@ -623,6 +623,7 @@ class Jd extends BaseController
                     'order_jd');
                 //预估积分
                 $orderThird->yuguJifen(
+                    $order['jd_id'],
                     $order['commission'],
                     $order['uid'],
                     $order['order_sn'],

app/controller/api/store/product/Jt.php

@@ -834,6 +834,7 @@ class Jt extends BaseController
                 $yanglaojin = $yanglaojin_order['extension_one'] ?? 0;
                 //预估积分
                 $orderThird->yuguJifen(
+                    $localOrder['order_jd_id'],
                     $localOrder['commission'],
                     $localOrder['uid'],
                     $localOrder['order_sn'],

app/controller/api/store/product/Su.php

@@ -777,6 +777,7 @@ class Su extends BaseController
                     'order_su');
                 //预估积分
                 $orderThird->yuguJifen(
+                    $localOrder['order_jd_id'],
                     $order['commission'],
                     $order['uid'],
                     $order['order_sn'],

app/controller/api/store/product/TaoKe.php

@@ -910,6 +910,7 @@ class TaoKe extends BaseController
                     'order_pdd');
                 //预估积分
                 $orderThird->yuguJifen(
+                    $localOrder['order_pdd_id'],
                     $localOrder['commission'] ,
                     $localOrder['uid'],
                     $localOrder['order_sn'],

app/controller/api/store/product/Vip.php

@@ -914,6 +914,7 @@ class Vip extends BaseController
                     'order_vip');
                 //预估积分
                 $orderThird->yuguJifen(
+                    $localOrder['order_vip_id'],
                     $localOrder['commission'],
                     $localOrder['uid'],
                     $localOrder['order_sn'],