From b5b14dfe10fa57abf2712df09899466de3a3bd88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Mon, 2 Jan 2023 13:36:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=98=E6=9B=B4=E4=B8=BA=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E4=BA=BA=E5=85=B3=E4=BA=8E=E6=89=98=E7=A6=8F=E8=B5=8F=E9=87=91?=
 =?UTF-8?q?=E7=9A=84=E5=88=A4=E6=96=AD,=E6=94=AF=E6=8C=81=E8=BF=BD?=
 =?UTF-8?q?=E5=8A=A0=E8=B5=8F=E9=87=91=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/xm/core/ctrl/XmTaskOrderController.java | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskOrderController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskOrderController.java
index 8a698107..99061ac5 100644
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskOrderController.java
+++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskOrderController.java
@@ -22,6 +22,7 @@ import io.swagger.annotations.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
@@ -60,6 +61,9 @@ public class XmTaskOrderController {
 
 	@Autowired
 	XmRecordService xmRecordService;
+
+	@Autowired
+	RedisTemplate redisTemplate;
 	 
 
 	Map<String,Object> fieldsMap = toMap(new XmTaskOrder());
@@ -477,6 +481,10 @@ public class XmTaskOrderController {
 			if(!StringUtils.hasText(order.getId())) {
 				return failed("data-0","订单Id不能为空");
 			}
+			String flag= (String) this.redisTemplate.opsForValue().get("pay-notify-success-"+order.getPayId());
+			if(!StringUtils.hasText(flag)|| !"1".equals(flag)){
+				return failed("pay-notify-success-flag-0","验证码错误");
+			}
 			xmTaskOrderService.orderPaySuccess(order.getId(),order.getPayId(),order.getPrepayId(), order.getTranId(), order.getPayAt(), order.getRemark());
 
 			m.put("tips", tips);
@@ -502,6 +510,10 @@ public class XmTaskOrderController {
 			if(!StringUtils.hasText(order.getId())) {
 				return failed("data-0","订单Id不能为空");
 			}
+			String flag= (String) this.redisTemplate.opsForValue().get("pay-notify-cancel-"+order.getPayId());
+			if(!StringUtils.hasText(flag)|| !"1".equals(flag)){
+				return failed("pay-notify-cancel-flag-0","验证码错误");
+			}
 			this.xmTaskOrderService.payCancel(order.getId(),order.getPayId(), order.getRemark());
 			m.put("tips", tips);
 			return m;