From dccd9f65e83cced20b407ba9fc5ccd83cd4522db Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Fri, 25 Sep 2020 16:37:01 +0800
Subject: [PATCH] 修改回调,不全字段

---
 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/AlipayServiceImpl.java |    5 +++--
 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/WxServiceImpl.java     |    5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/AlipayServiceImpl.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/AlipayServiceImpl.java
index ae8b6b6..293a819 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/AlipayServiceImpl.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/AlipayServiceImpl.java
@@ -5,7 +5,6 @@
 import com.alipay.api.request.AlipayTradePrecreateRequest;
 import com.alipay.api.response.AlipayTradePrecreateResponse;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.kidgrow.common.utils.DateUtils;
 import com.kidgrow.common.utils.QRCodeUtil;
 import com.kidgrow.common.utils.StringUtils;
 import com.kidgrow.oprationcenter.alipay.AlipayProperties;
@@ -18,6 +17,7 @@
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -68,8 +68,9 @@
             List<SaasClientPay> list = saasClientPayService.list(queryWrapper);
             if(!list.isEmpty()){
                 SaasClientPay saasClientPay = list.get(0);
-                saasClientPay.setPayTime(DateUtils.parseDate(requestMap.get("time_end")));
+                saasClientPay.setPayTime(new Date());
                 saasClientPay.setPayStatus(2);
+                saasClientPay.setPayMethod(1);
                 saasClientPay.setTradeNo(requestMap.get("trade_no"));
                 boolean b = saasClientPayService.saveOrUpdate(saasClientPay);
             }
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/WxServiceImpl.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/WxServiceImpl.java
index f6d1481..51568e7 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/WxServiceImpl.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/WxServiceImpl.java
@@ -1,7 +1,6 @@
 package com.kidgrow.oprationcenter.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.kidgrow.common.utils.DateUtils;
 import com.kidgrow.common.utils.QRCodeUtil;
 import com.kidgrow.common.utils.StringUtils;
 import com.kidgrow.oprationcenter.model.SaasClientPay;
@@ -15,6 +14,7 @@
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -92,8 +92,9 @@
                 List<SaasClientPay> list = iSaasClientPayService.list(queryWrapper);
                 if(!list.isEmpty()){
                     SaasClientPay saasClientPay = list.get(0);
-                    saasClientPay.setPayTime(DateUtils.parseDate(requestMap.get("time_end")));
+                    saasClientPay.setPayTime(new Date());
                     saasClientPay.setPayStatus(2);
+                    saasClientPay.setPayMethod(0);
                     saasClientPay.setTradeNo(requestMap.get("transaction_id"));
                     boolean b = iSaasClientPayService.saveOrUpdate(saasClientPay);
                     map.put("return_code","SUCCESS");

--
Gitblit v1.8.0