clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

fix bug

This commit is contained in:
kuang.yife 2023-09-28 16:01:07 +08:00
parent 8625d959da
commit 134da09966
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ghy-admin/src/main/resources/application.yaml
View File

@ -7,7 +7,7 @@ ruoyi:
# 版权年份 # 版权年份
copyrightYear: 2021 copyrightYear: 2021
# 实例演示开关 # 实例演示开关
demoEnabled: true demoEnabled: false
# 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
profile: /home/ruoyi/uploadPath profile: /home/ruoyi/uploadPath
# 获取ip地址开关 # 获取ip地址开关

4
ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java
View File

@ -730,11 +730,11 @@ public class OrderDetailServiceImpl implements OrderDetailService {
workerFee = workerFee.subtract(masterFee); workerFee = workerFee.subtract(masterFee);
feeFlag = true; feeFlag = true;
} }
if (MoneyUtil.gt0(placeOneMoney)) { if (MoneyUtil.gt0(placeOneMoney) && StringUtils.isNotEmpty(placeOne)) {
divMembers.add(new DivMember(placeOne, MoneyUtil.toS(placeOneMoney), !feeFlag)); divMembers.add(new DivMember(placeOne, MoneyUtil.toS(placeOneMoney), !feeFlag));
workerFee = workerFee.subtract(placeOneMoney); workerFee = workerFee.subtract(placeOneMoney);
} }
if (MoneyUtil.gt0(placeTwoMoney)) { if (MoneyUtil.gt0(placeTwoMoney) && StringUtils.isNotEmpty(placeTwo)) {
divMembers.add(new DivMember(placeTwo, MoneyUtil.toS(placeTwoMoney), !feeFlag)); divMembers.add(new DivMember(placeTwo, MoneyUtil.toS(placeTwoMoney), !feeFlag));
workerFee = workerFee.subtract(placeTwoMoney); workerFee = workerFee.subtract(placeTwoMoney);
} }