mkm/shop-new
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改支付下单主订单

Browse Source
This commit is contained in:
codeliu 2024-03-22 15:50:41 +08:00
parent 4c279f2153
commit 1e37ca795d
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/common/repositories/store/order/StoreOrderCreateRepository.php
View File

@ -1091,6 +1091,14 @@ class StoreOrderCreateRepository extends StoreOrderRepository
} }
$user_address = isset($address) ? ($address['province'] . $address['city'] . $address['district'] . $address['street'] . $address['detail']) : ''; $user_address = isset($address) ? ($address['province'] . $address['city'] . $address['district'] . $address['street'] . $address['detail']) : '';
//整理订单数据 //整理订单数据
$payPrice_order = $merchantCart['order']['pay_price'];
$couponPrice_order = bcadd($merchantCart['order']['coupon_price'], $merchantCart['order']['platform_coupon_price'], 2);
if($remarkMoney){
$payPrice_order = $remarkMoney;//输入得金额
$couponPrice_order = $merchantCart['order']['pay_price'] -$payPrice_order;
}
$_order = [ $_order = [
'cartInfo' => $merchantCart, 'cartInfo' => $merchantCart,
'activity_type' => $orderInfo['order_type'], 'activity_type' => $orderInfo['order_type'],
@ -1113,7 +1121,7 @@ class StoreOrderCreateRepository extends StoreOrderRepository
'total_postage' => $merchantCart['order']['postage_price'], 'total_postage' => $merchantCart['order']['postage_price'],
'pay_postage' => $merchantCart['order']['postage_price'], 'pay_postage' => $merchantCart['order']['postage_price'],
'svip_discount' => $merchantCart['order']['svip_discount'], 'svip_discount' => $merchantCart['order']['svip_discount'],
'pay_price' => $merchantCart['order']['pay_price'], 'pay_price' =>$payPrice_order,
'integral' => $merchantCart['order']['total_integral'], 'integral' => $merchantCart['order']['total_integral'],
'integral_price' => $merchantCart['order']['total_integral_price'], 'integral_price' => $merchantCart['order']['total_integral_price'],
'give_integral' => $merchantCart['order']['total_give_integral'], 'give_integral' => $merchantCart['order']['total_give_integral'],
@ -1122,7 +1130,7 @@ class StoreOrderCreateRepository extends StoreOrderRepository
'order_extend' => count($order_extend) ? json_encode($order_extend, JSON_UNESCAPED_UNICODE) : '', 'order_extend' => count($order_extend) ? json_encode($order_extend, JSON_UNESCAPED_UNICODE) : '',
'coupon_id' => implode(',', $merchantCart['order']['useCouponIds']), 'coupon_id' => implode(',', $merchantCart['order']['useCouponIds']),
'mark' => $mark[$merchantCart['mer_id']] ?? '', 'mark' => $mark[$merchantCart['mer_id']] ?? '',
'coupon_price' => bcadd($merchantCart['order']['coupon_price'], $merchantCart['order']['platform_coupon_price'], 2), 'coupon_price' => $couponPrice_order,
'platform_coupon_price' => $merchantCart['order']['platform_coupon_price'], 'platform_coupon_price' => $merchantCart['order']['platform_coupon_price'],
'pay_type' => $pay_type, 'pay_type' => $pay_type,
'refund_switch' => $merchantCart['order']['order_refund_switch'], 'refund_switch' => $merchantCart['order']['order_refund_switch'],