NotRepeatSubmitConfig(update)

src/main/java/com/mmc/oms/controller/demand/commit/NotRepeatSubmitConfig.java

@@ -7,6 +7,7 @@ import com.mmc.oms.dao.demand.DemandReleaseOrderDao;
 import com.mmc.oms.entity.demand.GetOrderNumberDO;
 import com.mmc.oms.entity.demand.GetOrderNumberDTO;
 import com.mmc.oms.model.vo.demand.CommonPaymentVO;
+import com.mmc.oms.model.vo.demand.UserPayInfoVO;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.Signature;
@@ -18,8 +19,11 @@ import org.aspectj.lang.reflect.MethodSignature;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.http.*;
 import org.springframework.stereotype.Component;
+import org.springframework.web.client.RestTemplate;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
@@ -47,6 +51,12 @@ public class NotRepeatSubmitConfig extends BaseController {
     @Autowired
     private StringRedisTemplate stringRedisTemplate;
 
+    @Autowired
+    private RestTemplate restTemplate;
+
+    @Value("${payment.url}")
+    private String paymentApp;
+
 
     @Pointcut("@within(notRepeatSubmit)||@annotation(notRepeatSubmit)")
     public void pointcut(NotRepeatSubmit notRepeatSubmit) {
@@ -97,6 +107,11 @@ public class NotRepeatSubmitConfig extends BaseController {
                     if (getOrderNumberDTO!=null){
                         GetOrderNumberDO getOrderNumberDO = new GetOrderNumberDO(getOrderNumberDTO);
                         if (getOrderNumberDTO.getRequirementsInfoId()!=null){
+                            String orderNumber1 = releaseOrderDao.getOrderNumber(getOrderNumberDO.getRequirementsInfoId());
+                            UserPayInfoVO userPayInfoVO = queryUserPayInfo(orderNumber1, request);
+                            if (userPayInfoVO.getTradeState()!="SUCCESS"){
+                                releaseOrderDao.getDelete(getOrderNumberDO.getRequirementsInfoId());
+                            }
                             int i = releaseOrderDao.selectOrderNumberDO(getOrderNumberDO.getRequirementsInfoId());
                             if (i!=0){
                                 return ResultBody.error("当前需求已有人支付");
@@ -120,5 +135,24 @@ public class NotRepeatSubmitConfig extends BaseController {
 
     }
 
+
+
+    /**
+     * 通过订单编号查看是否支付成功
+     *
+     * @param orderNo
+     * @return
+     */
+    public UserPayInfoVO queryUserPayInfo(String orderNo, HttpServletRequest request) {
+        String token = request.getHeader("token");
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        headers.add("token", token);
+        HttpEntity<String> entity = new HttpEntity<>(JSONObject.toJSONString(orderNo), headers);
+        ResponseEntity<UserPayInfoVO> exchange = restTemplate.exchange(paymentApp + "wechat/queryUserPayInfo?orderNo=" + orderNo, HttpMethod.GET, entity, UserPayInfoVO.class);
+        UserPayInfoVO body = exchange.getBody();
+        return body;
+    }
+
 }