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

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

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 mb.goods_name LIKE CONCAT('%', #{entity.goodsName}, '%')
+                AND og.goods_name LIKE CONCAT('%', #{entity.goodsName}, '%')
             </if>
         </where>
         ORDER BY mb.modify_time DESC