|
@@ -10601,6 +10601,7 @@ class StoreOrderRepository extends BaseRepository
|
|
10601
|
$res = $this->payment_confirm_create_traits($params);
|
10601
|
$res = $this->payment_confirm_create_traits($params);
|
|
10602
|
Db::name("log")->insert(array('data' => '汇付分账结果-----' . json_encode($res, JSON_FORCE_OBJECT)));//日志记录
|
10602
|
Db::name("log")->insert(array('data' => '汇付分账结果-----' . json_encode($res, JSON_FORCE_OBJECT)));//日志记录
|
|
10603
|
if ($res['status'] == 'succeeded') {
|
10603
|
if ($res['status'] == 'succeeded') {
|
|
|
|
10604
|
+ Db::name("store_order")->where('order_sn', $order['order_sn'])->update(['is_independentaccount' => 1]);
|
|
10604
|
Db::name("store_split_order")->where('requestId', $requestId)->update(['status' => 1, 'hf_pay_id' => $res['id']]);
|
10605
|
Db::name("store_split_order")->where('requestId', $requestId)->update(['status' => 1, 'hf_pay_id' => $res['id']]);
|
|
10605
|
return true;
|
10606
|
return true;
|
|
10606
|
}
|
10607
|
}
|
|
@@ -10653,7 +10654,7 @@ class StoreOrderRepository extends BaseRepository
|
|
10653
|
$order = Db::name('store_order')->where('order_sn', $order_sn)->where('paid', 1)->find();
|
10654
|
$order = Db::name('store_order')->where('order_sn', $order_sn)->where('paid', 1)->find();
|
|
10654
|
$order_group_data = Db::name('store_group_order')->where('group_order_id', $order['group_order_id'] ?? 0)->find();
|
10655
|
$order_group_data = Db::name('store_group_order')->where('group_order_id', $order['group_order_id'] ?? 0)->find();
|
|
10655
|
|
10656
|
|
|
10656
|
- if (!empty($order) && !empty($order_group_data)) {
|
|
|
|
|
|
10657
|
+ if (!empty($order) && !empty($order_group_data) && ($order['is_independentaccount'] == 0)) {
|
|
10657
|
// 商户信息
|
10658
|
// 商户信息
|
|
10658
|
$merchant = Db::name('merchant')->where('mer_id', $order['mer_id'])->find();
|
10659
|
$merchant = Db::name('merchant')->where('mer_id', $order['mer_id'])->find();
|
|
10659
|
// @todo 获取分账账号
|
10660
|
// @todo 获取分账账号
|