暂时提交一部分

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinPerformancesServiceImpl.java

@@ -416,10 +416,10 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
         performancesInfo.setMessage(KylinPerformanceStatusEnum.getName(performancesInfo.getAppStatus()));
 
         PayDetailVo payDetailVo = new PayDetailVo();
-        if(ticketVo.getIsExpress()==1) {
+        if (ticketVo.getIsExpress() == 1) {
             KylinTicketExpressModuleVo expressModuleVo = dataUtils.getTEMVo(ticketsId);
-            payDetailVo.setExpressModuleList(expressModuleVo==null?null:expressModuleVo.getProduceCodeList());
-        }else{
+            payDetailVo.setExpressModuleList(expressModuleVo == null ? null : expressModuleVo.getProduceCodeList());
+        } else {
             payDetailVo.setExpressModuleList(null);
         }
         payDetailVo.setPerformanceInfo(performancesInfo);
@@ -502,6 +502,9 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
 
     public KylinPerformanceVo checkAppStatusInfo(KylinPerformanceVo info) {
         if (null != info) {
+            if (info.getAppStatus() == 0 || info.getAppStatus() == 1) {
+                info.setAppStatus(3);
+            }
             List<KylinTicketTimesVo> ticketTimeList = info.getTicketTimeList();
             List<KylinTicketTimesVo> ticketTimeListNew = ObjectUtil.getKylinTicketTimesVoArrayList();
             for (KylinTicketTimesVo ticketTime : ticketTimeList) {

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

@@ -870,32 +870,53 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
     public ResponseDto<String> fieldsAuditPerformance(String performancesId, Integer status, String rejectTxt) {
         LocalDateTime now = LocalDateTime.now();
         KylinPerformanceVo vo = redisSlimeUtils.getPerformanceVo(performancesId);
-        if (vo.getFieldAuditStatus() == 0) {
-            return ResponseDto.failure("演出不需要审核");
-        } else if (vo.getFieldAuditStatus() == 1) {
-            KylinPerformanceVo changeVo = KylinPerformanceVo.getNew();
-            changeVo.setFieldAuditStatus(status);
-            changeVo.setRejectTxt(rejectTxt);
-            changeVo.setPerformancesId(performancesId);
-            if (status == 2) {
-                changeVo.setAuditStatus(status);
+        Integer auditStatus = 0;
+//        if (vo.getFieldAuditStatus() == 0) {
+//            return ResponseDto.failure("演出不需要审核");
+//        } else if (vo.getFieldAuditStatus() == 1) {
+        KylinPerformanceVo changeVo = KylinPerformanceVo.getNew();
+        changeVo.setFieldAuditStatus(status);
+        changeVo.setRejectTxt(rejectTxt);
+        changeVo.setPerformancesId(performancesId);
+        if(status==0){
+            auditStatus=0;
+        }
+        if (status == 2) {
+            if (vo.getAppStatus() == 1) {
+                changeVo.setAppStatus(0);
             }
-            mongoSlimeUtils.updateKylinPerformanceVoById(changeVo);
-            redisSlimeUtils.delPerformanceVo(performancesId);
-
-            PerformancePartnerVo changePartnerVo = PerformancePartnerVo.getNew();
-            changePartnerVo.setFieldAuditStatus(status);
-            changePartnerVo.setRejectTxt(rejectTxt);
-            changePartnerVo.setUpdatedAt(now.format(DateUtil.DTF_YMD_HMS));
-            if (status == 2) {
-                changePartnerVo.setAuditStatus(status);
+            changeVo.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);
             }
-            mongoSlimeUtils.updatePerformancePartnerVoById(changePartnerVo);
-            queueUtil.sendMsgByRedis(MQConst.SlimeQueue.SQL_SLIME_PERFORMANCE_UPDATE.getKey(),
-                    SqlMapping.get("kylin_performance_status.fieldsStatus",
-                            status, status, rejectTxt, performancesId, now, now
-                    ));
+            changePartnerVo.setAuditStatus(auditStatus);
         }
+        mongoSlimeUtils.updatePerformancePartnerVoById(changePartnerVo);
+        LinkedList<String> sqls = CollectionUtil.linkedListString();
+        sqls.add(SqlMapping.get("kylin_performance_status.fieldsStatus"));
+        sqls.add(SqlMapping.get("kylin_performances_reject_txt.fieldsStatus"));
+        LinkedList<Object[]> sqlsDataA = CollectionUtil.linkedListObjectArr();
+        LinkedList<Object[]> sqlsDataB = CollectionUtil.linkedListObjectArr();
+        sqlsDataA.add(new Object[]{
+                status, auditStatus, vo.getAppStatus(), performancesId, now, now
+        });
+        sqlsDataB.add(new Object[]{
+                rejectTxt, performancesId, now, now
+        });
+        String sqlData = SqlMapping.gets(sqls, sqlsDataA, sqlsDataB);
+        queueUtil.sendMsgByRedis(MQConst.SlimeQueue.SQL_SLIME_PERFORMANCE_UPDATE.getKey(),
+                sqlData);
+//        }
         return ResponseDto.success("审核完成");
     }
 

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

@@ -37,7 +37,9 @@ kylin_performances_status.onLine=UPDATE kylin_performance_status SET status = ?
 kylin_ticket_status.update_status=UPDATE kylin_ticket_status SET status = ?, updated_at = ? WHERE ticket_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 kylin_ticket_status.onLine=UPDATE kylin_ticket_status SET status = ?, updated_at = ? WHERE ticket_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 #  ----    场地审核演出    ----
-kylin_performance_status.fieldsStatus = UPDATE kylin_performance_status SET field_audit_status = ? , audit_status = ? , reject_txt = ? WHERE performance_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
+kylin_performance_status.fieldsStatus = UPDATE kylin_performance_status SET field_audit_status = ? , audit_status = ? ,status = ? WHERE performance_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
+kylin_performances_reject_txt.fieldsStatus = UPDATE kylin_performances SET reject_txt = ? WHERE performances_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
+
 #  ----    演出第二步骤操作    ----
 kylin_performance.updateStep2=UPDATE kylin_performances SET audit_time = ? , notice_image = ? WHERE performances_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 kylin_performance_status.updateStep2=UPDATE kylin_performance_status SET field_audit_status = ? ,audit_status = ? , is_true_name = ? , limit_count = ? WHERE performance_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)