Merge branch 'dev_merchant' into dev_merchant_tice

# Conflicts:
#	liquidnet-bus-common/liquidnet-common-service-base/src/main/java/com/liquidnet/service/base/constant/MQConst.java
#	liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/resources/sqlmap.properties

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/constant/KylinRedisConst.java

@@ -26,6 +26,8 @@ public class KylinRedisConst {
     public static final String ORDER_REFUND_BY_ORDER_ID = "kylin:order:refund:orderId:";
     public static final String ORDER_REFUND = "kylin:order:refund:orderRefundsId:";
 
+    public static final String BUY_NOTICE = "kylin:buyNotice";//购票须知
+
     public static final String ORDER_TRANSFER = "kylin:order:transfer:uid:";
     //订单导入失败key
     public static final String ORDER_IMPORT_FAIL = "kylin:order:import:fail:";

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/middle/KylinTicketVo.java

@@ -89,9 +89,13 @@ public class KylinTicketVo {
     private String qrCodeShowTime;
     @ApiModelProperty(value = "会员提前分钟")
     private Integer advanceMinuteMember;
+    @ApiModelProperty(value = "总库存")
+    private Integer totalGeneral;
+    @ApiModelProperty(value = "总兑换库存")
+    private Integer totalExchange;
 
     public void setTicket(KylinTickets ticket) {
-        this.mid=ticket.getMid();
+        this.mid = ticket.getMid();
         this.ticketsId = ticket.getTicketsId();
         this.title = ticket.getTitle();
         this.type = ticket.getType();
@@ -134,7 +138,8 @@ public class KylinTicketVo {
         this.sysDamai = ticketStatus.getSyncDamai();
         this.isShowCode = ticketStatus.getIsShowCode();
         this.qrCodeShowTime = DateUtil.Formatter.yyyyMMddHHmmss.format(ticketStatus.getQrCodeShowTime());
-
+        this.totalGeneral = ticketStatus.getTotalGeneral();
+        this.totalExchange = ticketStatus.getTotalExchange();
     }
 
 }

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/mongo/KylinPerformanceVo.java

@@ -120,6 +120,8 @@ public class KylinPerformanceVo {
     private Integer isRefundVoucher;
     private Integer isRefundExpress;
 
+    private Integer auditStatus;
+
     public void setPerformance(KylinPerformances performance) {
         this.mid = performance.getMid();
         this.performancesId = performance.getPerformancesId();
@@ -175,6 +177,7 @@ public class KylinPerformanceVo {
         this.isRefundPoundage = performanceStatus.getIsRefundPoundage();
         this.isRefundVoucher = performanceStatus.getIsRefundVoucher();
         this.isRefundExpress = performanceStatus.getIsRefundExpress();
+        this.auditStatus = 0;
     }
 
     public void setPerformanceRelations(KylinPerformanceRelations performanceRelations) {

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/partner/IKylinTicketTimesPartnerService.java

@@ -45,7 +45,7 @@ public interface IKylinTicketTimesPartnerService {
      * @param ticketTimesId 场次id
      * @return boolean
      */
-    ResponseDto<String> deleteTimes(String ticketTimesId);
+    ResponseDto<String> deleteTimes(String ticketTimesId,String performanceId);
 
     /**
      * 修改场次信息

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/partner/IKylinTicketsPartnerService.java

@@ -51,7 +51,7 @@ public interface IKylinTicketsPartnerService {
      * @param ticketsId 票id
      * @return boolean
      */
-    ResponseDto<String> deleteTicket(String ticketsId);
+    ResponseDto<String> deleteTicket(String ticketsId,String performanceId);
 
     /**
      * 复制票

liquidnet-bus-common/liquidnet-common-service-base/src/main/java/com/liquidnet/service/base/constant/MQConst.java

@@ -75,7 +75,7 @@ public class MQConst {
 
 
     public enum SweetQueue {
-         ARTISTS_RELATION("sweet:stream:rk.artists.relation", "group.artists.relation", "用户-关系"),
+        ARTISTS_RELATION("sweet:stream:rk.artists.relation", "group.artists.relation", "用户-关系"),
         ARTISTS_RELATION_MDSK("sweet:stream:rk.artists.mdsk.relation", "group.artists.mdsk.relation", "用户-关系"),
         LUCK_DRAW("sweet:stream:rk.luckDraw", "group.luckDraw", "用户-抽奖"),
         ANSWERINSERT_DRAW("sweet:stream:rk.answerInsert", "group.answerInsert", "答案"),
@@ -144,7 +144,15 @@ public class MQConst {
 //        SQL_MERCHANT_FIELD("merchant:stream:rk.sql.field", "group.sql.field", "场地相关")
 //        SQL_MERCHANT_SPONSOR("merchant:stream:rk.sql.sponsor", "group.sql.sponsor", "主办相关")
         SQL_MERCHANT_FIELD("kylin:stream:rk.performance.lack", "group.performance.lack", "场地相关"),
-        SQL_MERCHANT_SPONSOR("kylin:stream:rk.performance.lack", "group.performance.lack", "场地相关")
+        SQL_MERCHANT_SPONSOR("kylin:stream:rk.performance.lack", "group.performance.lack", "主办相关"),
+        
+
+
+        SQL_MERCHANT_TICKET_UPDATE("merchant:stream:rk.ticket", "group.ticket", "票种相关"),
+        SQL_MERCHANT_PERFORMANCE_UPDATE("merchant:stream:rk.performance", "group.performance", "演出相关"),
+        SQL_MERCHANT_STEP2("merchant:stream:rk.performance.step2", "group.performance.step2", "修改演出第二部"),
+        SQL_MERCHANT_LINE("merchant:stream:rk.any.line", "group.any.line", "上下线相关"),
+        SQL_MERCHANT_PERFORMANCE_INSERT("merchant:stream:rk.performance.insert", "group.performance.insert", "创建演出"),
         ;
 
         private final String key;

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

+package com.liquidnet.service.merchant.controller;
+
+
+import com.github.pagehelper.PageInfo;
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.kylin.dto.vo.middle.KylinBuyNoticeVo;
+import com.liquidnet.service.kylin.service.partner.IKylinBuyNoticePartnerService;
+import com.liquidnet.service.merchant.util.InnerUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * <p>
+ * 购票须知表 前端控制器
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-18
+ */
+@Api(tags = "第三方-购票须知", position = 1004)
+@RestController
+@RequestMapping("partner/buyNotice")
+public class KylinBuyNoticeParnterController {
+
+    @Autowired
+    private IKylinBuyNoticePartnerService buyNoticePartnerService;
+    @Autowired
+    InnerUtils innerUtils;
+
+    @GetMapping(value = "")
+    @ApiOperation(value = "购票须知列表", position = 1)
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    public ResponseDto<List<KylinBuyNoticeVo>> getBuyNotice() {
+        PageInfo<KylinBuyNoticeVo> result = buyNoticePartnerService.getBuyNotice();
+        if (null == result) {
+            return ResponseDto.failure("查询失败");
+        } else {
+            return ResponseDto.success(result.getList());
+        }
+    }
+
+    @GetMapping(value = "string")
+    @ApiOperation(value = "购票须知列表String", position = 1)
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    public ResponseDto<String> getBuyNoticeJsonString(@RequestParam("buyNoticeId") String buyNoticeId) {
+        return ResponseDto.success(innerUtils.getBuyNoticeJsonString(Arrays.asList(buyNoticeId.split(","))));
+    }
+
+}

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

+package com.liquidnet.service.merchant.controller;
+
+
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.kylin.dto.param.CreateTicketTimesParam;
+import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketTimesPartnerVo;
+import com.liquidnet.service.kylin.service.partner.IKylinTicketTimesPartnerService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+
+/**
+ * <p>
+ * 场次 前端控制器
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-06
+ */
+@Api(tags = "第三方-场次",position = 1002)
+@RestController
+@RequestMapping("partner/times")
+@Validated
+public class KylinTicketTimesPartnerController {
+
+    @Autowired
+    private IKylinTicketTimesPartnerService ticketTimesPartnerService;
+
+    @PostMapping(value = "")
+    @ApiOperation(value = "创建场次",position = 1)
+    @ApiResponse(response = KylinTicketTimesPartnerVo.class, code = 200, message = "接口返回对象参数")
+    public ResponseDto<KylinTicketTimesPartnerVo> createTimesSummary(@RequestBody @Valid CreateTicketTimesParam createTicketTimesParam) {
+        return ticketTimesPartnerService.createTimesSummary(createTicketTimesParam);
+    }
+
+    @DeleteMapping(value = "")
+    @ApiOperation(value = "删除场次",position = 2)
+    @ApiResponse(response = KylinTicketTimesPartnerVo.class, code = 200, message = "接口返回对象参数")
+    public ResponseDto<String> deleteTimes(@RequestParam("ticketTimesId") @NotNull(message = "场次ID不能为空") String ticketTimesId,
+                                           @RequestParam("performanceId") @NotNull(message = "演出ID不能为空") String performanceId) {
+        return ticketTimesPartnerService.deleteTimes(ticketTimesId,performanceId);
+    }
+
+    @PutMapping(value = "")
+    @ApiOperation(value = "修改场次",position = 3)
+    @ApiResponse(response = KylinTicketTimesPartnerVo.class, code = 200, message = "接口返回对象参数")
+    public ResponseDto<KylinTicketTimesPartnerVo> changeTimes(@RequestBody @Valid CreateTicketTimesParam createTicketTimesParam) {
+        return ticketTimesPartnerService.changeTimes(createTicketTimesParam);
+    }
+
+    @GetMapping(value = "/details")
+    @ApiOperation(value = "获取场次详情",position = 4)
+    @ApiResponse(response = KylinTicketTimesPartnerVo.class, code = 200, message = "接口返回对象参数")
+    public ResponseDto<KylinTicketTimesPartnerVo> getTimesMongo(@RequestParam("ticketTimesId") @NotNull(message = "场次ID不能为空") String ticketTimesId) {
+        KylinTicketTimesPartnerVo result = null;
+        result = ticketTimesPartnerService.getTimesMongo(ticketTimesId);
+        if (null == result) {
+            return ResponseDto.failure("查询场次信息失败");
+        } else {
+            return ResponseDto.success(result);
+        }
+    }
+
+
+}

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

+package com.liquidnet.service.merchant.controller;
+
+
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.kylin.dto.param.TicketCreateParam;
+import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketPartnerVo;
+import com.liquidnet.service.kylin.service.partner.IKylinTicketsPartnerService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+
+/**
+ * <p>
+ * 票 前端控制器
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-06
+ */
+@Api(tags = "第三方-票",position = 1003)
+@RestController
+@RequestMapping("partner/ticket")
+@Validated
+public class KylinTicketsPartnerController {
+
+    @Autowired
+    private IKylinTicketsPartnerService ticketsPartnerService;
+
+    @PostMapping(value = "")
+    @ApiOperation(value = "创建票务",position = 1 )
+    @ApiResponse(response = KylinTicketPartnerVo.class, code = 200, message = "接口返回对象参数")
+    public ResponseDto<KylinTicketPartnerVo> createTicketSummary(@RequestBody @Valid TicketCreateParam ticketCreateParam) {
+        return ticketsPartnerService.createTicketSummary(ticketCreateParam);
+    }
+
+    @PutMapping(value = "")
+    @ApiOperation(value = "修改票务",position = 2)
+    @ApiResponse(response = KylinTicketPartnerVo.class, code = 200, message = "接口返回对象参数")
+    public ResponseDto<KylinTicketPartnerVo> updateTicket(@RequestBody @Valid TicketCreateParam ticketCreateParam) {
+        return ticketsPartnerService.updateTicket(ticketCreateParam);
+    }
+
+    @DeleteMapping(value = "")
+    @ApiOperation(value = "删除票务",position = 3)
+    @ApiResponse( code = 200, message = "接口返回对象参数")
+    public ResponseDto<String> deleteTicket(@RequestParam("ticketsId") @NotNull(message = "票务ID不能为空") String ticketsId,
+                                            @RequestParam("performanceId") @NotNull(message = "演出ID不能为空") String performanceId) {
+        return ticketsPartnerService.deleteTicket(ticketsId,performanceId);
+    }
+
+    @PostMapping(value = "/copy")
+    @ApiOperation(value = "复制票务",position = 4)
+    @ApiResponse(response = KylinTicketPartnerVo.class, code = 200, message = "接口返回对象参数")
+    public ResponseDto<KylinTicketPartnerVo> copyTicket(@RequestParam("performancesId") @NotNull(message = "演出ID不能为空") String performancesId,
+                                                        @RequestParam("ticketsId") @NotNull(message = "票务ID不能为空") String ticketsId) {
+        return ticketsPartnerService.copyTicket(performancesId,ticketsId);
+    }
+
+    @GetMapping(value = "/details")
+    @ApiOperation(value = "获取票务详情",position = 5)
+    @ApiResponse(response = KylinTicketPartnerVo.class, code = 200, message = "接口返回对象参数")
+    public ResponseDto<KylinTicketPartnerVo> getTicketsMongo(@RequestParam("ticketsId") @NotNull(message = "票务ID不能为空") String ticketsId) {
+        KylinTicketPartnerVo result = null;
+        result = ticketsPartnerService.getTicketsMongo(ticketsId);
+        if (null == result) {
+            return ResponseDto.failure("查询票务信息失败");
+        } else {
+            return ResponseDto.success(result);
+        }
+    }
+
+    @PostMapping(value = "/onLine")
+    @ApiOperation(value = "票上线",position = 6)
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    public ResponseDto<String> onLine(@RequestParam("ticketsId") @NotNull(message = "票务ID不能为空") String ticketsId,
+                                      @RequestParam("performancesId") @NotNull(message = "演出ID不能为空") String performancesId) {
+        return ticketsPartnerService.onLine(ticketsId,performancesId);
+    }
+
+    @PostMapping(value = "/outLine")
+    @ApiOperation(value = "票下线",position = 7)
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    public ResponseDto<String> outLine(@RequestParam("ticketsId") @NotNull(message = "票务ID不能为空") String ticketsId,
+                                       @RequestParam("performancesId") @NotNull(message = "演出ID不能为空") String performancesId) {
+        return ticketsPartnerService.outLine(ticketsId,performancesId);
+    }
+}

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

+package com.liquidnet.service.merchant.controller;
+
+import com.github.pagehelper.PageInfo;
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.kylin.dao.PerformancePartnerListDao;
+import com.liquidnet.service.kylin.dto.param.PerformancePartnerListParam;
+import com.liquidnet.service.kylin.dto.param.PerformancePartnerVo;
+import com.liquidnet.service.kylin.dto.param.PerformanceStep1Param;
+import com.liquidnet.service.kylin.dto.param.PerformanceStep2Param;
+import com.liquidnet.service.kylin.dto.vo.PerformanceOrderStatisticalVo;
+import com.liquidnet.service.kylin.service.partner.IKylinPerformancesPartnerService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Api(tags = "第三方-演出",position = 1001)
+@RestController
+@RequestMapping("partner/performance")
+@Validated
+public class PerformancePartnerController {
+
+    @Autowired
+    private IKylinPerformancesPartnerService performancesPartnerService;
+
+    @PostMapping(value = "list")
+    @ApiOperation(value = "演出列表",position = 1)
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    public ResponseDto<PageInfo<PerformancePartnerListDao>> getList(@RequestBody @Valid PerformancePartnerListParam performancePartnerListParam) {
+        return performancesPartnerService.getList(performancePartnerListParam);
+    }
+
+    @PostMapping(value = "copy")
+    @ApiOperation(value = "复制演出",position = 6)
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    public ResponseDto<Map<String, String>> copyPerformance(@RequestParam("performancesId") @NotNull(message = "演出ID不能为空") String performancesId) {
+        String result = performancesPartnerService.copyPerformance(performancesId);
+        if (null == result) {
+            return ResponseDto.failure("复制失败");
+        } else {
+            Map<String, String> map = new HashMap<>();
+            map.put("performancesId", result);
+            return ResponseDto.success(map);
+        }
+    }
+
+
+    @GetMapping(value = "step1")
+    @ApiOperation(value = "获取演出第一步数据",position = 3)
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    public ResponseDto<PerformancePartnerVo> getStep1(@RequestParam("performancesId") @NotNull(message = "演出ID不能为空") String performancesId) {
+        return performancesPartnerService.getStep1(performancesId);
+    }
+
+    @PostMapping(value = "step1")
+    @ApiOperation(value = "操作演出第一步",position = 2)
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    public ResponseDto<Map<String, String>> Step1(@RequestBody @Valid PerformanceStep1Param performanceStep1Param) {
+        String result = performancesPartnerService.step1(performanceStep1Param);
+        if (result.isEmpty()) {
+            return ResponseDto.failure("操作失败");
+        } else if (result.equals("不可修改")) {
+            return ResponseDto.failure(result);
+        } else {
+            Map<String, String> map = new HashMap<>();
+            map.put("performancesId", result);
+            return ResponseDto.success(map);
+        }
+    }
+
+
+    @PostMapping(value = "step2")
+    @ApiOperation(value = "操作演出第二步",position = 4)
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    public ResponseDto<String> step2(@RequestBody @Valid PerformanceStep2Param performanceStep2Param) {
+        return performancesPartnerService.step2(performanceStep2Param);
+    }
+
+    @GetMapping(value = "step2")
+    @ApiOperation(value = "获取演出第二步数据",position = 5)
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    public ResponseDto<PerformanceStep2Param> getStep2(@RequestParam("performancesId") @NotNull(message = "演出ID不能为空") String performancesId) {
+        return performancesPartnerService.getStep2(performancesId);
+    }
+
+    @PostMapping(value = "online")
+    @ApiOperation(value = "演出上线",position = 7)
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    public ResponseDto<String> onLinePerformance(@RequestParam("performancesId") @NotNull(message = "演出ID不能为空") String performancesId) {
+        return performancesPartnerService.onLinePerformance(performancesId);
+    }
+
+    @PostMapping(value = "outline")
+    @ApiOperation(value = "演出下线",position = 8)
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    public ResponseDto<String> outLinePerformance(@RequestParam("performancesId") @NotNull(message = "演出ID不能为空") String performancesId) {
+        return performancesPartnerService.outLinePerformance(performancesId);
+    }
+
+    @PostMapping(value = "withdraw")
+    @ApiOperation(value = "演出撤回",position = 9)
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    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/KylinBuyNoticePartnerServiceImpl.java

+package com.liquidnet.service.merchant.service.impl;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.liquidnet.service.kylin.dto.vo.middle.KylinBuyNoticeVo;
+import com.liquidnet.service.kylin.entity.KylinBuyNotice;
+import com.liquidnet.service.kylin.mapper.KylinBuyNoticeMapper;
+import com.liquidnet.service.kylin.service.partner.IKylinBuyNoticePartnerService;
+import com.liquidnet.service.merchant.util.RedisMerchantUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+ * 购票须知表 服务实现类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-18
+ */
+@Service
+public class KylinBuyNoticePartnerServiceImpl  implements IKylinBuyNoticePartnerService {
+
+    @Autowired
+    RedisMerchantUtils merchantUtils;
+
+    @Override
+    public PageInfo<KylinBuyNoticeVo> getBuyNotice() {
+        List<KylinBuyNoticeVo> buyNoticeList = merchantUtils.getBuyNotice();
+        PageInfo<KylinBuyNoticeVo> pageInfoTmp = new PageInfo(buyNoticeList);
+        return pageInfoTmp;
+    }
+
+}

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

 package com.liquidnet.service.merchant.util;
 
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.liquidnet.commons.lang.util.CollectionUtil;
+import com.liquidnet.commons.lang.util.HttpUtil;
+import com.liquidnet.commons.lang.util.JsonUtils;
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.kylin.dto.vo.middle.KylinBuyNoticeVo;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
+import org.springframework.util.MultiValueMap;
+
+import java.util.List;
 
 @Component
 public class InnerUtils {
 
+//    @Value("${liquidnet.service.platform.url}")
+    private String platform="http://127.0.0.1:9003";
 
+    public List<KylinBuyNoticeVo> getBuyNotice() {
+        MultiValueMap<String, String> header = CollectionUtil.linkedMultiValueMapStringString();
+        header.add("Accept", "application/json;charset=UTF-8");
+        String resultData = HttpUtil.get(platform + "/platform/partner/buyNotice", null, header);
+        ResponseDto<List<KylinBuyNoticeVo>> innerReturnVo = JsonUtils.fromJson(resultData, new TypeReference<ResponseDto<List<KylinBuyNoticeVo>>>() {
+        });
+        return innerReturnVo.getData();
+    }
 
-//    public AdamUserInfoSimpleVo getUserInfo() throws Exception {
-//        MultiValueMap<String, String> header = CollectionUtil.linkedMultiValueMapStringString();
-//        header.add("Accept", "application/json;charset=UTF-8");
-//        header.add("Authorization", "Bearer " + CurrentUtil.getToken());
-//        String resultData = HttpUtil.post(adamUrl + "/adam/user/gif/mobile", null, header);
-//        ResponseDto<AdamUserInfoSimpleVo> innerReturnVo = JsonUtils.fromJson(resultData, new TypeReference<ResponseDto<AdamUserInfoSimpleVo>>() {
-//        });
-//        return innerReturnVo.getData();
-//    }
+    public String getBuyNoticeJsonString(List<String> buyNoticeId) {
+        MultiValueMap<String, String> header = CollectionUtil.linkedMultiValueMapStringString();
+        header.add("Accept", "application/json;charset=UTF-8");
+        String resultData = HttpUtil.get(platform + "/platform/partner/buyNotice/string?buyNoticeId="+ StringUtils.join(buyNoticeId,","), null, header);
+        ResponseDto<String> innerReturnVo = JsonUtils.fromJson(resultData, new TypeReference<ResponseDto<String>>() {
+        });
+        return innerReturnVo.getData();
+    }
 
 }

liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/resources/bootstrap-test.yml

@@ -6,10 +6,10 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    #host: 172.17.207.177:7001
-    instance:
-      prefer-ip-address: true
-    host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka
+    host: 172.17.207.177:7001
+ #   instance:
+ #     prefer-ip-address: true
+#    host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka
 
 # end-test-这里是配置信息基本值
 

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

 #  ---------------------------------------------------------------------------------------------------------------------
 merchant_fields.update_claim_status=UPDATE merchant_fields SET claim_status = ?, updated_at = ? WHERE field_id = ?
 merchant_fields.update_is_check=UPDATE merchant_fields SET is_check = ?, updated_at = ? WHERE field_id = ?
-
 #  ---------------------------------------------------------------------------------------------------------------------
 merchant_field_applies.insert=INSERT INTO merchant_field_applies (field_apply_id, apply_status, apply_type, reject, uid, field_id, name, logo, background, description, built_date, province_id, province_name, city_id, city_name, district_id, district_name, address, longitude, latitude, contact_name, contact_email, company_name, license_code, license_img, legal_name, legal_identity, legal_identity_obverse, legal_identity_reverse, created_at) VALUE (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-
 #  ---------------------------------------------------------------------------------------------------------------------
 merchant_field_checkers.insert=INSERT INTO merchant_field_checkers (field_checker_id, field_id, uid, mobile, name, cuid, created_at) VALUE (?, ?, ?, ?, ?, ?, ?)
 merchant_field_checkers.update=UPDATE merchant_field_checkers SET cuid = ?, updated_at = ?, delete_at = ? WHERE field_checker_id = ?
-
 #  ---------------------------------------------------------------------------------------------------------------------
-merchant_sponsor_applies.insert=INSERT INTO merchant_sponsor_applies (sponsor_apply_id, apply_status, apply_type, reject, uid, name, logo, background, description, contact_name, contact_identity, contact_identity_obverse, contact_identity_reverse, contact_email, company_name, license_code, license_img, legal_name, legal_identity, legal_identity_obverse, legal_identity_reverse, created_at) VALUE (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+merchant_sponsor_applies.insert=INSERT INTO merchant_sponsor_applies (sponsor_apply_id, apply_status, apply_type, reject, uid, name, logo, background, description, contact_name, contact_identity, contact_identity_obverse, contact_identity_reverse, contact_email, company_name, license_code, license_img, legal_name, legal_identity, legal_identity_obverse, legal_identity_reverse, created_at) VALUE (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
\ No newline at end of file
+
+
+
+
+#  ----    演出修改    ----
+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.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)
+#  ----    票种状态修改    ----
+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.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_ticket.updateStep2=UPDATE kylin_tickets SET time_end = ? , time_start = ? ,time_end_express = ? ,pay_countdown_minute = ? WHERE tickets_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
+kylin_ticket_status.updateStep2=UPDATE kylin_ticket_status SET WHERE ticket_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
+#  ----    VoStatus    ----
+kylin_ticket_status.VoStatus=UPDATE kylin_ticket_status SET status = ?, surplus_general = ? WHERE ticket_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
+kylin_performance_status.VoStatus=UPDATE kylin_performance_status SET status = ? WHERE performance_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
+# ----    createPerformanceMySql    ----
+kylin_performances.del=DELETE FROM kylin_performances WHERE performances_id = ?
+kylin_performance_status.del=DELETE FROM kylin_performance_status WHERE performance_id = ?
+kylin_performance_relations.del=DELETE FROM kylin_performance_relations WHERE performance_id = ?
+
+kylin_performances.insert=DELETE FROM kylin_performances WHERE performances_id = ?
+kylin_performance_status.insert=DELETE FROM kylin_performance_status WHERE performance_id = ?
+kylin_performance_relations.insert=DELETE FROM kylin_performance_relations WHERE performance_id = ?
+
+kylin_ticket_times.del=DELETE FROM kylin_ticket_times WHERE ticket_times_id = ?
+kylin_ticket_time_relation.del=DELETE FROM kylin_ticket_time_relation WHERE times_id = ?
+
+kylin_ticket_times.insert=DELETE FROM kylin_ticket_times WHERE ticket_times_id = ?
+kylin_ticket_time_relation.insert=DELETE FROM kylin_ticket_time_relation WHERE times_id = ?
+
+kylin_tickets.del=DELETE FROM kylin_tickets WHERE tickets_id = ?
+kylin_ticket_status.del=DELETE FROM kylin_ticket_status WHERE ticket_id = ?
+kylin_ticket_relations.del=DELETE FROM kylin_ticket_relations WHERE ticket_id = ?
+
+kylin_tickets.insert=DELETE FROM kylin_tickets WHERE tickets_id = ?
+kylin_ticket_status.insert=DELETE FROM kylin_ticket_status WHERE ticket_id = ?
+kylin_ticket_relations.insert=DELETE FROM kylin_ticket_relations WHERE ticket_id = ?

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

@@ -5,14 +5,18 @@ import com.github.pagehelper.PageInfo;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.dto.vo.middle.KylinBuyNoticeVo;
 import com.liquidnet.service.kylin.service.partner.IKylinBuyNoticePartnerService;
+import com.liquidnet.service.platform.utils.DataUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * <p>
  * 购票须知表 前端控制器
@@ -21,24 +25,33 @@ import org.springframework.web.bind.annotation.RestController;
  * @author liquidnet
  * @since 2021-05-18
  */
-@Api(tags = "第三方-购票须知",position = 1004)
+@Api(tags = "第三方-购票须知", position = 1004)
 @RestController
 @RequestMapping("partner/buyNotice")
 public class KylinBuyNoticeParnterController {
 
     @Autowired
     private IKylinBuyNoticePartnerService buyNoticePartnerService;
+    @Autowired
+    private DataUtils dataUtils;
 
     @GetMapping(value = "")
-    @ApiOperation(value = "购票须知列表",position = 1)
+    @ApiOperation(value = "购票须知列表", position = 1)
     @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<PageInfo<KylinBuyNoticeVo>> getBuyNotice() {
+    public ResponseDto<List<KylinBuyNoticeVo>> getBuyNotice() {
         PageInfo<KylinBuyNoticeVo> result = buyNoticePartnerService.getBuyNotice();
         if (null == result) {
             return ResponseDto.failure("查询失败");
         } else {
-            return ResponseDto.success(result);
+            return ResponseDto.success(result.getList());
         }
     }
 
+    @GetMapping(value = "string")
+    @ApiOperation(value = "购票须知列表String", position = 1)
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    public ResponseDto<String> getBuyNoticeJsonString(@RequestParam("buyNoticeId") String buyNoticeId) {
+        return ResponseDto.success(dataUtils.getBuyNoticeJsonString(buyNoticeId.split(",")));
+    }
+
 }

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

@@ -42,8 +42,9 @@ public class KylinTicketTimesPartnerController {
     @DeleteMapping(value = "")
     @ApiOperation(value = "删除场次",position = 2)
     @ApiResponse(response = KylinTicketTimesPartnerVo.class, code = 200, message = "接口返回对象参数")
-    public ResponseDto<String> deleteTimes(@RequestParam("ticketTimesId") @NotNull(message = "场次ID不能为空") String ticketTimesId) {
-        return ticketTimesPartnerService.deleteTimes(ticketTimesId);
+    public ResponseDto<String> deleteTimes(@RequestParam("ticketTimesId") @NotNull(message = "场次ID不能为空") String ticketTimesId,
+                                           @RequestParam("performanceId") @NotNull(message = "演出ID不能为空") String performanceId) {
+        return ticketTimesPartnerService.deleteTimes(ticketTimesId,performanceId);
     }
 
     @PutMapping(value = "")

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

@@ -49,8 +49,9 @@ public class KylinTicketsPartnerController {
     @DeleteMapping(value = "")
     @ApiOperation(value = "删除票务",position = 3)
     @ApiResponse( code = 200, message = "接口返回对象参数")
-    public ResponseDto<String> deleteTicket(@RequestParam("ticketsId") @NotNull(message = "票务ID不能为空") String ticketsId) {
-        return ticketsPartnerService.deleteTicket(ticketsId);
+    public ResponseDto<String> deleteTicket(@RequestParam("ticketsId") @NotNull(message = "票务ID不能为空") String ticketsId,
+                                            @RequestParam("performanceId") @NotNull(message = "演出ID不能为空") String performanceId) {
+        return ticketsPartnerService.deleteTicket(ticketsId,performanceId);
     }
 
     @PostMapping(value = "/copy")

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

@@ -8,6 +8,7 @@ import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.BeanUtil;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
+import com.liquidnet.commons.lang.util.StringUtil;
 import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.base.UserPathDto;
@@ -143,7 +144,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
             performancePartnerVo.setProjectId("0");
             performancePartnerVo.setIsShow(1);
             performancePartnerVo.setFieldName((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + performancePartnerVo.getFieldId(), "name"));
-            performancePartnerVo.setNoticeImage(dataUtils.getBuyNoticeJsonString(step1Param.getNoticeIds()));
+            performancePartnerVo.setNoticeImage(dataUtils.getBuyNoticeJsonString(step1Param.getNoticeIds().toArray(new String[step1Param.getNoticeIds().size()])));
 
             mongoTemplate.insert(
                     performancePartnerVo, PerformancePartnerVo.class.getSimpleName()
@@ -175,9 +176,9 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
             performancePartnerVo.setUpdatedAt(timeNow.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
             performancePartnerVo.setIsSubmit(0);
             performancePartnerVo.setStatus(0);
-            performancePartnerVo.setNoticeImage(dataUtils.getBuyNoticeJsonString(step1Param.getNoticeIds()));
+            performancePartnerVo.setNoticeImage(dataUtils.getBuyNoticeJsonString(step1Param.getNoticeIds().toArray(new String[step1Param.getNoticeIds().size()])));
             performancePartnerVo.setFieldName((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + performancePartnerVo.getFieldId(), "name"));
-            performancePartnerVo.setNoticeImage(dataUtils.getBuyNoticeJsonString(step1Param.getNoticeIds()));
+            performancePartnerVo.setNoticeImage(dataUtils.getBuyNoticeJsonString(step1Param.getNoticeIds().toArray(new String[step1Param.getNoticeIds().size()])));
             if (data != null) { // 有修改记录
                 performancePartnerVo.setIsTrueName(data.getIsTrueName());
                 performancePartnerVo.setLimitCount(data.getLimitCount());

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

@@ -170,7 +170,7 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
     }
 
     @Override
-    public ResponseDto<String> deleteTimes(String ticketTimesId) {
+    public ResponseDto<String> deleteTimes(String ticketTimesId,String performanceId) {
         try {
             LocalDateTime updatedAt = LocalDateTime.now();
 

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

@@ -259,7 +259,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
     }
 
     @Override
-    public ResponseDto<String> deleteTicket(String ticketsId) {
+    public ResponseDto<String> deleteTicket(String ticketsId,String performanceId) {
         try {
             LocalDateTime updatedAt = LocalDateTime.now();
 

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/utils/DataUtils.java

@@ -49,7 +49,7 @@ public class DataUtils {
      * @param buyNoticeIds 购票须知 数组
      * @return 购票须知 json串
      */
-    public String getBuyNoticeJsonString(List<String> buyNoticeIds) {
+    public String getBuyNoticeJsonString(String[] buyNoticeIds) {
         List<KylinBuyNotice> data = buyNoticeMapper.selectList(new UpdateWrapper<KylinBuyNotice>().in("buy_notice_id", buyNoticeIds));
         return JsonUtils.toJson(data);
     }