From c57fa40e29d8f407d57cc8e530d0dd279866eb25 Mon Sep 17 00:00:00 2001
From: GYJ <1157756119@qq.com>
Date: Thu, 5 Dec 2024 09:29:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E8=B0=83order=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/pay/controller/app/WuyouController.java  | 12 ++++++------
 .../java/com/sqx/modules/pay/wuyou/WuyouPay.java     |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/sqx/modules/pay/controller/app/WuyouController.java b/src/main/java/com/sqx/modules/pay/controller/app/WuyouController.java
index 320b97c3..7853ad69 100644
--- a/src/main/java/com/sqx/modules/pay/controller/app/WuyouController.java
+++ b/src/main/java/com/sqx/modules/pay/controller/app/WuyouController.java
@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.sqx.common.utils.DateUtils;
 import com.sqx.common.utils.Result;
 import com.sqx.modules.app.entity.UserEntity;
-import com.sqx.modules.app.entity.UserMoney;
 import com.sqx.modules.app.service.UserService;
 import com.sqx.modules.invite.service.InviteService;
 import com.sqx.modules.orders.entity.Orders;
@@ -14,13 +13,14 @@ import com.sqx.modules.pay.dao.CashOutDao;
 import com.sqx.modules.pay.dao.PayDetailsDao;
 import com.sqx.modules.pay.entity.CashOut;
 import com.sqx.modules.pay.entity.PayDetails;
-import com.sqx.modules.pay.service.CashOutService;
-import com.sqx.modules.pay.wuyou.*;
+import com.sqx.modules.pay.wuyou.BaseResp;
+import com.sqx.modules.pay.wuyou.Encrypt;
+import com.sqx.modules.pay.wuyou.NotifyDto;
+import com.sqx.modules.pay.wuyou.WuyouPay;
 import com.sqx.modules.utils.AliPayOrderUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
@@ -140,8 +140,8 @@ public class WuyouController {
         if (payDetails.getState() != 0) {
             log.info("订单表信息丢失！");
         }
-// {"callbacks":"CODE_SUCCESS","out_trade_no":"1000001931380634","pay_time":"1733306566","sign":"7B2C5B55AA09CE07DAE1CC847F51C0BC","total":0.01}
-        Orders order = ordersService.selectOrderByTradeNo(payDetails.getOrderId());
+
+        Orders order = ordersService.selectOrderByOrdersNo(payDetails.getOrderId());
         if (order == null) {
             log.error("无忧支付回调订单不存在, 参数: {}", JSONObject.toJSONString(notifyDto));
             return "订单不存在";
diff --git a/src/main/java/com/sqx/modules/pay/wuyou/WuyouPay.java b/src/main/java/com/sqx/modules/pay/wuyou/WuyouPay.java
index 340f00bd..70dfcb30 100644
--- a/src/main/java/com/sqx/modules/pay/wuyou/WuyouPay.java
+++ b/src/main/java/com/sqx/modules/pay/wuyou/WuyouPay.java
@@ -106,10 +106,10 @@ public class WuyouPay {
     }
 
     public static void main(String[] args) {
-//        payOrder("20221118123456791", "0.1", "Mozilla/5.0");
+        payOrder("20221118123456794", "0.1", "Mozilla/5.0");
 //        queryOrder("20221118123456791", "0.1", "Mozilla/5.0");
 
 //        extractOrder("20221118123456793", "1", "1157756119@qq.com", "巩奕杰");
-        queryExtractOrder("20221118123456793", "1");
+//        queryExtractOrder("20221118123456793", "1");
     }
 }