diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/service/impl/RetailOrderServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/service/impl/RetailOrderServiceImpl.java index 0948150a..735d18c2 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/service/impl/RetailOrderServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/service/impl/RetailOrderServiceImpl.java @@ -112,8 +112,8 @@ public class RetailOrderServiceImpl implements IRetailOrderService { CuMember newMember = new CuMember(); newMember.setMemberName(registerParam.getMemberName()); newMember.setPhone(registerParam.getPhone()); + newMember.setPkSettleCountry(CountryConstants.CHINA_COUNTRY); // newMember.setPkSettleGrade(gradeList.get(0).getPkId()); - newMember.setPkSettleCountry(1); // newMember.setPkAwards(gradeList.get(0).getPkAwards()); // 封装订单信息 SaOrderExt saOrderExt = this.createSaOrder(registerParam, gradeList, newMember); @@ -269,14 +269,10 @@ public class RetailOrderServiceImpl implements IRetailOrderService { // 邮费模板map(key:邮费模板ID,value:邮费订单明细) Map> postageMap = new HashMap<>(ComputeUtil.mapInitCapacity(waresDetailExtList.size())); - // 当前盒数 - BigDecimal boxNum = BigDecimal.ZERO; - // 遍历生成订单明细数据 for (BdWaresDetailExt waresDetailExt : waresDetailExtList) { // 订单明细 SaOrderItems orderItems = saOrderHandle.getSaOrderItems(cuMember, saOrderExt, currency, orderItemsList, waresDetailExt); - orderItems.setWaresBoxNum(null != waresDetailExt.getBoxNum() ? waresDetailExt.getBoxNum() : BigDecimal.ZERO); // 不是赠品,需要累积包邮邮费 if (EYesNo.NO.getIntValue() == waresDetailExt.getIsGift()) { @@ -297,8 +293,7 @@ public class RetailOrderServiceImpl implements IRetailOrderService { if (null != saOrderExt) { // 订单邮费 saOrderExt.setPostage(orderParam.getPostage()); - // 订单指定商品盒数 - saOrderExt.setBoxNum(boxNum); + saOrderExt.setBoxNum(BigDecimal.ZERO); if (isCopy41List) { saOrderExt.setOrderType(ESpecialArea.RETAIL_UPGRADE.getValue()); } diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/ext/BdWaresSpecsSkuExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/ext/BdWaresSpecsSkuExt.java index a33a2ba5..7859f18e 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/ext/BdWaresSpecsSkuExt.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/ext/BdWaresSpecsSkuExt.java @@ -8,11 +8,7 @@ import java.math.BigDecimal; import java.util.Date; /** - * @Description: sku扩展表 - * @Author: sui q - * @Time: 2022/9/19 11:06 - * @Classname: BdWaresSpecsSkuExt - * @PackageName: com.hzs.common.domain.sale.ext + * sku扩展表 */ @EqualsAndHashCode(callSuper = true) @Data @@ -31,7 +27,6 @@ public class BdWaresSpecsSkuExt extends BdWaresSpecsSku { private BigDecimal waresAchieve; - /** * 商品编号 */