github/CRMEB
1
0
Fork 0
mirror of https://github.com/crmeb/CRMEB.git synced 2026-10-29 14:01:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

修复拆单发货会出现订单商品没有正常拆分的问题

Browse Source
This commit is contained in:
evoxwht 2022-02-21 15:41:13 +08:00
parent 7e8fcc8b90
commit 04b031de78
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
crmeb/app/services/order/StoreOrderSplitServices.php
View File

@ -159,9 +159,12 @@ class StoreOrderSplitServices extends BaseServices
];
}
}
if ($orderInfo['pid'] == 0 || $orderInfo['pid'] > 0 && $key == 'new') {
$storeOrderCartInfoServices->saveAll($cart_data_all);
if ($orderInfo['pid'] > 0 && $key == 'other') {
$storeOrderCartInfoServices->delete(['oid' => $new_id]);
}
$storeOrderCartInfoServices->saveAll($cart_data_all);
$new_order = $this->dao->get($new_id);
$storeOrderCartInfoServices->clearOrderCartInfo($new_id);
$this->splitComputeOrder((int)$new_id, $cart_data_all, (float)($change_price ? $order_pay_price : 0), (float)$orderInfo['pay_price'], (float)($new_order['pay_price'] ?? 0));
@ -286,7 +289,7 @@ class StoreOrderSplitServices extends BaseServices
$deduction_price = bcadd((string)$deduction_price, (string)$_info['integral_price'], 2);
$coupon_price = bcadd((string)$coupon_price, (string)$_info['coupon_price'], 2);
$use_integral = bcadd((string)$use_integral, (string)$_info['use_integral'], 0);
$pay_postage = bcadd((string)$pay_postage, (string)$_info['postage_price'], 2);
$pay_postage = isset($_info['postage_price']) ? bcadd((string)$pay_postage, (string)$_info['postage_price'], 2) : 0;
$cartInfoGainIntegral = bcmul((string)$cart['cart_num'], (string)($_info['productInfo']['give_integral'] ?? '0'), 0);
$gainIntegral = bcadd((string)$gainIntegral, (string)$cartInfoGainIntegral, 0);
$one_brokerage = bcadd((string)$one_brokerage, (string)$_info['one_brokerage'], 2);