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

## 雨汐团队只有自己的复购、重消商品才累盒数；

This commit is contained in:
cabbage 2025-08-02 12:25:25 +08:00
parent b492f98a6f
commit 573943ae4f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -281,8 +281,8 @@ public class RetailOrderServiceImpl implements IRetailOrderService {
BigDecimal boxNum = BigDecimal.ZERO; BigDecimal boxNum = BigDecimal.ZERO;
// 2025.08.02 雨汐团队，普通复购、重消品不累计盒数 // 2025.08.02 雨汐团队，普通复购、重消品不累计盒数
List<String> tmpBoxWaresList = new ArrayList<>(); List<String> tmpBoxWaresList = new ArrayList<>();
if (ESpecialArea.RETAIL_REPURCHASE.getEnable() == orderParam.getSpecialArea() if (ESpecialArea.RETAIL_REPURCHASE.getValue() == orderParam.getSpecialArea()
|| ESpecialArea.RETAIL_RESCISSION.getEnable() == orderParam.getSpecialArea()) { || ESpecialArea.RETAIL_RESCISSION.getValue() == orderParam.getSpecialArea()) {
if (RetailConstants.VERTEX_PK_ID.equals(cuMember.getPkVertex())) { if (RetailConstants.VERTEX_PK_ID.equals(cuMember.getPkVertex())) {
tmpBoxWaresList = iBdWaresService.listWaresCodeByVertex(RetailConstants.VERTEX_PK_ID); tmpBoxWaresList = iBdWaresService.listWaresCodeByVertex(RetailConstants.VERTEX_PK_ID);
} }
@ -313,8 +313,8 @@ public class RetailOrderServiceImpl implements IRetailOrderService {
} }
if (boxWaresList.contains(waresDetailExt.getWaresCode())) { if (boxWaresList.contains(waresDetailExt.getWaresCode())) {
if (ESpecialArea.RETAIL_REPURCHASE.getEnable() == orderParam.getSpecialArea() if (ESpecialArea.RETAIL_REPURCHASE.getValue() == orderParam.getSpecialArea()
|| ESpecialArea.RETAIL_RESCISSION.getEnable() == orderParam.getSpecialArea()) { || ESpecialArea.RETAIL_RESCISSION.getValue() == orderParam.getSpecialArea()) {
if (RetailConstants.VERTEX_PK_ID.equals(cuMember.getPkVertex())) { if (RetailConstants.VERTEX_PK_ID.equals(cuMember.getPkVertex())) {
// 雨汐团队，复购、重消盒数品 // 雨汐团队，复购、重消盒数品
if (tmpBoxWaresList.contains(waresDetailExt.getWaresCode())) { if (tmpBoxWaresList.contains(waresDetailExt.getWaresCode())) {