暂时提交一部分

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

@@ -837,7 +837,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
                     performancePartnerVo.setAuditStatus(-1);
                     performancePartnerVo.setStatus(0);
                     performanceVo.setAuditStatus(performancePartnerVo.getAuditStatus());
-                    performanceVo.setAppStatus(performancePartnerVo.getAuditStatus());
+                    performanceVo.setAppStatus(performancePartnerVo.getStatus());
                     queueUtil.sendMsgByRedis(MQConst.SlimeQueue.SQL_SLIME_PERFORMANCE_UPDATE.getKey(),
                             SqlMapping.get("kylin_performances_status.withdraw2",
                                     -1, 0, performancesId, now, now
@@ -876,35 +876,35 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
             return ResponseDto.failure("演出不需要审核");
         } else if (vo.getFieldAuditStatus() == 1) {
             KylinPerformanceVo changeVo = KylinPerformanceVo.getNew();
+            PerformancePartnerVo changePartnerVo = PerformancePartnerVo.getNew();
+
             changeVo.setFieldAuditStatus(status);
             changeVo.setRejectTxt(rejectTxt);
             changeVo.setPerformancesId(performancesId);
+
             if (status == 0) {
                 auditStatus = 0;
             } else if (status == 2) {
                 auditStatus = -1;
-            }
-            if (status == 2) {
                 if (vo.getAppStatus() == 1) {
                     changeVo.setAppStatus(0);
+                    vo.setAppStatus(0);
                 }
                 changeVo.setAuditStatus(auditStatus);
+                if (vo.getAppStatus() == 0) {
+                    changePartnerVo.setStatus(-1);
+                }
+                changePartnerVo.setAuditStatus(auditStatus);
             }
-            mongoSlimeUtils.updateKylinPerformanceVoById(changeVo);
-            redisSlimeUtils.delPerformanceVo(performancesId);
 
-            PerformancePartnerVo changePartnerVo = PerformancePartnerVo.getNew();
             changePartnerVo.setPerformancesId(performancesId);
             changePartnerVo.setFieldAuditStatus(status);
             changePartnerVo.setRejectTxt(rejectTxt);
             changePartnerVo.setUpdatedAt(now.format(DateUtil.DTF_YMD_HMS));
-            if (status == 2) {
-                if (vo.getAppStatus() == 0) {
-                    changePartnerVo.setStatus(0);
-                }
-                changePartnerVo.setAuditStatus(auditStatus);
-            }
+
+            mongoSlimeUtils.updateKylinPerformanceVoById(changeVo);
             mongoSlimeUtils.updatePerformancePartnerVoById(changePartnerVo);
+            redisSlimeUtils.delPerformanceVo(performancesId);
             LinkedList<String> sqls = CollectionUtil.linkedListString();
             sqls.add(SqlMapping.get("kylin_performance_status.fieldsStatus"));
             sqls.add(SqlMapping.get("kylin_performances_reject_txt.fieldsStatus"));

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

@@ -30,7 +30,7 @@ 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 = ? AND 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.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)
 #  ----    票种状态修改    ----