计划任务-修复养老金进入公证处记录

app/command/GzcAddByBillCommand.php

@@ -18,7 +18,45 @@ class GzcAddByBillCommand extends Command
     protected function execute(Input $input, Output $output)
     {
         $output->writeln('定时任务执行中...');
-        $this->billGzcAdd();
+        // $this->billGzcAdd();
+
+        $gzcLogList = Db::name("gzc_logs")
+            ->where('link_id', '=', 0)
+            ->select()
+            ->toArray();
+        $orderSnList = array_column($gzcLogList, 'out_trade_no');
+        $userBillList = Db::name('user_bill')
+            ->where('status', 1)
+            ->where('commission_type', 5)
+            ->whereIn('order_sn', $orderSnList)
+            ->select()
+            ->toArray();
+        $userBillMap = [];
+        foreach ($userBillList as $key => $value) {
+            $userBillMap[$value['order_sn'] . '_' . $value['uid'] . '_' . $value['number']] = [
+                'bill_id' => $value['bill_id'],
+                'type_shop' => $value['type_shop']
+            ];
+        }
+        unset($userBillList);
+        $str = '';
+        foreach ($gzcLogList as $value) {
+            if (isset($userBillMap[$value['out_trade_no'] . '_' . $value['uid'] . '_' . $value['pension']])) {
+                $update = [
+                    'link_id' => $userBillMap[$value['out_trade_no'] . '_' . $value['uid'] . '_' . $value['pension']]['bill_id'],
+                    'order_type' => $userBillMap[$value['out_trade_no'] . '_' . $value['uid'] . '_' . $value['pension']]['type_shop'],
+                ];
+                if (empty($value['platform_no'])) {
+                    $update['platform_no'] = 'IN10' . (int)(microtime(true) * 1000) . mt_rand(10000, 99999);
+                }
+                Db::name("gzc_logs")
+                    ->where('id', '=', $value['id'])
+                    ->update($update);
+                $str .= $value['id'] . '、';
+            }
+        }
+        echo $str;
+        // $gzcLogList = Db::query('SELECT out_trade_no, order_type, uid, pension FROM rrx_gzc_logs GROUP BY out_trade_no, order_type, uid, pension HAVING COUNT(*) > 1');
         $output->writeln('定时任务执行完成');
     }
 
@@ -30,7 +68,7 @@ class GzcAddByBillCommand extends Command
         // 1. 使用chunk分批处理
         Db::name('user_bill')
             ->where('status', 1)
-            ->where('is_gzc', 0)
+            ->where('gzc', 0)
             ->where('commission_type', 5)
             ->whereNotIn('uid', $testUserIdList)
             ->chunk(100, function ($bills) {

app/common/repositories/store/order/StoreOrderRepository.php

@@ -9629,23 +9629,6 @@ class StoreOrderRepository extends BaseRepository
                         $sm_status = 1;
                         Db::name('store_order')->where("order_id", $order_id)->update(['gzc' => 1]);
 
-                        //添加养老金到公证处日志
-                        $ylj_data_log = [
-                            'user_name' => $get_cer_datas['user_name'],
-                            "mobile" => $get_cer_datas['mobile'],
-                            "user_card" => $get_cer_datas['user_card'],//身份证
-                            "pension" => $num,//养老金额度
-                            "out_trade_no" => $order_from_mer['order_sn'],//订单号
-                            "account_type" =>  $pay_type,//支付方式(3:微信,4:组合)
-                            "order_type" => 0,//订单类型(2:)
-                            "pay_time" => date('Y-m-d H:i:s'),
-                            "create_time" => date('Y-m-d H:i:s'),
-                            "update_time" => date('Y-m-d H:i:s'),
-                            "uid" => $uid,
-                        ];
-
-                        Db::name('gzc_logs')->insert($ylj_data_log);
-
                     }
                 }
 
@@ -9689,6 +9672,7 @@ class StoreOrderRepository extends BaseRepository
             'order_type' => 1,//1自营  2 第三方  订单类型
             'is_red_brokerage' => 0,//1红积分对冲佣金 0正常佣金
             'gzc' => $sm_status,//养老金是否已进入公证处log表0：未进入。1：已进入
+            'is_gzc' => $sm_status,//0：未发起 1：已发起 2：已成功
             'take_time' => $take_time,//结算时间
             'district_id' => '',//
             'street_id' => '',//
@@ -9696,7 +9680,26 @@ class StoreOrderRepository extends BaseRepository
 
         ];
 
-        Db::name('user_bill')->insert($bill);
+        $bill_id = Db::name('user_bill')->insertGetId($bill);
+        if ($sm_status == 1) {
+            //添加养老金到公证处日志
+            $ylj_data_log = [
+                'user_name' => $get_cer_datas['user_name'],
+                "mobile" => $get_cer_datas['mobile'],
+                "user_card" => $get_cer_datas['user_card'],//身份证
+                "pension" => $num,//养老金额度
+                "out_trade_no" => $order_from_mer['order_sn'],//订单号
+                "account_type" => $pay_type,//支付方式(3:微信,4:组合)
+                "order_type" => 0,//订单类型(2:)
+                "pay_time" => date('Y-m-d H:i:s'),
+                "create_time" => date('Y-m-d H:i:s'),
+                "update_time" => date('Y-m-d H:i:s'),
+                "uid" => $uid,
+                "platform_no" => 'IN10' . (int)(microtime(true) * 1000) . mt_rand(10000, 99999),
+                "link_id" => $bill_id
+            ];
+            Db::name('gzc_logs')->insert($ylj_data_log);
+        }
     }
 
     //添加复购金

app/controller/api/Notify.php

@@ -1728,25 +1728,7 @@ class Notify
                         $sm_status = 1;
                         $ds = 1;
                         Db::name('store_order')->where("order_id", $order_id)->update(['gzc' => 1]);
-
-                        //添加养老金到公证处日志
-                        $ylj_data_log = [
-                            'user_name' => $get_cer_datas['user_name'],
-                            "mobile" => $get_cer_datas['mobile'],
-                            "user_card" => $get_cer_datas['user_card'],//身份证
-                            "pension" => $num,//养老金额度
-                            "out_trade_no" =>  $order_from_mer['order_sn'],//订单号
-                            "account_type" =>  $pay_type,//支付方式(3:微信,4:组合)
-                            "order_type" => 0,//订单类型(2:)
-                            "pay_time" => date('Y-m-d H:i:s'),
-                            "create_time" => date('Y-m-d H:i:s'),
-                            "update_time" => date('Y-m-d H:i:s'),
-                            "uid" => $uid,
-                        ];
-
-                        Db::name('gzc_logs')->insert($ylj_data_log);
-
-                    } 
+                    }
                 }
             }
             $ds = 1;
@@ -1787,6 +1769,7 @@ class Notify
             'order_type'=>1,//1自营  2 第三方  订单类型
             'is_red_brokerage'=>0,//1红积分对冲佣金 0正常佣金
             'gzc'=> $sm_status,//养老金是否已进入公证处log表0：未进入。1：已进入
+            'is_gzc' => $sm_status,//0：未发起 1：已发起 2：已成功
             'take_time'=>$take_time,//结算时间
             'district_id'=>'',//
             'street_id'=>'',//
@@ -1794,8 +1777,27 @@ class Notify
 
         ];
 
-        Db::name('user_bill')->insert($bill);
-        
+        $bill_id = Db::name('user_bill')->insertGetId($bill);
+
+        if ($sm_status == 1) {
+            //添加养老金到公证处日志
+            $ylj_data_log = [
+                'user_name' => $get_cer_datas['user_name'],
+                "mobile" => $get_cer_datas['mobile'],
+                "user_card" => $get_cer_datas['user_card'],//身份证
+                "pension" => $num,//养老金额度
+                "out_trade_no" => $order_from_mer['order_sn'],//订单号
+                "account_type" => $pay_type,//支付方式(3:微信,4:组合)
+                "order_type" => 0,//订单类型(2:)
+                "pay_time" => date('Y-m-d H:i:s'),
+                "create_time" => date('Y-m-d H:i:s'),
+                "update_time" => date('Y-m-d H:i:s'),
+                "uid" => $uid,
+                "platform_no" => 'IN10' . (int)(microtime(true) * 1000) . mt_rand(10000, 99999),
+                "link_id" => $bill_id
+            ];
+            Db::name('gzc_logs')->insert($ylj_data_log);
+        }
     }
 
     //添加复购金