Requirements(update)

csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/vo/RequirementsInfoVO.java

@@ -31,6 +31,9 @@ public class RequirementsInfoVO implements Serializable {
     @NotNull(message = "id不能为空", groups = {Update.class})
     private Integer id;
 
+    @ApiModelProperty(value = "需求发布id", hidden = true)
+    private Integer requirementsInfoId;
+
     @ApiModelProperty(value = "需求类型id", example = "1", required = true)
     @NotNull(message = "需求类型id不能为空", groups = {Insert.class, Update.class})
     private Integer requirementTypeId;

csf-common/csf-common-util/src/main/java/com/mmc/csf/common/util/web/ResultEnum.java

@@ -407,7 +407,6 @@ public enum ResultEnum implements BaseErrorInfoInterface {
     YOU_CANNOT_MODIFY_REQUIREMENTS_PUBLISHED_BY_OTHERS("60003", "不能修改他(她)人发布的需求"),
     YOU_CANNOT_DELETE_REQUIREMENTS_POSTED_BY_OTHERS("60004", "不能删除他(她)人发布的需求"),
     THE_THIRD_PARTY_INTERFACE_IS_BEING_UPDATED("60005", "第三方接口在更新请联系开发人员"),
-
     THREE_FIELDS_CAN_BE_REPEATED("60002", "机型、等级、类型存在重复");
 
     /**

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

 package com.mmc.csf.release.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.mmc.csf.common.util.page.PageResult;
 import com.mmc.csf.common.util.web.ResultBody;
@@ -16,6 +17,7 @@ import com.mmc.csf.release.util.RestTemplateUtil;
 import lombok.extern.slf4j.Slf4j;
 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.Service;
 import org.springframework.web.client.RestClientException;
@@ -52,6 +54,9 @@ public class RequirementsServiceImpl implements RequirementsService {
     @Value("${iuav.omsapp.url}")
     private String omsApp;
 
+    @Autowired
+    private StringRedisTemplate stringRedisTemplate;
+
     @Override
     public ResultBody listType(Integer id) {
         List<RequirementsTypeDO> requirementsTypeDOList = requirementsDao.listTypeReq(id);
@@ -148,6 +153,18 @@ public class RequirementsServiceImpl implements RequirementsService {
         }
         requirementsInfoVO.setOrderNumber(randomOrderCode());
         requirementsInfoVO.setPublishAccountId(requirementsInfoDO.getUserAccountId());
+        requirementsInfoVO.setRequirementsInfoId(requirementsInfoDO.getId());
+
+        //已经支付
+        String s = stringRedisTemplate.opsForValue().get(requirementsInfoDO.getId().toString());
+        RequirementsInfoVO orderVO = JSON.parseObject(s, RequirementsInfoVO.class);
+        if (s != "") {
+            if (requirementsInfoDO.getId().equals(orderVO.getRequirementsInfoId()) && userAccountId.equals(orderVO.getUserAccountId())) {
+                requirementsInfoVO.setParamMoney(new BigDecimal(0));
+                requirementsInfoVO.setOrderNumber(orderVO.getOrderNumber());
+            }
+        }
+        //生成
         ResultBody resultBody = releaseOrder(requirementsInfoVO, request.getHeader("token"));
         if (resultBody.getCode().equals(ResultEnum.THE_THIRD_PARTY_INTERFACE_IS_BEING_UPDATED.getResultCode())) {
             return resultBody;