|
@@ -24,6 +24,7 @@ import org.springframework.web.bind.annotation.*;
|
24
|
24
|
import javax.servlet.http.HttpServletRequest;
|
25
|
25
|
import java.math.BigInteger;
|
26
|
26
|
import java.security.SecureRandom;
|
|
27
|
+import java.time.LocalDateTime;
|
27
|
28
|
import java.util.Date;
|
28
|
29
|
import java.util.Iterator;
|
29
|
30
|
import java.util.Map;
|
|
@@ -52,6 +53,7 @@ public class AliPayController extends BaseController {
|
52
|
53
|
// 更新商户订单号并改为支付中
|
53
|
54
|
taOrder.setOutTradeNo(outTradeNo);
|
54
|
55
|
taOrder.setStatus(CommConstants.SRTATUS_PAYING);
|
|
56
|
+ taOrder.setUpdateDate(LocalDateTime.now());
|
55
|
57
|
taOrderService.updateById(taOrder);
|
56
|
58
|
return ResponseBean.success(pay);
|
57
|
59
|
}
|
|
@@ -85,6 +87,7 @@ public class AliPayController extends BaseController {
|
85
|
87
|
String outTradeNo = request.getParameter("out_trade_no");
|
86
|
88
|
String tradeStatus = request.getParameter("trade_status");
|
87
|
89
|
TaOrder taOrder = taOrderService.getOne(new QueryWrapper<TaOrder>().eq("out_trade_no", outTradeNo));
|
|
90
|
+ taOrder.setUpdateDate(LocalDateTime.now());
|
88
|
91
|
// 支付失败
|
89
|
92
|
if (!tradeStatus.equals(CommConstants.TRADE_STATUS_SUCCESS)){
|
90
|
93
|
taOrder.setStatus(CommConstants.SRTATUS_EFFECTIVE);
|
|
@@ -94,6 +97,7 @@ public class AliPayController extends BaseController {
|
94
|
97
|
//支付成功 更新为已支付状态
|
95
|
98
|
taOrder.setIsPayed(true);
|
96
|
99
|
taOrder.setStatus(CommConstants.SRTATUS_EFFECTIVE);
|
|
100
|
+ taOrder.setTradeNo(tradeNo);
|
97
|
101
|
taOrderService.updateById(taOrder);
|
98
|
102
|
}
|
99
|
103
|
}
|