merchant修改

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

@@ -243,19 +243,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);
-            // 获取第一步数据
-            if (step2Param.getIsSubmit() == 1) { // 提交
-                KylinPerformanceMisVo kylinPerformanceMisVo = performanceUtils.getPerformanceMisVo(performanceId);
-                MerchantFieldsVo fieldsVo = redisMerchantUtils.getFieldVo(kylinPerformanceMisVo.getFieldId());
-                if (fieldsVo == null) {
-                    return ResponseDto.failure(ErrorMapping.get(20114));
+            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 {
-                    if (fieldsVo.getClaimStatus() == 1) {
-                        performancePartnerVo.setFieldAuditStatus(fieldsVo.getIsCheck());
-                    } else {
-                        performancePartnerVo.setFieldAuditStatus(0);
-                    }
+                    performancePartnerVo.setFieldAuditStatus(0);
                 }
+            }
+            // 获取第一步数据
+            if (step2Param.getIsSubmit() == 1) { // 提交
                 performancePartnerVo.setStatus(1);
                 performancePartnerVo.setIsCreateSave(0);
                 performancePartnerVo.setAuditStatus(0);