去掉多余注释、调整会员专区分账逻辑中分账金额字段

.gitignore

@@ -1,3 +1,4 @@
 public/
 .idea/
 .env
+runtime/

app/command/CommercialAreaOrderIndependentAccount.php

@@ -3,19 +3,11 @@
 namespace app\command;
 
 use app\common\model\store\order\StoreOrder;
-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\store\order\StoreOrderStatusRepository;
-use app\common\repositories\user\UserBillRepository;
-use app\common\repositories\user\UserRepository;
-use Carbon\Carbon;
 use think\console\Command;
 use think\console\Input;
 use think\console\Output;
 use think\facade\Db;
-use think\facade\Log;
 
 class CommercialAreaOrderIndependentAccount extends Command
 {
@@ -46,9 +38,6 @@ class CommercialAreaOrderIndependentAccount extends Command
     {
         // 商户信息
         $merchants = [];
-//        $StoreOrderStatusRepository = app()->make(StoreOrderStatusRepository::class);
-//        $OrderMerchantRepository = app()->make(OrderMerchantRepository::class);
-//        $OrderGzcRepository = app()->make(OrderGzcRepository::class);
 
         /** @var StoreOrderRepository $storeOrderRepository */
         $storeOrderRepository = app()->make(StoreOrderRepository::class);
@@ -57,7 +46,7 @@ class CommercialAreaOrderIndependentAccount extends Command
         // 订单状态（0：待发货；1：待收货；2：待评价；3：已完成；4已申请退款；-1：已退款）5未支付 6已取消'
         $status = [2, 3];
         // 已支付、未结算
-        $where = ['paid' => 1, 'gzc' => 0, 'is_del' => 0, 'is_system_del' => 0];
+        $where = ['paid' => 1, 'is_independentaccount' => 0, 'is_del' => 0, 'is_system_del' => 0];
         // 普通订单 @todo 排除 特殊商户{$excludeMerId}：精彩生活区、会员区、复购区
         $cursor = Db::table('rrx_store_order')->where($where)->where('pay_type', 'in', '1,2,4')->whereIn('status', $status)
             ->whereNotIn('mer_id', $excludeMerId)->cursor();
@@ -76,229 +65,15 @@ class CommercialAreaOrderIndependentAccount extends Command
                 $isSuccessed = $storeOrderRepository->prepareExecuteIndependentAccount(
                     $value, $group_order, $independentAccount['api_key'], $independentAccount['hf_member_id'], $independentAccount['hf_platform_member_id'], $value['cost'], $value['con_pri']
                 );
-                Db::name("log")->insert(array('data' => '商贸区-订单分账：' . json_encode($value, JSON_FORCE_OBJECT)));//日志记录
+                if ($isSuccessed) {
+                    Db::name("log")->insert(array('data' => '商贸区-订单分账：' . json_encode($value, JSON_FORCE_OBJECT)));//日志记录
 
-//                Db::transaction(function () use ($certification, $online, $pension, $OrderGzcRepository, $OrderMerchantRepository, $StoreOrderRepository) {
-//                    //新增入账明细记录
-//                    $orderId   = $OrderMerchantRepository->getNewOrderId('IN10');
-//                    $create    = [
-//                        'uid'          => $online['uid'],
-//                        'platform_no'  => $orderId,
-//                        'account_type' => $online['pay_type'] == 1 ? 3 : 2,
-//                        'user_name'    => $certification['user_name'],
-//                        'mobile'       => $certification['mobile'],
-//                        'user_card'    => $certification['user_card'],
-//                        'pension'      => $pension,
-//                        'order_type'   => 2,
-//                        'out_trade_no' => $online['order_sn']
-//                    ];
-//                    $test_user = Db::name('user')->where('uid', $online['uid'])->value('test_user');
-//                    $check     = Db::name("gzc_logs")->where("out_trade_no", $online['order_sn'])->where("order_type", 2)->count();
-//                    if ($test_user == 0 && $check <= 0) {
-//                        $OrderGzcRepository->create($create);
-//                    }
-                $order = StoreOrder::getInstance()->find($value['order_id']);
-                $order->gzc = 1;
-                $order->save();
-//                });
+                    $order = StoreOrder::getInstance()->where('order_id', $value['order_id'])->find();
+                    $order->is_independentaccount = 1;
+                    $order->save();
+                }
             }
         }
-
-        // 普通订单（红包，积分，京东，佣金，复购金，养老金，贡献值）
-//        $cursor = Db::table('rrx_store_order')->where('paid', 1)->where('is_settlement', 0)->where('pay_type', 'in', '0,1,2,4')->cursor();
-//        $StoreOrderStatusRepository = app()->make(StoreOrderStatusRepository::class);
-//        $OrderMerchantRepository    = app()->make(OrderMerchantRepository::class);
-//        $OrderGzcRepository         = app()->make(OrderGzcRepository::class);
-//        foreach ($cursor as $online) {
-//            $status = $StoreOrderStatusRepository->getWhere(['order_id' => $online['order_id'], 'change_type' => 'take']);
-//            if ($online['mer_id'] == 496) {
-//                if (!in_array($online['status'], [0, 1, 2, 3])) {
-//                    continue;
-//                }
-//                if (time() < strtotime($online['pay_time']) + 3600 * 24) {
-//                    Log::info('还没有到收货后' . $timeLimit . '天');
-//                    continue;
-//                }
-//            } else {
-//                if (!in_array($online['status'], [2, 3])) {
-//                    continue;
-//                }
-//                if (Carbon::now()->modify("-{$timeLimit} days")->lt($status->change_time ?? $status['change_time'])) {
-//                    Log::info('还没有到收货后' . $timeLimit . '天');
-//                    continue;
-//                }
-//            }
-//
-//            $StoreOrderRepository = app()->make(StoreOrderRepository::class);
-//            Db::transaction(function () use ($online, $StoreOrderRepository) {
-//                $order = StoreOrder::getInstance()->find($online['order_id']);
-//                $order->is_settlement   = 1;
-//                $order->settlement_time = date('Y-m-d H:i:s');
-//                $order->save();
-//
-//                // 结算积分
-//                $user_sign_score_list = Db::name('user_sign_score')
-//                    ->where('status', -1)
-//                    ->where('order_id', $online['order_id'])
-//                    ->whereIn('type', [1, 2])
-//                    ->select()
-//                    ->toArray();
-//                foreach ($user_sign_score_list as $user_sign_score) {
-//                    // 修改积分
-//                    Db::name('user')
-//                        ->where('uid', $user_sign_score['uid'])
-//                        ->inc('score', (float)$user_sign_score['reward_socre'])
-//                        ->update();
-//                    Db::name('user_sign_score')
-//                        ->where('status', -1)
-//                        ->where('id', $user_sign_score['id'])
-//                        ->update([
-//                            'status'          => 1,
-//                            'settlement_time' => date('Y-m-d H:i:s')
-//                        ]);
-//                }
-//
-//                // 结算红包
-//                $user_sign_hongbao_list = Db::name('user_sign_hongbao')
-//                    ->where('status', -1)
-//                    ->where('order_id', $online['order_id'])
-//                    ->whereIn('type', [1, 2])
-//                    ->select()
-//                    ->toArray();
-//                foreach ($user_sign_hongbao_list as $user_sign_hongbao) {
-//                    // 修改红包
-//                    Db::name('user')
-//                        ->where('uid', $user_sign_hongbao['uid'])
-//                        ->inc('hongbao', (float)$user_sign_hongbao['number'])
-//                        ->update();
-//                    Db::name('user_sign_hongbao')
-//                        ->where('status', -1)
-//                        ->where('id', $user_sign_hongbao['id'])
-//                        ->update([
-//                            'status'          => 1,
-//                            'settlement_time' => date('Y-m-d H:i:s')
-//                        ]);
-//                }
-//
-//
-//                // 结算京豆
-//                $user_sign_jingdou_list = Db::name('user_sign_jingdou')
-//                    ->where('status', -1)
-//                    ->where('order_id', $online['order_id'])
-//                    ->whereIn('type', [1, 2])
-//                    ->select()
-//                    ->toArray();
-//                foreach ($user_sign_jingdou_list as $user_sign_jingdou) {
-//                    // 修改京豆
-//                    Db::name('user')
-//                        ->where('uid', $user_sign_jingdou['uid'])
-//                        ->inc('jingdou', (float)$user_sign_jingdou['number'])
-//                        ->update();
-//                    Db::name('user_sign_jingdou')
-//                        ->where('status', -1)
-//                        ->where('id', $user_sign_jingdou['id'])
-//                        ->update([
-//                            'status'          => 1,
-//                            'settlement_time' => date('Y-m-d H:i:s')
-//                        ]);
-//                }
-//
-//
-//
-//                // 结算复购金
-//                $user_sign_fugou_list = Db::name('user_sign_fugou')
-//                    ->where('status', -1)
-//                    ->where('order_id', $online['order_id'])
-//                    ->whereIn('type', [1, 2])
-//                    ->select()
-//                    ->toArray();
-//                foreach ($user_sign_fugou_list as $user_sign_fugou) {
-//                    // 修改复购金
-//                    Db::name('user')
-//                        ->where('uid', $user_sign_fugou['uid'])
-//                        ->inc('fugou', (float)$user_sign_fugou['number'])
-//                        ->update();
-//                    Db::name('user_sign_fugou')
-//                        ->where('status', -1)
-//                        ->where('id', $user_sign_fugou['id'])
-//                        ->update([
-//                            'status'          => 1,
-//                            'settlement_time' => date('Y-m-d H:i:s')
-//                        ]);
-//                }
-//
-//
-//                // 结算贡献值
-//                $user_sign_gongxian_list = Db::name('user_sign_gongxian')
-//                    ->where('status', -1)
-//                    ->where('order_id', $online['order_id'])
-//                    ->whereIn('type', [1, 2])
-//                    ->select()
-//                    ->toArray();
-//                foreach ($user_sign_gongxian_list as $user_sign_gongxian) {
-//                    // 修改贡献值
-//                    Db::name('user')
-//                        ->where('uid', $user_sign_gongxian['uid'])
-//                        ->inc('contribute', (float)$user_sign_gongxian['number'])
-//                        ->update();
-//                    Db::name('user_sign_gongxian')
-//                        ->where('status', -1)
-//                        ->where('id', $user_sign_gongxian['id'])
-//                        ->update([
-//                            'status'          => 1,
-//                            'settlement_time' => date('Y-m-d H:i:s')
-//                        ]);
-//                }
-//
-//
-//                // 结算佣金
-//                $user_bill_list = Db::name('user_bill')
-//                    ->where('status', 0)
-//                    ->where('commission_type','<>', 5)
-//                    ->where([ 'link_id' => $online['order_id'], 'order_sn' => $online['order_sn']])
-//                    ->select()
-//                    ->toArray();
-//                foreach ($user_bill_list as $user_bill) {
-//                    if ($user_bill['commission_type'] != 5) {
-//                        if (in_array($user_bill['commission_type'], [7,12,19])) {
-//                            Db::name("merchant")
-//                                ->where("mer_id", $user_bill['mer_id'])
-//                                ->inc('brokerage_price', (float)$user_bill['number'])
-//                                ->update();
-//                        } else {
-//                            Db::name('user')
-//                                ->where('uid', $user_bill['uid'])
-//                                ->inc('brokerage_price', (float)$user_bill['number'])
-//                                ->update();
-//                        }
-//                    }
-//                    if ($online['pay_type'] == 0 && $user_bill['commission_type'] == 5) {
-//                    } else {
-//                        // 虚拟支付的养老金不修改不结算
-//                        Db::name('user_bill')
-//                            ->where('status', 0)
-//                            ->where('bill_id', $user_bill['bill_id'])
-//                            ->update([
-//                                'status'    => 1,
-//                                'take_time' => time()
-//                            ]);
-//                    }
-//                    if ($online['pay_type'] == 0 && $user_bill['commission_type'] == 5) {
-//                    } else {
-//                        // 虚拟支付的养老金不修改不结算
-//                        Db::name('user_bill')
-//                            ->where('status', 0)
-//                            ->where('bill_id', $user_bill['bill_id'])
-//                            ->update([
-//                                'status'    => 1,
-//                                'take_time' => time()
-//                            ]);
-//                    }
-//                }
-//                //按角色结算
-//                $StoreOrderRepository->close_order($online['order_id']);
-//            });
-//        }
     }
 
 }

app/command/GreatLifeOrderIndependentAccount.php

@@ -49,17 +49,13 @@ class GreatLifeOrderIndependentAccount extends Command
 
         $time = time();
         // 已支付、未结算
-        $where = ['paid' => 1, 'gzc' => 0, 'is_del' => 0, 'is_system_del' => 0];
+        $where = ['paid' => 1, 'is_independentaccount' => 0, 'is_del' => 0, 'is_system_del' => 0];
         // 订单状态（0：待发货；1：待收货；2：待评价；3：已完成；4已申请退款；-1：已退款）5未支付 6已取消'
         $status = [2, 3];
         // 普通订单
         $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);
-
         /** @var StoreOrderRepository $storeOrderRepository */
         $storeOrderRepository = app()->make(StoreOrderRepository::class);
 
@@ -77,232 +73,17 @@ class GreatLifeOrderIndependentAccount extends Command
 
                 // @todo 预分账处理 496：表示{会员专区}账户，精彩生活区分账到{会员专区}账户，故：hf_platform_member_id 为入账账户
                 $isSuccessed = $storeOrderRepository->prepareExecuteIndependentAccount(
-                    $value, $group_order, $independentAccount['api_key'], $independentAccount['hf_platform_member_id'], '', $value['con_pri'], 0
+                    $value, $group_order, $independentAccount['api_key'], $independentAccount['hf_platform_member_id'], '', $value['pay_price'], 0
                 );
+                if ($isSuccessed) {
+                    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) {
-//                    //新增入账明细记录
-//                    $orderId   = $OrderMerchantRepository->getNewOrderId('IN10');
-//                    $create    = [
-//                        'uid'          => $online['uid'],
-//                        'platform_no'  => $orderId,
-//                        'account_type' => $online['pay_type'] == 1 ? 3 : 2,
-//                        'user_name'    => $certification['user_name'],
-//                        'mobile'       => $certification['mobile'],
-//                        'user_card'    => $certification['user_card'],
-//                        'pension'      => $pension,
-//                        'order_type'   => 2,
-//                        'out_trade_no' => $online['order_sn']
-//                    ];
-//                    $test_user = Db::name('user')->where('uid', $online['uid'])->value('test_user');
-//                    $check     = Db::name("gzc_logs")->where("out_trade_no", $online['order_sn'])->where("order_type", 2)->count();
-//                    if ($test_user == 0 && $check <= 0) {
-//                        $OrderGzcRepository->create($create);
-//                    }
-                $order = StoreOrder::getInstance()->find($value['order_id']);
-                $order->gzc = 1;
-                $order->save();
-//                });
+                    $order = StoreOrder::getInstance()->where('order_id', $value['order_id'])->find();
+                    $order->is_independentaccount = 1;
+                    $order->save();
+                }
             }
         }
-
-        // 普通订单（红包，积分，京东，佣金，复购金，养老金，贡献值）
-//        $cursor = Db::table('rrx_store_order')->where('paid', 1)->where('is_settlement', 0)->where('pay_type', 'in', '0,1,2,4')->cursor();
-//        $StoreOrderStatusRepository = app()->make(StoreOrderStatusRepository::class);
-//        $OrderMerchantRepository    = app()->make(OrderMerchantRepository::class);
-//        $OrderGzcRepository         = app()->make(OrderGzcRepository::class);
-//        foreach ($cursor as $online) {
-//            $status = $StoreOrderStatusRepository->getWhere(['order_id' => $online['order_id'], 'change_type' => 'take']);
-//            if ($online['mer_id'] == 496) {
-//                if (!in_array($online['status'], [0, 1, 2, 3])) {
-//                    continue;
-//                }
-//                if (time() < strtotime($online['pay_time']) + 3600 * 24) {
-//                    Log::info('还没有到收货后' . $timeLimit . '天');
-//                    continue;
-//                }
-//            } else {
-//                if (!in_array($online['status'], [2, 3])) {
-//                    continue;
-//                }
-//                if (Carbon::now()->modify("-{$timeLimit} days")->lt($status->change_time ?? $status['change_time'])) {
-//                    Log::info('还没有到收货后' . $timeLimit . '天');
-//                    continue;
-//                }
-//            }
-//
-//            $StoreOrderRepository = app()->make(StoreOrderRepository::class);
-//            Db::transaction(function () use ($online, $StoreOrderRepository) {
-//                $order = StoreOrder::getInstance()->find($online['order_id']);
-//                $order->is_settlement   = 1;
-//                $order->settlement_time = date('Y-m-d H:i:s');
-//                $order->save();
-//
-//                // 结算积分
-//                $user_sign_score_list = Db::name('user_sign_score')
-//                    ->where('status', -1)
-//                    ->where('order_id', $online['order_id'])
-//                    ->whereIn('type', [1, 2])
-//                    ->select()
-//                    ->toArray();
-//                foreach ($user_sign_score_list as $user_sign_score) {
-//                    // 修改积分
-//                    Db::name('user')
-//                        ->where('uid', $user_sign_score['uid'])
-//                        ->inc('score', (float)$user_sign_score['reward_socre'])
-//                        ->update();
-//                    Db::name('user_sign_score')
-//                        ->where('status', -1)
-//                        ->where('id', $user_sign_score['id'])
-//                        ->update([
-//                            'status'          => 1,
-//                            'settlement_time' => date('Y-m-d H:i:s')
-//                        ]);
-//                }
-//
-//                // 结算红包
-//                $user_sign_hongbao_list = Db::name('user_sign_hongbao')
-//                    ->where('status', -1)
-//                    ->where('order_id', $online['order_id'])
-//                    ->whereIn('type', [1, 2])
-//                    ->select()
-//                    ->toArray();
-//                foreach ($user_sign_hongbao_list as $user_sign_hongbao) {
-//                    // 修改红包
-//                    Db::name('user')
-//                        ->where('uid', $user_sign_hongbao['uid'])
-//                        ->inc('hongbao', (float)$user_sign_hongbao['number'])
-//                        ->update();
-//                    Db::name('user_sign_hongbao')
-//                        ->where('status', -1)
-//                        ->where('id', $user_sign_hongbao['id'])
-//                        ->update([
-//                            'status'          => 1,
-//                            'settlement_time' => date('Y-m-d H:i:s')
-//                        ]);
-//                }
-//
-//
-//                // 结算京豆
-//                $user_sign_jingdou_list = Db::name('user_sign_jingdou')
-//                    ->where('status', -1)
-//                    ->where('order_id', $online['order_id'])
-//                    ->whereIn('type', [1, 2])
-//                    ->select()
-//                    ->toArray();
-//                foreach ($user_sign_jingdou_list as $user_sign_jingdou) {
-//                    // 修改京豆
-//                    Db::name('user')
-//                        ->where('uid', $user_sign_jingdou['uid'])
-//                        ->inc('jingdou', (float)$user_sign_jingdou['number'])
-//                        ->update();
-//                    Db::name('user_sign_jingdou')
-//                        ->where('status', -1)
-//                        ->where('id', $user_sign_jingdou['id'])
-//                        ->update([
-//                            'status'          => 1,
-//                            'settlement_time' => date('Y-m-d H:i:s')
-//                        ]);
-//                }
-//
-//
-//
-//                // 结算复购金
-//                $user_sign_fugou_list = Db::name('user_sign_fugou')
-//                    ->where('status', -1)
-//                    ->where('order_id', $online['order_id'])
-//                    ->whereIn('type', [1, 2])
-//                    ->select()
-//                    ->toArray();
-//                foreach ($user_sign_fugou_list as $user_sign_fugou) {
-//                    // 修改复购金
-//                    Db::name('user')
-//                        ->where('uid', $user_sign_fugou['uid'])
-//                        ->inc('fugou', (float)$user_sign_fugou['number'])
-//                        ->update();
-//                    Db::name('user_sign_fugou')
-//                        ->where('status', -1)
-//                        ->where('id', $user_sign_fugou['id'])
-//                        ->update([
-//                            'status'          => 1,
-//                            'settlement_time' => date('Y-m-d H:i:s')
-//                        ]);
-//                }
-//
-//
-//                // 结算贡献值
-//                $user_sign_gongxian_list = Db::name('user_sign_gongxian')
-//                    ->where('status', -1)
-//                    ->where('order_id', $online['order_id'])
-//                    ->whereIn('type', [1, 2])
-//                    ->select()
-//                    ->toArray();
-//                foreach ($user_sign_gongxian_list as $user_sign_gongxian) {
-//                    // 修改贡献值
-//                    Db::name('user')
-//                        ->where('uid', $user_sign_gongxian['uid'])
-//                        ->inc('contribute', (float)$user_sign_gongxian['number'])
-//                        ->update();
-//                    Db::name('user_sign_gongxian')
-//                        ->where('status', -1)
-//                        ->where('id', $user_sign_gongxian['id'])
-//                        ->update([
-//                            'status'          => 1,
-//                            'settlement_time' => date('Y-m-d H:i:s')
-//                        ]);
-//                }
-//
-//
-//                // 结算佣金
-//                $user_bill_list = Db::name('user_bill')
-//                    ->where('status', 0)
-//                    ->where('commission_type','<>', 5)
-//                    ->where([ 'link_id' => $online['order_id'], 'order_sn' => $online['order_sn']])
-//                    ->select()
-//                    ->toArray();
-//                foreach ($user_bill_list as $user_bill) {
-//                    if ($user_bill['commission_type'] != 5) {
-//                        if (in_array($user_bill['commission_type'], [7,12,19])) {
-//                            Db::name("merchant")
-//                                ->where("mer_id", $user_bill['mer_id'])
-//                                ->inc('brokerage_price', (float)$user_bill['number'])
-//                                ->update();
-//                        } else {
-//                            Db::name('user')
-//                                ->where('uid', $user_bill['uid'])
-//                                ->inc('brokerage_price', (float)$user_bill['number'])
-//                                ->update();
-//                        }
-//                    }
-//                    if ($online['pay_type'] == 0 && $user_bill['commission_type'] == 5) {
-//                    } else {
-//                        // 虚拟支付的养老金不修改不结算
-//                        Db::name('user_bill')
-//                            ->where('status', 0)
-//                            ->where('bill_id', $user_bill['bill_id'])
-//                            ->update([
-//                                'status'    => 1,
-//                                'take_time' => time()
-//                            ]);
-//                    }
-//                    if ($online['pay_type'] == 0 && $user_bill['commission_type'] == 5) {
-//                    } else {
-//                        // 虚拟支付的养老金不修改不结算
-//                        Db::name('user_bill')
-//                            ->where('status', 0)
-//                            ->where('bill_id', $user_bill['bill_id'])
-//                            ->update([
-//                                'status'    => 1,
-//                                'take_time' => time()
-//                            ]);
-//                    }
-//                }
-//                //按角色结算
-//                $StoreOrderRepository->close_order($online['order_id']);
-//            });
-//        }
     }
 
 }

app/common/repositories/movie/MovieRepository.php

@@ -155,9 +155,7 @@ class MovieRepository extends BaseRepository
             $group = Db::transaction(function () use ($userinfo, $_order) {
                 $_order = $this->dao->create($_order);
                 if ($_order) return ['code' => ApiResponseService::DEFAULT_SUCCESS_CODE, 'msg' => '下单成功', 'data' => ['order_sn' => $_order['order_sn']]];
-//                return $this->pay(
-//                    $_order['pay_type'], $userinfo->wechat_user_id, $_order, $_order['film_name'], env('APP_URL') . "/api/hf_notify/movie",
-//                    'delay');
+
                 throw new ValidateException('下单失败');
             });
             return $group;
@@ -167,6 +165,25 @@ class MovieRepository extends BaseRepository
     }
 
     /**
+     * @param $userinfo
+     * @param $order_sn
+     * @return mixed|string
+     */
+    public function confirmOrder($userinfo, $order_sn)
+    {
+        $orderinfo = $this->dao->getWhere(['order_sn' => $order_sn, 'uid' => $userinfo->uid])->find();
+        if (empty($orderinfo)) throw new ValidateException('订单不存在');
+        if ($orderinfo['paid'] == 0 && $orderinfo['status'] == 2) throw new ValidateException('订单已超时');
+        if ($orderinfo['paid'] == 0 && $orderinfo['status'] == 3) throw new ValidateException('订单已取消');
+        if ($orderinfo['paid'] == 1) throw new ValidateException('订单已支付');
+
+//                return $this->pay(
+//                    $_order['pay_type'], $userinfo->wechat_user_id, $_order, $_order['film_name'], env('APP_URL') . "/api/hf_notify/movie",
+//                    'delay');
+        return DouHuoMallFilmApiRequest::confirmOrder($third_order, $order_price);
+    }
+
+    /**
      * 支付
      *
      * @param $payType
@@ -243,16 +260,6 @@ class MovieRepository extends BaseRepository
     }
 
     /**
-     * @param $third_order
-     * @param $order_price
-     * @return mixed|string
-     */
-    public function confirmOrder($third_order, $order_price)
-    {
-        return DouHuoMallFilmApiRequest::confirmOrder($third_order, $order_price);
-    }
-
-    /**
      * @param $userinfo
      * @param $order_sn
      * @return mixed|string

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

@@ -10530,15 +10530,15 @@ class StoreOrderRepository extends BaseRepository
     {
         if ($order['pay_type'] == 1) {
             //微信
-            if ($group_order['pay_wx'] == 3) {
-                $hf_member_id = Db::name('merchant_member')->where('mer_id', $order['mer_id'])->where("type", 3)->value('member_id');
-                $api_key = 'api_live_b0a687ec-5450-4ada-a0e4-65bac0f46871';
-                $type = 3;
-            } else {
-                $hf_member_id = Db::name('merchant_member')->where('mer_id', $order['mer_id'])->where("type", 2)->value('member_id');
-                $api_key = 'api_live_90ef02e4-54ac-41ee-adf1-e4927d23d58f';
-                $type = 2;
-            }
+//            if ($group_order['pay_wx'] == 3) {
+//            } else {
+//                $hf_member_id = Db::name('merchant_member')->where('mer_id', $order['mer_id'])->where("type", 2)->value('member_id');
+//                $api_key = 'api_live_90ef02e4-54ac-41ee-adf1-e4927d23d58f';
+//                $type = 2;
+//            }
+            $hf_member_id = Db::name('merchant_member')->where('mer_id', $order['mer_id'])->where("type", 3)->value('member_id');
+            $api_key = 'api_live_b0a687ec-5450-4ada-a0e4-65bac0f46871';
+            $type = 3;
 
             // 平台特殊账户
             $hf_platform_member_id = Db::name('merchant_member')->where(['mer_id' => $dst_mer_id, 'type' => $type])->value('member_id');
@@ -10660,10 +10660,13 @@ class StoreOrderRepository extends BaseRepository
 
             // @todo 预分账处理 496：表示{会员专区}账户，本区分账到{会员专区}账户，故：hf_platform_member_id 为入账账户
             $isSuccessed = $this->prepareExecuteIndependentAccount(
-                $order, $order_group_data, $independentAccount['api_key'], $independentAccount['hf_platform_member_id'], '', $order['con_pri'], 0
+                $order, $order_group_data, $independentAccount['api_key'], $independentAccount['hf_platform_member_id'], '',
+                $order['pay_price'], 0
             );
+            if ($isSuccessed) {
+                Db::name("log")->insert(array('data' => '会员专区-订单分账：' . json_encode($order, JSON_FORCE_OBJECT)));//日志记录
+            }
 
-            Db::name("log")->insert(array('data' => '会员专区-订单分账：' . json_encode($order, JSON_FORCE_OBJECT)));//日志记录
         }
     }
 

app/controller/api/movie/Movie.php

@@ -172,13 +172,10 @@ class Movie extends BaseController
      */
     public function confirmOrder()
     {
-        $relation_id = $this->request->param(['relation_id']);
-        if (empty($cinema_sign)) return app('json')->fail('请选择场次');
-
-        $sched_sign = $this->request->param(['sched_sign']);
-        if (empty($film_sign)) return app('json')->fail('请选择场次');
+        $order_sn = $this->request->param(['order_sn']);
+        if (empty($order_sn)) return app('json')->fail('订单不存在');
 
-        return app('json')->success($this->repository->confirmOrder($relation_id, $sched_sign));
+        return app('json')->success($this->repository->confirmOrder($this->request->userInfo(), $order_sn));
     }
 
     /**
@@ -188,7 +185,7 @@ class Movie extends BaseController
      */
     public function getOrderInfo()
     {
-        $order_sn = $this->request->param('order_sn','');
+        $order_sn = $this->request->param('order_sn', '');
         if (empty($order_sn)) return app('json')->fail('订单不存在');
 
         return app('json')->success($this->repository->getOrderInfo($this->request->userInfo(), $order_sn));

config/console.php

@@ -20,5 +20,7 @@ return [
         'ln:import_store' => 'app\command\test\ln\ImportStore',
         'ln:user_bill' => 'app\command\test\ln\UserBill',
         'ln:import_user_cxb' => 'app\command\test\ln\ImportUser2',
+//        'great_life_order_independent_account' => 'app\command\GreatLifeOrderIndependentAccount',
+//        'commercial-\_area_order_independent_account' => 'app\command\CommercialAreaOrderIndependentAccount'
     ],
 ];