From 24679b74b46479acf248151f70a3768a9588249b Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Thu, 15 Oct 2020 16:58:55 +0800
Subject: [PATCH] 修改  h端添加的用户不能在h端登录的问题

---
 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/alipay/AlipayController.java |   24 +++++++++---------------
 1 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/alipay/AlipayController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/alipay/AlipayController.java
index 6331361..5ee5878 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/alipay/AlipayController.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/alipay/AlipayController.java
@@ -15,6 +15,7 @@
 import com.kidgrow.common.utils.StringUtils;
 import com.kidgrow.oprationcenter.alipay.AlipayProperties;
 import com.kidgrow.oprationcenter.model.SaasClientPay;
+import com.kidgrow.oprationcenter.service.AlipayService;
 import com.kidgrow.oprationcenter.service.ISaasClientPayService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -42,6 +43,8 @@
     private AlipayProperties alipayProperties;
     @Autowired
     private ISaasClientPayService saasClientPayService;
+    @Autowired
+    private AlipayService alipayService;
 
     @ApiOperation(value = "调用预支付的接口,生成二维码")
     @PostMapping("/precreate")
@@ -110,7 +113,7 @@
         return ResultBody.ok().data(response.getBody());
     }
 
-    @ApiOperation(value = "trade_success状态下异步通知接口,端口异常的接口")
+    @ApiOperation(value = "trade_success状态下异步通知接口,目前用的这个回调")
     @PostMapping("/notify")
     public String notify(HttpServletRequest request) throws Exception {   //trade_success状态下异步通知接口
         if (check(request.getParameterMap())) {
@@ -122,25 +125,16 @@
             if (requestMap.get("trade_status").equals("TRADE_SUCCESS")) {
                 log.error("wwwwwwwwwww");
                 //更新状态 out_trade_no
-                QueryWrapper queryWrapper = new QueryWrapper();
-                queryWrapper.eq("out_trade_no", requestMap.get("out_trade_no"));
-                queryWrapper.eq("pay_status", 0);
-                List<SaasClientPay> list = saasClientPayService.list(queryWrapper);
-                if (!list.isEmpty()) {
-                    SaasClientPay saasClientPay = list.get(0);
-                    saasClientPay.setPayTime(DateUtils.parseDate(requestMap.get("gmt_payment")));
-                    saasClientPay.setPayStatus(2);
-                    saasClientPay.setTradeNo(requestMap.get("trade_no"));
-                    boolean b = saasClientPayService.saveOrUpdate(saasClientPay);
-                }
+                log.error("eeeeeeeeeeeeeeeeeeeeeeeeeeeeeee");
+                System.out.println("异步通知 " + Instant.now());
+                return alipayService.notify(requestMap);
+            }else {
+                return "fail";
             }
-            log.error("eeeeeeeeeeeeeeeeeeeeeeeeeeeeeee");
-            System.out.println("异步通知 " + Instant.now());
         } else {
             System.out.println("验签失败");
             return "fail";
         }
-        return "success";
     }
 
     @ApiOperation(value = "订单支付成功后同步返回地址")

--
Gitblit v1.8.0