diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java index 83091a2..9e7406f 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java @@ -900,6 +900,8 @@ public class OrderInfoService extends ServiceImpl 0) { if (!SettlementWay.CASH.getVal().equals(ctx.getSettlementWay())) { + String way = SettlementWay.BALANCE.getVal().equals(ctx.getSettlementWay()) ? + SettlementWay.BALANCE.getTxt() : SettlementWay.MONTH.getTxt(); BigDecimal oldBalance = ctx.getCompanyBalance(); BigDecimal newBalance = oldBalance.subtract(payMoney); // 更新账户余额(支持负数余额) @@ -917,7 +919,7 @@ public class OrderInfoService extends ServiceImpl - AND og.goods_name LIKE CONCAT('%', #{entity.goodsName}, '%') + AND mb.goods_name LIKE CONCAT('%', #{entity.goodsName}, '%') ORDER BY mb.modify_time DESC