statusSell 初始值复制注释

增加 场地审核状态

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

@@ -96,6 +96,9 @@ public class PerformancePartnerVo implements Serializable,Cloneable {
     @ApiModelProperty(value = "审核状态", hidden = true)
     private Integer auditStatus;
 
+    @ApiModelProperty(value = "场地审核状态 [0-待提交|1-待审核|2-已拒绝|3-审核完成]", hidden = true)
+    private Integer fieldAuditStatus;
+
     @ApiModelProperty(value = "审核状态", hidden = true)
     private Integer isShow;
 

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

@@ -19,6 +19,10 @@ public class PerformanceStep2Param implements Serializable,Cloneable {
     @NotNull(message = "不能为空")
     private Integer isTrueName;
 
+    @ApiModelProperty(value = "场地审核状态 [0-待提交|1-待审核|2-已拒绝|3-审核完成]", example = "0")
+    @NotNull(message = "不能为空")
+    private Integer fieldAuditStatus;
+
     @ApiModelProperty(value = "限购数量 0为不限购", example = "0")
     @NotNull(message = "不能为空")
     private Integer limitCount;

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinPerformanceStatus.java

@@ -139,6 +139,11 @@ public class KylinPerformanceStatus implements Serializable  ,Cloneable{
      */
     private Integer isRefundExpress;
 
+    /**
+     * 是否需要场地审核
+     */
+    private Integer fieldAuditStatus;
+
     /**
      * 创建时间
      */
@@ -164,7 +169,7 @@ public class KylinPerformanceStatus implements Serializable  ,Cloneable{
                 vo.getIsShow(),vo.getStatus(),vo.getStatusSell(),
                 vo.getIsDistribution(),vo.getSyncAgent(),0,
                 vo.getAuditStatus(),vo.getIsTrueName(),vo.getLimitCount(),
-                vo.getLimitCountMember(),vo.getCreatedAt(),vo.getUpdatedAt()
+                vo.getLimitCountMember(),vo.getFieldAuditStatus(),vo.getCreatedAt(),vo.getUpdatedAt()
         };
     }
 }

liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/docu/db_merchant.sql

@@ -258,6 +258,7 @@ create index permission_id_index on merchant_authorization_permissions (permissi
 
 alter table kylin_ticket_status modify qr_code_show_time datetime default '2030-01-01 12:00:00' null comment '二维码显示时间';
 alter table kylin_tickets modify time_end_express datetime default '2030-01-01 12:00:00' null comment '快递票结束时间';
+alter table kylin_performance_status ADD field_audit_status int default 3 null comment '场地审核状态[0-待提交|1-待审核|2-已拒绝|3-审核完成]';
 
 drop table if exists kylin_ticket_express_module;
 create table kylin_ticket_express_module

liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/controller/PerformancePartnerController.java → liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/controller/KylinPerformancePartnerController.java

@@ -27,7 +27,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("partner/performance")
 @Validated
-public class PerformancePartnerController {
+public class KylinPerformancePartnerController {
 
     @Autowired
     private IKylinPerformancesPartnerService performancesPartnerService;
@@ -114,12 +114,4 @@ public class PerformancePartnerController {
     public ResponseDto<String> withdraw(@RequestParam("performancesId") @NotNull(message = "演出ID不能为空") String performancesId) {
         return performancesPartnerService.withdraw(performancesId);
     }
-
-    @GetMapping(value = "orderStatistical")
-    @ApiOperation(value = "演出订单统计",position = 9)
-    @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<List<PerformanceOrderStatisticalVo>> performanceOrderStatisticalList(@RequestParam("performancesId") @NotNull(message = "演出ID不能为空") String performancesId) {
-        List<PerformanceOrderStatisticalVo> list =performancesPartnerService.getPerformanceOrderStatisticalList(performancesId);
-        return ResponseDto.success(list);
-    }
 }

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

@@ -103,7 +103,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
             performancePartnerVo.setCreatedAt(createdAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
             performancePartnerVo.setIsSubmit(0);
             performancePartnerVo.setStatus(0);
-            performancePartnerVo.setStatusSell(1);
+//            performancePartnerVo.setStatusSell(1);
             performancePartnerVo.setAuditStatus(-1);
             performancePartnerVo.setRoadShowId("0");
             performancePartnerVo.setProjectId("0");
@@ -218,7 +218,8 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
             performancePartnerVo.setLimitCount(step2Param.getLimitCount());
             performancePartnerVo.setCreatedAt(createdAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
             performancePartnerVo.setIsSubmit(step2Param.getIsSubmit());
-            performancePartnerVo.setStatusSell(1);
+//            performancePartnerVo.setStatusSell(1);
+            performancePartnerVo.setFieldAuditStatus(step2Param.getFieldAuditStatus());
 
             // 获取第一步数据
             if (step2Param.getIsSubmit() == 1) { // 提交
@@ -298,6 +299,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
             performancePartnerVo.setCreatedAt(now.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
             performancePartnerVo.setUpdatedAt(now.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
             performancePartnerVo.setIsSubmit(step2Param.getIsSubmit());
+            performancePartnerVo.setFieldAuditStatus(step2Param.getFieldAuditStatus());
 
             // 获取第一步数据
             if (step2Param.getIsSubmit() == 1) { // 提交
@@ -329,7 +331,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
                             now, kylinPerformanceMisVo.getNoticeImage(), performanceId, now, now
                     });
                     sqlsDataB.add(new Object[]{
-                            performancePartnerVo.getAuditStatus(), step2Param.getIsTrueName(), step2Param.getLimitCount(), performanceId, now, now
+                            performancePartnerVo.getFieldAuditStatus(),performancePartnerVo.getAuditStatus(), step2Param.getIsTrueName(), step2Param.getLimitCount(), performanceId, now, now
                     });
                     redisMerchantUtils.setPerformanceIsTrueName(performanceId, step2Param.getIsTrueName());
 

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

@@ -25,7 +25,7 @@ kylin_ticket_status.update_status=UPDATE kylin_ticket_status SET status = ?, upd
 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.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 audit_status = ? , is_true_name = ? , limit_count = ? WHERE performance_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)
 kylin_ticket.updateStep2=UPDATE kylin_tickets SET time_end = ? , time_start = ? ,time_end_express = ? ,pay_countdown_minute = ? ,price = ? WHERE tickets_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 kylin_ticket_status.updateStep2=UPDATE kylin_ticket_status SET total_exchange = ? , total_general = ? , is_true_name = ? , limit_count = ? , is_lack_register = ? , is_express = ? , is_electronic = ? ,counts = ? , is_show_code = ? ,qr_code_show_time = ? WHERE ticket_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 #  ----    VoStatus    ----
@@ -37,7 +37,7 @@ kylin_performance_status.del=DELETE FROM kylin_performance_status WHERE performa
 kylin_performance_relations.del=DELETE FROM kylin_performance_relations WHERE performance_id = ?
 #province_id,province_name,district_id,district_name
 kylin_performances.insert=INSERT INTO kylin_performances (performances_id,title,type,img_poster,city_id,city_name,approval_url,notice,sponsor_id,sponsor_type,sponsor,contacts,mobile,describes,details,notice_image,time_start,time_end,sort,comment,created_at,updated_at) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
-kylin_performance_status.insert=INSERT INTO kylin_performance_status (performance_status_id,performance_id,is_show,status,status_sell,is_distribution,sync_agent,sync_damai,audit_status,is_true_name,limit_count,limit_count_member,created_at,updated_at) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+kylin_performance_status.insert=INSERT INTO kylin_performance_status (performance_status_id,performance_id,is_show,status,status_sell,is_distribution,sync_agent,sync_damai,audit_status,is_true_name,limit_count,limit_count_member,field_audit_status,created_at,updated_at) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
 kylin_performance_relations.insert=INSERT INTO kylin_performance_relations (performance_relations_id,performance_id,copy_id,merchant_id,field_id,road_show_id,project_id,video_id,created_at,updated_at) VALUES (?,?,?,?,?,?,?,?,?,?)
 
 kylin_ticket_times.del=DELETE FROM kylin_ticket_times WHERE ticket_times_id = ?

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

@@ -138,7 +138,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
             performancePartnerVo.setCreatedAt(createdAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
             performancePartnerVo.setIsSubmit(0);
             performancePartnerVo.setStatus(0);
-            performancePartnerVo.setStatusSell(1);
+//            performancePartnerVo.setStatusSell(1);
             performancePartnerVo.setAuditStatus(-1);
             performancePartnerVo.setRoadShowId("0");
             performancePartnerVo.setProjectId("0");