From 5d63fa89a11f3beb2ed39f1393b104c71836d38a Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Fri, 17 Oct 2025 15:50:40 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=B4=A6=E6=88=B7=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=E8=A1=A5=E5=85=85=E8=B4=AD=E4=B9=B0=E8=AE=A2=E5=8D=95=E5=8F=B7?=
 =?UTF-8?q?=EF=BC=9B2=E3=80=81=E6=94=AF=E4=BB=98=E5=8D=95=E8=A1=A5?=
 =?UTF-8?q?=E5=85=85=E5=A4=96=E9=83=A8=E6=94=AF=E4=BB=98=E5=8D=95=E5=8F=B7?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../funds/incomeandexpense/IncomeExpenseServiceImpl.java        | 2 +-
 .../cf/imes/module/system/service/pay/PayOrderServiceImpl.java  | 1 +
 .../funds/incomeandexpense/IncomeExpenseDetailsMapper.xml       | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

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 0c8a0a078..ae6f3fb11 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
@@ -73,7 +73,7 @@ public class IncomeExpenseServiceImpl implements IncomeExpenseService {
                 respVO.setRechargePayAmount(i.getExternalSpent());
                 respVO.setGiftPayAmount(i.getGiftMoneySpent());
                 respVO.setPaymentMethod(PayProductChannelCodeEnumNew.describe(i.getPaymentMethod()));
-                respVO.setOrderNo(String.valueOf(i.getPurchaseId()));
+                respVO.setOrderNo(ObjectUtil.isNotNull(i.getPurchaseId()) ? String.valueOf(i.getPurchaseId()) : null);
 
             } else if (TradeTypeEnum.MANUAL_ADJUST.getCode().equals(tradeType)) {
                 respVO.setRechargeAmount(i.getCashAmountChange());
diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/pay/PayOrderServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/pay/PayOrderServiceImpl.java
index f3a2f9006..cb9386559 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/pay/PayOrderServiceImpl.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/pay/PayOrderServiceImpl.java
@@ -509,6 +509,7 @@ public class PayOrderServiceImpl implements PayOrderService {
         String subject = payOrderDO.getSubject();
         payOrderUnifiedReqDTO.setSubject(subject);
         payOrderUnifiedReqDTO.setBody(subject);
+        payOrderUnifiedReqDTO.setOutTradeNo(String.valueOf(payOrderDO.getId()));
         payOrderUnifiedReqDTO.setPrice(payOrderDO.getPrice());
         payOrderUnifiedReqDTO.setExpireTime(payOrderDO.getExpireTime());
         payOrderUnifiedReqDTO.setNotifyUrl(String.format(alipayConfig.getNotifyUrl(), payOrderDO.getChannelCode().getCode()));
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 8c220cd1d..d8abce5b6 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
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.cf.imes.module.system.dal.mysql.incomeandexpense.IncomeExpenseDetailsMapper">
     <select id="getAccountDetailsPage" resultType="com.cf.imes.module.system.dal.dataobject.incomeandexpense.AccountDetailsDO">
-        select i.id, i.business_no, i.order_no ,i.trade_type , i.income_expense_type, i.cash_amount_change, i.gift_amount_change, i.creator, i.create_time, i.organ_id ,
+        select i.id, i.business_no, i.order_no ,i.trade_type , i.income_expense_type, i.cash_amount_change, i.gift_amount_change, i.creator, i.create_time, i.organ_id ,i.purchase_id,
         p.total_amount, p.external_spent, p.account_balance_spent, p.gift_money_spent, p.payment_method, o.channel_code
         from income_expense_details i
         left join purchase_record p on i.purchase_id = p.id