diff --git a/ghy-admin/src/main/resources/application.yaml b/ghy-admin/src/main/resources/application.yaml index 5a633a07..9e726bf6 100644 --- a/ghy-admin/src/main/resources/application.yaml +++ b/ghy-admin/src/main/resources/application.yaml @@ -7,7 +7,7 @@ ruoyi: # 版权年份 copyrightYear: 2021 # 实例演示开关 - demoEnabled: true + demoEnabled: false # 文件路径 示例( Windows配置D:/ruoyi/uploadPath,Linux配置 /home/ruoyi/uploadPath) profile: /home/ruoyi/uploadPath # 获取ip地址开关 diff --git a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java index c9a1ef3b..ef7dea89 100644 --- a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java +++ b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java @@ -730,11 +730,11 @@ public class OrderDetailServiceImpl implements OrderDetailService { workerFee = workerFee.subtract(masterFee); feeFlag = true; } - if (MoneyUtil.gt0(placeOneMoney)) { + if (MoneyUtil.gt0(placeOneMoney) && StringUtils.isNotEmpty(placeOne)) { divMembers.add(new DivMember(placeOne, MoneyUtil.toS(placeOneMoney), !feeFlag)); workerFee = workerFee.subtract(placeOneMoney); } - if (MoneyUtil.gt0(placeTwoMoney)) { + if (MoneyUtil.gt0(placeTwoMoney) && StringUtils.isNotEmpty(placeTwo)) { divMembers.add(new DivMember(placeTwo, MoneyUtil.toS(placeTwoMoney), !feeFlag)); workerFee = workerFee.subtract(placeTwoMoney); }