From 6f7c13a84ddbe5883027c5de19df1dfd2db31a15 Mon Sep 17 00:00:00 2001
From: ljw <ljw@jszsyinfo.com>
Date: Sat, 8 Nov 2025 13:37:13 +0800
Subject: [PATCH] 1

---
 .../njzscloud/supervisory/order/service/OrderInfoService.java | 4 +++-
 .../src/main/resources/mapper/money/MoneyBillMapper.xml       | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

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<OrderInfoMapper, OrderInfoEnti
         }
         if (payMoney != null && payMoney.compareTo(BigDecimal.ZERO) > 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<OrderInfoMapper, OrderInfoEnti
                         .setDelta(payMoney.negate()) // 扣减为负数
                         .setNewMoney(newBalance)
                         .setMoneyChangeCategory(MoneyChangeCategory.DingDanKouKuan)
-                        .setMemo("订单支付扣款，订单号：" + orderInfo.getSn() + "，结算方式：" + ctx.getSettlementWay());
+                        .setMemo("订单支付扣款，订单号：" + orderInfo.getSn() + "，结算方式：" + way);
 
                 moneyChangeDetailService.save(changeDetail);
 
diff --git a/njzscloud-svr/src/main/resources/mapper/money/MoneyBillMapper.xml b/njzscloud-svr/src/main/resources/mapper/money/MoneyBillMapper.xml
index 10c70ec..6f48847 100644
--- a/njzscloud-svr/src/main/resources/mapper/money/MoneyBillMapper.xml
+++ b/njzscloud-svr/src/main/resources/mapper/money/MoneyBillMapper.xml
@@ -57,7 +57,7 @@
                 AND bc.company_name LIKE CONCAT('%', #{entity.companyName}, '%')
             </if>
             <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>
         </where>
         ORDER BY mb.modify_time DESC