cxc/yshopb2c
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

升级spring-boot 2.4.12、wx-java 4.2.0、pom文件优化、swagger文档升级到3.0.0，邮费计算优化

Browse Source
This commit is contained in:
taozi
2021-11-12 21:00:10 +08:00
parent b8a0825b80
commit 0620e7ad2e
9 changed files with 34 additions and 570 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java
View File

@ -2055,7 +2055,7 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<StoreOrderMapper, Y
}
//处理包邮情况
for (Map.Entry<Integer, TemplateDto> entry : templateDTOMap.entrySet()) {
jj: for (Map.Entry<Integer, TemplateDto> entry : templateDTOMap.entrySet()) {
Integer mapKey = entry.getKey();
TemplateDto mapValue = entry.getValue();
@ -2067,6 +2067,7 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<StoreOrderMapper, Y
//满足包邮条件剔除
if (count > 0) {
templateDTOMap.remove(mapKey);
break jj;
}
}
@ -2079,17 +2080,17 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<StoreOrderMapper, Y
storePostage = NumberUtil.round(NumberUtil.add(storePostage,
templateDTO.getFirstPrice()), 2);
} else {
BigDecimal fristPrice = NumberUtil.add(storePostage, templateDTO.getFirstPrice());
BigDecimal firstPrice = NumberUtil.add(storePostage, templateDTO.getFirstPrice());
if (templateDTO.get_continue() <= 0) {
storePostage = fristPrice;
storePostage = firstPrice;
} else {
//续件平均值且向上取整数
double average = Math.ceil(NumberUtil.div(NumberUtil.sub(templateDTO.getNumber(),
templateDTO.getFirst()),
templateDTO.get_continue().doubleValue()));
//最终邮费
storePostage = NumberUtil.add(fristPrice, NumberUtil.mul(average,
storePostage = NumberUtil.add(firstPrice, NumberUtil.mul(average,
templateDTO.getContinuePrice()));
}