Merge branch 'dev' into test

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

@@ -26,6 +26,8 @@ public class PerformanceOrderStatisticalVo {
     private Integer type;
     @ApiModelProperty(value = "适用时间")
     private String useStart;
+    @ApiModelProperty(value = "适用时间")
+    private String useEnd;
     @ApiModelProperty(value = "总库存")
     private BigDecimal totalGeneral = BigDecimal.ZERO;
     @ApiModelProperty(value = "销售数量")

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

@@ -48,6 +48,8 @@ public class KylinOrderTicketEntitiesVo implements Serializable, Cloneable {
 
     private LocalDateTime changeDate;
 
+    private BigDecimal canRefundedPrice;
+
     public BigDecimal getRefundPrice() {
         return refundPrice==null?BigDecimal.valueOf(0.00):refundPrice;
     }

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

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.entity.KylinLackRegisters;
 
-public interface IKylinLackRegistersService extends IService<KylinLackRegisters> {
+public interface IKylinLackRegistersService  {
 
     ResponseDto<String> addLackRegister(String performanceId,String ticketId);
 

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

@@ -11,6 +11,6 @@ import com.liquidnet.service.kylin.entity.KylinOrderExpress;
  * @author jiangxiulong
  * @since 2021-05-02
  */
-public interface IKylinOrderExpress extends IService<KylinOrderExpress> {
+public interface IKylinOrderExpress  {
 
 }

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

@@ -11,6 +11,6 @@ import com.liquidnet.service.kylin.entity.KylinOrderRefundBatches;
  * @author jiangxiulong
  * @since 2021-05-25
  */
-public interface IKylinOrderRefundBatchesService extends IService<KylinOrderRefundBatches> {
+public interface IKylinOrderRefundBatchesService{
 
 }

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

@@ -11,6 +11,6 @@ import com.liquidnet.service.kylin.entity.KylinOrderRefundPic;
  * @author liquidnet
  * @since 2021-05-06
  */
-public interface IKylinOrderRefundPicService extends IService<KylinOrderRefundPic> {
+public interface IKylinOrderRefundPicService {
 
 }

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

@@ -11,6 +11,6 @@ import com.liquidnet.service.kylin.entity.KylinOrderRefundEntities;
  * @author jiangxiulong
  * @since 2021-06-16
  */
-public interface IKylinOrderRefundsEntitiesService extends IService<KylinOrderRefundEntities> {
+public interface IKylinOrderRefundsEntitiesService {
 
 }

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

@@ -11,6 +11,6 @@ import com.liquidnet.service.kylin.entity.KylinOrderRefunds;
  * @author jiangxiulong
  * @since 2021-05-26
  */
-public interface IKylinOrderRefundsService extends IService<KylinOrderRefunds> {
+public interface IKylinOrderRefundsService  {
 
 }

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

@@ -12,7 +12,7 @@ import com.liquidnet.service.kylin.entity.KylinOrderTicketEntities;
  * @author liquidnet
  * @since 2021-05-20
  */
-public interface IKylinOrderTicketEntitiesService extends IService<KylinOrderTicketEntities> {
+public interface IKylinOrderTicketEntitiesService  {
 
     void updateByStation(KylinStationUploadParam parameter);
 }

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

@@ -12,6 +12,6 @@ import com.liquidnet.service.kylin.entity.KylinOrderTicketStatus;
  * @author liquidnet
  * @since 2021-05-20
  */
-public interface IKylinOrderTicketRelationsService extends IService<KylinOrderTicketRelations> {
+public interface IKylinOrderTicketRelationsService {
 
 }

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

@@ -22,6 +22,6 @@ import java.util.List;
  * @author liquidnet
  * @since 2021-05-20
  */
-public interface IKylinOrderTicketStatusService extends IService<KylinOrderTicketStatus> {
+public interface IKylinOrderTicketStatusService {
 
 }

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

@@ -20,7 +20,7 @@ import java.util.List;
  * @author liquidnet
  * @since 2021-05-20
  */
-public interface IKylinOrderTicketsService extends IService<KylinOrderTickets> {
+public interface IKylinOrderTicketsService  {
 
     // 下单前判断接口(判断是否可锁定库存)(无订单->待支付->可支付)
     ResponseDto<PayResultVo> checkCanOrder(PayOrderParam payOrderParam);
@@ -39,9 +39,6 @@ public interface IKylinOrderTicketsService extends IService<KylinOrderTickets> {
     //订单详情
     OrderDetailsVo orderDetails(String orderId);
 
-    //TASK 倒计时
-    boolean checkOrderTime(String userId);
-
     //去 PHP pay检查 订单状态
     ResponseDto<Integer> checkOrderResult(String orderId);
 
@@ -62,7 +59,7 @@ public interface IKylinOrderTicketsService extends IService<KylinOrderTickets> {
      * @param picList                   证据截图
      * @return                          是否成功
      */
-    ResponseDto<Boolean> sendOrderRefund(String orderId, String orderTicketEntitiesId, String reason, String picList);
+    ResponseDto<String> sendOrderRefund(String orderId, String orderTicketEntitiesId, String reason, String picList);
 
     //退款撤回
     Boolean orderRefundWithdraw(String orderRefundsId);

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

@@ -14,5 +14,5 @@ import java.util.List;
  * @author liquidnet
  * @since 2021-05-05
  */
-public interface IKylinPerformancesService extends IService<KylinPerformances> {
+public interface IKylinPerformancesService  {
 }

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

@@ -11,6 +11,6 @@ import com.liquidnet.service.kylin.entity.KylinRoadShows;
  * @author liquidnet
  * @since 2021-05-11
  */
-public interface IKylinRoadShowsService extends IService<KylinRoadShows> {
+public interface IKylinRoadShowsService  {
 
 }

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

@@ -11,6 +11,6 @@ import com.liquidnet.service.kylin.entity.KylinTicketTimes;
  * @author liquidnet
  * @since 2021-05-06
  */
-public interface IKylinTicketTimesService extends IService<KylinTicketTimes> {
+public interface IKylinTicketTimesService {
 
 }

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

@@ -11,6 +11,6 @@ import com.liquidnet.service.kylin.entity.KylinTickets;
  * @author liquidnet
  * @since 2021-05-06
  */
-public interface IKylinTicketsService extends IService<KylinTickets> {
+public interface IKylinTicketsService  {
 
 }

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/admin/IKylinBannersService.java

@@ -11,6 +11,6 @@ import com.liquidnet.service.kylin.entity.KylinBanners;
  * @author jiangxiulong
  * @since 2021-05-02
  */
-public interface IKylinBannersService extends IService<KylinBanners> {
+public interface IKylinBannersService {
 
 }

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/admin/IKylinOrderTicketsAdminService.java

@@ -17,7 +17,7 @@ import java.util.List;
  * @Copyright: LightNet @ Copyright (c) 2021
  * @date 2021/6/6 11:53
  */
-public interface IKylinOrderTicketsAdminService extends IService<KylinOrderTickets> {
+public interface IKylinOrderTicketsAdminService {
     //订单列表(状态 待支付 已支付 倒计时 已失效)
     List<OrderTicketsListDao> orderList(OrderListReq orderListReq);
 

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/admin/IKylinPerformancesAdminService.java

@@ -22,7 +22,7 @@ import java.util.List;
  * @author liquidnet
  * @since 2021-05-05
  */
-public interface IKylinPerformancesAdminService extends IService<KylinPerformances> {
+public interface IKylinPerformancesAdminService {
 
     /**
      * 获取演出详情

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/admin/IKylinRoadShowsAdminService.java

@@ -15,7 +15,7 @@ import com.liquidnet.service.kylin.entity.KylinRoadShows;
  * @author liquidnet
  * @since 2021-05-11
  */
-public interface IKylinRoadShowsAdminService extends IService<KylinRoadShows> {
+public interface IKylinRoadShowsAdminService {
 
     /**
      * 创建巡演

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

@@ -13,7 +13,7 @@ import com.liquidnet.service.kylin.entity.KylinBuyNotice;
  * @author liquidnet
  * @since 2021-05-18
  */
-public interface IKylinBuyNoticePartnerService extends IService<KylinBuyNotice> {
+public interface IKylinBuyNoticePartnerService {
 
     /**
      * 购票须知列表

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

@@ -15,7 +15,7 @@ import com.liquidnet.service.kylin.entity.KylinCheckUser;
  * @author liquidnet
  * @since 2021-05-21
  */
-public interface IKylinCheckUserPartnerService extends IService<KylinCheckUser> {
+public interface IKylinCheckUserPartnerService {
 
     // 子账号列表
     PageInfo<ChildListDao> getCheckUserList(String merchantId, String mobile, int page, int size);

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

@@ -17,7 +17,7 @@ import java.util.List;
  * @author liquidnet
  * @since 2021-05-21
  */
-public interface IKylinCheckUserPerformancesPartnerService extends IService<KylinCheckUserPerformances> {
+public interface IKylinCheckUserPerformancesPartnerService  {
 
     // 已配置列表
     ResponseDto<PageInfo<ChildPerformanceDao>> childPerformanceList(String merchantId,String checkUserId,int page,int size,String name);

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

@@ -21,7 +21,7 @@ import java.util.List;
  * @author liquidnet
  * @since 2021-05-05
  */
-public interface IKylinPerformancesPartnerService extends IService<KylinPerformances> {
+public interface IKylinPerformancesPartnerService {
 
 
     /**

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

@@ -16,7 +16,7 @@ import java.util.List;
  * @author liquidnet
  * @since 2021-05-06
  */
-public interface IKylinTicketTimesPartnerService extends IService<KylinTicketTimes> {
+public interface IKylinTicketTimesPartnerService {
 
 
     /**

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

@@ -16,7 +16,7 @@ import java.util.List;
  * @author liquidnet
  * @since 2021-05-06
  */
-public interface IKylinTicketsPartnerService extends IService<KylinTickets> {
+public interface IKylinTicketsPartnerService {
 
     /**
      * 创建票汇总

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/PerformanceCalendarController.java

@@ -9,7 +9,7 @@ import com.liquidnet.client.admin.zhengzai.kylin.dto.PerformanceCalendarResp;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.StringUtil;
 import com.liquidnet.service.kylin.entity.KylinPerformances;
-import com.liquidnet.service.kylin.service.admin.IKylinPerformancesAdminService;
+import com.liquidnet.service.kylin.mapper.KylinPerformancesMapper;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -38,7 +38,7 @@ public class PerformanceCalendarController extends BaseController{
     private String prefix = "zhengzai/kylin/performanceCalendar";
 
     @Autowired
-    private IKylinPerformancesAdminService kylinPerformancesAdminService;
+    private KylinPerformancesMapper performancesMapper;
 
     @RequiresPermissions("kylin:performanceCalendar:view")
     @GetMapping()
@@ -84,7 +84,7 @@ public class PerformanceCalendarController extends BaseController{
             wrapper.le(KylinPerformances::getTimeStart, DateUtil.addDay(DateUtil.parse(performanceCalendarReq.getTimeEnd(),DateUtil.DATE_SMALL_STR),1));
         }
 
-        List<KylinPerformances> list = kylinPerformancesAdminService.list(wrapper);
+        List<KylinPerformances> list = performancesMapper.selectList(wrapper);
 
         String[][] dateArray2 = getDateList(DateUtil.parse(startTime,DateUtil.DATE_SMALL_STR),days);
         //初始化对象

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinPerformancesMapper.xml

@@ -85,6 +85,7 @@
         <result column="price" property="price"/>
         <result column="type" property="type"/>
         <result column="use_start" property="useStart"/>
+        <result column="use_end" property="useEnd"/>
         <result column="total_general" property="totalGeneral"/>
         <result column="sale_general" property="saleGeneral"/>
         <result column="surplus_general" property="surplusGeneral"/>
@@ -394,6 +395,7 @@
             kt.price,
             kt.type,
             kt.use_start,
+            kt.use_end,
             IFNULL(kts.total_general , 0) AS 'total_general' ,
             IFNULL(ot.total_sale_general , 0) AS 'sale_general' ,
             IFNULL((kts.total_general - IFNULL(ot.total_sale_general,0) - IFNULL(otp.total_paying_number , 0)),0) AS 'surplus_general',

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/pom.xml

@@ -14,7 +14,7 @@
         <!-- kylin -->
         <dependency>
             <groupId>com.liquidnet</groupId>
-            <artifactId>liquidnet-service-kylin-api</artifactId>
+            <artifactId>liquidnet-api-feign-kylin</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
 

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

@@ -19,7 +19,6 @@ import java.util.Arrays;
 
 @Slf4j
 @EnableFeignClients
-@MapperScan(basePackages = "com.liquidnet.service.kylin.mapper")
 @SpringBootApplication(scanBasePackages = {"com.liquidnet"})
 public class ServiceKylinApplication implements CommandLineRunner {
     @Autowired

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

-package com.liquidnet.service.kylin.controller;
-
-import com.liquidnet.service.base.ResponseDto;
-import com.liquidnet.service.kylin.dto.param.RefundCallbackParam;
-import com.liquidnet.service.kylin.service.impl.DataImpl;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-
-@Api(tags = "数据迁移 (会重复)")
-@RestController
-@RequestMapping("data")
-public class DataController {
-
-    @Autowired
-    private DataImpl data;
-
-    @PostMapping("performance")
-    @ApiOperation("演出数据迁移")
-    public ResponseDto<Boolean> performance() {
-        Boolean result = data.performance();
-        return ResponseDto.success(result);
-    }
-
-    @PostMapping("order")
-    @ApiOperation("订单数据迁移")
-    public ResponseDto<Boolean> order(String month) {
-        Boolean result = data.order(month);
-        return ResponseDto.success(result);
-    }
-
-    @PostMapping("roadShow")
-    @ApiOperation("巡演数据迁移")
-    public ResponseDto<Boolean> roadShow() {
-        Boolean result = data.roadShow();
-        return ResponseDto.success(result);
-    }
-
-}

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

-package com.liquidnet.service.kylin.controller;
-
-import com.liquidnet.service.base.ResponseDto;
-import com.liquidnet.service.kylin.dto.vo.KylinFieldsVo;
-import com.liquidnet.service.kylin.service.impl.FieldsServiceImpl;
-import io.swagger.annotations.*;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.HashMap;
-
-@Api
-@RestController
-@RequestMapping("kylin/user/fields")
-public class FieldsController {
-
-    @Autowired
-    private FieldsServiceImpl fieldsService;
-
-//    @GetMapping(value = "details")
-//    @ApiOperation(value = "获取场地详情")
-//    @ApiResponse(response = FieldsVo.class, code = 200, message = "接口返回对象参数")
-    public ResponseDto<KylinFieldsVo> fieldDetails(@RequestParam(value = "fieldId", defaultValue = "59666659929161728") String fieldId) {
-        KylinFieldsVo result = null;
-        result = fieldsService.fieldDetails(fieldId);
-        if (null == result) {
-            return ResponseDto.failure("场地详情查询失败");
-        } else {
-            return ResponseDto.success(result);
-        }
-    }
-
-//    @GetMapping(value = "list")
-//    @ApiOperation(value = "获取场地列表")
-//    @ApiResponse(response = FieldsVo.class, code = 200, message = "接口返回对象参数")
-    public ResponseDto<HashMap<String, Object>> fieldList(@RequestParam(value = "page", defaultValue = "1") int page,@RequestParam(value = "size", defaultValue = "10") int size,@RequestParam(value = "city_id", defaultValue = "1") int city_id) {
-        HashMap<String, Object> result = null;
-        result = fieldsService.fieldList(page-1,size,city_id);
-        if (null == result) {
-            return ResponseDto.failure("场地列表获取失败");
-        } else {
-            return ResponseDto.success(result);
-        }
-    }
-}

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

@@ -100,11 +100,14 @@ public class KylinOrderTicketsController {
     @PostMapping("sendOrderRefunds")
     @ApiOperation("发起退款申请")
     @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<Boolean> sendOrderRefund(@RequestParam(value = "orderId", required = true) @NotNull(message = "订单id不能为空") String orderId,
+    public ResponseDto<HashMap<String,String>> sendOrderRefund(@RequestParam(value = "orderId", required = true) @NotNull(message = "订单id不能为空") String orderId,
                                                 @RequestParam(value = "orderTicketEntitiesId", required = true) @NotNull(message = "票单id不能为空") String orderTicketEntitiesId,
                                                 @RequestParam(value = "reason", required = true) @NotNull(message = "退款原因不能为空") String reason,
                                                 @RequestParam(value = "picList", required = false) String picList) {
-        return orderTicketsService.sendOrderRefund(orderId, orderTicketEntitiesId, reason, picList);
+        String orderRefundId = orderTicketsService.sendOrderRefund(orderId, orderTicketEntitiesId, reason, picList).getData();
+        HashMap<String,String> map = new HashMap<String,String>();
+        map.put("orderRefundsId",orderRefundId);
+        return ResponseDto.success(map);
     }
 
     @GetMapping("orderRefundDetails")
@@ -146,12 +149,4 @@ public class KylinOrderTicketsController {
         map.put("unPayCount", unPayCount);
         return ResponseDto.success(map);
     }
-
-
-    @PostMapping("checkOrderTime")
-    @ApiOperation("订单过期脚本")
-    @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<Boolean> checkOrderTime() {
-        return ResponseDto.success(orderTicketsService.checkOrderTime(""));
-    }
 }

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

@@ -211,12 +211,6 @@ public class KylinPerformancesController {
         }
     }
 
-    @PostMapping("/checkPerformanceTime")
-    @ApiOperation("演出脚本")
-    public ResponseDto<String> checkPerformanceTime(@RequestParam(value = "performancesId",required = false)String performancesId){
-        return ResponseDto.success(kylinPerformancesService.checkPerformanceTime(performancesId));
-    }
-
     @PostMapping("lackRegister")
     @ApiOperation("缺票登记")
     @ApiImplicitParams({

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/partner/FieldsPartnerController.java

-package com.liquidnet.service.kylin.controller.partner;
-
-import com.liquidnet.service.base.ResponseDto;
-import com.liquidnet.service.kylin.dto.vo.KylinFieldsVo;
-import com.liquidnet.service.kylin.service.impl.partner.FieldsPartnerServiceImpl;
-import io.swagger.annotations.Api;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.HashMap;
-
-@Api
-@RestController
-@RequestMapping("partner/fields")
-public class FieldsPartnerController {
-
-    @Autowired
-    private FieldsPartnerServiceImpl fieldsPartnerService;
-
-//    @GetMapping(value = "details")
-//    @ApiOperation(value = "获取场地详情")
-//    @ApiResponse(response = FieldsVo.class, code = 200, message = "接口返回对象参数")
-    public ResponseDto<KylinFieldsVo> fieldDetails(@RequestParam(value = "fieldId", defaultValue = "59666659929161728") String fieldId) {
-        KylinFieldsVo result = null;
-        result = fieldsPartnerService.fieldDetails(fieldId);
-        if (null == result) {
-            return ResponseDto.failure("场地详情查询失败");
-        } else {
-            return ResponseDto.success(result);
-        }
-    }
-
-//    @GetMapping(value = "list")
-//    @ApiOperation(value = "获取场地列表")
-//    @ApiResponse(response = FieldsVo.class, code = 200, message = "接口返回对象参数")
-    public ResponseDto<HashMap<String, Object>> fieldList(@RequestParam(value = "page", defaultValue = "1") int page, @RequestParam(value = "size", defaultValue = "10") int size, @RequestParam(value = "name", defaultValue = "") String name) {
-        HashMap<String, Object> result = null;
-        result = fieldsPartnerService.fieldList(page-1,size,name);
-        if (null == result) {
-            return ResponseDto.failure("场地列表获取失败");
-        } else {
-            return ResponseDto.success(result);
-        }
-    }
-
-}

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

-package com.liquidnet.service.kylin.controller.partner;
-
-
-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.impl.partner.KylinBuyNoticePartnerServiceImpl;
-import com.liquidnet.service.kylin.service.partner.IKylinBuyNoticePartnerService;
-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.*;
-
-/**
- * <p>
- * 购票须知表 前端控制器
- * </p>
- *
- * @author liquidnet
- * @since 2021-05-18
- */
-@Api(tags = "第三方-购票须知",position = 1004)
-@RestController
-@RequestMapping("partner/buyNotice")
-public class KylinBuyNoticeParnterController {
-
-    @Autowired
-    private IKylinBuyNoticePartnerService buyNoticePartnerService;
-
-    @GetMapping(value = "")
-    @ApiOperation(value = "购票须知列表",position = 1)
-    @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<PageInfo<KylinBuyNoticeVo>> getBuyNotice() {
-        PageInfo<KylinBuyNoticeVo> result = buyNoticePartnerService.getBuyNotice();
-        if (null == result) {
-            return ResponseDto.failure("查询失败");
-        } else {
-            return ResponseDto.success(result);
-        }
-    }
-
-}

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/partner/KylinCheckUserPartnerController.java

-package com.liquidnet.service.kylin.controller.partner;
-
-
-import com.github.pagehelper.PageInfo;
-import com.liquidnet.service.base.ResponseDto;
-import com.liquidnet.service.kylin.dao.ChildDetailsDao;
-import com.liquidnet.service.kylin.dao.ChildListDao;
-import com.liquidnet.service.kylin.service.impl.partner.KylinCheckUserPartnerServiceImpl;
-import com.liquidnet.service.kylin.service.partner.IKylinCheckUserPartnerService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiResponse;
-import org.hibernate.validator.constraints.Length;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
-
-/**
- * <p>
- * 验票用户表 前端控制器
- * </p>
- *
- * @author liquidnet
- * @since 2021-05-21
- */
-@Api(tags = "第三方-验票账号")
-@RestController
-@RequestMapping("partner/checkUser")
-@Validated
-public class KylinCheckUserPartnerController {
-
-    @Autowired
-    private IKylinCheckUserPartnerService checkUserPartnerService;
-
-    @PostMapping(value = "")
-    @ApiOperation(value = "创建验票账号", position = 1)
-    @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<String> create(@RequestParam("merchantId") @NotNull String merchantId,
-                                      @RequestParam("name") @NotNull String name,
-                                      @RequestParam("pwd") @NotNull String pwd,
-                                      @RequestParam("mobile") @NotNull @Length(max = 11) String mobile) {
-        return checkUserPartnerService.create(merchantId, name, pwd, mobile);
-    }
-
-    @DeleteMapping(value = "")
-    @ApiOperation(value = "删除验票账号", position = 1)
-    @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<String> del(@RequestParam("merchantId") @NotNull String merchantId,
-                                   @RequestParam("checkUserId") @NotNull String checkUserId) {
-        return checkUserPartnerService.del(merchantId, checkUserId);
-    }
-
-    @PutMapping(value = "")
-    @ApiOperation(value = "修改验票账号", position = 1)
-    @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<String> change(@RequestParam("merchantId") @NotNull String merchantId,
-                                      @RequestParam("checkUserId") @NotNull String checkUserId,
-                                      @RequestParam("name") @NotNull String name,
-                                      @RequestParam(value = "pwd",required = false) @NotNull String pwd,
-                                      @RequestParam("mobile") @Length(max = 11) String mobile) {
-        return checkUserPartnerService.change(merchantId, checkUserId, name, pwd, mobile);
-    }
-
-    @GetMapping(value = "list")
-    @ApiOperation(value = "验票账号列表", position = 1)
-    @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<PageInfo<ChildListDao>> getCheckUserList(@RequestParam("merchantId") @NotNull String merchantId,
-                                                                    @RequestParam(value = "mobile" , required = false) @Length(max = 11) String mobile,
-                                                                    @RequestParam("page") @NotNull @Min(1) int page,
-                                                                    @RequestParam("size") @NotNull @Min(1)int size) {
-        PageInfo<ChildListDao> result = checkUserPartnerService.getCheckUserList(merchantId,mobile,page,size);
-        if (null == result) {
-            return ResponseDto.failure("查询失败");
-        } else {
-            return ResponseDto.success(result);
-        }
-    }
-
-    @GetMapping(value = "details")
-    @ApiOperation(value = "验票账号详情", position = 1)
-    @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<ChildDetailsDao> details(@RequestParam("merchantId") @NotNull String merchantId,
-                                                @RequestParam("checkUserId") @NotNull String checkUserId) {
-        ResponseDto<ChildDetailsDao> result = checkUserPartnerService.details(merchantId,checkUserId);
-        if (null == result) {
-            return ResponseDto.failure("查询失败");
-        } else {
-            return result;
-        }
-    }
-
-}

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/partner/KylinCheckUserPerformancesPartnerController.java

-package com.liquidnet.service.kylin.controller.partner;
-
-
-import com.github.pagehelper.PageInfo;
-import com.liquidnet.service.base.ResponseDto;
-import com.liquidnet.service.kylin.dao.ChildPerformanceDao;
-import com.liquidnet.service.kylin.dto.param.CheckPerformanceRelationParam;
-import com.liquidnet.service.kylin.dto.param.CheckUserParam;
-import com.liquidnet.service.kylin.mapper.KylinCheckUserPerformancesMapper;
-import com.liquidnet.service.kylin.service.impl.partner.KylinCheckUserPerformancesPartnerServiceImpl;
-import com.liquidnet.service.kylin.service.impl.partner.KylinTicketsPartnerServiceImpl;
-import com.liquidnet.service.kylin.service.partner.IKylinCheckUserPerformancesPartnerService;
-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.Min;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
-import java.time.LocalDateTime;
-import java.util.List;
-
-/**
- * <p>
- * 验票用户可看演出表 前端控制器
- * </p>
- *
- * @author liquidnet
- * @since 2021-05-21
- */
-@Api(tags = "第三方-验票账号关联演出")
-@RestController
-@RequestMapping("partner/checkUser/performance")
-@Validated
-public class KylinCheckUserPerformancesPartnerController {
-
-    @Autowired
-    private IKylinCheckUserPerformancesPartnerService userPerformancesPartnerService;
-
-    @PostMapping(value = "")
-    @ApiOperation(value = "添加关联关系", position = 1)
-    @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<String> setPerformance(@RequestBody @Valid CheckUserParam param) {
-        return userPerformancesPartnerService.setPerformance(param);
-    }
-
-    @DeleteMapping(value = "")
-    @ApiOperation(value = "删除关联关系", position = 1)
-    @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<String> delPerformance(@RequestParam("performanceIds") @Size(min = 1) @NotNull List<String> performanceIds,
-                                              @RequestParam("checkUserId") String checkUserId) {
-        return userPerformancesPartnerService.delPerformance(performanceIds, checkUserId);
-    }
-
-    @GetMapping(value = "relation")
-    @ApiOperation(value = "关联演出列表", position = 1)
-    @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<PageInfo<ChildPerformanceDao>> childPerformanceList(@RequestParam("merchantId") @NotNull String merchantId,
-                                                                           @RequestParam("checkUserId") @NotNull String checkUserId,
-                                                                           @RequestParam("page") @NotNull @Min(1) int page,
-                                                                           @RequestParam("size") @NotNull @Min(1)int size,
-                                                                           @RequestParam("name") String name) {
-        return userPerformancesPartnerService.childPerformanceList(merchantId, checkUserId, page, size,name);
-    }
-
-    @GetMapping(value = "unRelation")
-    @ApiOperation(value = "未关联演出列表", position = 1)
-    @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<PageInfo<ChildPerformanceDao>> unChildPerformanceList(@RequestParam("merchantId") @NotNull String merchantId,
-                                                                             @RequestParam("checkUserId") @NotNull String checkUserId,
-                                                                             @RequestParam("page") @NotNull @Min(1) int page,
-                                                                             @RequestParam("size") @NotNull @Min(1) int size,
-                                                                             @RequestParam("name") String name) {
-        return userPerformancesPartnerService.unChildPerformanceList(merchantId, checkUserId, page, size,name);
-    }
-}

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

-package com.liquidnet.service.kylin.controller.partner;
-
-
-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.impl.partner.KylinTicketTimesPartnerServiceImpl;
-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 String ticketTimesId) {
-        return ticketTimesPartnerService.deleteTimes(ticketTimesId);
-    }
-
-    @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 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-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/partner/KylinTicketsPartnerController.java

-package com.liquidnet.service.kylin.controller.partner;
-
-
-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.impl.partner.KylinTicketsPartnerServiceImpl;
-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 String ticketsId) {
-        return ticketsPartnerService.deleteTicket(ticketsId);
-    }
-
-    @PostMapping(value = "/copy")
-    @ApiOperation(value = "复制票务",position = 4)
-    @ApiResponse(response = KylinTicketPartnerVo.class, code = 200, message = "接口返回对象参数")
-    public ResponseDto<KylinTicketPartnerVo> copyTicket(@RequestParam("performancesId") @NotNull String performancesId,@RequestParam("ticketsId") @NotNull 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 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 String ticketsId,@RequestParam("performancesId") @NotNull 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 String ticketsId,@RequestParam("performancesId") @NotNull String performancesId) {
-        return ticketsPartnerService.outLine(ticketsId,performancesId);
-    }
-}

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

-package com.liquidnet.service.kylin.controller.partner;
-
-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 com.liquidnet.service.kylin.utils.OtherUtils;
-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 OtherUtils otherUtils;
-    @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 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 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 String performancesId) {
-        return performancesPartnerService.getStep2(performancesId);
-    }
-
-    @PostMapping(value = "online")
-    @ApiOperation(value = "演出上线",position = 7)
-    @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<String> onLinePerformance(@RequestParam("performancesId") @NotNull String performancesId) {
-        return performancesPartnerService.onLinePerformance(performancesId);
-    }
-
-    @PostMapping(value = "outline")
-    @ApiOperation(value = "演出下线",position = 8)
-    @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<String> outLinePerformance(@RequestParam("performancesId") @NotNull String performancesId) {
-        return performancesPartnerService.outLinePerformance(performancesId);
-    }
-
-    @PostMapping(value = "withdraw")
-    @ApiOperation(value = "演出撤回",position = 9)
-    @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<String> withdraw(@RequestParam("performancesId") @NotNull 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 String performancesId) {
-        List<PerformanceOrderStatisticalVo> list =performancesPartnerService.getPerformanceOrderStatisticalList(performancesId);
-        return ResponseDto.success(list);
-    }
-}

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

 package com.liquidnet.service.kylin.service.impl;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.service.kylin.dto.vo.KylinBannersVo;
-import com.liquidnet.service.kylin.entity.KylinBanners;
-import com.liquidnet.service.kylin.mapper.KylinBannersMapper;
 import com.liquidnet.service.kylin.service.admin.IKylinBannersService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -27,7 +24,7 @@ import java.util.List;
  * @since 2021-05-02
  */
 @Service
-public class BannersServiceImpl extends ServiceImpl<KylinBannersMapper, KylinBanners> implements IKylinBannersService {
+public class BannersServiceImpl implements IKylinBannersService {
 
     @Value("${liquidnet.al-oss.imgUrl}")
     private String imgUrl;

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

@@ -21,7 +21,7 @@ import java.util.HashMap;
 
 
 @Service
-public class FieldsServiceImpl extends ServiceImpl<KylinFieldsMapper, KylinFields> implements KylinFieldsService {
+public class FieldsServiceImpl  implements KylinFieldsService {
 
     @Autowired
     MongoTemplate mongoTemplate;

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

@@ -18,7 +18,7 @@ import java.time.LocalDateTime;
 import java.util.Map;
 
 @Service
-public class KylinLackRegistersServiceImpl extends ServiceImpl<KylinLackRegistersMapper, KylinLackRegisters> implements IKylinLackRegistersService {
+public class KylinLackRegistersServiceImpl implements IKylinLackRegistersService {
 
     @Autowired
     private RabbitTemplate rabbitTemplate;

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

@@ -7,5 +7,5 @@ import com.liquidnet.service.kylin.service.IKylinOrderRefundPicService;
 import org.springframework.stereotype.Service;
 
 @Service
-public class KylinOrderRefundPicServiceImpl extends ServiceImpl<KylinOrderRefundPicMapper, KylinOrderRefundPic> implements IKylinOrderRefundPicService {
+public class KylinOrderRefundPicServiceImpl implements IKylinOrderRefundPicService {
 }

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

@@ -37,7 +37,7 @@ import java.util.List;
  */
 @Slf4j
 @Service
-public class KylinOrderTicketEntitiesServiceImpl extends ServiceImpl<KylinOrderTicketEntitiesMapper, KylinOrderTicketEntities> implements IKylinOrderTicketEntitiesService {
+public class KylinOrderTicketEntitiesServiceImpl  implements IKylinOrderTicketEntitiesService {
     @Autowired
     MongoTemplate mongoTemplate;
     @Autowired

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

@@ -18,6 +18,6 @@ import org.springframework.stereotype.Service;
  * @since 2021-05-06
  */
 @Service
-public class KylinOrderTicketRelationsImpl extends ServiceImpl<KylinOrderTicketRelationsMapper, KylinOrderTicketRelations> implements IKylinOrderTicketRelationsService {
+public class KylinOrderTicketRelationsImpl implements IKylinOrderTicketRelationsService {
 
 }

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

@@ -15,6 +15,6 @@ import org.springframework.stereotype.Service;
  * @since 2021-05-06
  */
 @Service
-public class KylinOrderTicketStatusImpl extends ServiceImpl<KylinOrderTicketStatusMapper, KylinOrderTicketStatus> implements IKylinOrderTicketStatusService {
+public class KylinOrderTicketStatusImpl  implements IKylinOrderTicketStatusService {
 
 }

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

@@ -64,7 +64,7 @@ import java.util.*;
  */
 @Service
 @Slf4j
-public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsMapper, KylinOrderTickets> implements IKylinOrderTicketsService {
+public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
 
     @Value("${liquidnet.url-pay.pay}")
     private String payUrl;
@@ -96,12 +96,6 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
     @Autowired
     private TaobaoTicketUtils taobaoTicketUtils;
     @Autowired
-    private KylinOrderTicketsMapper orderTicketsMapper;
-    @Autowired
-    private KylinOrderTicketStatusMapper orderTicketStatusMapper;
-    @Autowired
-    private KylinOrderTicketRelationsMapper orderTicketRelationsMapper;
-    @Autowired
     private OrderRefundOvertimeServiceImpl orderRefundsCallbackService;
     @Autowired
     private KylinRefundsStatusServiceImpl refundsStatusService;
@@ -1070,100 +1064,6 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
         }
     }
 
-    @Override
-    public boolean checkOrderTime(String userId) {
-        String lock = "order_lock:checkOrderTime:" + userId;
-        List<OrderScriptDto> dtoData = orderTicketsMapper.orderScriptDto(userId);
-        LocalDateTime now = LocalDateTime.now();
-        Long currentTime = System.currentTimeMillis();
-        HashMap<String, Integer> mapSurplusGeneral = new HashMap<>();
-        ArrayList<String> orderDataList = new ArrayList<>();
-        ArrayList<String> orderIdList = new ArrayList<>();
-        HashMap<String, Object> mapMongo = new HashMap<>();
-
-        for (OrderScriptDto item : dtoData) {
-            if (item.getStatus().equals(KylinTableStatusConst.ORDER_STATUS0)) {
-                try {
-                    //vo
-                    mapMongo.put("status", KylinTableStatusConst.ORDER_STATUS2);
-                    mapMongo.put("updatedAt", DateUtil.Formatter.yyyyMMddHHmmssSSS.format(now));
-                    mapMongo.put("changeDate", now);
-                    orderDataList.add(item.getOrderTicketsId() + "," + item.getUserId());
-                    orderIdList.add(item.getOrderTicketsId());
-                    mapSurplusGeneral.put(item.getTicketId(), mapSurplusGeneral.get(item.getTicketId()) == null ? item.getNumber() : mapSurplusGeneral.get(item.getTicketId()) + item.getNumber());
-                } catch (Exception e) {
-                    log.debug("CHECK TIME SYNC = " + e.getMessage());
-                    e.printStackTrace();
-                    return false;
-                }
-            } else {
-            }
-        }
-        currentTime = System.currentTimeMillis() - currentTime;
-        log.debug("FOR 循环 -> time:" + (currentTime) + "毫秒");
-
-        if (orderDataList.size() > 0) {
-            //mysql
-            String orderStr = "";
-            for (int i = 0; i < orderIdList.size(); i++) {
-                String orderTicketId = orderIdList.get(i);
-                orderStr += "'" + orderTicketId + "',";
-            }
-            orderStr = orderStr.substring(0, orderStr.length() - 1);
-
-            KylinOrderTickets orderTickets = new KylinOrderTickets();
-            orderTickets.setUpdatedAt(now);
-            orderTicketsMapper.update(orderTickets, new UpdateWrapper<KylinOrderTickets>().in("order_tickets_id", orderIdList));
-
-            KylinOrderTicketStatus orderTicketStatus = new KylinOrderTicketStatus();
-            orderTicketStatus.setStatus(2);
-            orderTicketStatus.setUpdatedAt(now);
-            orderTicketStatusMapper.update(orderTicketStatus, new UpdateWrapper<KylinOrderTicketStatus>().in("order_id", orderIdList));
-
-            KylinOrderTicketRelations orderTicketRelations = new KylinOrderTicketRelations();
-            orderTicketRelations.setUpdatedAt(now);
-            orderTicketRelationsMapper.update(orderTicketRelations, new UpdateWrapper<KylinOrderTicketRelations>().in("order_id", orderIdList));
-
-            currentTime = System.currentTimeMillis() - currentTime;
-            log.debug("mysql -> time:" + (currentTime) + "毫秒");
-
-            //库存
-            for (Map.Entry<String, Integer> entry : mapSurplusGeneral.entrySet()) {
-                dataUtils.changeSurplusGeneral(entry.getKey(), entry.getValue());
-            }
-            currentTime = System.currentTimeMillis() - currentTime;
-            log.debug("redis 库存 -> time:" + (currentTime) + "毫秒");
-
-            try {
-                //mongo
-                mongoTemplate.getCollection(KylinOrderTicketVo.class.getSimpleName()).updateMany(
-                        Query.query(Criteria.where("orderTicketsId").in(orderIdList)).getQueryObject(),
-                        new BasicDBObject("$set", mongoConverter.convertToMongoType(mapMongo))
-                );
-                currentTime = System.currentTimeMillis() - currentTime;
-                log.debug("mongo -> time:" + (currentTime) + "毫秒");
-            } catch (Exception e) {
-
-            }
-
-            int forSize = 500;
-            int forCount = orderDataList.size() % forSize == 0 ? orderDataList.size() / forSize : (orderDataList.size() / forSize) + 1;
-            for (int i = 0; i < forCount; i++) {
-                LinkedList<String> mqList = new LinkedList<>();
-                for (int y = 0; y < forSize; y++) {
-                    try {
-                        String t = orderDataList.get(i * 500 + y);
-                        mqList.add(t);
-                    } catch (Exception e) {
-                        break;
-                    }
-                }
-                rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_CLOSE, MQConst.ROUTING_KEY_SQL_ORDER_CLOSE, OrderCloseMapping.get(mqList));
-            }
-        }
-        return true;
-    }
-
     @Override
     public ResponseDto<Integer> checkOrderResult(String orderId) {
         String uid = CurrentUtil.getCurrentUid();
@@ -1252,9 +1152,12 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
         OrderRefundVo vo = new OrderRefundVo();
         String uid = CurrentUtil.getCurrentUid();
         KylinOrderTicketVo orderTicketVo = dataUtils.getOrderTicketVo(orderId);
+        KylinPerformanceVo performanceVo = dataUtils.getPerformanceVo(orderTicketVo.getPerformanceId());
+
         if (!orderTicketVo.getUserId().equals(uid)) {
             return null;
         }
+        orderTicketVo.setFieldName(performanceVo.getFieldName());
         KylinOrderRefundsVoBase kylinOrderRefundsVoBase = dataUtils.getOrderRefundVo(orderRefundId);
         vo.setKylinOrderRefundsVoBaseList(kylinOrderRefundsVoBase);
         vo.setOrderTicketVo(orderTicketVo);
@@ -1262,7 +1165,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
     }
 
     @Override
-    public ResponseDto<Boolean> sendOrderRefund(String orderId, String orderTicketEntitiesId, String reason, String picList) {
+    public ResponseDto<String> sendOrderRefund(String orderId, String orderTicketEntitiesId, String reason, String picList) {
         KylinOrderTicketEntitiesVo orderTicketEntitiesVo = null;
         try {
             String uid = CurrentUtil.getCurrentUid();
@@ -1289,9 +1192,9 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
             }
             Map token = CurrentUtil.getTokenClaims();
             String username = StringUtils.defaultString(((String) token.get("nickname")), "");
-            boolean result = refundsStatusService.userOrderTicketRefunding(orderTicketVo, refundSinglePrice.doubleValue(), orderTicketEntitiesId, reason, picList, uid, username, kylinOrderRefundsVoBaseList.size());
-            if (result) {
-                return ResponseDto.success();
+            String result = refundsStatusService.userOrderTicketRefunding(orderTicketVo, refundSinglePrice.doubleValue(), orderTicketEntitiesId, reason, picList, uid, username, kylinOrderRefundsVoBaseList.size());
+            if (result!="") {
+                return ResponseDto.success(result);
             } else {
                 return ResponseDto.failure(ErrorMapping.get("20019"));
             }

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

@@ -13,7 +13,6 @@ import com.liquidnet.service.kylin.dto.vo.returns.PayDetailVo;
 import com.liquidnet.service.kylin.entity.KylinPerformances;
 import com.liquidnet.service.kylin.mapper.KylinPerformancesMapper;
 import com.liquidnet.service.kylin.service.IKylinPerformancesService;
-import com.liquidnet.service.kylin.timerTask.PerformanceVoTask;
 import com.liquidnet.service.kylin.utils.DataUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.bson.Document;
@@ -43,7 +42,7 @@ import java.util.stream.Collectors;
  */
 @Service
 @Slf4j
-public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesMapper, KylinPerformances> implements IKylinPerformancesService {
+public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
 
     @Autowired
     private MongoTemplate mongoTemplate;
@@ -51,9 +50,6 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
     @Autowired
     private DataUtils dataUtils;
 
-    @Autowired
-    private PerformanceVoTask task;
-
     public HashMap<String, Object> localList(
             int days, String cityName, int type,
             Integer isDiscount, Integer isAdvance, Integer isExclusive,
@@ -529,14 +525,4 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
         }
         return isMemberStatus;
     }
-
-    public String checkPerformanceTime(String performancesId) {
-        try {
-            task.performanceVoStatus(performancesId);
-            return "成功";
-        } catch (Exception e) {
-            e.printStackTrace();
-            return "失败";
-        }
-    }
 }

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

@@ -15,6 +15,6 @@ import org.springframework.stereotype.Service;
  * @since 2021-05-11
  */
 @Service
-public class KylinRoadShowsServiceImpl extends ServiceImpl<KylinRoadShowsMapper, KylinRoadShows> implements IKylinRoadShowsService {
+public class KylinRoadShowsServiceImpl implements IKylinRoadShowsService {
 
 }

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

@@ -15,6 +15,6 @@ import org.springframework.stereotype.Service;
  * @since 2021-05-06
  */
 @Service
-public class KylinTicketTimesServiceImpl extends ServiceImpl<KylinTicketTimesMapper, KylinTicketTimes> implements IKylinTicketTimesService {
+public class KylinTicketTimesServiceImpl implements IKylinTicketTimesService {
 
 }

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

@@ -15,6 +15,6 @@ import org.springframework.stereotype.Service;
  * @since 2021-05-06
  */
 @Service
-public class KylinTicketsServiceImpl extends ServiceImpl<KylinTicketsMapper, KylinTickets> implements IKylinTicketsService {
+public class KylinTicketsServiceImpl implements IKylinTicketsService {
 
 }

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

 package com.liquidnet.service.kylin.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
-import com.liquidnet.service.kylin.dao.KylinOrderTicketEntitiesDao;
-import com.liquidnet.service.kylin.dto.param.RefundCallbackParam;
+import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketEntitiesVo;
+import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo;
 import com.liquidnet.service.kylin.entity.*;
 import com.liquidnet.service.kylin.mapper.*;
 import com.liquidnet.service.kylin.service.IKylinOrderRefundsService;
@@ -16,7 +16,6 @@ import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -35,18 +34,6 @@ public class OrderRefundOvertimeServiceImpl extends ServiceImpl<KylinOrderRefund
     @Autowired
     private KylinRefundsStatusServiceImpl kylinRefundsStatusServiceImpl;
 
-    @Autowired
-    private KylinOrderRefundsMapper kylinOrderRefundsMapper;
-
-    @Autowired
-    private KylinOrderTicketsMapper kylinOrderTicketsMapper;
-
-    @Autowired
-    private KylinOrderTicketEntitiesMapper kylinOrderTicketEntitiesMapper;
-
-    @Autowired
-    private KylinOrderTicketRelationsMapper kylinOrderTicketRelationsMapper;
-
     @Autowired
     MongoTemplate mongoTemplate;
 
@@ -54,51 +41,19 @@ public class OrderRefundOvertimeServiceImpl extends ServiceImpl<KylinOrderRefund
     private DataUtils dataUtils;
 
     public Boolean refundApply(String orderTicketsId) {
-        KylinOrderTickets orderInfo = kylinOrderTicketsMapper.selectOne(
-                new QueryWrapper<KylinOrderTickets>().eq("order_tickets_id", orderTicketsId)
-        );
-        KylinOrderTicketRelations orderRelations = kylinOrderTicketRelationsMapper.selectOne(
-                new QueryWrapper<KylinOrderTicketRelations>().eq("order_id", orderTicketsId)
-        );
-        // 传的快递费不能大于实际的快递费=（支付的快递费-已退的快递费）
-        Double refundPriceExpressSum = kylinOrderRefundsMapper.RefundPriceExpressSum(// 已退快递费
-                orderTicketsId,
-                KylinTableStatusConst.ORDER_REFUND_STATUS_CANCEL
-        );
-        if (null == refundPriceExpressSum) {
-            refundPriceExpressSum = 0.0;
-        }
-        Double RefundPriceExpress = orderInfo.getPriceExpress().doubleValue() - refundPriceExpressSum;
+        KylinOrderTicketVo orderInfo = dataUtils.getOrderTicketVo(orderTicketsId);
+        // 快递费 未进行判断
+        Double RefundPriceExpress = orderInfo.getPriceExpress().doubleValue();
+        double priceActual = orderInfo.getPriceActual().doubleValue();
+        double priceExpress = orderInfo.getPriceExpress().doubleValue();
 
         // 查询订单入场人
-        List<KylinOrderTicketEntitiesDao> entitiesListTemp = kylinOrderTicketEntitiesMapper.getOvertimeRefundEntitiesList(orderTicketsId);
-        List<KylinOrderTicketEntitiesDao> entitiesList = new ArrayList<>();
-
-        if(entitiesListTemp.size() > 0) {
-            double priceActual = orderInfo.getPriceActual().doubleValue();
-            double priceExpress = orderInfo.getPriceExpress().doubleValue();
-            int allEntitiesCount = kylinOrderTicketEntitiesMapper.selectCount(// 总入场人数量 排出未付款的 用来计算单入场人的价格
-                    new QueryWrapper<KylinOrderTicketEntities>()
-                            .eq("order_id", orderInfo.getOrderTicketsId())
-//                            .ne("is_payment", KylinTableStatusConst.ENTITIES_IS_PAYMENT0)
-            );
+        List<KylinOrderTicketEntitiesVo> entitiesList = orderInfo.getEntitiesVoList();
+        if (!CollectionUtil.isEmpty(entitiesList)) {
+            int allEntitiesCount = entitiesList.size();// 总入场人数量 排出未付款的 用来计算单入场人的价格
             double onePrice = (priceActual - priceExpress) / allEntitiesCount;//单价
-            for (KylinOrderTicketEntitiesDao entities : entitiesListTemp) {
-                Double refundedPrice = kylinOrderTicketEntitiesMapper.getRefundEntitiesPrice(//已退 包含退款中
-                        orderInfo.getOrderTicketsId(),
-                        KylinTableStatusConst.ORDER_REFUND_STATUS_CANCEL,
-                        entities.getOrderTicketEntitiesId()
-                );
-                double canRefundedPrice;
-                if (null != refundedPrice) {
-                    canRefundedPrice = onePrice - refundedPrice;
-                } else {
-                    canRefundedPrice = onePrice;
-                }
-                entities.setCanRefundedPrice(BigDecimal.valueOf(canRefundedPrice));
-                if (canRefundedPrice > 0) { // 退款中但是可退款金额为0不展示
-                    entitiesList.add(entities);
-                }
+            for (KylinOrderTicketEntitiesVo entities : entitiesList) {
+                entities.setCanRefundedPrice(BigDecimal.valueOf(onePrice));
             }
         }
 
@@ -111,16 +66,12 @@ public class OrderRefundOvertimeServiceImpl extends ServiceImpl<KylinOrderRefund
                 ticketEntityIds, entitiesPrice
         );
         if (res) {
-                // 超时直接退还库存
-                for (String entitiesId : ticketEntityIds) {
-                    KylinOrderTicketEntities entitiesInfo = kylinOrderTicketEntitiesMapper.selectOne(
-                            new QueryWrapper<KylinOrderTicketEntities>().eq("order_ticket_entities_id", entitiesId)
-                    );
-                    if (entitiesInfo.getIsPayment() == KylinTableStatusConst.ENTITIES_IS_PAYMENT3) {
-                        dataUtils.changeSurplusGeneral(entitiesInfo.getTicketId(), 1);
-                        dataUtils.changeBuyInfo(orderInfo.getUserId(), entitiesInfo.getEnterIdCode(), orderRelations.getPerformanceId(), entitiesInfo.getTicketId(), -1);
-                    }
-                }
+            // 超时直接退还库存
+            for (KylinOrderTicketEntitiesVo entitiesInfo : entitiesList) {
+                // 因固定状态为未支付 所以无需判断 entitiesInfo.getIsPayment() == KylinTableStatusConst.ENTITIES_IS_PAYMENT3
+                dataUtils.changeSurplusGeneral(entitiesInfo.getTicketId(), 1);
+                dataUtils.changeBuyInfo(orderInfo.getUserId(), entitiesInfo.getEnterIdCode(), orderInfo.getPerformanceId(), entitiesInfo.getTicketId(), -1);
+            }
             return true;
         } else {
             return false;

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

-package com.liquidnet.service.kylin.service.impl.admin;
-
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.liquidnet.common.cache.redis.util.RedisUtil;
-import com.liquidnet.commons.lang.util.BeanUtil;
-import com.liquidnet.commons.lang.util.IDGenerator;
-import com.liquidnet.commons.lang.util.JsonUtils;
-import com.liquidnet.service.kylin.constant.KylinRedisConst;
-import com.liquidnet.service.kylin.dao.FieldMisDetailsDao;
-import com.liquidnet.service.kylin.dao.FieldMisListDao;
-import com.liquidnet.service.kylin.dto.param.FieldsAuditParam;
-import com.liquidnet.service.kylin.dto.param.FieldsParam;
-import com.liquidnet.service.kylin.dto.param.FieldsSearchParam;
-import com.liquidnet.service.kylin.dto.param.FieldsStatusParam;
-import com.liquidnet.service.kylin.dto.vo.KylinFieldsVo;
-import com.liquidnet.service.kylin.entity.KylinFieldStatus;
-import com.liquidnet.service.kylin.entity.KylinFields;
-import com.liquidnet.service.kylin.mapper.KylinFieldRelationMapper;
-import com.liquidnet.service.kylin.mapper.KylinFieldStatusMapper;
-import com.liquidnet.service.kylin.mapper.KylinFieldsMapper;
-import com.liquidnet.service.kylin.service.admin.KylinFieldsAdminService;
-import com.mongodb.BasicDBObject;
-import com.mongodb.client.model.FindOneAndUpdateOptions;
-import com.mongodb.client.model.ReturnDocument;
-import org.bson.Document;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.data.mongodb.core.query.Criteria;
-import org.springframework.data.mongodb.core.query.Query;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.*;
-
-@Service
-public class FieldsAdminServiceImpl implements KylinFieldsAdminService {
-
-    @Autowired
-    MongoTemplate mongoTemplate;
-
-    @Autowired
-    private RedisUtil redisUtil;
-
-    @Autowired
-    private KylinFieldsMapper fieldsMapper;
-
-    @Autowired
-    private KylinFieldStatusMapper kylinFieldStatusMapper;
-
-    @Autowired
-    private KylinFieldRelationMapper fieldRelationsMapper;
-
-    /**
-     * 创建场地
-     *
-     * @param fieldsParam
-     * @return boolean
-     */
-    @Override
-    @Transactional
-    public boolean fieldCreate(FieldsParam fieldsParam) {
-        try {
-            // 获取 主键id
-            String fieldsId = IDGenerator.nextSnowId().toString();
-            // 获取 当前时间 -> 创建时间
-            LocalDateTime createdAt = LocalDateTime.now();
-
-            // mysql 操作
-            fieldsMapper.insert(fieldsParam.getFields(fieldsId, createdAt));
-            kylinFieldStatusMapper.insert(fieldsParam.getFieldStatus(fieldsId, createdAt, 1, 1, 1, 1));
-            fieldRelationsMapper.insert(fieldsParam.getFieldRelations(fieldsId, createdAt));
-
-            // mongo 操作
-            KylinFieldsVo kylinFieldsVo = new KylinFieldsVo();
-            BeanUtils.copyProperties(fieldsParam, kylinFieldsVo);
-            kylinFieldsVo.setFieldsId(fieldsId);
-            kylinFieldsVo.setCreatedAt(createdAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-            kylinFieldsVo.setUpdatedAt(createdAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-            KylinFieldsVo data = mongoTemplate.insert(
-                    kylinFieldsVo, KylinFieldsVo.class.getSimpleName()
-            );
-
-            // redis 操作
-            redisUtil.hset(KylinRedisConst.FIELDS, fieldsId, kylinFieldsVo);
-
-            return true;
-        } catch (Exception e) {
-            return false;
-        }
-    }
-
-
-    /**
-     * mis修改场地全部数据
-     *
-     * @param fieldsParam
-     * @return
-     */
-    @Override
-    public boolean fieldUpdateMessage(FieldsParam fieldsParam) {
-        try {
-            String fieldsId = fieldsParam.getFieldsId();
-            LocalDateTime updatedAt = LocalDateTime.now();
-            // mysql 操作
-            KylinFields fields = fieldsParam.getFields(null, null);
-            fields.setUpdatedAt(updatedAt);
-            fieldsMapper.update(fields
-                    , new UpdateWrapper<KylinFields>().eq("fields_id", fieldsId));
-
-            // mongo 操作
-            KylinFieldsVo kylinFieldsVoData = new KylinFieldsVo();
-            BeanUtils.copyProperties(fieldsParam, kylinFieldsVoData);
-            kylinFieldsVoData.setFieldsId(fieldsId);
-            kylinFieldsVoData.setUpdatedAt(updatedAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-
-            BasicDBObject object = new BasicDBObject("$set", JSON.parse(JsonUtils.toJson(kylinFieldsVoData)));
-            Document doc = mongoTemplate.getCollection(KylinFieldsVo.class.getSimpleName()).findOneAndUpdate(
-                    Query.query(Criteria.where("fieldsId").is(fieldsId)).getQueryObject(),
-                    object,
-                    new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
-            );
-
-            // redis 操作
-            redisUtil.hset(KylinRedisConst.FIELDS, fieldsId, JsonUtils.fromJson(doc.toJson(), KylinFieldsVo.class));
-            return true;
-
-        } catch (Exception e) {
-            return false;
-        }
-    }
-
-
-    /**
-     * 场地列表 - 条件查询
-     *
-     * @param fieldsSearchParam
-     * @return
-     */
-    @Override
-    public List<FieldMisListDao> fieldList(FieldsSearchParam fieldsSearchParam) {
-        try {
-            fieldsSearchParam.setCityId(0);
-            fieldsSearchParam.setDistrictId(0);
-            fieldsSearchParam.setProvinceId(0);
-            fieldsSearchParam.setPage((fieldsSearchParam.getPage() - 1) * fieldsSearchParam.getSize());
-
-            List<FieldMisListDao> data = fieldsMapper.misSearchFields(BeanUtil.convertBeanToMap(fieldsSearchParam));
-            return data;
-        } catch (Exception e) {
-            return new ArrayList<>();
-        }
-    }
-
-    @Override
-    public Long fieldListCount(FieldsSearchParam fieldsSearchParam) {
-        try {
-            fieldsSearchParam.setCityId(0);
-            fieldsSearchParam.setDistrictId(0);
-            fieldsSearchParam.setProvinceId(0);
-            Long count = fieldsMapper.misSearchFieldsCount(BeanUtil.convertBeanToMap(fieldsSearchParam));
-            return count;
-        } catch (Exception e) {
-            return 0L;
-        }
-    }
-
-    /**
-     * 场地详情
-     *
-     * @param fieldsId
-     * @return
-     */
-    @Override
-    public FieldMisDetailsDao fieldDetails(String fieldsId) {
-        FieldMisDetailsDao data = fieldsMapper.misFieldsDetails(fieldsId);
-        return data;
-    }
-
-    /**
-     * 场地审核
-     *
-     * @param fieldsAuditParam
-     * @return
-     */
-    @Override
-    public boolean fieldAudit(FieldsAuditParam fieldsAuditParam) {
-        try {
-            String fieldsId = fieldsAuditParam.getFieldsId();
-            LocalDateTime updatedAt = LocalDateTime.now();
-            fieldsAuditParam.setChangeStatus(1);
-            fieldsAuditParam.setUpdatedAt(updatedAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-
-            // mysql 操作
-            KylinFields fields = fieldsAuditParam.getFields();
-            fields.setUpdatedAt(updatedAt);
-            fieldsMapper.update(fields, new UpdateWrapper<KylinFields>().eq("fields_id", fieldsId));
-
-            KylinFieldStatus fieldStatus = fieldsAuditParam.getFieldStatus();
-            fieldStatus.setUpdatedAt(updatedAt);
-            kylinFieldStatusMapper.update(fieldStatus, new UpdateWrapper<KylinFieldStatus>().eq("field_id", fieldsId));
-
-            // mongo 操作
-            Object obj = JSON.parse(JsonUtils.toJson(fieldsAuditParam));
-            BasicDBObject object = new BasicDBObject("$set", obj);
-            Document doc = mongoTemplate.getCollection(KylinFieldsVo.class.getSimpleName()).findOneAndUpdate(
-                    Query.query(Criteria.where("fieldsId").is(fieldsId)).getQueryObject(),
-                    object,
-                    new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
-            );
-
-            // redis 操作
-            redisUtil.hset(KylinRedisConst.FIELDS, fieldsId, JsonUtils.fromJson(doc.toJson(), KylinFieldsVo.class));
-            return true;
-
-        } catch (Exception e) {
-            return false;
-        }
-    }
-
-    /**
-     * 修改场地状态
-     *
-     * @param fieldsStatusParam
-     * @return
-     */
-    @Override
-    public boolean fieldStatus(FieldsStatusParam fieldsStatusParam) {
-        try {
-            String fieldsId = fieldsStatusParam.getFieldsId();
-            LocalDateTime updatedAt = LocalDateTime.now();
-            fieldsStatusParam.setUpdatedAt(updatedAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-
-            KylinFieldStatus fieldStatus = fieldsStatusParam.getFieldStatus();
-            fieldStatus.setUpdatedAt(updatedAt);
-            kylinFieldStatusMapper.update(fieldStatus, new UpdateWrapper<KylinFieldStatus>().eq("field_id", fieldsId));
-
-            Object obj = JSON.parse(JsonUtils.toJson(fieldsStatusParam));
-            BasicDBObject object = new BasicDBObject("$set", obj);
-            Document doc = mongoTemplate.getCollection(KylinFieldsVo.class.getSimpleName()).findOneAndUpdate(
-                    Query.query(Criteria.where("fieldsId").is(fieldsId)).getQueryObject(),
-                    object,
-                    new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
-            );
-
-            redisUtil.hset(KylinRedisConst.FIELDS, fieldsId, JsonUtils.fromJson(doc.toJson(), KylinFieldsVo.class));
-            return true;
-        }catch (Exception e){
-            return false;
-        }
-    }
-}

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

-package com.liquidnet.service.kylin.service.impl.partner;
-
-import com.liquidnet.common.cache.redis.util.RedisUtil;
-import com.liquidnet.service.kylin.constant.KylinRedisConst;
-import com.liquidnet.service.kylin.dto.vo.KylinFieldsVo;
-import com.liquidnet.service.kylin.mapper.KylinFieldRelationMapper;
-import com.liquidnet.service.kylin.mapper.KylinFieldStatusMapper;
-import com.liquidnet.service.kylin.mapper.KylinFieldsMapper;
-import com.liquidnet.service.kylin.service.partner.KylinFieldsPartnerService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.data.mongodb.core.query.Criteria;
-import org.springframework.data.mongodb.core.query.Query;
-import org.springframework.stereotype.Service;
-
-import java.util.HashMap;
-
-@Service
-public class FieldsPartnerServiceImpl implements KylinFieldsPartnerService {
-
-    @Autowired
-    MongoTemplate mongoTemplate;
-
-    @Autowired
-    private RedisUtil redisUtil;
-
-    @Autowired
-    private KylinFieldsMapper fieldsMapper;
-
-    @Autowired
-    private KylinFieldStatusMapper kylinFieldStatusMapper;
-
-    @Autowired
-    private KylinFieldRelationMapper fieldRelationsMapper;
-
-    /**
-     * 根据名字模糊查询 partner 场地列表
-     * @param page
-     * @param size
-     * @param name
-     * @return
-     */
-    @Override
-    public HashMap<String, Object> fieldList(int page, int size, String name) {
-        HashMap<String,Object> info = new HashMap<>();
-
-        // 排序 分页
-        Pageable pageable = PageRequest.of(0, size, Sort.by(Sort.Direction.DESC, "createdAt"));
-
-        //条件
-        Query query = Query.query(Criteria.where("name").regex(".*?\\" +name));
-
-        // 查询总数
-        long count = mongoTemplate.count(query, KylinFieldsVo.class, KylinFieldsVo.class.getSimpleName());
-
-        query.with(pageable);
-        info.put("total",count);
-        info.put("data", mongoTemplate.find(query, KylinFieldsVo.class, KylinFieldsVo.class.getSimpleName()));
-
-        return info;
-    }
-
-
-    /**
-     * partner 场地详情
-     * @param fieldId
-     * @return
-     */
-    @Override
-    public KylinFieldsVo fieldDetails(String fieldId) {
-        KylinFieldsVo info = null;
-        // 获取 redis数据
-        info = (KylinFieldsVo) redisUtil.hget(KylinRedisConst.FIELDS, fieldId + "");
-        //不存在 获取 mongo数据
-        if (null == info) {
-            info = mongoTemplate.findOne(Query.query(Criteria.where("fieldsId").is(fieldId)), KylinFieldsVo.class, KylinFieldsVo.class.getSimpleName());
-            redisUtil.hset(KylinRedisConst.FIELDS, fieldId + "",info);
-        }
-        return info;
-    }
-}

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

-package com.liquidnet.service.kylin.service.impl.partner;
-
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.liquidnet.service.kylin.service.partner.IKylinBuyNoticePartnerService;
-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 extends ServiceImpl<KylinBuyNoticeMapper, KylinBuyNotice> implements IKylinBuyNoticePartnerService {
-
-    @Autowired
-    private KylinBuyNoticeMapper kylinBuyNoticeMapper;
-
-    @Override
-    public PageInfo<KylinBuyNoticeVo> getBuyNotice() {
-        PageInfo<KylinBuyNoticeVo> pageInfoTmp = null;
-
-        PageHelper.startPage(1, 20);
-        List<KylinBuyNotice> buyNoticeList = kylinBuyNoticeMapper.selectList(new UpdateWrapper<KylinBuyNotice>().eq("status", 1).orderByDesc("sort").orderByDesc("mid"));
-
-        List<KylinBuyNoticeVo> kylinBuyNoticeVoList = new ArrayList<>();
-        for (KylinBuyNotice item : buyNoticeList) {
-            KylinBuyNoticeVo kylinBuyNoticeVo = new KylinBuyNoticeVo();
-            BeanUtils.copyProperties(item, kylinBuyNoticeVo);
-            kylinBuyNoticeVoList.add(kylinBuyNoticeVo);
-        }
-        pageInfoTmp = new PageInfo(kylinBuyNoticeVoList);
-
-        return pageInfoTmp;
-    }
-
-}

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

-package com.liquidnet.service.kylin.service.impl.partner;
-
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.liquidnet.commons.lang.util.IDGenerator;
-import com.liquidnet.service.base.ErrorMapping;
-import com.liquidnet.service.base.ResponseDto;
-import com.liquidnet.service.kylin.dao.ChildDetailsDao;
-import com.liquidnet.service.kylin.dao.ChildListDao;
-import com.liquidnet.service.kylin.dto.vo.mongo.KylinCheckUserVo;
-import com.liquidnet.service.kylin.entity.KylinCheckUser;
-import com.liquidnet.service.kylin.mapper.KylinCheckUserMapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.liquidnet.service.kylin.service.partner.IKylinCheckUserPartnerService;
-import com.liquidnet.service.kylin.utils.DataUtils;
-import com.mongodb.BasicDBObject;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.data.mongodb.core.convert.MongoConverter;
-import org.springframework.data.mongodb.core.query.Criteria;
-import org.springframework.data.mongodb.core.query.Query;
-import org.springframework.stereotype.Service;
-import org.springframework.util.DigestUtils;
-
-import java.time.LocalDateTime;
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * <p>
- * 验票用户表 服务实现类
- * </p>
- *
- * @author liquidnet
- * @since 2021-05-21
- */
-@Service
-public class KylinCheckUserPartnerServiceImpl extends ServiceImpl<KylinCheckUserMapper, KylinCheckUser> implements IKylinCheckUserPartnerService {
-
-    @Autowired
-    private MongoTemplate mongoTemplate;
-    @Autowired
-    private MongoConverter mongoConverter;
-    @Autowired
-    private DataUtils dataUtils;
-    @Autowired
-    private KylinCheckUserMapper checkUserMapper;
-
-    @Override
-    public PageInfo<ChildListDao> getCheckUserList(String merchantId, String mobile, int page, int size) {
-        PageInfo<ChildListDao> pageInfo = null;
-        try {
-            PageHelper.startPage(page, size);
-            List<ChildListDao> data = checkUserMapper.childSimpleList(merchantId, mobile);
-            pageInfo = new PageInfo(data);
-            return pageInfo;
-        } catch (Exception e) {
-            return pageInfo;
-        }
-    }
-
-    @Override
-    public ResponseDto<String> del(String merchantId, String checkUserId) {
-        try {
-            KylinCheckUser checkUser = new KylinCheckUser();
-            checkUser.setUpdatedAt(LocalDateTime.now());
-            checkUser.setStatus(0);
-            checkUserMapper.update(checkUser, new UpdateWrapper<KylinCheckUser>().eq("check_user_id", checkUserId));
-            dataUtils.delCheckUserRedis(checkUserId);
-
-            HashMap<String, Object> map = new HashMap<>();
-            map.put("status", 0);
-//            BasicDBObject obj = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
-//            mongoTemplate.getCollection(CheckUserVo.class.getSimpleName()).updateOne(
-//                    Query.query(Criteria.where("checkUserId").is(checkUserId)).getQueryObject(),
-//                    obj
-            mongoTemplate.remove(Query.query(Criteria.where("checkUserId").is(checkUserId)), KylinCheckUserVo.class, KylinCheckUserVo.class.getSimpleName());
-            return ResponseDto.success("删除成功");
-        } catch (Exception e) {
-            return ResponseDto.failure(ErrorMapping.get(20102));
-        }
-    }
-
-    @Override
-    public ResponseDto<String> create(String merchantId, String name, String pwd, String mobile) {
-        try {
-            KylinCheckUser checkUser = new KylinCheckUser();
-            checkUser.setName(name);
-            checkUser.setPwd(DigestUtils.md5DigestAsHex(pwd.getBytes()));
-            checkUser.setMobile(mobile);
-            checkUser.setCheckUserId(IDGenerator.nextSnowId().toString());
-            checkUser.setCreatedAt(LocalDateTime.now());
-            checkUser.setMerchantId(merchantId);
-            checkUser.setStatus(1);
-            checkUserMapper.insert(checkUser);
-
-            KylinCheckUserVo kylinCheckUserVo = new KylinCheckUserVo();
-            BeanUtils.copyProperties(checkUser, kylinCheckUserVo);
-            mongoTemplate.insert(kylinCheckUserVo, KylinCheckUserVo.class.getSimpleName());
-
-            return ResponseDto.success("添加成功");
-        } catch (Exception e) {
-            return ResponseDto.failure(ErrorMapping.get(20101));
-        }
-    }
-
-    @Override
-    public ResponseDto<String> change(String merchantId, String checkUserId, String name, String pwd, String mobile) {
-        try {
-            KylinCheckUser checkUser = new KylinCheckUser();
-            checkUser.setName(name);
-            if(null!=pwd) {
-                checkUser.setPwd(DigestUtils.md5DigestAsHex(pwd.getBytes()));
-            }
-            checkUser.setMobile(mobile);
-            checkUser.setUpdatedAt(LocalDateTime.now());
-            checkUserMapper.update(checkUser, new UpdateWrapper<KylinCheckUser>().eq("check_user_id", checkUserId).eq("merchant_id", merchantId));
-            BasicDBObject obj = new BasicDBObject("$set", mongoConverter.convertToMongoType(checkUser));
-            mongoTemplate.getCollection(KylinCheckUserVo.class.getSimpleName()).updateOne(
-                    Query.query(Criteria.where("checkUserId").is(checkUserId)).getQueryObject(),
-                    obj
-            );
-            dataUtils.delCheckUserRedis(checkUserId);
-            return ResponseDto.success("修改成功");
-        } catch (Exception e) {
-            return ResponseDto.failure(ErrorMapping.get(20103));
-        }
-    }
-
-    @Override
-    public ResponseDto<ChildDetailsDao> details(String merchantId, String checkUserId) {
-        try {
-            ChildDetailsDao data = checkUserMapper.childDetails(merchantId, checkUserId);
-            return ResponseDto.success(data);
-        } catch (Exception e) {
-            return ResponseDto.failure(ErrorMapping.get(20104));
-        }
-    }
-}

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

-package com.liquidnet.service.kylin.service.impl.partner;
-
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.liquidnet.commons.lang.util.DateUtil;
-import com.liquidnet.commons.lang.util.IDGenerator;
-import com.liquidnet.service.base.ErrorMapping;
-import com.liquidnet.service.base.ResponseDto;
-import com.liquidnet.service.kylin.dao.ChildPerformanceDao;
-import com.liquidnet.service.kylin.dto.param.CheckPerformanceRelationParam;
-import com.liquidnet.service.kylin.dto.param.CheckUserParam;
-import com.liquidnet.service.kylin.dto.vo.mongo.KylinCheckUserPerformanceVo;
-import com.liquidnet.service.kylin.entity.KylinCheckUserPerformances;
-import com.liquidnet.service.kylin.mapper.KylinCheckUserPerformancesMapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.liquidnet.service.kylin.service.partner.IKylinCheckUserPerformancesPartnerService;
-import com.liquidnet.service.kylin.utils.DataUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.data.mongodb.core.convert.MongoConverter;
-import org.springframework.data.mongodb.core.query.Criteria;
-import org.springframework.data.mongodb.core.query.Query;
-import org.springframework.stereotype.Service;
-
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * <p>
- * 验票用户可看演出表 服务实现类
- * </p>
- *
- * @author liquidnet
- * @since 2021-05-21
- */
-@Service
-public class KylinCheckUserPerformancesPartnerServiceImpl extends ServiceImpl<KylinCheckUserPerformancesMapper, KylinCheckUserPerformances> implements IKylinCheckUserPerformancesPartnerService {
-
-    @Autowired
-    private MongoTemplate mongoTemplate;
-    @Autowired
-    private MongoConverter mongoConverter;
-    @Autowired
-    private DataUtils dataUtils;
-    @Autowired
-    private KylinCheckUserPerformancesMapper checkUserPerformancesMapper;
-
-    @Override
-    public ResponseDto<PageInfo<ChildPerformanceDao>> childPerformanceList(String merchantId, String checkUserId, int page, int size, String name) {
-        PageInfo<ChildPerformanceDao> pageInfo = null;
-        try {
-            PageHelper.startPage(page, size);
-            List<ChildPerformanceDao> data = checkUserPerformancesMapper.childPerformanceList(merchantId, checkUserId, name);
-            pageInfo = new PageInfo(data);
-            return ResponseDto.success(pageInfo);
-        } catch (Exception e) {
-            return ResponseDto.success(pageInfo);
-        }
-    }
-
-    @Override
-    public ResponseDto<PageInfo<ChildPerformanceDao>> unChildPerformanceList(String merchantId, String checkUserId, int page, int size, String name) {
-        PageInfo<ChildPerformanceDao> pageInfo = null;
-        try {
-            PageHelper.startPage(page, size);
-            List<ChildPerformanceDao> data = checkUserPerformancesMapper.unChildPerformanceList(merchantId, checkUserId, name);
-            pageInfo = new PageInfo(data);
-            return ResponseDto.success(pageInfo);
-        } catch (Exception e) {
-            return ResponseDto.success(pageInfo);
-        }
-    }
-
-    @Override
-    public ResponseDto<String> setPerformance(CheckUserParam param) {
-        try {
-            for (CheckPerformanceRelationParam item : param.getCheckPerformanceRelationParamList()) {
-                if (null == item.getCanDownTime()) {
-                    return ResponseDto.failure(ErrorMapping.get(20101));
-                }
-                KylinCheckUserPerformances checkUserPerformances = new KylinCheckUserPerformances();
-                checkUserPerformances.setCheckUserId(param.getCheckUserId());
-                checkUserPerformances.setCanDownTime(DateUtil.Formatter.yyyyMMddHHmmss.parse(item.getCanDownTime()));
-                checkUserPerformances.setPerformanceId(item.getPerformanceId());
-                checkUserPerformances.setCheckUserPerformanceId(IDGenerator.nextSnowId());
-                checkUserPerformances.setCreatedAt(LocalDateTime.now());
-                checkUserPerformances.setStatus(1);
-                checkUserPerformancesMapper.insert(checkUserPerformances);
-            }
-            mongoTemplate.remove(Query.query(Criteria.where("checkUserId").is(param.getCheckUserId())), KylinCheckUserPerformanceVo.class, KylinCheckUserPerformanceVo.class.getSimpleName());
-
-            KylinCheckUserPerformanceVo userPerformanceVo = new KylinCheckUserPerformanceVo();
-            List<CheckPerformanceRelationParam> performanceRelationParamsList = new ArrayList<>();
-            List<KylinCheckUserPerformances> data = checkUserPerformancesMapper.selectList(new UpdateWrapper<KylinCheckUserPerformances>().eq("check_user_id", param.getCheckUserId()));
-            for (KylinCheckUserPerformances item : data) {
-                CheckPerformanceRelationParam performanceRelationParam = new CheckPerformanceRelationParam();
-                performanceRelationParam.setCanDownTime(item.getCanDownTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-                performanceRelationParam.setPerformanceId(item.getPerformanceId());
-                performanceRelationParamsList.add(performanceRelationParam);
-            }
-            userPerformanceVo.setCheckUserId(param.getCheckUserId());
-            userPerformanceVo.setRelationParams(performanceRelationParamsList);
-
-            mongoTemplate.insert(userPerformanceVo, KylinCheckUserPerformanceVo.class.getSimpleName());
-            dataUtils.delCheckUserRelationRedis(param.getCheckUserId());
-            return ResponseDto.success("添加成功");
-        } catch (Exception e) {
-            e.printStackTrace();
-            return ResponseDto.failure(ErrorMapping.get(20101));
-        }
-    }
-
-    @Override
-    public ResponseDto<String> delPerformance(List<String> performanceIds, String checkUserId) {
-        try {
-            for (String performanceId : performanceIds) {
-                checkUserPerformancesMapper.delete(new UpdateWrapper<KylinCheckUserPerformances>().eq("check_user_id", checkUserId).eq("performance_id", performanceId));
-            }
-            mongoTemplate.remove(Query.query(Criteria.where("checkUserId").is(checkUserId)), KylinCheckUserPerformanceVo.class, KylinCheckUserPerformanceVo.class.getSimpleName());
-
-            KylinCheckUserPerformanceVo userPerformanceVo = new KylinCheckUserPerformanceVo();
-            List<CheckPerformanceRelationParam> performanceRelationParamsList = new ArrayList<>();
-            List<KylinCheckUserPerformances> data = checkUserPerformancesMapper.selectList(new UpdateWrapper<KylinCheckUserPerformances>().eq("check_user_id", checkUserId));
-            for (KylinCheckUserPerformances item : data) {
-                CheckPerformanceRelationParam performanceRelationParam = new CheckPerformanceRelationParam();
-                performanceRelationParam.setCanDownTime(item.getCanDownTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-                performanceRelationParam.setPerformanceId(item.getPerformanceId());
-                performanceRelationParamsList.add(performanceRelationParam);
-            }
-            userPerformanceVo.setCheckUserId(checkUserId);
-            userPerformanceVo.setRelationParams(performanceRelationParamsList);
-            mongoTemplate.insert(userPerformanceVo, KylinCheckUserPerformanceVo.class.getSimpleName());
-            dataUtils.delCheckUserRelationRedis(checkUserId);
-            return ResponseDto.success("删除成功");
-        } catch (Exception e) {
-            return ResponseDto.failure(ErrorMapping.get(20102));
-        }
-    }
-}

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

@@ -30,8 +30,6 @@ import java.util.regex.Pattern;
 @Component
 public class DataUtils {
 
-    @Autowired
-    private KylinBuyNoticeMapper buyNoticeMapper;
     @Autowired
     private MongoTemplate mongoTemplate;
     @Autowired
@@ -41,17 +39,6 @@ public class DataUtils {
     @Autowired
     private RedisTemplate redisTemplate;
 
-    /**
-     * 根据 购票须知 id 获取 购票须知文案
-     *
-     * @param buyNoticeIds 购票须知 数组
-     * @return 购票须知 json串
-     */
-    public String getBuyNoticeJsonString(List<String> buyNoticeIds) {
-        List<KylinBuyNotice> data = buyNoticeMapper.selectList(new UpdateWrapper<KylinBuyNotice>().in("buy_notice_id", buyNoticeIds));
-        return JsonUtils.toJson(data);
-    }
-
     /**
      * 初始化普通库存
      *
@@ -243,11 +230,7 @@ public class DataUtils {
     public void updatePerformanceMongo(String performanceIds, KylinPerformanceVo paramVo) {
         //查询 mysql 数据
         KylinPerformanceVo vo;
-        if (null == paramVo) {
-            vo = mongoVoUtils.combinePerformanceVoData(performanceIds);
-        } else {
-            vo = paramVo;
-        }
+        vo = paramVo;
         if (vo != null) {
             try {
                 //删除 mongo数据

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

@@ -42,8 +42,6 @@ public class KylinCheckUserPerformancesPartnerServiceImpl extends ServiceImpl<Ky
     @Autowired
     private MongoTemplate mongoTemplate;
     @Autowired
-    private MongoConverter mongoConverter;
-    @Autowired
     private DataUtils dataUtils;
     @Autowired
     private KylinCheckUserPerformancesMapper checkUserPerformancesMapper;