计划任务-将养老金任务独立出来，完善将养老金推入公证处明细表

app/command/GzcAddByBillCommand.php

@@ -2,166 +2,147 @@
 
 namespace app\command;
 
-use app\common\model\user\UserCertification;
-use app\common\repositories\merchant\order\OrderGzcRepository;
-use app\common\repositories\merchant\order\OrderMerchantRepository;
-use app\common\repositories\store\order\StoreOrderRepository;
-use app\common\repositories\user\UserRepository;
 use think\console\Command;
 use think\console\Input;
 use think\console\Output;
-use think\db\exception\DataNotFoundException;
-use think\db\exception\DbException;
-use think\db\exception\ModelNotFoundException;
-use think\facade\Db;
-use think\facade\Log;
+use think\facade\{Db, Log};
 
 class GzcAddByBillCommand extends Command
 {
     protected function configure()
     {
-        // 配置命令名称及描述
         $this->setName('gzcAddByBill')
             ->setDescription('从bill表中查询未提交到公证处的养老金记录，并提交公证处');
     }
 
     protected function execute(Input $input, Output $output)
     {
-        // 在这里执行任务的具体内容
         $output->writeln('定时任务执行中...');
-
-        $nowTime = time();
-        $this->billGzcAdd($nowTime);
-
+        $this->billGzcAdd();
         $output->writeln('定时任务执行完成');
     }
 
-    /**
-     * 线下支付订单公证处IN10入账
-     * @param $nowTime
-     * author: php迷途小书童
-     * created: 2021/3/20 9:26
-     */
-    public function billGzcAdd($nowTime)
+    public function billGzcAdd()
     {
-        $OrderGzcRepository      = app()->make(OrderGzcRepository::class);
-        $OrderMerchantRepository = app()->make(OrderMerchantRepository::class);
-        $StoreOrderRepository    = app()->make(StoreOrderRepository::class);
-        $testUserIdList = [];
-        /** @var UserRepository $userRepository */
-        $userRepository = app()->make(UserRepository::class);
-        try {
-            $userIdData = $userRepository->selectWhere(['test_user' => 1], 'uid')->toArray();
-            if (!empty($userIdData)) {
-                $testUserIdList = array_column($userIdData, 'uid');
+        $testUserIdList = Db::name('user')
+            ->where('test_user', 1)
+            ->column('uid');
+        // 1. 使用chunk分批处理
+        Db::name('user_bill')
+            ->where('status', 1)
+            ->where('is_gzc', 0)
+            ->where('commission_type', 5)
+            ->whereNotIn('uid', $testUserIdList)
+            ->chunk(100, function ($bills) {
+                $this->processBills($bills);
+            });
+    }
+
+    protected function processBills($bills)
+    {
+        // 2. 预加载用户实名认证信息
+        $userIds = array_unique(array_column($bills->toArray(), 'uid'));
+        $certifications = Db::name('user_certification')
+            ->whereIn('uid', $userIds)
+            ->column('user_name,mobile,user_card', 'uid');
+
+        // 3. 订单类型映射配置
+        $orderMap = [
+            0 => ['table' => 'rrx_store_order', 'condition' => [['paid', '=', 1]]],
+            1 => ['table' => 'rrx_order_pdd'],
+            2 => ['table' => 'rrx_order_vip'],
+            3 => ['table' => 'rrx_order_su'],
+            5 => ['table' => 'rrx_order_tb'],
+            6 => ['table' => 'rrx_order_jd'],
+            9 => ['table' => 'rrx_order_huafei'],
+            10 => [
+                'table' => 'rrx_order_merchant',
+                'condition' => [['paid', '=', 1], ['status', '=', 1]],
+                'field_map' => ['order_sn' => 'out_trade_no']
+            ],
+        ];
+
+        foreach ($bills as $bill) {
+            $typeShop = $bill['type_shop'] ?? 0;
+
+            // 4. 跳过无效类型
+            if (in_array($typeShop, [4, 7, 8])) continue;
+
+            // 5. 使用映射配置查询订单
+            $online = $this->getOrderData($orderMap, $typeShop, $bill);
+
+            if (!$online) {
+                Log::info("用户{$bill['uid']}订单{$bill['order_sn']}不存在");
+                continue;
             }
-        } catch (DataNotFoundException|ModelNotFoundException|DbException $e) {
 
-        }
+            // 6. 检查实名认证
+            if (!isset($certifications[$bill['uid']])) {
+                Log::info("用户{$bill['uid']}未实名认证");
+                continue;
+            }
+
+            // 7. 验证养老金金额
+            $pension = $bill['number'] ?? 0;
+            if ($pension <= 0) {
+                Log::info("订单{$online['order_sn']}养老金金额无效: {$pension}");
+                continue;
+            }
 
-        try {
-            $cursor = Db::name('user_bill')
-                ->where('status', 1)
-                ->where('is_gzc', 0)
-                ->where('commission_type', 5)
-                ->whereNotIn('uid', $testUserIdList)
-                ->select();
-        } catch (DataNotFoundException|ModelNotFoundException|DbException $e) {
+            // 8. 事务处理
+            Db::transaction(function () use ($bill, $online, $certifications, $pension, $typeShop) {
+                // 检查是否已存在记录
+                $exists = Db::name("gzc_logs")
+                    ->where("link_id", $bill['bill_id'])
+                    ->where("order_type", $typeShop)
+                    ->count();
 
-        }
+                if ($exists) return;
 
-        if(!empty($cursor)) {
-            foreach ($cursor as $bill) {
-                $type_shop = $bill['type_shop'] ?? 0;
-                switch ($type_shop){
-                    case "0":
-                        $online = Db::table('rrx_store_order')->where('uid', $bill['uid'])->where('order_sn', $bill['order_sn'])->where('paid', 1)->find();
-                        break;
-                    case "1":
-                        $online = Db::table('rrx_order_pdd')->where('uid', $bill['uid'])->where('order_sn', $bill['order_sn'])->find();
-                        break;
-                    case "2":
-                        $online =  Db::table('rrx_order_vip')->where('uid', $bill['uid'])->where('order_sn', $bill['order_sn'])->find();
-                        break;
-                    case "3":
-                        $online = Db::table('rrx_order_su')->where('uid', $bill['uid'])->where('order_sn', $bill['order_sn'])->find();
-                        break;
-                    case "4":
-                        $online = '';
-                        break;
-                    case "5":
-                        $online = Db::table('rrx_order_tb')->where('uid', $bill['uid'])->where('order_sn', $bill['order_sn'])->find();
-                        break;
-                    case "6":
-                        $online = Db::table('rrx_order_jd')->where('uid', $bill['uid'])->where('order_sn', $bill['order_sn'])->find();
-                        break;
-                    case "7":
-                        $online = '';
-                        break;
-                    case "8":
-                        $online = '';
-                        break;
-                    case "9":
-                        $online = Db::table('rrx_order_huafei')->where('uid', $bill['uid'])->where('order_sn', $bill['order_sn'])->find();
-                        break;
-                    case "10":
-                        $online = Db::table('rrx_order_merchant')
-                            ->where('uid', $bill['uid'])
-                            ->where('out_trade_no', $bill['order_sn'])
-                            ->where('paid', 1)
-                            ->where('status', 1)
-                            ->find();
-                        if (!empty($online)) {
-                            $online['order_sn'] = $online['out_trade_no'];
-                        }
-                        break;
-                    default:
-                        $online = Db::table('rrx_store_order')->where('uid', $bill['uid'])->where('order_sn', $bill['order_sn'])->where('paid', 1)->find();
-                }
-                if (!$online) {
-                    Log::info($bill['uid'] . '查询不到订单');
-                    continue;
-                }
-
-                $certification = UserCertification::getInstance()->where('uid', $bill['uid'])->find();
-                if (!$certification) {
-                    Log::info($online['uid'] . '没有实名认证');
-                    continue;
-                }
-
-                $pension = $bill['number'] ?? 0;
-                if ($pension <= 0) {
-                    Log::info($online['order_sn'] . 'pension' . $pension);
-                    continue;
-                }
-
-                //新增入账明细记录
-                $orderId   = $OrderMerchantRepository->getNewOrderId('IN10');
-                $create    = [
-                    'uid'          => $online['uid'],
-                    'platform_no'  => $orderId,
+                // 创建唯一订单ID
+                $orderId = 'IN10' . (int)(microtime(true) * 1000) . mt_rand(10000, 99999);
+
+                Db::name("gzc_logs")->insert([
+                    'uid' => $bill['uid'],
+                    'platform_no' => $orderId,
                     'account_type' => 1,
-                    'user_name'    => $certification['user_name'],
-                    'mobile'       => $certification['mobile'],
-                    'user_card'    => $certification['user_card'],
-                    'pension'      => $pension,
-                    'order_type'   => $type_shop,
+                    'user_name' => $certifications[$bill['uid']]['user_name'],
+                    'mobile' => $certifications[$bill['uid']]['mobile'],
+                    'user_card' => $certifications[$bill['uid']]['user_card'],
+                    'pension' => $pension,
+                    'order_type' => $typeShop,
                     'out_trade_no' => $online['order_sn'],
-                    'link_id'=> $bill['bill_id']
-                ];
-                $test_user = Db::name('user')->where('uid', $online['uid'])->value('test_user');
-                $check     = Db::name("gzc_logs")->where("link_id", $bill['bill_id'])->where("order_type", $type_shop)->count();
-                if ($test_user == 0 && $check <= 0) {
-                    $OrderGzcRepository->create($create);
-                    Db::name('user_bill')
-                        ->where('bill_id', $bill['bill_id'])
-                        ->where('commission_type', 5)
-                        ->update([
-                            'is_gzc'          => 1,
-                            'gzc'             => 1
-                        ]);
-                }
+                    'link_id' => $bill['bill_id']
+                ]);
+
+                Db::name('user_bill')->where('bill_id', $bill['bill_id'])->update([
+                    'is_gzc' => 1,
+                    'gzc' => 1
+                ]);
+            });
+        }
+    }
+
+    protected function getOrderData($orderMap, $typeShop, $bill)
+    {
+        $config = $orderMap[$typeShop] ?? $orderMap[0];
+        $query = Db::table($config['table'])
+            ->where('uid', $bill['uid'])
+            ->where($config['field_map']['order_sn'] ?? 'order_sn', $bill['order_sn']);
+
+        if (!empty($config['condition'])) {
+            $query->where($config['condition']);
+        }
+
+        $result = $query->find();
+
+        // 字段映射处理
+        if ($result && isset($config['field_map'])) {
+            foreach ($config['field_map'] as $src => $dest) {
+                $result[$src] = $result[$dest] ?? null;
             }
         }
+
+        return $result;
     }
 }

app/command/PensionTasks.php

@@ -67,7 +67,7 @@ class PensionTasks extends Command
 //            $this->doThridVipOrderGzc($nowTime, $timeLimit = 30);
 //            $this->doThridDyOrderGzc($nowTime, $timeLimit = 30);
 //            $this->doThridHfOrderGzc($nowTime, $timeLimit = 30);
-            $this->billGzcAdd($nowTime);
+//             $this->billGzcAdd($nowTime);
             //升级
 //            $this -> doUpgrade();
         } catch (\Throwable $e) {