From ddd4919fdd5c5dd4fc96eb99e590403cad58bbd7 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 03 六月 2023 02:03:18 +0800
Subject: [PATCH] 更新支付

---
 user/guns-admin/src/main/java/com/supersavedriving/user/modular/api/AppUserController.java |   39 +++++++--------------------------------
 1 files changed, 7 insertions(+), 32 deletions(-)

diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/api/AppUserController.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/api/AppUserController.java
index 77ec4cf..f039b71 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/api/AppUserController.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/api/AppUserController.java
@@ -22,10 +22,7 @@
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
@@ -314,25 +311,16 @@
     @ResponseBody
     @PostMapping("/base/appUser/rechargeBalanceCallback")
 //    @ServiceLog(name = "余额充值回调", url = "/base/appUser/rechargeBalanceCallback")
-    public void rechargeBalanceCallback(HttpServletRequest request, HttpServletResponse response){
+    public void rechargeBalanceCallback(@RequestBody InterfaceResponse interfaceResponse, HttpServletResponse response){
         try {
-            String code = request.getParameter("code");
-            String version = request.getParameter("version");
-            String msg = request.getParameter("msg");
-            String date = request.getParameter("date");
-            String result = request.getParameter("result");
-            String sign = request.getParameter("sign");
-            InterfaceResponse interfaceResponse = new InterfaceResponse();
-            interfaceResponse.setCode(code);
-            interfaceResponse.setVersion(version);
-            interfaceResponse.setMsg(msg);
-            interfaceResponse.setDate(date);
-            interfaceResponse.setResult(result);
-            interfaceResponse.setSign(sign);
             // 验签
             boolean verify = RSASignature.validate(interfaceResponse.content(), interfaceResponse.getSign());
             if (verify) {//验签成功业务处理逻辑
-                JSONObject jsonObject = JSON.parseObject(result);
+                if(!"0000".equals(interfaceResponse.getCode())){
+                    System.err.println("充值回调异常:" + interfaceResponse.getMsg());
+                    return;
+                }
+                JSONObject jsonObject = JSON.parseObject(interfaceResponse.getResult());
                 String merOrderId = jsonObject.getString("merOrderId");
                 String orderId = jsonObject.getString("parameter1");
                 appUserService.rechargeBalanceCallback(orderId, merOrderId);
@@ -344,19 +332,6 @@
             } else {//验签失败业务处理逻辑
                 System.err.println("支付回调验签失败");
             }
-
-//            Map<String, String> map = payMoneyUtil.weixinpayCallback(request);
-//            if(null != map){
-//                String out_trade_no = map.get("out_trade_no");
-//                String transaction_id = map.get("transaction_id");
-//                String result = map.get("result");
-//                String orderId = out_trade_no.substring(17);
-//                appUserService.rechargeBalanceCallback(out_trade_no, transaction_id);
-//                PrintWriter out = response.getWriter();
-//                out.print(result);
-//                out.flush();
-//                out.close();
-//            }
         }catch (Exception e){
             e.printStackTrace();
         }

--
Gitblit v1.7.1