From f7a06a24e6feda67c09b3835538b1c1c9255f6f9 Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Tue, 26 Aug 2025 15:47:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=AC=AC=E4=B8=89=E6=96=B9?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=B8=A6=E6=B8=A0=E9=81=93=E7=BC=96=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../client/dto/order/PayOrderRespDTO.java     | 21 +++++++++++++++++++
 .../impl/alipay/AlipayPcPayHandler.java       |  3 ++-
 .../impl/wechat/WechatNativePayHandler.java   |  3 ++-
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/cf-framework/cf-spring-boot-starter-biz-pay/src/main/java/com/cf/imes/framework/pay/core/client/dto/order/PayOrderRespDTO.java b/cf-framework/cf-spring-boot-starter-biz-pay/src/main/java/com/cf/imes/framework/pay/core/client/dto/order/PayOrderRespDTO.java
index 3fbee25c5..63997f50c 100644
--- a/cf-framework/cf-spring-boot-starter-biz-pay/src/main/java/com/cf/imes/framework/pay/core/client/dto/order/PayOrderRespDTO.java
+++ b/cf-framework/cf-spring-boot-starter-biz-pay/src/main/java/com/cf/imes/framework/pay/core/client/dto/order/PayOrderRespDTO.java
@@ -81,6 +81,11 @@ public class PayOrderRespDTO {
      */
     private Map<String,Object> passbackParams;
 
+    /**
+     * 支付渠道：0-支付宝、1-微信
+     */
+    private Integer channelCode;
+
     /**
      * 创建【WAITING】状态的订单返回
      */
@@ -96,6 +101,22 @@ public class PayOrderRespDTO {
         return respDTO;
     }
 
+    /**
+     * 创建【WAITING】状态的订单返回
+     */
+    public static PayOrderRespDTO waitingOf(String displayMode, String displayContent,
+                                            String outTradeNo, Object rawData, Integer channelCode) {
+        PayOrderRespDTO respDTO = new PayOrderRespDTO();
+        respDTO.status = PayOrderStatusRespEnum.WAITING.getStatus();
+        respDTO.displayMode = displayMode;
+        respDTO.displayContent = displayContent;
+        // 相对通用的字段
+        respDTO.outTradeNo = outTradeNo;
+        respDTO.rawData = rawData;
+        respDTO.channelCode = channelCode;
+        return respDTO;
+    }
+
     /**
      * 创建【SUCCESS】状态的订单返回
      */
diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/pay/factory/impl/alipay/AlipayPcPayHandler.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/pay/factory/impl/alipay/AlipayPcPayHandler.java
index b5151592b..95d3c1595 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/pay/factory/impl/alipay/AlipayPcPayHandler.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/pay/factory/impl/alipay/AlipayPcPayHandler.java
@@ -20,6 +20,7 @@ import com.cf.imes.framework.pay.config.ChenfengAlipayConfig;
 import com.cf.imes.framework.pay.core.client.dto.order.PayOrderRespDTO;
 import com.cf.imes.module.system.controller.admin.pay.vo.PayOrderUnifiedReqDTO;
 import com.cf.imes.framework.pay.core.enums.order.PayOrderStatusRespEnum;
+import com.cf.imes.module.system.enums.pay.PayChannelCodeEnum;
 import com.cf.imes.module.system.enums.pay.PayConstants;
 import com.cf.imes.module.system.service.pay.factory.impl.AbstractPayHandler;
 import lombok.extern.slf4j.Slf4j;
@@ -80,7 +81,7 @@ public class AlipayPcPayHandler extends AbstractPayHandler {
                     outTradeNo, response);
         }
         return PayOrderRespDTO.waitingOf(null, response.getBody(),
-                outTradeNo, response);
+                outTradeNo, response, PayChannelCodeEnum.ALIPAY_PC.getCode());
     }
 
     @Override
diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/pay/factory/impl/wechat/WechatNativePayHandler.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/pay/factory/impl/wechat/WechatNativePayHandler.java
index 9898d257a..dfd5c4b18 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/pay/factory/impl/wechat/WechatNativePayHandler.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/pay/factory/impl/wechat/WechatNativePayHandler.java
@@ -9,6 +9,7 @@ import com.cf.imes.framework.pay.config.ChenfengWechatPayConfig;
 import com.cf.imes.framework.pay.core.client.dto.order.PayOrderRespDTO;
 import com.cf.imes.module.system.controller.admin.pay.vo.PayOrderUnifiedReqDTO;
 import com.cf.imes.framework.pay.core.enums.order.PayOrderDisplayModeEnum;
+import com.cf.imes.module.system.enums.pay.PayChannelCodeEnum;
 import com.cf.imes.module.system.enums.pay.PayOrderStatusEnum;
 import com.cf.imes.module.system.service.pay.factory.impl.AbstractPayHandler;
 import com.github.binarywang.wxpay.bean.notify.SignatureHeader;
@@ -64,7 +65,7 @@ public class WechatNativePayHandler extends AbstractPayHandler {
 
         // 转换结果
         return PayOrderRespDTO.waitingOf(PayOrderDisplayModeEnum.APP.getMode(), JsonUtils.toJsonString(response),
-                reqDTO.getOutTradeNo(), response);
+                reqDTO.getOutTradeNo(), response, PayChannelCodeEnum.WECHAT_NATIVE.getCode());
     }
 
     @Override