精彩生活区、会员专区分账mer_id调整

app/command/CommercialAreaOrderIndependentAccount.php

@@ -28,8 +28,8 @@ class CommercialAreaOrderIndependentAccount extends Command
 
     protected function execute(Input $input, Output $output)
     {
-        // @todo 商贸区订单分账
-        $this->doCommercialAreaOrderIndependentAccount([439,491,496]);
+        // @todo 商贸区订单分账 496：会员专区，439：精品生活区
+        $this->doCommercialAreaOrderIndependentAccount([439, 491, 496]);
     }
 
     /**
@@ -97,9 +97,9 @@ class CommercialAreaOrderIndependentAccount extends Command
 //                    if ($test_user == 0 && $check <= 0) {
 //                        $OrderGzcRepository->create($create);
 //                    }
-                    $order                  = StoreOrder::getInstance()->find($value['order_id']);
-                    $order->gzc             = 1;
-                    $order->save();
+                $order = StoreOrder::getInstance()->find($value['order_id']);
+                $order->gzc = 1;
+                $order->save();
 //                });
             }
         }

app/command/GreatLifeOrderIndependentAccount.php

@@ -28,37 +28,37 @@ class GreatLifeOrderIndependentAccount extends Command
 
     protected function execute(Input $input, Output $output)
     {
-        // @todo 精彩生活区订单分账
-        $this->doGreatLifeOrderIndependentAccount();
+        // @todo 会员专区、精彩生活区订单分账，496：会员专区，439：精品生活区
+        $this->doGreatLifeOrderIndependentAccount([439, 496]);
     }
 
     /**
-     * 精彩生活区订单分账
+     * 会员专区、精彩生活区订单分账
      *
-     * @param $timeLimit
      * @param $merId
+     * @param $timeLimit
      * @return void
      * @throws \think\db\exception\DataNotFoundException
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
      */
-    private function doGreatLifeOrderIndependentAccount($timeLimit = 30, $merId = 439)
+    private function doGreatLifeOrderIndependentAccount($merId = [], $timeLimit = 30)
     {
+        // 商户信息
+        $merchants = [];
+
         $time = time();
         // 已支付、未结算
-        $where = [
-            'paid' => 1, 'gzc' => 0, 'mer_id' => $merId, 'is_del' => 0, 'is_system_del' => 0
-        ];
+        $where = ['paid' => 1, 'gzc' => 0, 'is_del' => 0, 'is_system_del' => 0];
         // 订单状态（0：待发货；1：待收货；2：待评价；3：已完成；4已申请退款；-1：已退款）5未支付 6已取消'
-        $status = [2,3];
+        $status = [2, 3];
         // 普通订单
-        $cursor = Db::table('rrx_store_order')->where($where)->where('pay_type', 'in', '1,2,4')->whereIn('status', $status)->cursor();
+        $cursor = Db::table('rrx_store_order')->where($where)->where('pay_type', 'in', '1,2,4')->whereIn('status', $status)
+            ->whereIn('mer_id', $merId)->cursor();
 
 //        $StoreOrderStatusRepository = app()->make(StoreOrderStatusRepository::class);
 //        $OrderMerchantRepository    = app()->make(OrderMerchantRepository::class);
 //        $OrderGzcRepository         = app()->make(OrderGzcRepository::class);
-        // 商户信息
-        $merchant = Db::name('merchant')->where('mer_id', $merId)->find();
 
         /** @var StoreOrderRepository $storeOrderRepository */
         $storeOrderRepository = app()->make(StoreOrderRepository::class);
@@ -67,17 +67,20 @@ class GreatLifeOrderIndependentAccount extends Command
             $settlement_period_time = strtotime($value['create_time']) + $timeLimit * 24 * 3600;
             // @todo 下单后第{$timeLimit}天后可分账
             if ($settlement_period_time >= $time) {
+                if (!isset($merchants[$value['mer_id']])) {
+                    $merchants[$value['mer_id']] = Db::name('merchant')->where('mer_id', $value['mer_id'])->find();
+                }
                 $group_order = Db::name('store_group_order')->alias('sgo')->where('sgo.group_order_id', $value['group_order_id'])->find();
 
                 // 分账账号 496：表示{会员专区}账户，精彩生活区分账到{会员专区}账户
-                $independentAccount = $storeOrderRepository->getIndependentAccount($value, $group_order, 496, $merchant['hf_member_id']);
+                $independentAccount = $storeOrderRepository->getIndependentAccount($value, $group_order, 496, $merchants[$value['mer_id']]['hf_member_id']);
 
                 // @todo 预分账处理 496：表示{会员专区}账户，精彩生活区分账到{会员专区}账户，故：hf_platform_member_id 为入账账户
                 $isSuccessed = $storeOrderRepository->prepareExecuteIndependentAccount(
                     $value, $group_order, $independentAccount['api_key'], $independentAccount['hf_platform_member_id'], '', $value['con_pri'], 0
                 );
 
-                Db::name("log")->insert(array('data' => '精彩生活区-订单分账：' . json_encode($value,JSON_FORCE_OBJECT)));//日志记录
+                Db::name("log")->insert(array('data' => '精彩生活区-订单分账：' . json_encode($value, JSON_FORCE_OBJECT)));//日志记录
 
 //                Db::transaction(function () use ($certification, $online, $pension, $OrderGzcRepository, $OrderMerchantRepository, $StoreOrderRepository) {
 //                    //新增入账明细记录