Merge remote-tracking branch 'origin/dev' into dev

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

@@ -9,6 +9,7 @@ import com.liquidnet.service.kylin.dao.PerformanceMemberAuditDao;
 import com.liquidnet.service.kylin.dao.PerformanceRecommendAdminDao;
 import com.liquidnet.service.kylin.dao.PerformanceRecommendDao;
 import com.liquidnet.service.kylin.dao.PerformanceTitleDao;
+import com.liquidnet.service.kylin.service.admin.IKylinPerformancesAdminService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -30,7 +31,7 @@ public class KylinMemberAuditController extends BaseController {
     private String prefix = "zhengzai/kylin/performances/memberAudit";
 
     @Autowired
-    private KylinPerformancesAdminServiceImpl kylinPerformancesService;
+    private IKylinPerformancesAdminService kylinPerformancesService;
 
     @RequiresPermissions("kylin:performances:memberAudit")
     @GetMapping()

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

@@ -18,6 +18,8 @@ import com.liquidnet.service.kylin.dto.param.SysDamaiParam;
 import com.liquidnet.service.kylin.dto.vo.admin.KylinPerformanceAgentVo;
 import com.liquidnet.service.kylin.dto.vo.admin.KylinPerformanceDamaiVo;
 import com.liquidnet.service.kylin.dto.vo.partner.KylinPerformanceMisVo;
+import com.liquidnet.service.kylin.service.admin.IKylinPerformancesAdminService;
+import com.liquidnet.service.kylin.service.other.DamaiService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -40,10 +42,10 @@ public class KylinPerformancesController extends BaseController {
     private String prefix = "zhengzai/kylin/performances";
 
     @Autowired
-    private KylinPerformancesAdminServiceImpl kylinPerformancesService;
+    private IKylinPerformancesAdminService kylinPerformancesService;
 
     @Autowired
-    private KylinDamaiServiceImpl damaiService;
+    private DamaiService damaiService;
 
     @RequiresPermissions("kylin:performances:view")
     @GetMapping()

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

@@ -12,6 +12,7 @@ import com.liquidnet.service.kylin.dao.PerformanceTitleDao;
 import com.liquidnet.service.kylin.dto.param.PerformanceAdminListParam;
 import com.liquidnet.service.kylin.dto.param.PerformanceRecommendAdminParam;
 import com.liquidnet.service.kylin.dto.vo.partner.KylinPerformanceMisVo;
+import com.liquidnet.service.kylin.service.admin.IKylinPerformancesAdminService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -33,7 +34,7 @@ public class KylinPerformancesRecommendController extends BaseController {
     private String prefix = "zhengzai/kylin/performances/recommend";
 
     @Autowired
-    private KylinPerformancesAdminServiceImpl kylinPerformancesService;
+    private IKylinPerformancesAdminService kylinPerformancesService;
 
     @RequiresPermissions("kylin:performances:recommend")
     @GetMapping()

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

@@ -14,6 +14,8 @@ import com.liquidnet.service.kylin.dao.RoadShowAdminListDao;
 import com.liquidnet.service.kylin.dto.param.CreateRoadShowParam;
 import com.liquidnet.service.kylin.dto.vo.admin.KylinRoadShowAdminVo;
 import com.liquidnet.service.kylin.dto.vo.partner.KylinPerformanceMisVo;
+import com.liquidnet.service.kylin.service.admin.IKylinPerformancesAdminService;
+import com.liquidnet.service.kylin.service.admin.IKylinRoadShowsAdminService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -35,9 +37,9 @@ public class KylinRoadShowController extends BaseController {
     private String prefix = "zhengzai/kylin/performances/roadShow";
 
     @Autowired
-    private KylinRoadShowsAdminServiceImpl kylinRoadShowsAdminService;
+    private IKylinRoadShowsAdminService kylinRoadShowsAdminService;
     @Autowired
-    private KylinPerformancesAdminServiceImpl kylinPerformancesService;
+    private IKylinPerformancesAdminService kylinPerformancesService;
 
     @RequiresPermissions("kylin:performances:roadShow")
     @GetMapping()

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

@@ -9,6 +9,7 @@ import com.liquidnet.service.kylin.dto.param.SyncOrderParam;
 import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderListVo;
 import com.liquidnet.service.kylin.dto.vo.returns.OrderDetailsVo;
 import com.liquidnet.service.kylin.dto.vo.returns.PayResultVo;
+import com.liquidnet.service.kylin.service.IKylinOrderTicketsService;
 import com.liquidnet.service.kylin.service.impl.KylinOrderTicketsServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -38,7 +39,7 @@ import java.util.List;
 public class KylinOrderTicketsController {
 
     @Autowired
-    private KylinOrderTicketsServiceImpl orderTicketsService;
+    IKylinOrderTicketsService orderTicketsService;
 
     @PostMapping("pre")
     @ApiOperation("下单")

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

@@ -4,6 +4,7 @@ package com.liquidnet.service.kylin.controller;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
 import com.liquidnet.service.kylin.dto.vo.returns.PayDetailVo;
+import com.liquidnet.service.kylin.service.IKylinLackRegistersService;
 import com.liquidnet.service.kylin.service.impl.KylinLackRegistersServiceImpl;
 import com.liquidnet.service.kylin.service.impl.KylinPerformancesServiceImpl;
 import io.swagger.annotations.Api;
@@ -33,7 +34,7 @@ public class KylinPerformancesController {
     @Autowired
     private KylinPerformancesServiceImpl kylinPerformancesService;
     @Autowired
-    private KylinLackRegistersServiceImpl kylinLackRegistersService;
+    private IKylinLackRegistersService kylinLackRegistersService;
 
     @GetMapping("localList")
     @ApiOperation("本地演出列表")

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

@@ -5,6 +5,7 @@ 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;
@@ -25,7 +26,7 @@ import org.springframework.web.bind.annotation.*;
 public class KylinBuyNoticeParnterController {
 
     @Autowired
-    private KylinBuyNoticePartnerServiceImpl buyNoticePartnerService;
+    private IKylinBuyNoticePartnerService buyNoticePartnerService;
 
     @GetMapping(value = "")
     @ApiOperation(value = "购票须知列表",position = 1)

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

@@ -6,6 +6,7 @@ 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;
@@ -32,7 +33,7 @@ import javax.validation.constraints.NotNull;
 public class KylinCheckUserPartnerController {
 
     @Autowired
-    private KylinCheckUserPartnerServiceImpl checkUserPartnerService;
+    private IKylinCheckUserPartnerService checkUserPartnerService;
 
     @PostMapping(value = "")
     @ApiOperation(value = "创建验票账号", position = 1)

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

@@ -9,6 +9,7 @@ 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;
@@ -38,7 +39,7 @@ import java.util.List;
 public class KylinCheckUserPerformancesPartnerController {
 
     @Autowired
-    private KylinCheckUserPerformancesPartnerServiceImpl userPerformancesPartnerService;
+    private IKylinCheckUserPerformancesPartnerService userPerformancesPartnerService;
 
     @PostMapping(value = "")
     @ApiOperation(value = "添加关联关系", position = 1)

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

@@ -5,6 +5,7 @@ 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;
@@ -30,7 +31,7 @@ import javax.validation.constraints.NotNull;
 public class KylinTicketTimesPartnerController {
 
     @Autowired
-    private KylinTicketTimesPartnerServiceImpl ticketTimesPartnerService;
+    private IKylinTicketTimesPartnerService ticketTimesPartnerService;
 
     @PostMapping(value = "")
     @ApiOperation(value = "创建场次",position = 1)

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

@@ -5,6 +5,7 @@ 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;
@@ -30,7 +31,7 @@ import javax.validation.constraints.NotNull;
 public class KylinTicketsPartnerController {
 
     @Autowired
-    private KylinTicketsPartnerServiceImpl ticketsPartnerService;
+    private IKylinTicketsPartnerService ticketsPartnerService;
 
     @PostMapping(value = "")
     @ApiOperation(value = "创建票务",position = 1 )

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

@@ -7,6 +7,7 @@ import com.liquidnet.service.kylin.dto.param.*;
 import com.liquidnet.service.kylin.dto.vo.middle.message.MessageConfigVo;
 import com.liquidnet.service.kylin.dto.vo.middle.message.MessageDataVo;
 import com.liquidnet.service.kylin.service.impl.partner.KylinPerformancesPartnerServiceImpl;
+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;
@@ -29,7 +30,7 @@ public class PerformancePartnerController {
     @Autowired
     private OtherUtils otherUtils;
     @Autowired
-    private KylinPerformancesPartnerServiceImpl performancesPartnerService;
+    private IKylinPerformancesPartnerService performancesPartnerService;
 
     @PostMapping(value = "list")
     @ApiOperation(value = "演出列表",position = 1)