From 9f8c4223ee8b3bd214a6de0b80f6108fdca1a6e9 Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Mon, 20 Oct 2025 15:58:42 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E9=87=91=E7=AE=A1=E7=90=86=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E7=95=8C=E9=9D=A2=E5=8F=82=E6=95=B0=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../enums/pay/PayProductChannelCodeEnumNew.java     | 13 +++++++++++--
 .../incomeandexpense/IncomeExpenseServiceImpl.java  |  2 +-
 .../incomeandexpense/IncomeExpenseDetailsMapper.xml |  5 ++++-
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/enums/pay/PayProductChannelCodeEnumNew.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/enums/pay/PayProductChannelCodeEnumNew.java
index 3ed55d9a5..24e77b344 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/enums/pay/PayProductChannelCodeEnumNew.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/enums/pay/PayProductChannelCodeEnumNew.java
@@ -1,5 +1,7 @@
 package com.cf.imes.module.system.enums.pay;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
 import lombok.Getter;
 
 import java.util.ArrayList;
@@ -120,8 +122,15 @@ public enum PayProductChannelCodeEnumNew {
      *
      * @param code
      */
-    public static String describe(int code) {
-        return parse(code).stream()
+    public static String describe(Integer code) {
+        if (ObjectUtil.isNull(code)) {
+            return null;
+        }
+        List<PayProductChannelCodeEnumNew> parse = parse(code);
+        if (CollUtil.isEmpty(parse)) {
+            return null;
+        }
+        return parse.stream()
                 .map(PayProductChannelCodeEnumNew::getLabel)
                 .collect(Collectors.joining("+"));
     }
diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/incomeandexpense/IncomeExpenseServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/incomeandexpense/IncomeExpenseServiceImpl.java
index ab2d57fa3..7b283dff4 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/incomeandexpense/IncomeExpenseServiceImpl.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/incomeandexpense/IncomeExpenseServiceImpl.java
@@ -79,7 +79,7 @@ public class IncomeExpenseServiceImpl implements IncomeExpenseService {
             if (TradeTypeEnum.RECHARGE.getCode().equals(tradeType)) {
                 respVO.setRechargeAmount(i.getCashAmountChange());
                 respVO.setRechargeGiftAmount(i.getGiftAmountChange());
-                respVO.setPaymentMethod(i.getChannelCode().getDesc());
+                respVO.setPaymentMethod(ObjectUtil.isNotNull(i.getChannelCode()) ? i.getChannelCode().getDesc() : null);
                 respVO.setOrderNo(i.getOrderNo());
 
             } else if (TradeTypeEnum.PRODUCT.getCode().equals(tradeType)) {
diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/mapper/funds/incomeandexpense/IncomeExpenseDetailsMapper.xml b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/funds/incomeandexpense/IncomeExpenseDetailsMapper.xml
index 3f54f345b..37d10589a 100644
--- a/cf-module-system/cf-module-system-biz/src/main/resources/mapper/funds/incomeandexpense/IncomeExpenseDetailsMapper.xml
+++ b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/funds/incomeandexpense/IncomeExpenseDetailsMapper.xml
@@ -12,7 +12,7 @@
             AND i.organ_id = #{reqVO.organId}
         </if>
         <if test="reqVO.businessNo != null and reqVO.businessNo != ''">
-            AND i.business_no = #{reqVO.businessNo}
+            AND i.business_no like concat('%', #{reqVO.businessNo}, '%')
         </if>
         <if test="reqVO.orderNo != null and reqVO.orderNo != ''">
             AND (i.order_no = #{reqVO.orderNo} or i.purchase_id = #{reqVO.orderNo})
@@ -47,5 +47,8 @@
             AND i.gift_amount_change = #{reqVO.giftAmount}
             AND (i.trade_type = '${@com.cf.imes.module.system.enums.pay.TradeTypeEnum@RECHARGE.code}' or i.trade_type = '${@com.cf.imes.module.system.enums.pay.TradeTypeEnum@MANUAL_ADJUST.code}')
         </if>
+        <if test="reqVO.operator != null and reqVO.operator !=''">
+            AND i.creator like concat('%', #{reqVO.operator}, '%')
+        </if>
     </select>
 </mapper>
\ No newline at end of file