lzq
/
njzscloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

master
ljw 2025-11-08 13:37:13 +08:00
parent eb17f855dc
commit 6f7c13a84d
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java
View File

@ -900,6 +900,8 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
} }
if (payMoney != null && payMoney.compareTo(BigDecimal.ZERO) > 0) { if (payMoney != null && payMoney.compareTo(BigDecimal.ZERO) > 0) {
if (!SettlementWay.CASH.getVal().equals(ctx.getSettlementWay())) { 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 oldBalance = ctx.getCompanyBalance();
BigDecimal newBalance = oldBalance.subtract(payMoney); BigDecimal newBalance = oldBalance.subtract(payMoney);
// 更新账户余额（支持负数余额） // 更新账户余额（支持负数余额）
@ -917,7 +919,7 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
.setDelta(payMoney.negate()) // 扣减为负数 .setDelta(payMoney.negate()) // 扣减为负数
.setNewMoney(newBalance) .setNewMoney(newBalance)
.setMoneyChangeCategory(MoneyChangeCategory.DingDanKouKuan) .setMoneyChangeCategory(MoneyChangeCategory.DingDanKouKuan)
.setMemo("订单支付扣款，订单号：" + orderInfo.getSn() + "，结算方式：" + ctx.getSettlementWay()); .setMemo("订单支付扣款，订单号：" + orderInfo.getSn() + "，结算方式：" + way);
moneyChangeDetailService.save(changeDetail); moneyChangeDetailService.save(changeDetail);

2
njzscloud-svr/src/main/resources/mapper/money/MoneyBillMapper.xml
View File

@ -57,7 +57,7 @@
AND bc.company_name LIKE CONCAT('%', #{entity.companyName}, '%') AND bc.company_name LIKE CONCAT('%', #{entity.companyName}, '%')
</if> </if>
<if test="entity.goodsName != null and entity.goodsName != ''"> <if test="entity.goodsName != null and entity.goodsName != ''">
AND og.goods_name LIKE CONCAT('%', #{entity.goodsName}, '%') AND mb.goods_name LIKE CONCAT('%', #{entity.goodsName}, '%')
</if> </if>
</where> </where>
ORDER BY mb.modify_time DESC ORDER BY mb.modify_time DESC