angelo
/
java-zk-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

## 去掉盒数等处理；

This commit is contained in:
cabbage 2025-10-29 10:08:06 +08:00
parent f9d935d52d
commit f4457f246f
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/service/impl/RetailOrderServiceImpl.java
View File

@ -112,8 +112,8 @@ public class RetailOrderServiceImpl implements IRetailOrderService {
CuMember newMember = new CuMember(); CuMember newMember = new CuMember();
newMember.setMemberName(registerParam.getMemberName()); newMember.setMemberName(registerParam.getMemberName());
newMember.setPhone(registerParam.getPhone()); newMember.setPhone(registerParam.getPhone());
newMember.setPkSettleCountry(CountryConstants.CHINA_COUNTRY);
// newMember.setPkSettleGrade(gradeList.get(0).getPkId()); // newMember.setPkSettleGrade(gradeList.get(0).getPkId());
newMember.setPkSettleCountry(1);
// newMember.setPkAwards(gradeList.get(0).getPkAwards()); // newMember.setPkAwards(gradeList.get(0).getPkAwards());
// 封装订单信息 // 封装订单信息
SaOrderExt saOrderExt = this.createSaOrder(registerParam, gradeList, newMember); SaOrderExt saOrderExt = this.createSaOrder(registerParam, gradeList, newMember);
@ -269,14 +269,10 @@ public class RetailOrderServiceImpl implements IRetailOrderService {
// 邮费模板map（key：邮费模板ID，value：邮费订单明细） // 邮费模板map（key：邮费模板ID，value：邮费订单明细）
Map<Integer, List<SaOrderItems>> postageMap = new HashMap<>(ComputeUtil.mapInitCapacity(waresDetailExtList.size())); Map<Integer, List<SaOrderItems>> postageMap = new HashMap<>(ComputeUtil.mapInitCapacity(waresDetailExtList.size()));
// 当前盒数
BigDecimal boxNum = BigDecimal.ZERO;
// 遍历生成订单明细数据 // 遍历生成订单明细数据
for (BdWaresDetailExt waresDetailExt : waresDetailExtList) { for (BdWaresDetailExt waresDetailExt : waresDetailExtList) {
// 订单明细 // 订单明细
SaOrderItems orderItems = saOrderHandle.getSaOrderItems(cuMember, saOrderExt, currency, orderItemsList, waresDetailExt); SaOrderItems orderItems = saOrderHandle.getSaOrderItems(cuMember, saOrderExt, currency, orderItemsList, waresDetailExt);
orderItems.setWaresBoxNum(null != waresDetailExt.getBoxNum() ? waresDetailExt.getBoxNum() : BigDecimal.ZERO);
// 不是赠品，需要累积包邮邮费 // 不是赠品，需要累积包邮邮费
if (EYesNo.NO.getIntValue() == waresDetailExt.getIsGift()) { if (EYesNo.NO.getIntValue() == waresDetailExt.getIsGift()) {
@ -297,8 +293,7 @@ public class RetailOrderServiceImpl implements IRetailOrderService {
if (null != saOrderExt) { if (null != saOrderExt) {
// 订单邮费 // 订单邮费
saOrderExt.setPostage(orderParam.getPostage()); saOrderExt.setPostage(orderParam.getPostage());
// 订单指定商品盒数 saOrderExt.setBoxNum(BigDecimal.ZERO);
saOrderExt.setBoxNum(boxNum);
if (isCopy41List) { if (isCopy41List) {
saOrderExt.setOrderType(ESpecialArea.RETAIL_UPGRADE.getValue()); saOrderExt.setOrderType(ESpecialArea.RETAIL_UPGRADE.getValue());
} }

7
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/ext/BdWaresSpecsSkuExt.java
View File

@ -8,11 +8,7 @@ import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
/** /**
* @Description: sku扩展表 * sku扩展表
* @Author: sui q
* @Time: 2022/9/19 11:06
* @Classname: BdWaresSpecsSkuExt
* @PackageName: com.hzs.common.domain.sale.ext
*/ */
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Data @Data
@ -31,7 +27,6 @@ public class BdWaresSpecsSkuExt extends BdWaresSpecsSku {
private BigDecimal waresAchieve; private BigDecimal waresAchieve;
/** /**
* 商品编号 * 商品编号
*/ */