From 858bf4fc796132c2db78c33217976fc42ec32bd8 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Fri, 6 Dec 2024 11:21:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E7=8E=B0=20=E5=A4=B1=E8=B4=A5=20?=
 =?UTF-8?q?=E6=83=85=E5=86=B5=20=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pay/controller/app/WuyouController.java   | 53 ++++++++++++++-----
 1 file changed, 39 insertions(+), 14 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 7853ad69..ec24e005 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,6 +5,9 @@ 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.UserMoneyDetails;
+import com.sqx.modules.app.service.UserMoneyDetailsService;
+import com.sqx.modules.app.service.UserMoneyService;
 import com.sqx.modules.app.service.UserService;
 import com.sqx.modules.invite.service.InviteService;
 import com.sqx.modules.orders.entity.Orders;
@@ -21,8 +24,10 @@ import com.sqx.modules.utils.AliPayOrderUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
@@ -43,16 +48,22 @@ public class WuyouController {
     private final PayDetailsDao payDetailsDao;
     private final UserService userService;
     private final InviteService inviteService;
+    private final UserMoneyService userMoneyService;
+    private final UserMoneyDetailsService userMoneyDetailsService;
+
     private final CashOutDao cashOutDao;
 
     private final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
-    WuyouController(OrdersService ordersService, PayDetailsDao payDetailsDao, UserService userService, InviteService inviteService, CashOutDao cashOutDao) {
+    WuyouController(OrdersService ordersService, PayDetailsDao payDetailsDao, UserService userService, InviteService inviteService, CashOutDao cashOutDao,
+                    UserMoneyService userMoneyService, UserMoneyDetailsService userMoneyDetailsService) {
         this.ordersService = ordersService;
         this.payDetailsDao = payDetailsDao;
         this.userService = userService;
         this.inviteService = inviteService;
         this.cashOutDao = cashOutDao;
+        this.userMoneyService = userMoneyService;
+        this.userMoneyDetailsService = userMoneyDetailsService;
     }
 
     @ApiOperation("支付订单")
@@ -95,24 +106,38 @@ public class WuyouController {
     @PostMapping("/extractNotify")
     public String extractNotify(HttpServletRequest request, NotifyDto notifyDto) {
         log.info("无忧支付提现回调， {}", notifyDto);
-        Map<String, Object> params = new HashMap<>();
-        params.put("callbacks", notifyDto.getCallbacks());
-        params.put("total", notifyDto.getTotal());
-        params.put("out_trade_no", notifyDto.getOut_trade_no());
-        params.put("status", notifyDto.getStatus());
-        params.put("msg", notifyDto.getMsg());
+//        Map<String, Object> params = new HashMap<>();
+//        params.put("callbacks", notifyDto.getCallbacks());
+//        params.put("total", notifyDto.getTotal());
+//        params.put("out_trade_no", notifyDto.getOut_trade_no());
+//        params.put("status", notifyDto.getStatus());
+//        params.put("msg", notifyDto.getMsg());
 
-        String sign = Encrypt.getParamsSign(params);
-        if (!sign.equals(notifyDto.getSign())) {
-            log.error("无忧支付提现回调签名错误, 参数: {}，签名结果：{}", JSONObject.toJSONString(notifyDto), sign);
-            return "签名错误";
-        }
+//        String sign = Encrypt.getParamsSign(params);
+//        if (!sign.equals(notifyDto.getSign())) {
+//            log.error("无忧支付提现回调签名错误, 参数: {}，签名结果：{}", JSONObject.toJSONString(notifyDto), sign);
+//            return "签名错误";
+//        }
         CashOut cashOut = cashOutDao.selectOne(new QueryWrapper<CashOut>().eq("order_number", notifyDto.getOut_trade_no()));
         if (cashOut != null) {
-            if("2".equals(notifyDto.getStatus())){
+            if ("2".equals(notifyDto.getStatus())) {
                 cashOut.setState(1);
-            }else {
+            } else {
                 cashOut.setRefund(notifyDto.getMsg());
+
+                UserMoneyDetails userMoneyDetails = new UserMoneyDetails();
+                userMoneyDetails.setClassify(5);
+                userMoneyDetails.setMoney(new BigDecimal(cashOut.getMoney()));
+                userMoneyDetails.setUserId(cashOut.getUserId());
+                SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                userMoneyDetails.setCreateTime(simpleDateFormat.format(new Date()));
+                userMoneyDetails.setContent("提现失败存入余额");
+                userMoneyDetails.setTitle("提现失败存入余额" + cashOut.getMoney() + "元");
+                userMoneyDetails.setState(2);
+                userMoneyDetails.setType(1);
+                //存入余额 钱
+                userMoneyService.updateAmount(1, cashOut.getUserId(), Double.parseDouble(cashOut.getMoney()));
+                userMoneyDetailsService.save(userMoneyDetails);
             }
         }
         return "success";