取消创建第二部接口

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/PerformanceStep2Param.java

@@ -19,10 +19,6 @@ public class PerformanceStep2Param implements Serializable,Cloneable {
     @NotNull(message = "不能为空")
     private Integer isTrueName;
 
-    @ApiModelProperty(value = "场地审核状态 [0-待提交|1-待审核|2-已拒绝|3-审核完成]", example = "0")
-    @NotNull(message = "不能为空")
-    private Integer fieldAuditStatus;
-
     @ApiModelProperty(value = "限购数量 0为不限购", example = "0")
     @NotNull(message = "不能为空")
     private Integer limitCount;

liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/service/impl/KylinPerformancesPartnerServiceImpl.java

@@ -22,6 +22,7 @@ import com.liquidnet.service.kylin.dto.vo.partner.*;
 import com.liquidnet.service.kylin.service.partner.IKylinPerformancesPartnerService;
 import com.liquidnet.service.kylin.service.partner.IKylinTicketTimesPartnerService;
 import com.liquidnet.service.kylin.service.partner.IKylinTicketsPartnerService;
+import com.liquidnet.service.merchant.dto.vo.MerchantFieldsVo;
 import com.liquidnet.service.merchant.util.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
@@ -218,10 +219,19 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
             performancePartnerVo.setCreatedAt(createdAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
             performancePartnerVo.setIsSubmit(step2Param.getIsSubmit());
 //            performancePartnerVo.setStatusSell(1);
-            performancePartnerVo.setFieldAuditStatus(step2Param.getFieldAuditStatus());
-
             // 获取第一步数据
             if (step2Param.getIsSubmit() == 1) { // 提交
+                KylinPerformanceMisVo kylinPerformanceMisVo = performanceUtils.getPerformanceMisVo(performanceId);
+                MerchantFieldsVo fieldsVo = redisMerchantUtils.getFieldVo(kylinPerformanceMisVo.getFieldId());
+                if (fieldsVo == null) {
+                    return ResponseDto.failure(ErrorMapping.get(20114));
+                } else {
+                    if (fieldsVo.getClaimStatus() == 1) {
+                        performancePartnerVo.setFieldAuditStatus(fieldsVo.getIsCheck());
+                    } else {
+                        performancePartnerVo.setFieldAuditStatus(0);
+                    }
+                }
                 performancePartnerVo.setStatus(1);
                 performancePartnerVo.setIsCreateSave(0);
                 performancePartnerVo.setAuditStatus(0);
@@ -237,7 +247,6 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
                 if (kylinTicketTimesPartnerVoList.size() <= 0) {
                     return ResponseDto.failure(ErrorMapping.get(20113));
                 } else {
-                    KylinPerformanceMisVo kylinPerformanceMisVo = performanceUtils.getPerformanceMisVo(performanceId);
                     LocalDateTime now = LocalDateTime.now();
                     HashMap<String, Object> mapSql = CollectionUtil.mapStringObject();
                     mapSql.put("isCreateSave", 0);
@@ -298,7 +307,17 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
             performancePartnerVo.setCreatedAt(now.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
             performancePartnerVo.setUpdatedAt(now.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
             performancePartnerVo.setIsSubmit(step2Param.getIsSubmit());
-            performancePartnerVo.setFieldAuditStatus(step2Param.getFieldAuditStatus());
+            KylinPerformanceMisVo kylinPerformanceMisVo = performanceUtils.getPerformanceMisVo(performanceId);
+            MerchantFieldsVo fieldsVo = redisMerchantUtils.getFieldVo(kylinPerformanceMisVo.getFieldId());
+            if (fieldsVo == null) {
+                return ResponseDto.failure(ErrorMapping.get(20114));
+            } else {
+                if (fieldsVo.getClaimStatus() == 1) {
+                    performancePartnerVo.setFieldAuditStatus(fieldsVo.getIsCheck());
+                } else {
+                    performancePartnerVo.setFieldAuditStatus(0);
+                }
+            }
 
             // 获取第一步数据
             if (step2Param.getIsSubmit() == 1) { // 提交
@@ -321,7 +340,6 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
                 if (kylinTicketTimesPartnerVoList.size() <= 0) {
                     return ResponseDto.failure(ErrorMapping.get(20113));
                 } else {
-                    KylinPerformanceMisVo kylinPerformanceMisVo = performanceUtils.getPerformanceMisVo(performanceId);
                     HashMap<String, Object> mapSql = CollectionUtil.mapStringObject();
                     mapSql.put("rejectTxt", "");
                     mapSql.put("status", performancePartnerVo.getStatus());
@@ -330,7 +348,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
                             now, kylinPerformanceMisVo.getNoticeImage(), performanceId, now, now
                     });
                     sqlsDataB.add(new Object[]{
-                            performancePartnerVo.getFieldAuditStatus(),performancePartnerVo.getAuditStatus(), step2Param.getIsTrueName(), step2Param.getLimitCount(), performanceId, now, now
+                            performancePartnerVo.getFieldAuditStatus(), performancePartnerVo.getAuditStatus(), step2Param.getIsTrueName(), step2Param.getLimitCount(), performanceId, now, now
                     });
                     redisMerchantUtils.setPerformanceIsTrueName(performanceId, step2Param.getIsTrueName());