Requirements(update)

release-service/src/main/java/com/mmc/csf/release/commit/NotRepeatSubmitConfig.java

@@ -98,8 +98,10 @@ public class NotRepeatSubmitConfig extends BaseController {
         log.info("tryLock:" + tryLock);
         if (tryLock) {
             try {
-                String wechatPayOrderNumber = grabTheOrderVO.getWechatPayOrderNumber();
                 Integer requirementsInfoId = grabTheOrderVO.getRequirementsInfoId();
+                String paymentOrderNumber = getPaymentOrderNumber(requirementsInfoId, request);
+                //String wechatPayOrderNumber = grabTheOrderVO.getWechatPayOrderNumber();
+                String wechatPayOrderNumber = paymentOrderNumber;
                 if (wechatPayOrderNumber != null) {
                     UserPayInfoVO userPayInfoVO = queryUserPayInfo(wechatPayOrderNumber, request);
                     System.out.println(userPayInfoVO);
@@ -165,5 +167,18 @@ public class NotRepeatSubmitConfig extends BaseController {
         return body;
     }
 
+    public String getPaymentOrderNumber(Integer requirementsInfoId, 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(requirementsInfoId), headers);
+        ResponseEntity<String> exchange = restTemplate.exchange(omsApp + "releaseOrder/getPaymentOrderNumber?requirementsInfoId=" + requirementsInfoId, HttpMethod.GET, entity, String.class);
+        //UserPayInfoVO body = exchange.getBody();
+        String body = exchange.getBody();
+        //    ResultBody<Object> objectResultBody = new ResultBody<>();
+        return body;
+    }
+
 
 }

release-service/src/main/java/com/mmc/csf/release/service/impl/RequirementsServiceImpl.java

@@ -2153,10 +2153,14 @@ public class RequirementsServiceImpl implements RequirementsService {
         totalAmount = totalAmount.multiply(bigDecimal).setScale(2, BigDecimal.ROUND_HALF_UP);
         String json = stringRedisTemplate.opsForValue().get(grabTheOrderVO.getWechatPayOrderNumber() + grabTheOrderVO.getUserAccountId());
         GetOrderNumberDTO orderNumberDTO = JSONObject.parseObject(json, GetOrderNumberDTO.class);
-        IsNullConvertZeroUtil.checkIsNull(orderNumberDTO);
+        if (orderNumberDTO != null) {
+            IsNullConvertZeroUtil.checkIsNull(orderNumberDTO);
+        }
+       
         //需要冻结的金额
         FlyerWalletFlowVO flyerWalletFlowVO = new FlyerWalletFlowVO();
         IsNullConvertZeroUtil.checkIsNull(flyerWalletFlowVO);
+        //IsNullConvertZeroUtil.checkIsNull(flyerWalletFlowVO);
         //PublisherWalletFlowVO publisherWalletFlowVO = walletFlowVO.getPublisherWalletFlowVO();
         BigDecimal tempTotalAmount = totalAmount;
         String paymentType = grabTheOrderVO.getPaymentType();
@@ -2227,7 +2231,6 @@ public class RequirementsServiceImpl implements RequirementsService {
             requirementsServiceDO.setOpenid(openid);
             requirementsServiceDO.setPhoneNum(grabTheOrderVO.getPhoneNum());
             //微信是否支付成功
-
             requirementsDao.insertService(requirementsServiceDO);
             requirementsInfoDO.setRepertory(repertory - 1);
             requirementsDao.updateGrabTheOrder(grabTheOrderVO.getRequirementsInfoId(), requirementsInfoDO.getRepertory());