Commit 2b266806 authored by 332784038@qq.com's avatar 332784038@qq.com

Merge branch 'refs/heads/master-fix' into release

parents 21db5cfd 1aada05f
-- 对于拆单订单品名的原收费数据同步拆单后的收费值一致,不保留母订单的收费值
update ecw_order_item set receivable_sea_freight = 0, receivable_clearance_freight = 0, org_charge_num = 0,org_charge_quantity = 0, org_charge_weight = 0, org_charge_volume = 0 where order_no like('%-%') warehouse_in_info is not null and deleted = 0 and org_charge_num > 0;
\ No newline at end of file
......@@ -1139,6 +1139,10 @@ public class OrderSplitServiceImpl extends AbstractService<OrderSplitMapper, Ord
newOrderItemDO.setChargeQuantity(orderSplitItemBackVO.getChargeQuantity());
newOrderItemDO.setChargeWeight(orderSplitItemBackVO.getChargeWeight());
newOrderItemDO.setChargeVolume(orderSplitItemBackVO.getChargeVolume());
newOrderItemDO.setOrgChargeNum(0);
newOrderItemDO.setOrgChargeQuantity(BigDecimal.ZERO);
newOrderItemDO.setOrgChargeWeight(BigDecimal.ZERO);
newOrderItemDO.setOrgChargeVolume(BigDecimal.ZERO);
if (splitSeparateOrder) {
// 独立订单, 重置原有特价
// TODO 是否排除出货相关拆单的主拆单订单,因为出货阶段的主拆单订单是走的原单业务
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment