定时结算-修改平台订单结算方法

app/command/PensionTasks.php

@@ -3,16 +3,19 @@ declare (strict_types=1);
 
 namespace app\command;
 
+use app\common\enum\CommonEnum;
 use app\common\model\merchant\order\OrderMerchant;
 use app\common\model\store\order\StoreOrder;
 use app\common\model\user\User;
 use app\common\model\user\UserCertification;
 use app\common\repositories\merchant\order\OrderGzcRepository;
 use app\common\repositories\merchant\order\OrderMerchantRepository;
+use app\common\repositories\shared\SharedProsperityUserRepository;
 use app\common\repositories\store\order\StoreOrderStatusRepository;
 use app\common\repositories\store\product\ProductRepository;
 use app\common\repositories\user\UserBillRepository;
 use app\common\repositories\user\UserRepository;
+use app\entity\data\shared\SharedProsperityUserEntity;
 use app\traits\GzcApiRequest;
 use Carbon\Carbon;
 use think\console\Command;
@@ -1570,15 +1573,34 @@ class PensionTasks extends Command
     {
         // 普通订单
         $order_data = Db::name('store_order')->where('paid', 1)->where('is_settlement', 0)->where('pay_type', 'in', '0,1,2,4')->where([['status','in','2,3']])->select();
-        $StoreOrderStatusRepository = app()->make(StoreOrderStatusRepository::class);
         if($order_data) {
             $order_data = $order_data->toArray();
+            // foreach ($order_data as $online) {
+            //     $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,0);
+            //         Db::name('store_order')->where('order_id', $online['order_id'])->update(['is_settlement' => 1 ,'settlement_time' => date('Y-m-d H:i:s')]);
+            //     });
+            // }
+            $orderIdList = [];
+            $date = date('Y-m-d H:i:s', strtotime('-' . $timeLimit . ' days'));
             foreach ($order_data as $online) {
-                $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,0);
-                    Db::name('store_order')->where('order_id', $online['order_id'])->update(['is_settlement' => 1 ,'settlement_time' => date('Y-m-d H:i:s')]);
+                if (strtotime($online['create_time']) < strtotime($date)) {
+                    $orderIdList[] = $online['order_id'];
+                } else if ($order_data['mer_id'] == CommonEnum::DESIGN_MERCHANT_ID['SharedProsperity']['code']) {
+                    if (strtotime($online['create_time']) < strtotime(date('Y-m-d 00:00:00'))) {
+                        $orderIdList[] = $online['order_id'];
+                    }
+                }
+            }
+            if (!empty($orderIdList)) {
+                Db::transaction(function () use ($orderIdList) {
+                    // 系统订单 走新的 结算方法
+                    /** @var StoreOrderRepository $storeOrderRepository */
+                    $storeOrderRepository = app()->make(StoreOrderRepository::class);
+                    $storeOrderRepository->settlementOrderByOrderIdList($orderIdList);
+
                 });
             }
         }