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 3fdd9fde..fced33ed 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 @@ -292,6 +292,9 @@ public class RetailOrderServiceImpl implements IRetailOrderService { // // 2025.03.11 添加需求,复购专区、重消专区,指定盒数商品每用户每月限购50件 // this.checkWaresLimit(cuMember.getPkId(), orderParam.getSpecialArea(), waresDetailExtList, boxProductList); + // 设置已经累计盒数的商品列表 + List tmpBoxWares = new ArrayList<>(); + // 遍历生成订单明细数据 for (BdWaresDetailExt waresDetailExt : waresDetailExtList) { // // 价格KEY(商品编号 + 价格) @@ -319,15 +322,24 @@ public class RetailOrderServiceImpl implements IRetailOrderService { // 雨汐团队,复购、重消盒数品 if (tmpBoxWaresList.contains(waresDetailExt.getWaresCode())) { // 商品是盒数商品,需要累计数量 - boxNum = boxNum.add(waresDetailExt.getBoxNum().multiply(new BigDecimal(orderItems.getWaresQuantity()))); + if (!tmpBoxWares.contains(waresDetailExt.getWaresCode())) { + boxNum = boxNum.add(waresDetailExt.getBoxNum().multiply(new BigDecimal(orderItems.getWaresQuantity()))); + tmpBoxWares.add(waresDetailExt.getWaresCode()); + } } } else { // 商品是盒数商品,需要累计数量 - boxNum = boxNum.add(waresDetailExt.getBoxNum().multiply(new BigDecimal(orderItems.getWaresQuantity()))); + if (!tmpBoxWares.contains(waresDetailExt.getWaresCode())) { + boxNum = boxNum.add(waresDetailExt.getBoxNum().multiply(new BigDecimal(orderItems.getWaresQuantity()))); + tmpBoxWares.add(waresDetailExt.getWaresCode()); + } } } else { // 商品是盒数商品,需要累计数量 - boxNum = boxNum.add(waresDetailExt.getBoxNum().multiply(new BigDecimal(orderItems.getWaresQuantity()))); + if (!tmpBoxWares.contains(waresDetailExt.getWaresCode())) { + boxNum = boxNum.add(waresDetailExt.getBoxNum().multiply(new BigDecimal(orderItems.getWaresQuantity()))); + tmpBoxWares.add(waresDetailExt.getWaresCode()); + } } } @@ -819,8 +831,9 @@ public class RetailOrderServiceImpl implements IRetailOrderService { // 盒数 = 商品上传盒数 * 商品数量 BigDecimal boxNum = saOrderItems.getWaresBoxNum().multiply(waresQuantity); orderWaresMap.put(saOrderItems.getPkWares(), boxNum); - // 价格 = 商品上传价格 * 商品数量,不存在直接放入,存在则进行累加 - BigDecimal waresPrice = saOrderItems.getPrice().multiply(waresQuantity); + + // 价格 = 产品上传价格 * 产品数量 * 商品数量,不存在直接放入,存在则进行累加 + BigDecimal waresPrice = saOrderItems.getPrice().multiply(new BigDecimal(saOrderItems.getQuantity())).multiply(waresQuantity); if (orderWaresPriceMap.containsKey(saOrderItems.getPkWares())) { BigDecimal tmpWaresPrice = orderWaresPriceMap.get(saOrderItems.getPkWares()); orderWaresPriceMap.put(saOrderItems.getPkWares(), tmpWaresPrice.add(waresPrice));