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

## BUG449处理；

This commit is contained in:
cabbage 2025-10-28 10:07:57 +08:00
parent 0d4e39d287
commit b4f29b3c3e
2 changed files with 12 additions and 5 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

@ -251,7 +251,7 @@ public class RetailOrderServiceImpl implements IRetailOrderService {
} }
// 商品+产品明细 // 商品+产品明细
List<BdWaresDetailExt> waresDetailExtList = getWaresDetailExtList(ESpecialArea.getRetailSpecialAreaValue(orderParam.getSpecialArea()), orderParam.getOrderItemsParams(), cuMember, orderParam.getSystemType()); List<BdWaresDetailExt> waresDetailExtList = getWaresDetailExtList(ESpecialArea.getNewSpecialAreaValue(orderParam.getSpecialArea()), orderParam.getOrderItemsParams(), cuMember, orderParam.getSystemType());
// 包邮邮费 // 包邮邮费
BigDecimal freePostage = BigDecimal.ZERO; BigDecimal freePostage = BigDecimal.ZERO;
// 邮费模板map（key：邮费模板ID，value：邮费订单明细） // 邮费模板map（key：邮费模板ID，value：邮费订单明细）
@ -301,13 +301,11 @@ public class RetailOrderServiceImpl implements IRetailOrderService {
if (CollectionUtil.isEmpty(gradeList)) { if (CollectionUtil.isEmpty(gradeList)) {
gradeList = iGradeServiceApi.getRetailGradeList().getData(); gradeList = iGradeServiceApi.getRetailGradeList().getData();
} }
if(ObjectUtil.isEmpty(updateGradeMember.getPkSettleGrade())){
updateGradeMember.setPkSettleGrade(iSaOrderService.calculateGrade().getPkId());
}
BdGrade bdGrade = gradeList.stream().filter(tmpGrade -> updateGradeMember.getPkSettleGrade().equals(tmpGrade.getPkId())).findFirst().get(); BdGrade bdGrade = gradeList.stream().filter(tmpGrade -> updateGradeMember.getPkSettleGrade().equals(tmpGrade.getPkId())).findFirst().get();
if (bdGrade.getGradeValue() == EGrade.YOU_KE.getValue()) { if (bdGrade.getGradeValue() == EGrade.YOU_KE.getValue()) {
// 最高级，直接返回 // 最高级，直接返回
updateGradeMember.setPkSettleGrade(bdGrade.getPkId());
return bdGrade; return bdGrade;
} }
@ -315,7 +313,7 @@ public class RetailOrderServiceImpl implements IRetailOrderService {
if (null == orderAchieve) { if (null == orderAchieve) {
orderAchieve = BigDecimal.ZERO; orderAchieve = BigDecimal.ZERO;
// 商品+产品明细 // 商品+产品明细
List<BdWaresDetailExt> waresDetailExtList = getWaresDetailExtList(ESpecialArea.getRetailSpecialAreaValue(specialArea), orderItemsParams, updateGradeMember, null); List<BdWaresDetailExt> waresDetailExtList = getWaresDetailExtList(ESpecialArea.getNewSpecialAreaValue(specialArea), orderItemsParams, updateGradeMember, null);
// 遍历生成订单明细数据 // 遍历生成订单明细数据
for (BdWaresDetailExt waresDetailExt : waresDetailExtList) { for (BdWaresDetailExt waresDetailExt : waresDetailExtList) {
// 不是赠品，需要计算业绩 // 不是赠品，需要计算业绩
@ -328,6 +326,7 @@ public class RetailOrderServiceImpl implements IRetailOrderService {
List<BdGrade> tmpGradeList = gradeList.stream().sorted(Comparator.comparingInt(BdGrade::getGradeValue).reversed()).collect(Collectors.toList()); List<BdGrade> tmpGradeList = gradeList.stream().sorted(Comparator.comparingInt(BdGrade::getGradeValue).reversed()).collect(Collectors.toList());
for (BdGrade tmpGrade : tmpGradeList) { for (BdGrade tmpGrade : tmpGradeList) {
if (orderAchieve.compareTo(tmpGrade.getStartValue()) >= 0) { if (orderAchieve.compareTo(tmpGrade.getStartValue()) >= 0) {
updateGradeMember.setPkSettleGrade(tmpGrade.getPkId());
return tmpGrade; return tmpGrade;
} }
} }

8
bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESpecialArea.java
View File

@ -106,5 +106,13 @@ public enum ESpecialArea {
return value; return value;
} }
public static int getNewSpecialAreaValue(Integer value) {
// 41、42 都返回 41
if (RETAIL_REGISTER.getValue() == value
|| RETAIL_UPGRADE.getValue() == value) {
return RETAIL_REGISTER.getValue();
}
return value;
}
} }