From 1b975c2164c36e77a5ba6b5f01b9dc0ea497cf0e Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Wed, 14 Jan 2026 17:09:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/czg/controller/NotifyController.java  | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/cash-api/order-server/src/main/java/com/czg/controller/NotifyController.java b/cash-api/order-server/src/main/java/com/czg/controller/NotifyController.java
index 479293715..efbe3250e 100644
--- a/cash-api/order-server/src/main/java/com/czg/controller/NotifyController.java
+++ b/cash-api/order-server/src/main/java/com/czg/controller/NotifyController.java
@@ -3,12 +3,12 @@ package com.czg.controller;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.IoUtil;
 import com.alibaba.fastjson2.JSONObject;
-import com.czg.CzgPayUtils;
 import com.czg.PayCst;
+import com.czg.PolyPayUtils;
 import com.czg.constants.PayTypeConstants;
 import com.czg.dto.req.WechatNotifyReqDto;
 import com.czg.dto.req.WechatPayNotifyDataDto;
-import com.czg.entity.CzgBaseRespParams;
+import com.czg.entity.PolyBaseResp;
 import com.czg.exception.CzgException;
 import com.czg.market.entity.MkShopConsumeDiscountRecord;
 import com.czg.market.service.MkDistributionUserService;
@@ -105,8 +105,8 @@ public class NotifyController {
 
 
     @RequestMapping("/payCallBack")
-    public String notifyCallBack(@RequestBody CzgBaseRespParams respParams) {
-        JSONObject czg = CzgPayUtils.getCzg(respParams);
+    public String notifyCallBack(@RequestBody PolyBaseResp respParams) {
+        JSONObject czg = PolyPayUtils.getCzg(respParams);
         AssertUtil.isNull(czg, "支付回调数据为空");
         log.info("支付回调数据为:{}", czg);
         orderInfoCustomService.payCallBackOrder(czg.getString("mchOrderNo"), czg, 0);
@@ -131,12 +131,15 @@ public class NotifyController {
     }
 
 
+    /**
+     *
+     */
     @RequestMapping("/native/wx/pay/distributionRecharge")
     public String nativeNotify(HttpServletRequest request) throws IOException {
-        String timestamp = request.getHeader("Wechatpay-Timestamp");
-        String nonce = request.getHeader("Wechatpay-Nonce");
-        String serialNo = request.getHeader("Wechatpay-Serial");
-        String signature = request.getHeader("Wechatpay-Signature");
+//        String timestamp = request.getHeader("Wechatpay-Timestamp");
+//        String nonce = request.getHeader("Wechatpay-Nonce");
+//        String serialNo = request.getHeader("Wechatpay-Serial");
+//        String signature = request.getHeader("Wechatpay-Signature");
         String result = IoUtil.readUtf8(request.getInputStream());
         JSONObject jsonObject = JSONObject.parseObject(result);
         JSONObject resource = jsonObject.getJSONObject("resource");
@@ -171,8 +174,8 @@ public class NotifyController {
 
 
     @RequestMapping("/refundCallBack")
-    public String refundCallBack(@RequestBody CzgBaseRespParams respParams) {
-        JSONObject czg = CzgPayUtils.getCzg(respParams);
+    public String refundCallBack(@RequestBody PolyBaseResp respParams) {
+        JSONObject czg = PolyPayUtils.getCzg(respParams);
         AssertUtil.isNull(czg, "退款回调数据为空");
         log.info("退款回调数据为:{}", czg);
         orderInfoCustomService.refundCallBackOrder(czg.getString("mchOrderNo"), czg);