暂时提交一部分

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinPerformancesAdminServiceImpl.java

@@ -103,7 +103,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
     @Override
     public KylinPerformanceMisVo performanceDetails(String performancesId) {
         log.info(" PERFORMANCE  mis演出详情");
-        KylinPerformanceMisVo createMisVo = performanceVoUtils.getPerformanceMisVo(performancesId,null);
+        KylinPerformanceMisVo createMisVo = performanceVoUtils.getPerformanceMisVo(performancesId, null);
         return createMisVo;
     }
 
@@ -170,7 +170,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
                     HashMap<String, Object> mapSql = new HashMap<>();
                     mapSql.put("status", 9);
                     mapSql.put("updatedAt", updatedAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-                    KylinPerformanceMisVo vo = performanceVoUtils.getPerformanceMisVo(performancesId,"0");
+                    KylinPerformanceMisVo vo = performanceVoUtils.getPerformanceMisVo(performancesId, "0");
                     performanceVoUtils.updatePerformanceMySql(performancesId, mapSql, vo, updatedAt, auditStatus);
 //                    if (sqlStatus.getStatus() >= 6 && sqlStatus.getStatus() != 7) {//若 演出上 则 线判断状态
                     performanceVoUtils.performanceVoStatus(performancesId);
@@ -211,6 +211,9 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
                 //修改mongo
                 HashMap<String, Object> mapVo = new HashMap<>();
                 mapVo.put("rejectTxt", rejectTxt);
+                if (statusData.getStatus() <= 2) {
+                    mapVo.put("status", status);
+                }
                 mapVo.put("auditStatus", auditStatus);
                 object = new BasicDBObject("$set", mongoConverter.convertToMongoType(mapVo));
                 mongoTemplate.getCollection(KylinPerformanceVo.class.getSimpleName()).updateOne(

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

@@ -836,11 +836,13 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
                 } else if (vo.getAppStatus() == 4 || vo.getAppStatus() == 1) {//未通过审核
                     performancePartnerVo.setAuditStatus(-1);
                     performancePartnerVo.setStatus(0);
+                    performancePartnerVo.setFieldAuditStatus(0);
                     performanceVo.setAuditStatus(performancePartnerVo.getAuditStatus());
                     performanceVo.setAppStatus(performancePartnerVo.getStatus());
+                    performanceVo.setFieldAuditStatus(0);
                     queueUtil.sendMsgByRedis(MQConst.SlimeQueue.SQL_SLIME_PERFORMANCE_UPDATE.getKey(),
                             SqlMapping.get("kylin_performances_status.withdraw2",
-                                    -1, 0, performancesId, now, now
+                                    -1, 0, 0, performancesId, now, now
                             ));
                 } else {
                     performancePartnerVo.setAuditStatus(2);

liquidnet-bus-service/liquidnet-service-slime/liquidnet-service-slime-impl/src/main/resources/sqlmap.properties

@@ -29,8 +29,8 @@ kylin_order_ticket_entities.update_status_bystation=UPDATE kylin_order_ticket_en
 
 #  ----    演出修改    ----
 kylin_performances.auditTime=UPDATE kylin_performances SET audit_time = ? WHERE performances_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
-kylin_performances_status.withdraw=UPDATE kylin_performance_status SET audit_status = ? WHERE performance_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
-kylin_performances_status.withdraw2=UPDATE kylin_performance_status SET audit_status = ? , status = ? WHERE performance_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
+kylin_performances_status.withdraw=UPDATE kylin_performance_status SET audit_status = ?  WHERE performance_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
+kylin_performances_status.withdraw2=UPDATE kylin_performance_status SET audit_status = ? , field_audit_status = ?, status = ? WHERE performance_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 kylin_performances_status.outLine=UPDATE kylin_performance_status SET status = ? AND updated_at = ? WHERE performance_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 kylin_performances_status.onLine=UPDATE kylin_performance_status SET status = ? AND updated_at = ? WHERE performance_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 #  ----    票种状态修改    ----