修改type类型问题

app/command/PensionTasks.php

@@ -56,7 +56,7 @@ class PensionTasks extends Command
             $this->suOrderNew($timeLimit = 30);
             $this->taobaoOrderNew($timeLimit = 30);
             $this->vipOrderNew($timeLimit = 30);
-            $this->dyOrderNew($timeLimit = 30);
+//            $this->dyOrderNew($timeLimit = 30);
 //            $this->doThridPddOrderGzc($nowTime, $timeLimit = 30);
 //            $this->doThridJdOrderGzc($nowTime, $timeLimit = 30);
 //            $this->doThridSnOrderGzc($nowTime, $timeLimit = 30);
@@ -1549,7 +1549,7 @@ class PensionTasks extends Command
                 $date = date('Y-m-d H:i:s', strtotime('-' . $timeLimit . ' days'));
                 if($date < $online['create_time']) continue;
                 Db::transaction(function () use ($online) {
-                    $this->settleAward($online);
+                    $this->settleAward($online,0);
                     Db::name('store_order')->where('order_id', $online['order_id'])->update(['is_settlement' => 1 ,'settlement_time' => date('Y-m-d H:i:s')]);
                 });
             }
@@ -1575,7 +1575,7 @@ class PensionTasks extends Command
                 if($date < $online['create_time']) continue;
                 $online['order_id'] = $online['order_huafei_id'];
                 Db::transaction(function () use ($online) {
-                    $this->settleAward($online);
+                    $this->settleAward($online,9);
                     Db::name('order_huafei')->where('order_huafei_id', $online['order_huafei_id'])->update(['gzc' => 1]);
                 });
             }
@@ -1601,7 +1601,7 @@ class PensionTasks extends Command
                 if($date < $online['create_time']) continue;
                 $online['order_id'] = $online['order_pdd_id'];
                 Db::transaction(function () use ($online) {
-                    $this->settleAward($online);
+                    $this->settleAward($online,1);
                     Db::name('order_pdd')->where('order_pdd_id', $online['order_pdd_id'])->update(['gzc' => 1]);
                 });
             }
@@ -1627,7 +1627,7 @@ class PensionTasks extends Command
                 if($date < $online['create_time']) continue;
                 $online['order_id'] = $online['order_jd_id'];
                 Db::transaction(function () use ($online) {
-                    $this->settleAward($online);
+                    $this->settleAward($online,6);
                     Db::name('order_jd')->where('order_jd_id', $online['order_jd_id'])->update(['gzc' => 1]);
                 });
             }
@@ -1653,7 +1653,7 @@ class PensionTasks extends Command
                 if($date < $online['create_time']) continue;
                 $online['order_id'] = $online['order_su_id'];
                 Db::transaction(function () use ($online) {
-                    $this->settleAward($online);
+                    $this->settleAward($online,3);
                     Db::name('order_su')->where('order_su_id', $online['order_su_id'])->update(['gzc' => 1]);
                 });
             }
@@ -1679,7 +1679,7 @@ class PensionTasks extends Command
                 if($date < $online['create_time']) continue;
                 $online['order_id'] = $online['order_tb_id'];
                 Db::transaction(function () use ($online) {
-                    $this->settleAward($online);
+                    $this->settleAward($online,5);
                     Db::name('order_tb')->where('order_tb_id', $online['order_tb_id'])->update(['gzc' => 1]);
                 });
             }
@@ -1705,7 +1705,7 @@ class PensionTasks extends Command
                 if($date < $online['create_time']) continue;
                 $online['order_id'] = $online['order_vip_id'];
                 Db::transaction(function () use ($online) {
-                    $this->settleAward($online);
+                    $this->settleAward($online,2);
                     Db::name('order_vip')->where('order_vip_id', $online['order_vip_id'])->update(['gzc' => 1]);
                 });
             }
@@ -1746,13 +1746,14 @@ class PensionTasks extends Command
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
      */
-    public function settleAward($online)
+    public function settleAward($online,$order_type)
     {
         // 结算积分
         $user_sign_score_list = Db::name('user_sign_score')
             ->where('status', -1)
             ->where('order_id', $online['order_id'])
             ->where('pm', 1)
+            ->where('order_type', $order_type)
             ->select()
             ->toArray();
         if($user_sign_score_list){
@@ -1776,6 +1777,7 @@ class PensionTasks extends Command
             ->where('status', -1)
             ->where('order_id', $online['order_id'])
             ->where('type', 1)
+            ->where('order_type', $order_type)
             ->select()
             ->toArray();
         if($user_sign_hongbao_list){
@@ -1800,6 +1802,7 @@ class PensionTasks extends Command
             ->where('status', -1)
             ->where('order_id', $online['order_id'])
             ->where('type', 1)
+            ->where('order_type', $order_type)
             ->select()
             ->toArray();
         if($user_sign_jingdou_list){
@@ -1823,6 +1826,7 @@ class PensionTasks extends Command
             ->where('status', -1)
             ->where('order_id', $online['order_id'])
             ->where('type', 1)
+            ->where('order_type', $order_type)
             ->select()
             ->toArray();
         if($user_sign_fugou_list){
@@ -1847,6 +1851,7 @@ class PensionTasks extends Command
             ->where('status', -1)
             ->where('order_id', $online['order_id'])
             ->where('type', 1)
+            ->where('order_type', $order_type)
             ->select()
             ->toArray();
         if($user_sign_gongxian_list){
@@ -1872,6 +1877,7 @@ class PensionTasks extends Command
         $user_pv_list = Db::name('user_pv_log')
             ->where('status', -1)
             ->where('order_id', $online['order_id'])
+            ->where('order_type', $order_type)
             ->select()
             ->toArray();
         if($user_pv_list) {
@@ -1895,6 +1901,7 @@ class PensionTasks extends Command
         $user_bill_list = Db::name('user_bill')
             ->where('status', 0)
             ->where([ 'link_id' => $online['order_id']])
+            ->where('type_shop', $order_type)
             ->where([ 'pm' => 1])
             ->select()
             ->toArray();

app/common/repositories/user/UserThirdRepository.php

@@ -684,7 +684,7 @@ class UserThirdRepository extends BaseRepository
     /**
      * 修改积分，养老金，贡献值记录状态
      */
-    public static  function  updateJilu($user_id,$order_sn,$type_shop){
+    public static  function  updateJilu($user_id,$order_id,$type_shop){
 //        if (empty($user_id)) {
 //            Db::name('log')->insert(['data' => "type_shop:{$type_shop}, $order_sn, $order_sn, 修改积分，养老金，贡献值记录, 不存在用户ID"]);
 //            return false;
@@ -692,15 +692,15 @@ class UserThirdRepository extends BaseRepository
 
         log::info("订单修改开始");
         // 更新养老金
-        Db::name("user_bill")->where("type_shop", $type_shop)->where("order_sn", $order_sn)->update(['status'=>-1]);
+        Db::name("user_bill")->where("type_shop", $type_shop)->where("link_id", $order_id)->update(['status'=>-1]);
         //更新积分
-        Db::name("user_sign_score")->where("order_type", $type_shop)->where("order_id", $order_sn)->update(['status'=>0]);
+        Db::name("user_sign_score")->where("order_type", $type_shop)->where("order_id", $order_id)->update(['status'=>0]);
         //更新贡献值
-        Db::name("user_sign_gongxian")->where("order_type", $type_shop)->where("order_id", $order_sn)->update(['status'=>0]);
+        Db::name("user_sign_gongxian")->where("order_type", $type_shop)->where("order_id", $order_id)->update(['status'=>0]);
         //更新红包
-        Db::name("user_sign_hongbao")->where("order_type", $type_shop)->where("order_id", $order_sn)->update(['status'=>0]);
-        log::info("订单 {$order_sn}  用户id ={$user_id} 三方来源={$type_shop} 积分，贡献值，养老金，红包更新更新");
-        Db::name('log')->insert(['data' => "type_shop:{$type_shop}, $order_sn, $order_sn, 修改积分，养老金，贡献值，红包记录, 更新成功！！！"]);
+        Db::name("user_sign_hongbao")->where("order_type", $type_shop)->where("order_id", $order_id)->update(['status'=>0]);
+        log::info("订单 {$order_id}  用户id ={$user_id} 三方来源={$type_shop} 积分，贡献值，养老金，红包更新更新");
+        Db::name('log')->insert(['data' => "type_shop:{$type_shop}, $order_id, $order_id, 修改积分，养老金，贡献值，红包记录, 更新成功！！！"]);
     }
 
 

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

@@ -399,11 +399,13 @@ class DaTaoKe
                 if($localOrder['tk_status']!=$order['tk_status']) {
                     log::info("=============更新订单");
                     $localOrder->save($order);//更新订单信息
-                    //修改积分和贡献,yanglaojin值记录
-                    $orderThird->updateJilu(
-                        $localOrder['uid'],
-                        $localOrder['order_sn'],
-                        5);
+                    if($order['tk_status'] == 13){
+                        //修改积分和贡献,yanglaojin值记录
+                        $orderThird->updateJilu(
+                            $localOrder['uid'],
+                            $localOrder['order_sn'],
+                            5);
+                    }
                 }
 
             }

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

@@ -849,7 +849,7 @@ class Jt extends BaseController
                     $localOrder['commission'],
                     $localOrder['uid'],
                     $localOrder['order_sn'],
-                    6
+                    $type_shop
                 );
                 //直推奖处理
 //            $orderThird->yuguZhitui(
@@ -863,11 +863,13 @@ class Jt extends BaseController
 
                 if($localOrder['status']!=$order['status']) {
                     $localOrder->save($order);//更新订单信息
-                    //修改积分和贡献,yanglaojin值记录
-                    $orderThird->updateJilu(
-                        $localOrder['uid'],
-                        $localOrder['order_sn'],
-                        5);
+                    if(!in_array($order['status'],[15,16,17])){
+                        //修改积分和贡献,yanglaojin值记录
+                        $orderThird->updateJilu(
+                            $localOrder['uid'],
+                            $localOrder['order_jd_id'],
+                            $type_shop);
+                    }
                 }
 
             }

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

@@ -777,7 +777,7 @@ class Su extends BaseController
                     'order_su');
                 //预估积分
                 $orderThird->yuguJifen(
-                    $localOrder['order_jd_id'],
+                    $localOrder['order_su_id'],
                     $order['commission'],
                     $order['uid'],
                     $order['order_sn'],
@@ -789,8 +789,8 @@ class Su extends BaseController
                     //修改积分和贡献,yanglaojin值记录
                     $orderThird->updateJilu(
                         $localOrder['uid'],
-                        $localOrder['order_sn'],
-                        5);
+                        $localOrder['order_su_id'],
+                        3);
                 }
             }
 

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

@@ -932,11 +932,13 @@ class TaoKe extends BaseController
                 if($localOrder['pin_order_status']!=$order['pin_order_status']) {
                     log::info("=============更新订单");
                     $localOrder->save($order);//更新订单信息
-                    //修改积分和贡献,yanglaojin值记录
-                    $orderThird->updateJilu(
-                        $localOrder['uid'],
-                        $localOrder['order_sn'],
-                        5);
+                    if($order['pin_order_status'] == 4){
+                        //修改积分和贡献,yanglaojin值记录
+                        $orderThird->updateJilu(
+                            $localOrder['uid'],
+                            $localOrder['order_pdd_id'],
+                            $type_shop);
+                    }
                 }
 
                 if ($localOrder['pin_order_status'] != $order['pin_order_status']) {

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

@@ -926,10 +926,12 @@ class Vip extends BaseController
 //                    log::info("进入修改lorder==={$localOrder['status']}======");
 //                    log::info("====ooder+{$order['status']}=======");
                     //修改积分和贡献,yanglaojin值记录
-                    $orderThird->updateJilu(
-                        $localOrder['uid'],
-                        $localOrder['order_sn'],
-                        2);
+                    if($order['status'] == 0){
+                        $orderThird->updateJilu(
+                            $localOrder['uid'],
+                            $localOrder['order_vip_id'],
+                            2);
+                    }
                     $localOrder->save($order);//更新订单信息
 
                 }

app/controller/api/store/service/Huafei.php

@@ -95,11 +95,11 @@ class Huafei extends BaseController
 					Db::name('log')->insert(['data'=>'话费充值汇付支付撤销返回结果：'.json_encode($hf_refund_res)]);
 
 					//把赠送出去的养老金 积分 贡献值 复购金 改为已失效
-					Db::name('user_bill')->where('link_id', $order_data['order_id'])->update(['status'=> -1]);
-					Db::name('user_sign_score')->where('order_id', $order_data['order_id'])->update(['status'=> 0]);
-					Db::name('user_sign_gongxian')->where('order_id', $order_data['order_id'])->update(['status'=> 0]);
-					Db::name('user_sign_fugou')->where('order_id', $order_data['order_id'])->update(['status'=> 0]);
-					Db::name('user_sign_hongbao')->where('order_id', $order_data['order_id'])->update(['status'=> 0]);
+					Db::name('user_bill')->where("type_shop", 9)->where('link_id', $order_data['order_id'])->update(['status'=> -1]);
+					Db::name('user_sign_score')->where("order_type", 9)->where('order_id', $order_data['order_id'])->update(['status'=> 0]);
+					Db::name('user_sign_gongxian')->where("order_type", 9)->where('order_id', $order_data['order_id'])->update(['status'=> 0]);
+					Db::name('user_sign_fugou')->where("order_type", 9)->where('order_id', $order_data['order_id'])->update(['status'=> 0]);
+					Db::name('user_sign_hongbao')->where("order_type", 9)->where('order_id', $order_data['order_id'])->update(['status'=> 0]);
 				}
 	
 				echo 'success';