暂时提交一部分

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/PerformancePartnerVo.java

@@ -131,7 +131,7 @@ public class PerformancePartnerVo implements Serializable, Cloneable {
         }
     }
 
-    public PerformancePartnerVo copy(KylinPerformances performances, KylinPerformanceStatus performanceStatus, KylinPerformanceRelations kylinPerformanceRelations,String fieldName) {
+    public PerformancePartnerVo copy(KylinPerformances performances, KylinPerformanceStatus performanceStatus, KylinPerformanceRelations kylinPerformanceRelations, String fieldName) {
         this.setPerformancesId(performances.getPerformancesId());
         this.setImgPoster(performances.getImgPoster());
         this.setTitle(performances.getTitle());
@@ -158,6 +158,7 @@ public class PerformancePartnerVo implements Serializable, Cloneable {
         this.setRoadShowId(kylinPerformanceRelations.getRoadShowId());
         this.setRejectTxt(performances.getRejectTxt());
         this.setAuditStatus(performanceStatus.getAuditStatus());
+        this.setFieldAuditStatus(performanceStatus.getFieldAuditStatus());
         this.setIsShow(performanceStatus.getIsShow());
         this.setProjectId(kylinPerformanceRelations.getProjectId());
         this.setCreatedAt(DateUtil.Formatter.yyyyMMddHHmmss.format(performances.getCreatedAt()));

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

@@ -228,6 +228,8 @@ public class KylinTicketsPartnerServiceImpl implements IKylinTicketsPartnerServi
             kylinTicketPartnerVo.setDefault();
             if (ticketCreateParam.getIsExpress() == 1) {
                 kylinTicketPartnerVo.setTimeEndExpress(ticketCreateParam.getTimeEndExpress().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+            } else {
+                kylinTicketPartnerVo.setTimeEndExpress(null);
             }
             if (ticketCreateParam.getExpressType() == null) {
                 ticketCreateParam.setExpressType(0);
@@ -258,16 +260,18 @@ public class KylinTicketsPartnerServiceImpl implements IKylinTicketsPartnerServi
             KylinPerformanceVo vo = redisSlimeUtils.getPerformanceVo(performanceId);
             KylinTicketTimesVo ticketTimesData;
             KylinTicketVo ticketData = null;
-            for (int x = 0; x < vo.getTicketTimeList().size(); x++) {
-                ticketTimesData = vo.getTicketTimeList().get(x);
-                for (int y = 0; y < ticketTimesData.getTicketList().size(); y++) {
-                    KylinTicketVo ticketItem = ticketTimesData.getTicketList().get(y);
-                    if (ticketItem.getTicketsId().equals(ticketsId)) {
-                        ticketData = ticketItem;
-                        break;
+            if (vo != null) {
+                for (int x = 0; x < vo.getTicketTimeList().size(); x++) {
+                    ticketTimesData = vo.getTicketTimeList().get(x);
+                    for (int y = 0; y < ticketTimesData.getTicketList().size(); y++) {
+                        KylinTicketVo ticketItem = ticketTimesData.getTicketList().get(y);
+                        if (ticketItem.getTicketsId().equals(ticketsId)) {
+                            ticketData = ticketItem;
+                            break;
+                        }
                     }
+                    break;
                 }
-                break;
             }
             if (ticketData == null) {
                 mongoSlimeUtils.deleteTicketPartnerVo(ticketsId);
@@ -393,6 +397,7 @@ public class KylinTicketsPartnerServiceImpl implements IKylinTicketsPartnerServi
                 ticketPartnerVo.setStatus(9);
                 mongoSlimeUtils.updateTicketPartnerVo(ticketPartnerVo);
                 performanceUtils.performanceVoStatus(performancesId, null);
+                redisSlimeUtils.delPerformanceVo(performancesId);
                 log.info(UserPathDto.setPartnerData("0", "onLine", "performancesId=" + performancesId + ",ticketsId=" + ticketsId, "上线成功"));
                 return ResponseDto.success("上线成功");
             } else {
@@ -443,6 +448,7 @@ public class KylinTicketsPartnerServiceImpl implements IKylinTicketsPartnerServi
                 ticketPartnerVo.setStatus(7);
                 mongoSlimeUtils.updateTicketPartnerVo(ticketPartnerVo);
                 performanceUtils.performanceVoStatus(performancesId, null);
+                redisSlimeUtils.delPerformanceVo(performancesId);
                 log.info(UserPathDto.setPartnerData("0", "outLine", "performancesId=" + performancesId + ",ticketsId=" + ticketsId, "下线成功"));
                 return ResponseDto.success("下线成功");
             } else {