| @@ -3030,6 +3030,7 @@ public class WxOrderServiceImpl implements WxOrderService { | |||||
| if(EnumOrderShopingType.DISTRIBUTION.getCode().equals(shippingType)){ | if(EnumOrderShopingType.DISTRIBUTION.getCode().equals(shippingType)){ | ||||
| record.setShippingAddress(JSON.toJSONString(address)); | record.setShippingAddress(JSON.toJSONString(address)); | ||||
| } | } | ||||
| record.updateTenantInfo(composeOrder); | |||||
| record.setComposeOrderId(composeOrder.getMainOrderId()); | record.setComposeOrderId(composeOrder.getMainOrderId()); | ||||
| record.setComposeOrderType(composeOrder.getComposeOrderType()); | record.setComposeOrderType(composeOrder.getComposeOrderType()); | ||||
| record.setCouponNumber(couponNumber); | record.setCouponNumber(couponNumber); | ||||
| @@ -3093,6 +3094,7 @@ public class WxOrderServiceImpl implements WxOrderService { | |||||
| // 4.2 保存订单 | // 4.2 保存订单 | ||||
| WxOrder record = new WxOrder(); | WxOrder record = new WxOrder(); | ||||
| record.setType(orderType); | record.setType(orderType); | ||||
| record.setPayVendor(payWay.getCode()); | record.setPayVendor(payWay.getCode()); | ||||
| record.setPayVersion(payVersion.getCode()); | record.setPayVersion(payVersion.getCode()); | ||||
| @@ -3107,6 +3109,7 @@ public class WxOrderServiceImpl implements WxOrderService { | |||||
| } | } | ||||
| record.setOrderStatus(orderStatus); | record.setOrderStatus(orderStatus); | ||||
| record.updateTenantInfo(composeOrder); | |||||
| record.setComposeOrderId(composeOrder.getMainOrderId()); | record.setComposeOrderId(composeOrder.getMainOrderId()); | ||||
| //if (EnumComposeOrder.childOrderIsSingle(composeOrder.getComposeOrderType())) { | //if (EnumComposeOrder.childOrderIsSingle(composeOrder.getComposeOrderType())) { | ||||
| // record.setComposeOrderType(EnumComposeOrder.SINGLE.getCode()); | // record.setComposeOrderType(EnumComposeOrder.SINGLE.getCode()); | ||||
| @@ -3308,6 +3311,7 @@ public class WxOrderServiceImpl implements WxOrderService { | |||||
| wxOrderPressMapper.insert(orderPress); | wxOrderPressMapper.insert(orderPress); | ||||
| // 更新订单砍价信息 | // 更新订单砍价信息 | ||||
| WxOrder orderUpdatePress = new WxOrder(); | WxOrder orderUpdatePress = new WxOrder(); | ||||
| orderUpdatePress.updateTenantInfo(coupon); | |||||
| orderUpdatePress.setId(record.getId()); | orderUpdatePress.setId(record.getId()); | ||||
| orderUpdatePress.setPressCurrentNum(1); | orderUpdatePress.setPressCurrentNum(1); | ||||
| orderUpdatePress.setPressCurrentValue(left_total - orderPress.getPressValue()); | orderUpdatePress.setPressCurrentValue(left_total - orderPress.getPressValue()); | ||||