提交

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

@@ -211,7 +211,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
             if (vo == null || vo.getAppStatus() == 0 || vo.getAppStatus() == 1 || (vo.getAppStatus() == 4 && vo.getAuditStatus() == 2)) {
                 result = createStep2(step2Param);
                 log.info(UserPathDto.setPartnerData("0", "createStep2", step2Param, result));
-            } else if ( vo.getAppStatus() == 3 || vo.getAppStatus() == 6 || vo.getAppStatus() == 7 || vo.getAppStatus() == 8 || vo.getAppStatus() == 9) {// 修改
+            } else if (vo.getAppStatus() == 3 || vo.getAppStatus() == 6 || vo.getAppStatus() == 7 || vo.getAppStatus() == 8 || vo.getAppStatus() == 9) {// 修改
                 if (!mongoSlimeUtils.judgeIsPermission(step2Param.getPerformancesId(), step2Param.getMerchantId(), new String[]{
                         SlimeAuthorizationConst.PerformancePermission.EDIT.getId(),
                 })) {
@@ -449,7 +449,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
 
                             //快递相关
                             KylinTicketExpressModuleVo moduleVo = redisSlimeUtils.getTEMMerchantVo(ticketItem.getTicketsId());
-                            if (moduleVo != null && moduleVo.getProduceCodeList()!=null) {
+                            if (moduleVo != null && moduleVo.getProduceCodeList() != null) {
                                 redisSlimeUtils.setTEMVo(ticketItem.getTicketsId(), moduleVo);
                                 sqlsDataE.add(new Object[]{ticketItem.getTicketsId(), now});
                                 for (ExpressModuleVo mVo : moduleVo.getProduceCodeList())
@@ -767,6 +767,9 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
                             vo.setStatus(6);
                         }
                     }
+                    if (vo.getFieldAuditStatus() == 2) {
+                        vo.setAuditStatus(2);
+                    }
                 }
                 pageInfoTmp = new PageInfo(voList);
             } catch (Exception e) {