Merge branch '250115-realNameAndinformation-optimization' into container-test

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

@@ -124,8 +124,6 @@ public class PerformancePartnerVo implements Serializable, Cloneable {
     @ApiModelProperty(value = "是否保存", example = "")
     private Integer isCreateSave;
 
-    @ApiModelProperty(value = "须知提醒 0：不提醒 1：提醒")
-    private Integer noticeRemindStatus;
 
     public Integer getIdCount() {
         return idCount==null?limitCount:idCount;

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

@@ -90,7 +90,4 @@ public class PerformanceStep1Param implements Serializable {
     @JsonIgnore
     private String createdAt;
 
-    @ApiModelProperty(value = "须知提醒 0：不提醒 1：提醒")
-    @NotNull(message = "须知提醒不能为空")
-    private Integer noticeRemindStatus;
 }

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

@@ -50,6 +50,10 @@ public class PerformanceStep2Param implements Serializable,Cloneable {
     @ApiModelProperty(value = "场次数据",hidden = true)
     private List<TicketTimesTicketCreatePartnerVo> ticketTimes;
 
+    @ApiModelProperty(value = "须知提醒 0：不提醒 1：提醒")
+    @NotNull(message = "须知提醒不能为空")
+    private Integer noticeRemindStatus;
+
     private static final PerformanceStep2Param obj = new PerformanceStep2Param();
     public static PerformanceStep2Param getNew() {
         try {

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

@@ -123,8 +123,6 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
             performancePartnerVo.setFieldName(redisSlimeUtils.getFieldVo(step1Param.getFieldId()).getName());
             performancePartnerVo.setNoticeImage(innerUtils.getBuyNoticeJsonString(step1Param.getNoticeIds()));
             mongoSlimeUtils.insertPerformancePartnerVo(performancePartnerVo);
-            // 设置须知提醒状态
-            redisSlimeUtils.setPerformanceNoticeRemindStatus(performanceId, step1Param.getNoticeRemindStatus());
             return performanceId;
         } catch (Exception e) {
             e.printStackTrace();
@@ -179,8 +177,6 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
                 performancePartnerVo.setProjectId(vo.getProjectId());
                 mongoSlimeUtils.insertPerformancePartnerVo(performancePartnerVo);
             }
-            // 修改须知提醒状态
-            redisSlimeUtils.setPerformanceNoticeRemindStatus(performanceId, step1Param.getNoticeRemindStatus());
             return performanceId;
         } catch (Exception e) {
             e.printStackTrace();
@@ -208,7 +204,6 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
         if (null != vo) {
             data.setStatus(vo.getAppStatus());
         }
-        data.setNoticeRemindStatus(redisSlimeUtils.getPerformanceNoticeRemindStatus(performancesId));
         log.info(UserPathDto.setPartnerData("0", "getStep1", "merchant=" + merchantId + "&performancesId=" + performancesId, data));
         return ResponseDto.success(data);
     }
@@ -220,6 +215,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
         // 无 performancesId 则 创建
         if (!step2Param.getPerformancesId().isEmpty()) { // 获取 create 数据 status = 0 或 无数据 创建
             redisSlimeUtils.setPerformanceInvoiceReminder(step2Param.getPerformancesId(), step2Param.getIsInvoiceReminder());
+            redisSlimeUtils.setPerformanceNoticeRemindStatus(step2Param.getPerformancesId(), step2Param.getNoticeRemindStatus());
             KylinPerformanceVo vo = redisSlimeUtils.getPerformanceVo(step2Param.getPerformancesId());
             if (vo == null || vo.getAppStatus() == 0 || vo.getAppStatus() == 1 || (vo.getAppStatus() == 4 && vo.getAuditStatus() == 2)) {
                 result = createStep2(step2Param);
@@ -558,6 +554,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
 
         performanceStep2Param.setTicketTimes(ticketTimesTicketCreatePartnerVoList);
         performanceStep2Param.setIsInvoiceReminder(redisSlimeUtils.getPerformanceInvoiceReminder(performancesId));
+        performanceStep2Param.setNoticeRemindStatus(redisSlimeUtils.getPerformanceNoticeRemindStatus(performancesId));
         log.info(UserPathDto.setPartnerData("0", "getStep2", "performancesId=" + performancesId, performanceStep2Param));
         return ResponseDto.success(performanceStep2Param);
     }