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:50:56 +08:00
parent 0df18cfe1d
commit b498fc9924
2 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -360,7 +360,8 @@ public class RetailOrderServiceImpl implements IRetailOrderService {
if (CollectionUtil.isNotEmpty(orderItemsParams)) { if (CollectionUtil.isNotEmpty(orderItemsParams)) {
List<BdWaresDetailExt> waresDetailExtList = iBdWaresDetailService.queryWaresDetailByCondition(specialArea, ETransportType.LAND.getValue(), orderItemsParams, systemType); List<BdWaresDetailExt> waresDetailExtList = iBdWaresDetailService.queryWaresDetailByCondition(specialArea, ETransportType.LAND.getValue(), orderItemsParams, systemType);
// 复购处理极差 // 复购处理极差
setWaresRange(specialArea, waresDetailExtList, cuMember); // 2025.10.29 去掉级差处理，目前没有级差价格
// setWaresRange(specialArea, waresDetailExtList, cuMember);
if (waresDetailExtList.size() > 0) { if (waresDetailExtList.size() > 0) {
bdWaresDetailExtList.addAll(waresDetailExtList); bdWaresDetailExtList.addAll(waresDetailExtList);
} }

35
bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresSpecsSkuServiceImpl.java
View File

@ -422,23 +422,24 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl<BdWaresSpecsSkuMappe
waresItemWaresInfo.setSkuInfo(StringUtils.join(specsNames, ",")); waresItemWaresInfo.setSkuInfo(StringUtils.join(specsNames, ","));
}); });
if (EOrderType.RETAIL_REPURCHASE.getValue() == specialArea // 2025.10.29 去掉级差处理，目前没有级差价格
|| EOrderType.RETAIL_CONSUME.getValue() == specialArea) { // if (EOrderType.RETAIL_REPURCHASE.getValue() == specialArea
// 2024.12.30 添加需求，复消也需要处理级差 // || EOrderType.RETAIL_CONSUME.getValue() == specialArea) {
CuMember cuMember = iSaOrderService.getCuMemberByKey(pkMember); // // 2024.12.30 添加需求，复消也需要处理级差
int level = cuMember.getPkSettleGrade(); // CuMember cuMember = iSaOrderService.getCuMemberByKey(pkMember);
int rangeType = ERangeType.GRADE.getValue(); // int level = cuMember.getPkSettleGrade();
List<Integer> pkWaresSpecsSku = productGroup.stream().map(ProductGroup::getPkSkuId).collect(Collectors.toList()); // int rangeType = ERangeType.GRADE.getValue();
List<BdWaresRange> bdWaresRangeList = iBdWaresRangeService.querySkuWaresRangeByCondition(cuMember.getPkSettleCountry(), rangeType, level, pkWaresSpecsSku); // List<Integer> pkWaresSpecsSku = productGroup.stream().map(ProductGroup::getPkSkuId).collect(Collectors.toList());
bdWaresRangeList.forEach(bdWaresRange -> { // List<BdWaresRange> bdWaresRangeList = iBdWaresRangeService.querySkuWaresRangeByCondition(cuMember.getPkSettleCountry(), rangeType, level, pkWaresSpecsSku);
String key = bdWaresRange.getPkWaresDetail().toString() + bdWaresRange.getPkWaresSpecsSku(); // bdWaresRangeList.forEach(bdWaresRange -> {
if (waresDetailExtMap.containsKey(key)) { // String key = bdWaresRange.getPkWaresDetail().toString() + bdWaresRange.getPkWaresSpecsSku();
waresDetailExtMap.get(key).setPrice(bdWaresRange.getPrice()); // if (waresDetailExtMap.containsKey(key)) {
waresDetailExtMap.get(key).setAchieve(bdWaresRange.getAchieve()); // waresDetailExtMap.get(key).setPrice(bdWaresRange.getPrice());
waresDetailExtMap.get(key).setAssAchieve(bdWaresRange.getAssAchieve()); // waresDetailExtMap.get(key).setAchieve(bdWaresRange.getAchieve());
} // waresDetailExtMap.get(key).setAssAchieve(bdWaresRange.getAssAchieve());
}); // }
} // });
// }
for (WaresItemWaresInfo waresItemWaresInfo : waresItemVo.getWaresItemsParamList()) { for (WaresItemWaresInfo waresItemWaresInfo : waresItemVo.getWaresItemsParamList()) {
waresItemVo.setPrice(ComputeUtil.computeAdd(waresItemVo.getPrice(), ComputeUtil.computeMultiply(waresItemWaresInfo.getPrice(), waresItemWaresInfo.getQuantity()))); waresItemVo.setPrice(ComputeUtil.computeAdd(waresItemVo.getPrice(), ComputeUtil.computeMultiply(waresItemWaresInfo.getPrice(), waresItemWaresInfo.getQuantity())));