diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/RetailMemberVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/RetailMemberVO.java index a947e253..f6ba7d04 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/RetailMemberVO.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/RetailMemberVO.java @@ -1,6 +1,7 @@ package com.hzs.member.base.vo; import com.fasterxml.jackson.annotation.JsonFormat; +import com.hzs.common.core.annotation.BigDecimalFormat; import com.hzs.common.core.annotation.Excel; import com.hzs.common.core.annotation.Transaction; import com.hzs.common.core.constant.EnumsPrefixConstants; @@ -90,13 +91,15 @@ public class RetailMemberVO implements Serializable { /** * 消费金额 注册金额 */ - @Excel(name = "注册金额") + @Excel(name = "注册金额", scale = 2) + @BigDecimalFormat() private BigDecimal consumeMoney; /** * 消费业绩 注册业绩 */ - @Excel(name = "注册业绩($)") + @Excel(name = "注册业绩", scale = 2) + @BigDecimalFormat() private BigDecimal consumeAchieve; /** * 隶属体系 diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/api/ApiRetailOrderController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/api/ApiRetailOrderController.java index aebec37c..1b9cd61e 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/api/ApiRetailOrderController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/api/ApiRetailOrderController.java @@ -633,7 +633,6 @@ public class ApiRetailOrderController { .channel(shoppingCartRedis.getSource()) .waresCode(shoppingCartRedis.getWaresCode()) .quantity(shoppingCartRedis.getNumber()) - .pkMakerSpace(shoppingCartRedis.getPkMakerSpace()) .build(); List waresItemsParamList = new ArrayList<>(shoppingCartRedis.getProductGroup().size()); for (ProductGroup productGroup : shoppingCartRedis.getProductGroup()) { 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 59d36f9b..36a92481 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 @@ -283,7 +283,7 @@ public class RetailOrderServiceImpl implements IRetailOrderService { if (boxWaresList.contains(waresDetailExt.getWaresCode())) { // 商品是盒数商品，需要累计数量 - boxNum += orderItems.getWaresQuantity(); + boxNum += waresDetailExt.getBoxNum() * orderItems.getWaresQuantity(); } } } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/ParentOrderController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/ParentOrderController.java index 9368f7fc..d937cbf4 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/ParentOrderController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/ParentOrderController.java @@ -601,7 +601,6 @@ public abstract class ParentOrderController extends BaseController { .channel(shoppingCartRedis.getSource()) .waresCode(shoppingCartRedis.getWaresCode()) .quantity(shoppingCartRedis.getNumber()) - .pkMakerSpace(shoppingCartRedis.getPkMakerSpace()) .build(); List waresItemsParamList = new ArrayList<>(shoppingCartRedis.getProductGroup().size()); for (ProductGroup productGroup : shoppingCartRedis.getProductGroup()) { diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/OrderItemsParam.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/OrderItemsParam.java index 1440a51a..5d53a1d6 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/OrderItemsParam.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/OrderItemsParam.java @@ -40,9 +40,9 @@ public class OrderItemsParam implements Serializable { private Integer quantity; /** - * 创客空间id + * 商品盒数 */ - private Long pkMakerSpace; + private Integer boxNum; /** * 商品明细 diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java index 56d5d282..c6175807 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java @@ -2157,11 +2157,13 @@ public class SaOrderServiceImpl extends ServiceImpl impl // 当前产品盒数 int boxNum = 0; + // 处理商品盒数 + this.handleWaresBoxNum(specialArea, orderItemsParams); // 判断订单明细中指定产品数量，校验等级 for (OrderItemsParam orderItemsParam : orderItemsParams) { if (boxWaresList.contains(orderItemsParam.getWaresCode())) { // 存在指定商品，需要累计盒数 - boxNum += orderItemsParam.getQuantity(); + boxNum += orderItemsParam.getBoxNum() * orderItemsParam.getQuantity(); } } @@ -2297,4 +2299,29 @@ public class SaOrderServiceImpl extends ServiceImpl impl } } + + /** + * 处理商品盒数 + * + * @param orderItemsParams + */ + private void handleWaresBoxNum(Integer specialArea, List orderItemsParams) { + if (CollectionUtil.isNotEmpty(orderItemsParams)) { + List waresCodeList = orderItemsParams.stream().map(OrderItemsParam::getWaresCode).collect(Collectors.toList()); + List waresList = iBdWaresService.list(Wrappers.lambdaQuery() + .eq(BdWares::getSpecialArea, specialArea) + .in(BdWares::getWaresCode, waresCodeList) + ); + if (CollectionUtil.isNotEmpty(waresList)) { + for (OrderItemsParam orderItemsParam : orderItemsParams) { + for (BdWares bdWares : waresList) { + if (orderItemsParam.getWaresCode().equals(bdWares.getWaresCode())) { + orderItemsParam.setBoxNum(bdWares.getBoxNum()); + } + } + } + } + } + } + } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/shopping/controller/api/ApiShoppingCartController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/shopping/controller/api/ApiShoppingCartController.java index 9fe554e1..4fb54840 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/shopping/controller/api/ApiShoppingCartController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/shopping/controller/api/ApiShoppingCartController.java @@ -76,7 +76,6 @@ public class ApiShoppingCartController extends BaseController { String jsonString = innerShopMap.get(innerKey.toString()); ShoppingCartRedis shoppingCartRedis = JSONUtil.toBean(jsonString, ShoppingCartRedis.class); shoppingCartRedis.setNumber(shoppingCartRedis.getNumber() + scr.getNumber()); - shoppingCartRedis.setPkMakerSpace(scr.getPkMakerSpace()); innerShopMap.put(innerKey.toString(), JSONUtil.toJsonStr(shoppingCartRedis)); } else { diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/shopping/vo/ShoppingCartRedis.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/shopping/vo/ShoppingCartRedis.java index 408db2ed..ed442790 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/shopping/vo/ShoppingCartRedis.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/shopping/vo/ShoppingCartRedis.java @@ -21,11 +21,6 @@ public class ShoppingCartRedis implements Serializable { */ private Integer number; - /** - * 创客空间id - */ - private Long pkMakerSpace; - /** * 产品 sku 组合 */ diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresDetailServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresDetailServiceImpl.java index bf8d4d8c..ac8151c9 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresDetailServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresDetailServiceImpl.java @@ -35,7 +35,6 @@ public class BdWaresDetailServiceImpl extends ServiceImpl