From 34589cd092e0de8cfd704cd59608ed0f36f6093a Mon Sep 17 00:00:00 2001
From: bingbing <zhaobingliang@aliyun.com>
Date: Mon, 26 Oct 2020 09:56:30 +0800
Subject: [PATCH] Merge branch 'pay_master' into dev
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/AlipayServiceImpl.java | 7 ++++---
1 files changed, 4 insertions(+), 3 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..7fb8cef 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,10 +68,11 @@
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);
+ boolean b = saasClientPayService.updateById(saasClientPay);
}
return "success";
}else {
--
Gitblit v1.8.0