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

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

@@ -3,12 +3,17 @@ package com.liquidnet.service.kylin.dto.param;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
 import java.util.List;
 
 @Data
 public class CheckUserParam {
     @ApiModelProperty(value = "演出id")
+    @NotNull
     private String checkUserId;
     @ApiModelProperty(value = "可下载时间")
+    @NotNull
+    @Size(min = 1)
     private List<CheckPerformanceRelationParam> checkPerformanceRelationParamList;
 }

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

 package com.liquidnet.service.kylin.dto.param;
 
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Builder;
 import lombok.Data;
 
+import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
 import java.util.List;
 
@@ -19,16 +21,19 @@ public class PayOrderParam {
     private String ticketId;
     @ApiModelProperty(value = "数量")
     @NotNull(message = "必传")
+    @Min(value = 1,message = "太小了")
     private Integer number;
 
 //    @ApiModelProperty(value = "是否学生票")
 //    @NotNull(message = "必传")
 //    private Integer isStudent;
     @ApiModelProperty(value = "是否电子票")
-    @NotNull(message = "必传")
+    @Min(0)
+    @Min(1)
     private Integer isElectronic;
     @ApiModelProperty(value = "是否快递票")
-    @NotNull(message = "必传")
+    @Min(0)
+    @Min(1)
     private Integer isExpress;
 
     @ApiModelProperty(value = "收货地址id")
@@ -40,6 +45,8 @@ public class PayOrderParam {
     private String agentId;
     @ApiModelProperty(value = "快递类型 1寄付 2到付")
     @NotNull(message = "必传")
+    @Min(0)
+    @Min(1)
     private Integer expressType;
 
 

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

@@ -3,6 +3,7 @@ package com.liquidnet.service.kylin.dto.param;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.Min;
 import java.math.BigDecimal;
 
 @Data

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

@@ -5,10 +5,7 @@ import lombok.Data;
 
 @Data
 public class SysDamaiParam {
-    @ApiModelProperty(value = "类型id", example = "")
     private String id;
-    @ApiModelProperty(value = "类型 演出/performance ticket/票", example = "")
     private String type;
-    @ApiModelProperty(value = "状态 1同步 2不同步", example = "")
     private Integer status;
 }

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

+package com.liquidnet.service.kylin.dto.vo;
+
+import com.liquidnet.service.kylin.dao.TicketAgentDao;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@ApiModel
+@Data
+public class KylinPerformanceAgentVo {
+    private String performancesId;
+    private String title;
+    private List<TicketAgentDao> tickets;
+}

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

+package com.liquidnet.service.kylin.dto.vo;
+
+import com.liquidnet.service.kylin.dao.TicketAgentDao;
+import com.liquidnet.service.kylin.dao.TicketDamaiDao;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.util.List;
+
+@ApiModel
+@Data
+public class KylinPerformanceDamaiVo {
+    private String performancesId;
+    private String title;
+    private Integer syncDamai;
+    private List<TicketDamaiDao> damaiTickets;
+}

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

@@ -6,6 +6,8 @@ import com.liquidnet.service.kylin.dao.*;
 import com.liquidnet.service.kylin.dto.param.PerformanceAdminListParam;
 import com.liquidnet.service.kylin.dto.param.PerformanceMemberAuditParam;
 import com.liquidnet.service.kylin.dto.param.SysDamaiParam;
+import com.liquidnet.service.kylin.dto.vo.KylinPerformanceAgentVo;
+import com.liquidnet.service.kylin.dto.vo.KylinPerformanceDamaiVo;
 import com.liquidnet.service.kylin.dto.vo.partner.KylinPerformanceMisVo;
 import com.liquidnet.service.kylin.entity.KylinPerformances;
 
@@ -168,5 +170,9 @@ public interface IKylinPerformancesAdminService extends IService<KylinPerformanc
      */
     boolean changeSysDamai(List<SysDamaiParam> params);
 
+    KylinPerformanceAgentVo getPerformanceAgent(String performancesId);
+
+    KylinPerformanceDamaiVo getPerformanceDamai(String performancesId);
+
     List<PerformanceOrderStatisticalDao> getPerformanceOrderStatisticalList(String performancesId);
 }

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

+package com.liquidnet.service.kylin.service.other;
+
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.kylin.dto.vo.tmp.CourierListVo;
+
+public interface DamaiService {
+    //同步演出
+    Boolean sycPerformance(String performanceId);
+    //同步场次
+    Boolean sycTimes(String timeId);
+    //同步票
+    Boolean sycTicket(String ticketId);
+}

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

 package com.liquidnet.client.admin.web.controller.zhengzai.kylin;
 
+import com.alibaba.druid.support.json.JSONUtils;
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.client.admin.common.core.controller.BaseController;
 import com.liquidnet.client.admin.common.core.domain.AjaxResult;
 import com.liquidnet.client.admin.common.core.page.TableDataInfo;
+import com.liquidnet.client.admin.common.json.JSON;
 import com.liquidnet.client.admin.zhengzai.kylin.dto.PerformanceOrderStatisCountResp;
+import com.liquidnet.client.admin.zhengzai.kylin.service.impl.KylinDamaiServiceImpl;
 import com.liquidnet.client.admin.zhengzai.kylin.service.impl.KylinPerformancesAdminServiceImpl;
+import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.kylin.dao.PerformanceAdminListDao;
 import com.liquidnet.service.kylin.dao.PerformanceMemberAuditDao;
 import com.liquidnet.service.kylin.dao.PerformanceOrderStatisticalDao;
 import com.liquidnet.service.kylin.dto.param.PerformanceAdminListParam;
 import com.liquidnet.service.kylin.dto.param.PerformanceMemberAuditParam;
+import com.liquidnet.service.kylin.dto.param.SysDamaiParam;
+import com.liquidnet.service.kylin.dto.vo.KylinPerformanceAgentVo;
+import com.liquidnet.service.kylin.dto.vo.KylinPerformanceDamaiVo;
 import com.liquidnet.service.kylin.dto.vo.partner.KylinPerformanceMisVo;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,6 +44,9 @@ public class KylinPerformancesController extends BaseController {
     @Autowired
     private KylinPerformancesAdminServiceImpl kylinPerformancesService;
 
+    @Autowired
+    private KylinDamaiServiceImpl damaiService;
+
     @RequiresPermissions("kylin:performances:view")
     @GetMapping()
     public String performances() {
@@ -104,8 +115,8 @@ public class KylinPerformancesController extends BaseController {
         //构造top统计数据
         PerformanceOrderStatisCountResp perCountResp = new PerformanceOrderStatisCountResp();
         perCountResp.setPerformanceTitle(performanceMisVo.getTitle());
-        if(result.size()>=2){
-            PerformanceOrderStatisticalDao resdao = result.get(result.size()-1);
+        if (result.size() >= 2) {
+            PerformanceOrderStatisticalDao resdao = result.get(result.size() - 1);
             perCountResp.setTotalSalePrice(resdao.getTotalSalePrice());
             perCountResp.setSaleGeneral(resdao.getSaleGeneral());
             perCountResp.setTotalGeneral(resdao.getTotalGeneral());
@@ -120,4 +131,46 @@ public class KylinPerformancesController extends BaseController {
         mmap.put("perOrderStaticList", result);
         return prefix + "/performancesStatic";
     }
+
+    @RequiresPermissions("kylin:performances:damai")
+    @GetMapping(value = "/damai/{performancesId}")
+    public String damai(@PathVariable("performancesId") String performancesId, ModelMap mmap) {
+        KylinPerformanceDamaiVo result = kylinPerformancesService.getPerformanceDamai(performancesId);
+        mmap.put("kylinPerformanceDamaiVo", result);
+        return prefix + "/damai";
+    }
+
+    @RequiresPermissions("kylin:performances:agent")
+    @GetMapping(value = "/agent/{performancesId}")
+    public String agent(@PathVariable("performancesId") String performancesId, ModelMap mmap) {
+        KylinPerformanceAgentVo result = kylinPerformancesService.getPerformanceAgent(performancesId);
+        mmap.put("kylinPerformanceAgentVo", result);
+        return prefix + "/agent";
+    }
+
+    @RequiresPermissions("kylin:performances:agent")
+    @PostMapping(value = "/agent/change")
+    @ResponseBody
+    public AjaxResult changeTicketAgent(@RequestParam("ticketsId") String ticketsId, @RequestParam("status") Integer status) {
+        boolean result = kylinPerformancesService.changeTicketAgent(ticketsId, status);
+        return toAjax(result);
+    }
+
+    @RequiresPermissions("kylin:performances:damai")
+    @PostMapping(value = "/damai/change")
+    @ResponseBody
+    public AjaxResult changeSysDamai(@RequestParam("params") String params) {
+        List<SysDamaiParam> data = JsonUtils.fromJson(params, new TypeReference<List<SysDamaiParam>>() {
+        });
+        boolean result = kylinPerformancesService.changeSysDamai(data);
+        return toAjax(result);
+    }
+
+    @RequiresPermissions("kylin:performances:damai")
+    @PostMapping(value = "/sync/damai")
+    @ResponseBody
+    public AjaxResult syncDamai(@RequestParam("performancesId") String performancesId) {
+        boolean result = damaiService.sycPerformance(performancesId);
+        return toAjax(result);
+    }
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/agent.html

+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org">
+<head>
+    <th:block th:include="include :: header('代理相关')"/>
+</head>
+<body class="white-bg">
+<div class="wrapper wrapper-content animated fadeInRight ibox-content">
+    <form class="form-horizontal m" id="form-agent-edit" th:object="${kylinPerformanceAgentVo}">
+        <div class="form-group">
+            <label class="col-sm-3 control-label is-required">performances_id：</label>
+            <div class="col-sm-8">
+                <input name="performancesId" th:field="*{performancesId}" class="form-control" type="text" readonly>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label is-required">演出名称：</label>
+            <div class="col-sm-8">
+                <input name="title" th:value="*{title}" class="form-control" type="text" readonly>
+            </div>
+        </div>
+        <div th:each="ticket : ${kylinPerformanceAgentVo.tickets}">
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">票种名称：</label>
+                <div class="col-sm-8">
+                    <input name="title" th:value="${ticket.title}" class="form-control" type="text" readonly>
+                    <input name="ticketsId" th:value="${ticket.ticketsId}" class="form-control" type="hidden" readonly>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">是否代理：</label>
+                <div class="col-sm-8" th:if="${ticket.isAgent==1}">
+                    <div class="radio check-box">
+                        <input type="radio" value="1" th:name="'ticket_agent:'+${ticket.ticketsId}" checked>代理</label>
+                    </div>
+                    <div class="radio check-box">
+                        <input type="radio" value="0" th:name="'ticket_agent:'+${ticket.ticketsId}">不代理</label>
+                    </div>
+                    <button type="button" class="btn btn-w-m btn-success" onclick="submitHandler(this)">
+                        修改
+                    </button>
+                </div>
+                <div class="col-sm-8" th:if="${ticket.isAgent==0}">
+                    <div class="radio check-box">
+                        <input type="radio" value="1" th:name="'ticket_agent:'+${ticket.ticketsId}">代理</label>
+                    </div>
+                    <div class="radio check-box">
+                        <input type="radio" value="0" th:name="'ticket_agent:'+${ticket.ticketsId}" checked> 不代理</label>
+                    </div>
+                    <button type="button" class="btn btn-w-m btn-success" onclick="submitHandler(this)">
+                        修改
+                    </button>
+                </div>
+            </div>
+        </div>
+    </form>
+</div>
+<th:block th:include="include :: footer"/>
+<script th:inline="javascript">
+    var prefix = ctx + "kylin/performances";
+    $("#form-performances-edit").validate({
+        focusCleanup: true
+    });
+
+    function submitHandler(res) {
+        var param = {
+            "ticketsId":$(res).parent().parent().parent().find("input[name^='ticketsId']").val(),
+            "status": $(res).parent().find("input[name^='ticket_agent:"+$(res).parent().parent().parent().find("input[name^='ticketsId']").val()+"']:checked").val()
+        }
+        $.operate.post(prefix + "/agent/change", param, function (res) {
+            location.reload();
+        });
+    }
+
+
+</script>
+</body>
+</html>
\ No newline at end of file

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/damai.html

+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org">
+<head>
+    <th:block th:include="include :: header('代理相关')"/>
+</head>
+<body class="white-bg">
+<div class="wrapper wrapper-content animated fadeInRight ibox-content">
+    <form class="form-horizontal m" id="form-damai-edit" th:object="${kylinPerformanceDamaiVo}">
+        <div class="form-group">
+            <label class="col-sm-3 control-label is-required">performances_id：</label>
+            <div class="col-sm-8">
+                <input name="performancesId" th:field="*{performancesId}" class="form-control" type="text" readonly>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label is-required">演出名称：</label>
+            <div class="col-sm-8">
+                <input name="title" th:field="*{title}" class="form-control" type="text" readonly>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label is-required">是否同步：</label>
+            <div class="col-sm-8" th:if="*{syncDamai==1}">
+                <div class="radio check-box">
+                    <input type="radio" value="1" name="performance_sync_damai" checked>同步</label>
+                </div>
+                <div class="radio check-box">
+                    <input type="radio" value="0" name="performance_sync_damai">不同步</label>
+                </div>
+            </div>
+            <div class="col-sm-8" th:if="*{syncDamai==0}">
+                <div class="radio check-box">
+                    <input type="radio" value="1" name="performance_sync_damai">同步</label>
+                </div>
+                <div class="radio check-box">
+                    <input type="radio" value="0" name="performance_sync_damai" checked> 不同步</label>
+                </div>
+            </div>
+        </div>
+        <div th:each="tickets : ${kylinPerformanceDamaiVo.damaiTickets}">
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">票种名称：</label>
+                <div class="col-sm-8">
+                    <input name="title" th:value="${tickets.title}" class="form-control" type="text" readonly>
+                    <input name="ticketsId" th:value="${tickets.ticketsId}" class="form-control" type="hidden" required>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">是否同步：</label>
+                <div class="col-sm-8" th:if="${tickets.syncDamai==1}">
+                    <div class="radio check-box">
+                        <input type="radio" value="1" th:name="'ticket_syncDamai:'+${tickets.ticketsId}"
+                               checked>同步</label>
+                    </div>
+                    <div class="radio check-box">
+                        <input type="radio" value="0" th:name="'ticket_syncDamai:'+${tickets.ticketsId}">不同步</label>
+                    </div>
+                </div>
+                <div class="col-sm-8" th:if="${tickets.syncDamai==0}">
+                    <div class="radio check-box">
+                        <input type="radio" value="1" th:name="'ticket_syncDamai:'+${tickets.ticketsId}">同步</label>
+                    </div>
+                    <div class="radio check-box">
+                        <input type="radio" value="0" th:name="'ticket_syncDamai:'+${tickets.ticketsId}" checked>
+                        不同步</label>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <button type="button" class="btn btn-w-m btn-success" onclick="submitHandler()">
+            修改
+        </button>
+
+    </form>
+</div>
+<th:block th:include="include :: footer"/>
+<script th:inline="javascript">
+    var prefix = ctx + "kylin/performances";
+    $("#form-performances-edit").validate({
+        focusCleanup: true
+    });
+
+    function submitHandler() {
+        const paramList = [];
+        var param = {
+            id: '[[${kylinPerformanceDamaiVo.performancesId}]]'.replaceAll("\"", ""),
+            type: "performance",
+            status: parseInt($("input[name^='performance_sync_damai']:checked").val())
+        }
+        paramList.push(param)
+        var ticketObj = JSON.parse('[[${kylinPerformanceDamaiVo.damaiTickets}]]');
+        $.each(ticketObj, function (i, damaiTickets) {
+            var param = {
+                id:damaiTickets.ticketsId,
+                type:"ticket",
+                status:parseInt($("input[name^='ticket_syncDamai:"+damaiTickets.ticketsId+"']:checked").val())
+            }
+            paramList.push(param)
+        });
+
+        $.operate.post(prefix + "/damai/change",
+            {params:JSON.stringify(paramList)},
+            function (res) {
+                location.reload();
+            });
+    }
+</script>
+</body>
+</html>
\ No newline at end of file

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/details.html

@@ -23,9 +23,9 @@
                     </li>
                     <li class=""><a data-toggle="tab" href="#tab-3" aria-expanded="false" onclick="memberInfo()">会员信息配置</a>
                     </li>
-                    <li class=""><a data-toggle="tab" href="#tab-2" aria-expanded="false">关联直播数量配置</a>
+                    <li class=""><a data-toggle="tab" href="#tab-4" aria-expanded="false" onclick="agentInfo()">代理配置</a>
                     </li>
-                    <li class=""><a data-toggle="tab" href="#tab-2" aria-expanded="false">云南摩登权限</a>
+                    <li class=""><a data-toggle="tab" href="#tab-5" aria-expanded="false" onclick="damaiInfo()">大麦配置</a>
                     </li>
                 </ul>
                 <div class="tab-content">
@@ -221,6 +221,16 @@
                             <iframe id="content_iframe" name="content_iframe" marginwidth=0 marginheight=0 width=100% height=800px  frameborder=0></iframe>
                         </div>
                     </div>
+                    <div id="tab-4" class="tab-pane">
+                        <div class="panel-body">
+                            <iframe id="agent_iframe" name="agent_iframe" marginwidth=0 marginheight=0 width=100% height=800px  frameborder=0></iframe>
+                        </div>
+                    </div>
+                    <div id="tab-5" class="tab-pane">
+                        <div class="panel-body">
+                            <iframe id="damai_iframe" name="damai_iframe" marginwidth=0 marginheight=0 width=100% height=800px  frameborder=0></iframe>
+                        </div>
+                    </div>
                 </div>
 
 
@@ -272,7 +282,8 @@
             };
             $.operate.post(prefix + "/audit", param, function (res) {
                 // $.modal.close();
-                $.table.refresh();
+                // $.table.refresh();
+                location.reload();
             });
         }
     }
@@ -284,7 +295,16 @@
     //会员详情
     function memberInfo() {
         document.getElementById("content_iframe").src="../memberInfo/"+'[[${kylinPerformanceMisVo.performancesId}]]'.replaceAll("\"", "");
+    }
+
+    //代理详情
+    function agentInfo() {
+        document.getElementById("agent_iframe").src="../agent/"+'[[${kylinPerformanceMisVo.performancesId}]]'.replaceAll("\"", "");
+    }
 
+    //大麦详情
+    function damaiInfo() {
+        document.getElementById("damai_iframe").src="../damai/"+'[[${kylinPerformanceMisVo.performancesId}]]'.replaceAll("\"", "");
     }
 
     $("#tab-nav-1").bind("click",function(){

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/performances.html

 <!DOCTYPE html>
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>
-    <th:block th:include="include :: header('演出列表')" />
+    <th:block th:include="include :: header('演出列表')"/>
 </head>
 <body class="gray-bg">
-     <div class="container-div">
-        <div class="row">
-            <div class="col-sm-12 search-collapse">
-                <form id="formId">
-                    <div class="select-list">
-                        <ul>
-                            <li>
-                                <label>演出名称：</label>
-                                <input type="text" name="title"/>
-                            </li>
-                            <li>
-                                <label>城市名称：</label>
-                                <input type="text" name="cityName"/>
-                            </li>
-                            <li>
-                                <label>排序字段：</label>
-                                <select name="orderItem">
-                                    <option value="">所有</option>
-                                    <option value="created_at">创建时间</option>
-                                    <option value="updatedAt">修改时间</option>
-                                </select>
-                            </li>
-                            <li>
-                                <label>排序方式：</label>
-                                <select name="orderSc">
-                                    <option value="">所有</option>
-                                    <option value="asc">正序</option>
-                                    <option value="desc">倒序</option>
-                                </select>
-                            </li>
-                            <li>
-                                <label>演出状态：</label>
-                                <select name="status">
-                                    <option value="-2">全部</option>
-                                    <option value="1">审核中</option>
-                                    <option value="3">审核通过</option>
-                                    <option value="4">审核拒绝</option>
-                                    <option value="6">售卖</option>
-                                    <option value="7">已下架</option>
-                                    <option value="8">演出结束</option>
-                                </select>
-                            </li>
-                            <li>
-                                <label>审核状态：</label>
-                                <select name="auditStatus">
-                                    <option value="-2">全部</option>
-                                    <option value="0">审核中</option>
-                                    <option value="2">审核拒绝</option>
-                                </select>
-                            </li>
-                            <li>
-                                <label>停售时间：</label>
-                                <select name="stopSellDay">
-                                    <option value="-2">全部</option>
-                                    <option value="0">今天</option>
-                                    <option value="1">明天</option>
-                                    <option value="-1">昨天</option>
-                                </select>
-                            </li>
-                            <li>
-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-                            </li>
-                        </ul>
-                    </div>
-                </form>
-            </div>
+<div class="container-div">
+    <div class="row">
+        <div class="col-sm-12 search-collapse">
+            <form id="formId">
+                <div class="select-list">
+                    <ul>
+                        <li>
+                            <label>演出名称：</label>
+                            <input type="text" name="title"/>
+                        </li>
+                        <li>
+                            <label>城市名称：</label>
+                            <input type="text" name="cityName"/>
+                        </li>
+                        <li>
+                            <label>排序字段：</label>
+                            <select name="orderItem">
+                                <option value="">所有</option>
+                                <option value="created_at">创建时间</option>
+                                <option value="updatedAt">修改时间</option>
+                            </select>
+                        </li>
+                        <li>
+                            <label>排序方式：</label>
+                            <select name="orderSc">
+                                <option value="">所有</option>
+                                <option value="asc">正序</option>
+                                <option value="desc">倒序</option>
+                            </select>
+                        </li>
+                        <li>
+                            <label>演出状态：</label>
+                            <select name="status">
+                                <option value="-2">全部</option>
+                                <option value="1">审核中</option>
+                                <option value="3">审核通过</option>
+                                <option value="4">审核拒绝</option>
+                                <option value="6">售卖</option>
+                                <option value="7">已下架</option>
+                                <option value="8">演出结束</option>
+                            </select>
+                        </li>
+                        <li>
+                            <label>审核状态：</label>
+                            <select name="auditStatus">
+                                <option value="-2">全部</option>
+                                <option value="0">审核中</option>
+                                <option value="2">审核拒绝</option>
+                            </select>
+                        </li>
+                        <li>
+                            <label>停售时间：</label>
+                            <select name="stopSellDay">
+                                <option value="-2">全部</option>
+                                <option value="0">今天</option>
+                                <option value="1">明天</option>
+                                <option value="-1">昨天</option>
+                            </select>
+                        </li>
+                        <li>
+                            <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
+                                    class="fa fa-search"></i>&nbsp;搜索</a>
+                            <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i
+                                    class="fa fa-refresh"></i>&nbsp;重置</a>
+                        </li>
+                    </ul>
+                </div>
+            </form>
+        </div>
 
-            <div class="btn-group-sm" id="toolbar" role="group">
-                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="kylin:performances:add">
-                    <i class="fa fa-plus"></i> 添加
-                </a>
-                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="kylin:performances:edit">
-                    <i class="fa fa-edit"></i> 修改
-                </a>
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="kylin:performances:remove">
-                    <i class="fa fa-remove"></i> 删除
-                </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="kylin:performances:export">
-                    <i class="fa fa-download"></i> 导出
-                </a>
-            </div>
-            <div class="col-sm-12 select-table table-bordered">
-                <table id="bootstrap-table"></table>
-            </div>
+        <div class="btn-group-sm" id="toolbar" role="group">
+            <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="kylin:performances:add">
+                <i class="fa fa-plus"></i> 添加
+            </a>
+            <a class="btn btn-primary single disabled" onclick="$.operate.edit()"
+               shiro:hasPermission="kylin:performances:edit">
+                <i class="fa fa-edit"></i> 修改
+            </a>
+            <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()"
+               shiro:hasPermission="kylin:performances:remove">
+                <i class="fa fa-remove"></i> 删除
+            </a>
+            <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="kylin:performances:export">
+                <i class="fa fa-download"></i> 导出
+            </a>
+        </div>
+        <div class="col-sm-12 select-table table-bordered">
+            <table id="bootstrap-table"></table>
         </div>
     </div>
-    <th:block th:include="include :: footer" />
-    <script th:inline="javascript">
-        var detailFlag = [[${@permission.hasPermi('kylin:performances:detail')}]];
-        var expertFlag = [[${@permission.hasPermi('kylin:performances:expert')}]];
-        var prefix = ctx + "kylin/performances";
+</div>
+<th:block th:include="include :: footer"/>
+<script th:inline="javascript">
+    var detailFlag = [[${@permission.hasPermi('kylin:performances:detail')}]];
+    var expertFlag = [[${@permission.hasPermi('kylin:performances:expert')}]];
+    var prefix = ctx + "kylin/performances";
 
-        $(function() {
-            var options = {
-                url: prefix + "/list",
-                detailUrl: prefix + "/details/{id}",
-                createUrl: prefix + "/add",
-                updateUrl: prefix + "/edit/{id}",
-                removeUrl: prefix + "/remove",
-                exportUrl: prefix + "/export",
-                // sortName: "sort",
-                modalName: "演出",
-                columns: [{
-                    checkbox: true
-                },
+    $(function () {
+        var options = {
+            url: prefix + "/list",
+            detailUrl: prefix + "/details/{id}",
+            createUrl: prefix + "/add",
+            updateUrl: prefix + "/edit/{id}",
+            removeUrl: prefix + "/remove",
+            exportUrl: prefix + "/export",
+            // sortName: "sort",
+            modalName: "演出",
+            columns: [{
+                checkbox: true
+            },
                 {
                     field: 'title',
                     title: '演出名称'
@@ -142,10 +146,6 @@
                     field: 'rejectTxt',
                     title: '拒绝理由'
                 },
-                // {
-                //     field: 'provinceName',
-                //     title: '转增状态'
-                // },
                 {
                     field: 'sort',
                     title: '排序',
@@ -154,16 +154,24 @@
                 {
                     title: '操作',
                     align: 'center',
-                    formatter: function(value, row, index) {
+                    formatter: function (value, row, index) {
                         var actions = [];
                         actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detailTab(\'' + row.performancesId + '\')"><i class="fa fa-edit"></i>查看</a> ');
-                        actions.push('<a class="btn btn-danger btn-xs ' + expertFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.mid + '\')"><i class="fa fa-remove"></i>导出</a>');
+                        if (row.syncDamai == 1) {
+                            actions.push('<a class="btn btn-warning btn-xs ' + expertFlag + '" href="javascript:void(0)" onclick="f(\'' + row.performancesId + '\')"><i class="fa fa-remove"></i>同步</a>');
+                        }
                         return actions.join('');
                     }
                 }]
-            };
-            $.table.init(options);
+        };
+        $.table.init(options);
+    });
+
+    function f(id) {
+        $.post(prefix + "/sync/damai",{performancesId:id},function (res) {
+            alert(res.msg)
         });
-    </script>
+    }
+</script>
 </body>
 </html>
\ No newline at end of file

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinDamaiServiceImpl.java

+package com.liquidnet.client.admin.zhengzai.kylin.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.liquidnet.commons.lang.util.IDGenerator;
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.kylin.dao.RoadShowAdminListDao;
+import com.liquidnet.service.kylin.dto.param.CreateRoadShowParam;
+import com.liquidnet.service.kylin.dto.vo.KylinRoadShowVo;
+import com.liquidnet.service.kylin.dto.vo.admin.KylinRoadShowAdminVo;
+import com.liquidnet.service.kylin.entity.KylinRoadShows;
+import com.liquidnet.service.kylin.mapper.KylinRoadShowsMapper;
+import com.liquidnet.service.kylin.service.admin.IKylinRoadShowsAdminService;
+import com.liquidnet.service.kylin.service.other.DamaiService;
+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 java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * <p>
+ * 巡演 服务实现类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-11
+ */
+@Service
+public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, KylinRoadShows> implements DamaiService {
+
+    @Autowired
+    private MongoTemplate mongoTemplate;
+
+    @Autowired
+    private MongoConverter mongoConverter;
+
+
+    @Override
+    public Boolean sycPerformance(String performanceId) {
+        return false;
+    }
+
+    @Override
+    public Boolean sycTimes(String timeId) {
+        return false;
+    }
+
+    @Override
+    public Boolean sycTicket(String ticketId) {
+        return false;
+    }
+}

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinPerformancesAdminServiceImpl.java

@@ -9,6 +9,8 @@ import com.liquidnet.client.admin.zhengzai.kylin.utils.PerformanceVoUtils;
 import com.liquidnet.commons.lang.util.BeanUtil;
 import com.liquidnet.service.kylin.dao.*;
 import com.liquidnet.service.kylin.dto.param.*;
+import com.liquidnet.service.kylin.dto.vo.KylinPerformanceAgentVo;
+import com.liquidnet.service.kylin.dto.vo.KylinPerformanceDamaiVo;
 import com.liquidnet.service.kylin.dto.vo.KylinPerformanceVo;
 import com.liquidnet.service.kylin.dto.vo.KylinTicketVo;
 import com.liquidnet.service.kylin.dto.vo.admin.KylinPerformanceMemberHistoryVo;
@@ -227,8 +229,8 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
     }
 
     @Override
-    public List<PerformanceTitleDao> getListByStatus(String status,String title) {
-        List<PerformanceTitleDao> voList = performancesMapper.misTitleByStatusList(status,title);
+    public List<PerformanceTitleDao> getListByStatus(String status, String title) {
+        List<PerformanceTitleDao> voList = performancesMapper.misTitleByStatusList(status, title);
         return voList;
     }
 
@@ -236,8 +238,8 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
     public boolean changeRoadShowId(String performancesId, String roadShowId) {
         try {
             //mysql
-            if(null==roadShowId || roadShowId.isEmpty()){
-                roadShowId="0";
+            if (null == roadShowId || roadShowId.isEmpty()) {
+                roadShowId = "0";
             }
             KylinPerformanceRelations performanceRelations = new KylinPerformanceRelations();
             performanceRelations.setRoadShowId(roadShowId);
@@ -265,10 +267,10 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
     }
 
     @Override
-    public boolean setRecommend(String performancesId,Integer isRecommend) {
+    public boolean setRecommend(String performancesId, Integer isRecommend) {
         try {
-            if(null == isRecommend){
-                isRecommend=0;
+            if (null == isRecommend) {
+                isRecommend = 0;
             }
             KylinPerformanceStatus performanceStatus = new KylinPerformanceStatus();
 //            performanceStatus.setIsRecommend(0);
@@ -284,16 +286,16 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
 //            );
 
 //            for (PerformanceRecommendAdminParam item : performancesIdList) {
-                performanceStatus.setIsRecommend(isRecommend);
-                performanceStatusMapper.update(performanceStatus, new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", performancesId));
+            performanceStatus.setIsRecommend(isRecommend);
+            performanceStatusMapper.update(performanceStatus, new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", performancesId));
 
-                HashMap<String, Object> map2 = new HashMap<>();
-                map2.put("isRecommend", isRecommend);
-                BasicDBObject object2 = new BasicDBObject("$set", map2);
-                mongoTemplate.getCollection(KylinPerformanceVo.class.getSimpleName()).updateOne(
-                        Query.query(Criteria.where("performancesId").is(performancesId)).getQueryObject(),
-                        object2
-                );
+            HashMap<String, Object> map2 = new HashMap<>();
+            map2.put("isRecommend", isRecommend);
+            BasicDBObject object2 = new BasicDBObject("$set", map2);
+            mongoTemplate.getCollection(KylinPerformanceVo.class.getSimpleName()).updateOne(
+                    Query.query(Criteria.where("performancesId").is(performancesId)).getQueryObject(),
+                    object2
+            );
 //            }
 //            dataUtils.delPerformanceRecommendRedis(item.getPerformanceId());
             return true;
@@ -307,9 +309,9 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
         try {
             Integer resultInt = 0;
             if (isShow == 0) {
-                resultInt=performanceStatusMapper.hideIsShow(performancesId);
+                resultInt = performanceStatusMapper.hideIsShow(performancesId);
             } else {
-                resultInt=performanceStatusMapper.showIsShow(performancesId);
+                resultInt = performanceStatusMapper.showIsShow(performancesId);
             }
             HashMap<String, Object> map = new HashMap<>();
             map.put("isShow", isShow);
@@ -422,8 +424,8 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
 
     @Override
     public PerformanceMemberAuditDao performanceMemberAuditInfo(String performanceId, Integer status) {
-        if(null==status){
-            status=1;
+        if (null == status) {
+            status = 1;
         }
         PerformanceMemberAuditParam memberAuditVo = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(performanceId).and("status").is(status)), PerformanceMemberAuditParam.class, PerformanceMemberAuditParam.class.getSimpleName());
         if (memberAuditVo == null) {
@@ -632,6 +634,29 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
         }
     }
 
+    @Override
+    public KylinPerformanceAgentVo getPerformanceAgent(String performancesId) {
+        KylinPerformances performanceData = performancesMapper.selectOne(new UpdateWrapper<KylinPerformances>().eq("performances_id", performancesId));
+        List<TicketAgentDao> ticketData = ticketsMapper.ticketAgent(performancesId);
+        KylinPerformanceAgentVo vo = new KylinPerformanceAgentVo();
+        vo.setPerformancesId(performanceData.getPerformancesId());
+        vo.setTitle(performanceData.getTitle());
+        vo.setTickets(ticketData);
+        return vo;
+    }
+
+    public KylinPerformanceDamaiVo getPerformanceDamai(String performancesId) {
+        KylinPerformances performanceData = performancesMapper.selectOne(new UpdateWrapper<KylinPerformances>().eq("performances_id", performancesId));
+        KylinPerformanceStatus performanceStatusData = performanceStatusMapper.selectOne(new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", performancesId));
+        List<TicketDamaiDao> ticketData = ticketsMapper.ticketDamai(performancesId);
+        KylinPerformanceDamaiVo vo = new KylinPerformanceDamaiVo();
+        vo.setPerformancesId(performanceData.getPerformancesId());
+        vo.setTitle(performanceData.getTitle());
+        vo.setSyncDamai(performanceStatusData.getSyncDamai());
+        vo.setDamaiTickets(ticketData);
+        return vo;
+    }
+
     @Override
     public List<PerformanceOrderStatisticalDao> getPerformanceOrderStatisticalList(String performancesId) {
         PerformanceOrderStatisticalDao countBean = new PerformanceOrderStatisticalDao();

liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/core/JwtValidator.java

@@ -8,6 +8,8 @@ import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
 
+import javax.crypto.SecretKey;
+import javax.crypto.spec.SecretKeySpec;
 import java.util.Date;
 import java.util.Map;
 
@@ -21,9 +23,19 @@ public class JwtValidator {
     private Long expireTtl;
     private Long refreshTtl;
     private Long blacklistGracePeriod;
+
 //    private static final long EXPIRE_TIME = 15 * 60 * 1000;
 //    private static final String TOKEN_SECRET = "qZHglvNP0n0aOOckHiQXq5JMD468J4eG";
 
+    private SecretKey secretKey;
+
+    private SecretKey initSecretKey(String secret) {
+        if (null == this.secretKey) {
+            this.secretKey = new SecretKeySpec(secret.getBytes(), SignatureAlgorithm.HS256.getJcaName());
+        }
+        return this.secretKey;
+    }
+
     /**
      * 用户登录成功后生成Jwt token
      * 使用Hs256算法
@@ -35,16 +47,11 @@ public class JwtValidator {
         long nowMillis = System.currentTimeMillis();
         long expMillis = System.currentTimeMillis() + expireTtl * 60000;
 
-        // 创建一个JwtBuilder，设置jwt的body
         JwtBuilder builder = Jwts.builder()
-                // 保存在Payload（有效载荷）中的内容, 自定义一些数据保存在这里
                 .setClaims(claimsMap)
-                // iat: jwt的签发时间
                 .setIssuedAt(new Date(nowMillis))
-                // 设置过期时间
                 .setExpiration(new Date(expMillis))
-                // 使用HS256算法和签名使用的秘钥生成密文
-                .signWith(SignatureAlgorithm.HS256, secret);
+                .signWith(SignatureAlgorithm.HS256, this.initSecretKey(this.secret));
         return builder.compact();
     }
 
@@ -55,11 +62,8 @@ public class JwtValidator {
      * @return
      */
     public Claims parse(String token) {
-        // 得到DefaultJwtParser
         return Jwts.parser()
-                // 设置签名的秘钥
-                .setSigningKey(secret)
-                // 设置需要解析的token
+                .setSigningKey(this.initSecretKey(this.secret))
                 .parseClaimsJws(token).getBody();
     }
 }

liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/util/CurrentUtil.java

@@ -7,7 +7,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 public class CurrentUtil {
-    public static final String uID = "uid";
+    public static final String uID = "sub";
     public static final String uTag = "u-tag";
     public static final String uToken = "u-token";
     public static final String CLI_SOURCE = "source";
@@ -21,16 +21,6 @@ public class CurrentUtil {
 
     public static Map getTokenClaims() {
         String utag = ServletUtils.getRequest().getHeader(uTag);
-
-        // TODO: 2021/5/14 dev联调API未启用token默认使用1
-        if (StringUtils.isEmpty(utag)) {
-            Map<String, Object> map = new HashMap<>();
-            map.put("mobile", "000");
-            map.put("nickname", "111");
-            map.put("uid", "1");
-            return map;
-        }
-
         return JsonUtils.fromJson(utag, Map.class);
     }
 

liquidnet-bus-config/liquidnet-config/application-test.yml

@@ -22,7 +22,10 @@ liquidnet:
   knife4j:
     disable: false
   redis:
-    host: r-2zefzyjbij5vbez65y.redis.rds.aliyuncs.com
+#    host: r-2zefzyjbij5vbez65y.redis.rds.aliyuncs.com
+#    port: 6380
+#    password: PO@B!Iud32
+    host: r-2ze7002ckw5u75fguk.redis.rds.aliyuncs.com
     port: 6380
     password: PO@B!Iud32
   mongodb:

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/PerformanceAdminListDao.java

@@ -19,6 +19,7 @@ public class PerformanceAdminListDao {
     private Integer saleGeneral;
     private Integer totalSalePrice;
     private Integer surplusGeneral;
+    private Integer syncDamai;
     private String rejectTxt;
     private Integer sort;
     private String createdAt;

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/TicketAgentDao.java

+package com.liquidnet.service.kylin.dao;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class TicketAgentDao {
+    private String ticketsId;
+    private String title;
+    private Integer isAgent;
+}

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/TicketDamaiDao.java

+package com.liquidnet.service.kylin.dao;
+
+import lombok.Data;
+
+@Data
+public class TicketDamaiDao {
+    private String ticketsId;
+    private String title;
+    private Integer syncDamai;
+}

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

@@ -73,6 +73,11 @@ public class KylinOrderTickets implements Serializable {
      */
     private String orderType;
 
+    /**
+     * 下单来源
+     */
+    private String orderSource;
+
     /**
      * 下单版本
      */

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/mapper/KylinTicketsMapper.java

 package com.liquidnet.service.kylin.mapper;
 
+import com.liquidnet.service.kylin.dao.TicketAgentDao;
+import com.liquidnet.service.kylin.dao.TicketDamaiDao;
 import com.liquidnet.service.kylin.entity.KylinTickets;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.List;
+
 /**
  * <p>
  * 票 Mapper 接口
@@ -13,4 +17,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface KylinTicketsMapper extends BaseMapper<KylinTickets> {
 
+    List<TicketAgentDao> ticketAgent(String performanceIs);
+
+    List<TicketDamaiDao> ticketDamai(String performanceIs);
+
 }

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

@@ -34,6 +34,7 @@
         <result column="sort" property="sort"/>
         <result column="audit_time" property="auditTime"/>
         <result column="sponsor" property="sponsor"/>
+        <result column="sync_damai" property="syncDamai"/>
         <result column="created_at" property="createdAt"/>
     </resultMap>
 
@@ -178,6 +179,7 @@
         p.type,
         p.time_start ,
         p.time_end ,
+        ps.sync_damai ,
         IFNULL(t.total_general , 0) AS 'total_general' ,
         IFNULL(ot.sale_general , 0) AS 'sale_general' ,
         IFNULL(ot.total_sale_price , 0) AS 'total_sale_price' ,

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

@@ -2,4 +2,44 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.liquidnet.service.kylin.mapper.KylinTicketsMapper">
 
+    <resultMap id="ticketAgentResult" type="com.liquidnet.service.kylin.dao.TicketAgentDao">
+        <result column="tickets_id" property="ticketsId"/>
+        <result column="title" property="title"/>
+        <result column="is_agent" property="isAgent"/>
+    </resultMap>
+
+    <resultMap id="ticketDamaiResult" type="com.liquidnet.service.kylin.dao.TicketDamaiDao">
+        <result column="tickets_id" property="ticketsId"/>
+        <result column="title" property="title"/>
+        <result column="is_agent" property="isAgent"/>
+    </resultMap>
+
+
+    <!-- 票分销情况-->
+    <select id="ticketAgent" parameterType="java.lang.String" resultMap="ticketAgentResult">
+        SELECT
+            tickets_id ,
+            concat(title,' - ',use_start)  as 'title',
+            ts.is_agent
+        FROM
+            kylin_ticket_status AS ts
+                LEFT JOIN kylin_ticket_relations AS tr ON tr.ticket_id = ts.ticket_id
+                LEFT JOIN kylin_ticket_time_relation AS ttr ON tr.times_id = ttr.times_id
+                LEFT JOIN kylin_tickets AS t ON t.tickets_id = ts.ticket_id
+        where performance_id = ${performanceIds}
+    </select>
+
+    <!-- 票大麦情况-->
+    <select id="ticketDamai" parameterType="java.lang.String" resultMap="ticketDamaiResult">
+        SELECT
+            tickets_id ,
+            concat(title,' - ',use_start)  as 'title',
+            ts.sync_damai
+        FROM
+            kylin_ticket_status AS ts
+                LEFT JOIN kylin_ticket_relations AS tr ON tr.ticket_id = ts.ticket_id
+                LEFT JOIN kylin_ticket_time_relation AS ttr ON tr.times_id = ttr.times_id
+                LEFT JOIN kylin_tickets AS t ON t.tickets_id = ts.ticket_id
+        where performance_id = ${performanceIds}
+    </select>
 </mapper>

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamLoginController.java

@@ -132,7 +132,7 @@ public class AdamLoginController {
         loginInfoVo.setUserInfo(userInfoVo);
 
         Map<String, Object> claimsMap = new HashMap<>();
-        claimsMap.put("uid", userInfoVo.getUid());
+        claimsMap.put("sub", userInfoVo.getUid());
         // TODO: 2021/5/25 修改手机号更新TOKEN
         claimsMap.put("mobile", userInfoVo.getMobile());
         claimsMap.put("nickname", userInfoVo.getNickname());
@@ -166,7 +166,7 @@ public class AdamLoginController {
         loginInfoVo.setUserInfo(userInfoVo);
 
         Map<String, Object> claimsMap = new HashMap<>();
-        claimsMap.put("uid", userInfoVo.getUid());
+        claimsMap.put("sub", userInfoVo.getUid());
         claimsMap.put("mobile", userInfoVo.getMobile());
         claimsMap.put("nickname", userInfoVo.getNickname());
         loginInfoVo.setToken(this.ssoProcess(claimsMap));
@@ -200,7 +200,7 @@ public class AdamLoginController {
         }
 
         Map<String, Object> claimsMap = new HashMap<>();
-        claimsMap.put("uid", loginInfoVo.getUserInfo().getUid());
+        claimsMap.put("sub", loginInfoVo.getUserInfo().getUid());
         claimsMap.put("mobile", loginInfoVo.getUserInfo().getMobile());
         claimsMap.put("nickname", loginInfoVo.getUserInfo().getNickname());
         loginInfoVo.setToken(this.ssoProcess(claimsMap));
@@ -276,7 +276,7 @@ public class AdamLoginController {
     }
 
     private String ssoProcess(Map<String, Object> claimsMap) {
-        String uid = (String) claimsMap.get("uid");
+        String uid = (String) claimsMap.get("sub");
 
         String uidSso = jwtValidator.getSsoRedisKey().concat(uid);
 

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/docu/db_kylin_structure.sql

@@ -419,6 +419,7 @@ CREATE TABLE `kylin_order_tickets`
     `pay_code`             varchar(255)  NOT NULL DEFAULT '' COMMENT '支付单号',
     `qr_code`              varchar(255)  NOT NULL DEFAULT '' COMMENT '二维码地址',
     `order_type`           varchar(255)  NOT NULL DEFAULT '' COMMENT '下单方式',
+    `order_source`        varchar(255)  NOT NULL DEFAULT '' COMMENT '下单来源',
     `order_version`        varchar(255)  NOT NULL DEFAULT '' COMMENT '下单版本',
     `number`               int(32) NOT NULL DEFAULT 0 COMMENT '数量',
     `price`                decimal(8, 2) NOT NULL DEFAULT '0.00' COMMENT '单价',

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

@@ -16,6 +16,9 @@ import io.swagger.annotations.ApiResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
 import java.util.HashMap;
 import java.util.List;
 
@@ -38,43 +41,43 @@ public class KylinOrderTicketsController {
     @PostMapping("pre")
     @ApiOperation("下单")
     @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<PayResultVo> checkCanOrder(@RequestBody PayOrderParam payOrderParam) {
+    public ResponseDto<PayResultVo> checkCanOrder(@RequestBody @Valid PayOrderParam payOrderParam) {
         return orderTicketsService.checkCanOrder(payOrderParam);
     }
 
     @PostMapping("payAgain")
     @ApiOperation("再次支付")
     @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<PayResultVo> payAgain(@RequestBody PayAgainParam payAgainParam) {
+    public ResponseDto<PayResultVo> payAgain(@RequestBody @Valid PayAgainParam payAgainParam) {
         return orderTicketsService.payAgain(payAgainParam);
     }
 
     @PostMapping("syncOrder")
     @ApiOperation("支付回调")
     @ApiResponse(code = 200, message = "接口返回对象参数")
-    public String payAgain(@RequestBody SyncOrderParam syncOrderParam) {
+    public String payAgain(@RequestBody @Valid SyncOrderParam syncOrderParam) {
         return orderTicketsService.syncOrder(syncOrderParam);
     }
 
     @GetMapping("list")
     @ApiOperation("订单列表")
     @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<PageInfo<List<KylinOrderListVo>>> payAgain(@RequestParam("page") int page,
-                                                                  @RequestParam("size") int size) {
+    public ResponseDto<PageInfo<List<KylinOrderListVo>>> orderList(@RequestParam("page") @NotNull @Min(1) int page,
+                                                                  @RequestParam("size") @NotNull @Min(1) int size) {
         return ResponseDto.success(orderTicketsService.orderList(page,size));
     }
 
     @GetMapping("details")
     @ApiOperation("订单详情")
     @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<OrderDetailsVo> orderDetails(@RequestParam("orderId") String orderId) {
+    public ResponseDto<OrderDetailsVo> orderDetails(@RequestParam("orderId") @NotNull String orderId) {
         return ResponseDto.success(orderTicketsService.orderDetails(orderId));
     }
 
     @GetMapping("checkPayment")
-    @ApiOperation("订单详情")
+    @ApiOperation("订单状态")
     @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<HashMap> checkOrderResult(@RequestParam("orderId") String orderId) {
+    public ResponseDto<HashMap> checkOrderResult(@RequestParam("orderId") @NotNull String orderId) {
         Integer status = orderTicketsService.checkOrderResult(orderId).getData();
         HashMap<String,Integer> map = new HashMap<>();
         map.put("status",status);

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

@@ -38,6 +38,7 @@ import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Function;
 import java.util.function.Predicate;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 @Api(tags = "验票")
@@ -105,13 +106,15 @@ public class KylinStationController {
     @ApiOperation(value = "演出列表")
     @ApiImplicitParams({
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "mod", value = "模块[recent-近期的,over-历史]", allowableValues = "recent,over"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "match", value = "匹配字符[title|cityName|fieldName]"),
             @ApiImplicitParam(type = "form", required = true, dataType = "Integer", name = "pageNo", value = "页码", example = "1"),
             @ApiImplicitParam(type = "form", required = true, dataType = "Integer", name = "pageSize", value = "页记录数", example = "5"),
     })
     @GetMapping("performances")
     public ResponseDto<PageInfo<KylinStationPerformanceVo>> performances(@RequestParam String mod,
-                                                                     @RequestParam(defaultValue = "1", required = false) int pageNo,
-                                                                     @RequestParam(defaultValue = "5", required = false) int pageSize) {
+                                                                         @RequestParam(required = false) String match,
+                                                                         @RequestParam(defaultValue = "1", required = false) int pageNo,
+                                                                         @RequestParam(defaultValue = "5", required = false) int pageSize) {
         List<KylinStationPerformanceVo> voList = new ArrayList<>();
         String currentUid = CurrentUtil.getCurrentUid();
         long count = 0;
@@ -124,25 +127,34 @@ public class KylinStationController {
                 if (!CollectionUtils.isEmpty(performanceRelationList)) {
                     LocalDateTime tmpDt = LocalDateTime.of(LocalDate.now(), LocalTime.of(0, 0, 0, 0));
                     String tmpDtStr = DateUtil.format(tmpDt, DateUtil.Formatter.yyyyMMddHHmmss);
-                    Query performancesVoQuery = Query.query(Criteria.where("performancesId").in(
+                    Criteria criteria = Criteria.where("performancesId").in(
                             performanceRelationList.stream().map(CheckPerformanceRelationParam::getPerformanceId).toArray()
-                    ));
+                    );
                     switch (mod) {
                         case "recent":
-                            log.info(":::performances/recent:{}", currentUid);
-                            performancesVoQuery.addCriteria(Criteria.where("timeEnd").gt(tmpDtStr));
+                            log.debug(":::performances/recent:{},match:{}", currentUid, match);
+                            criteria.andOperator(Criteria.where("timeEnd").gt(tmpDtStr));
                             break;
 //                        case "down":
 //                            log.info(":::performances/down:{}", currentUid);
 //                            break;
                         case "over":
                             log.info(":::performances/over:{}", currentUid);
-                            performancesVoQuery.addCriteria(Criteria.where("timeEnd").lte(tmpDtStr));
+                            criteria.andOperator(Criteria.where("timeEnd").lte(tmpDtStr));
                             break;
                         default:
                             log.info(":::performances/default:{}", currentUid);
                             return ResponseDto.success(new PageInfo<>());
                     }
+                    if (StringUtils.isNotBlank(match)) {
+                        Pattern pattern = Pattern.compile("^.*" + match + ".*$", Pattern.CASE_INSENSITIVE);
+                        criteria.orOperator(
+                                Criteria.where("title").regex(pattern),
+                                Criteria.where("cityName").regex(pattern),
+                                Criteria.where("fieldName").regex(pattern)
+                        );
+                    }
+                    Query performancesVoQuery = Query.query(criteria);
                     count = mongoTemplate.count(performancesVoQuery, KylinPerformanceVo.class.getSimpleName());
 
                     if (count <= 0) return ResponseDto.success(new PageInfo<>());
@@ -178,6 +190,8 @@ public class KylinStationController {
 
                         List<KylinStationTicketVo> ticketVoList = new ArrayList<>();
 
+                        BigDecimal priceSum = BigDecimal.ZERO;
+                        int number = 0, checkedNum = 0, remainderNum = 0;
                         for (Map.Entry<String, List<KylinOrderTicketEntitiesVo>> entry : performanceTicketEntitiesVoMap.entrySet()) {
                             KylinTicketVo ticketVo = performanceTicketMap.get(entry.getKey());
 
@@ -200,9 +214,23 @@ public class KylinStationController {
                             List<KylinOrderTicketEntitiesVo> remainderEntitiesVoList = subStatusPerformanceTicketEntitiesVoMap.get(0);
                             stationTicketVo.setRemainderNum(CollectionUtils.isEmpty(remainderEntitiesVoList) ? 0 : remainderEntitiesVoList.size());
 
+                            number += stationTicketVo.getNumber();
+                            checkedNum += stationTicketVo.getCheckedNum();
+                            remainderNum += stationTicketVo.getRemainderNum();
+                            priceSum = priceSum.add(stationTicketVo.getPriceSum());
+
                             ticketVoList.add(stationTicketVo);
                         }
 
+                        KylinStationTicketVo sumTicketVo = KylinStationTicketVo.getNew();
+                        sumTicketVo.setTicketId("TT");
+                        sumTicketVo.setTitle("合计");
+                        sumTicketVo.setPriceSum(priceSum);
+                        sumTicketVo.setNumber(number);
+                        sumTicketVo.setCheckedNum(checkedNum);
+                        sumTicketVo.setRemainderNum(remainderNum);
+
+                        ticketVoList.add(sumTicketVo);
                         r.setTicketVoList(ticketVoList);
                         r.setCanDownTime(performanceRelationMap.get(r.getPerformancesId()));
                     });
@@ -377,7 +405,7 @@ public class KylinStationController {
         String ssoKeyUid = jwtValidator.getSsoRedisKey().concat(uid);
 
         Map<String, Object> claimsMap = new HashMap<>();
-        claimsMap.put("uid", uid);
+        claimsMap.put("sub", uid);
         claimsMap.put("mobile", checkUserVo.getMobile());
         claimsMap.put("nickname", checkUserVo.getName());
 

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

@@ -30,7 +30,7 @@ public class KylinBuyNoticeParnterController {
     @GetMapping(value = "")
     @ApiOperation(value = "购票须知列表",position = 1)
     @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<PageInfo<KylinBuyNoticeVo>> copyPerformance() {
+    public ResponseDto<PageInfo<KylinBuyNoticeVo>> getBuyNotice() {
         PageInfo<KylinBuyNoticeVo> result = buyNoticePartnerService.getBuyNotice();
         if (null == result) {
             return ResponseDto.failure("查询失败");

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

@@ -11,9 +11,13 @@ import com.liquidnet.service.kylin.service.impl.partner.KylinCheckUserPartnerSer
 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.web.bind.annotation.*;
 
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+
 /**
  * <p>
  * 验票用户表 前端控制器
@@ -33,39 +37,39 @@ public class KylinCheckUserPartnerController {
     @PostMapping(value = "")
     @ApiOperation(value = "创建验票账号", position = 1)
     @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<String> create(@RequestParam("merchantId") String merchantId,
-                                      @RequestParam("name") String name,
-                                      @RequestParam("pwd") String pwd,
-                                      @RequestParam("mobile") String mobile) {
+    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") String merchantId,
-                                   @RequestParam("checkUserId") String checkUserId) {
+    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") String merchantId,
-                                      @RequestParam("checkUserId") String checkUserId,
-                                      @RequestParam("name") String name,
-                                      @RequestParam(value = "pwd",required = false) String pwd,
-                                      @RequestParam("mobile") String mobile) {
+    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") String merchantId,
-                                                                    @RequestParam(value = "mobile" , required = false) String mobile,
-                                                                    @RequestParam("page") int page,
-                                                                    @RequestParam("size") int size) {
+    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("查询失败");
@@ -77,8 +81,8 @@ public class KylinCheckUserPartnerController {
     @GetMapping(value = "details")
     @ApiOperation(value = "验票账号详情", position = 1)
     @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<ChildDetailsDao> details(@RequestParam("merchantId") String merchantId,
-                                                @RequestParam("checkUserId") String checkUserId) {
+    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("查询失败");

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

@@ -15,6 +15,10 @@ import io.swagger.annotations.ApiResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 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;
 
@@ -37,14 +41,14 @@ public class KylinCheckUserPerformancesPartnerController {
     @PostMapping(value = "")
     @ApiOperation(value = "添加关联关系", position = 1)
     @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<String> setPerformance(@RequestBody CheckUserParam param) {
+    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") List<String> performanceIds,
+    public ResponseDto<String> delPerformance(@RequestParam("performanceIds") @Size(min = 1) @NotNull List<String> performanceIds,
                                               @RequestParam("checkUserId") String checkUserId) {
         return userPerformancesPartnerService.delPerformance(performanceIds, checkUserId);
     }
@@ -52,10 +56,10 @@ public class KylinCheckUserPerformancesPartnerController {
     @GetMapping(value = "relation")
     @ApiOperation(value = "关联演出列表", position = 1)
     @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<PageInfo<ChildPerformanceDao>> childPerformanceList(@RequestParam("merchantId") String merchantId,
-                                                                           @RequestParam("checkUserId") String checkUserId,
-                                                                           @RequestParam("page") int page,
-                                                                           @RequestParam("size") int size,
+    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);
     }
@@ -63,10 +67,10 @@ public class KylinCheckUserPerformancesPartnerController {
     @GetMapping(value = "unRelation")
     @ApiOperation(value = "未关联演出列表", position = 1)
     @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<PageInfo<ChildPerformanceDao>> unChildPerformanceList(@RequestParam("merchantId") String merchantId,
-                                                                             @RequestParam("checkUserId") String checkUserId,
-                                                                             @RequestParam("page") int page,
-                                                                             @RequestParam("size") int size,
+    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

@@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
 
 /**
  * <p>
@@ -39,7 +40,7 @@ public class KylinTicketTimesPartnerController {
     @DeleteMapping(value = "")
     @ApiOperation(value = "删除场次",position = 2)
     @ApiResponse(response = KylinTicketTimesPartnerVo.class, code = 200, message = "接口返回对象参数")
-    public ResponseDto<String> deleteTimes(@RequestParam("ticketTimesId") String ticketTimesId) {
+    public ResponseDto<String> deleteTimes(@RequestParam("ticketTimesId") @NotNull String ticketTimesId) {
         return ticketTimesPartnerService.deleteTimes(ticketTimesId);
     }
 
@@ -53,7 +54,7 @@ public class KylinTicketTimesPartnerController {
     @GetMapping(value = "/details")
     @ApiOperation(value = "获取场次详情",position = 4)
     @ApiResponse(response = KylinTicketTimesPartnerVo.class, code = 200, message = "接口返回对象参数")
-    public ResponseDto<KylinTicketTimesPartnerVo> getTimesMongo(@RequestParam("ticketTimesId") String ticketTimesId) {
+    public ResponseDto<KylinTicketTimesPartnerVo> getTimesMongo(@RequestParam("ticketTimesId") @NotNull String ticketTimesId) {
         KylinTicketTimesPartnerVo result = null;
         result = ticketTimesPartnerService.getTimesMongo(ticketTimesId);
         if (null == result) {

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

@@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
 
 /**
  * <p>
@@ -46,21 +47,21 @@ public class KylinTicketsPartnerController {
     @DeleteMapping(value = "")
     @ApiOperation(value = "删除票务",position = 3)
     @ApiResponse( code = 200, message = "接口返回对象参数")
-    public ResponseDto<String> deleteTicket(@RequestParam("ticketsId") String ticketsId) {
+    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("ticketsId") String ticketsId) {
+    public ResponseDto<KylinTicketPartnerVo> copyTicket(@RequestParam("ticketsId") @NotNull String ticketsId) {
         return ticketsPartnerService.copyTicket(ticketsId);
     }
 
     @GetMapping(value = "/details")
     @ApiOperation(value = "获取票务详情",position = 5)
     @ApiResponse(response = KylinTicketPartnerVo.class, code = 200, message = "接口返回对象参数")
-    public ResponseDto<KylinTicketPartnerVo> getTicketsMongo(@RequestParam("ticketsId") String ticketsId) {
+    public ResponseDto<KylinTicketPartnerVo> getTicketsMongo(@RequestParam("ticketsId") @NotNull String ticketsId) {
         KylinTicketPartnerVo result = null;
         result = ticketsPartnerService.getTicketsMongo(ticketsId);
         if (null == result) {
@@ -73,14 +74,14 @@ public class KylinTicketsPartnerController {
     @PostMapping(value = "/onLine")
     @ApiOperation(value = "票上线",position = 6)
     @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<String> onLine(@RequestParam("ticketsId") String ticketsId) {
+    public ResponseDto<String> onLine(@RequestParam("ticketsId") @NotNull String ticketsId) {
         return ticketsPartnerService.onLine(ticketsId);
     }
 
     @PostMapping(value = "/outLine")
     @ApiOperation(value = "票下线",position = 7)
     @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<String> outLine(@RequestParam("ticketsId") String ticketsId) {
+    public ResponseDto<String> outLine(@RequestParam("ticketsId") @NotNull String ticketsId) {
         return ticketsPartnerService.outLine(ticketsId);
     }
 }

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

@@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -33,7 +34,7 @@ public class PerformancePartnerController {
     @PostMapping(value = "copy")
     @ApiOperation(value = "复制演出",position = 6)
     @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<Map<String, String>> copyPerformance(@RequestParam("performancesId") String performancesId) {
+    public ResponseDto<Map<String, String>> copyPerformance(@RequestParam("performancesId") @NotNull String performancesId) {
         String result = performancesPartnerService.copyPerformance(performancesId);
         if (null == result) {
             return ResponseDto.failure("复制失败");
@@ -48,7 +49,7 @@ public class PerformancePartnerController {
     @GetMapping(value = "step1")
     @ApiOperation(value = "获取演出第一步数据",position = 3)
     @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<PerformancePartnerVo> getStep1(@RequestParam("performancesId") String performancesId) {
+    public ResponseDto<PerformancePartnerVo> getStep1(@RequestParam("performancesId") @NotNull String performancesId) {
         return performancesPartnerService.getStep1(performancesId);
     }
 
@@ -79,28 +80,28 @@ public class PerformancePartnerController {
     @GetMapping(value = "step2")
     @ApiOperation(value = "获取演出第二步数据",position = 5)
     @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<PerformanceStep2Param> getStep2(@RequestParam("performancesId") String performancesId) {
+    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") String performancesId) {
+    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") String performancesId) {
+    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") String performancesId) {
+    public ResponseDto<String> withdraw(@RequestParam("performancesId") @NotNull String performancesId) {
         return performancesPartnerService.withdraw(performancesId);
     }
 }

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

@@ -12,6 +12,7 @@ import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.feign.adam.api.FeignAdamBaseClient;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
+import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
 import com.liquidnet.service.kylin.dto.param.PayAgainParam;
 import com.liquidnet.service.kylin.dto.param.PayOrderParam;
 import com.liquidnet.service.kylin.dto.param.SyncOrderParam;
@@ -29,6 +30,7 @@ import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.env.Environment;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
@@ -62,6 +64,8 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
     @Value("${liquidnet.url-pay.localUrl}")
     private String synUrl;
 
+    @Autowired
+    private Environment environment;
     @Autowired
     private DataUtils dataUtils;
     @Autowired
@@ -204,8 +208,8 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                 //限购判断 如果实名 则身份证维度限购 如果不实名则数量限购
                 Query queryPerformance = new Query();
                 Query queryTicket = new Query();
-                queryPerformance.addCriteria(Criteria.where("performanceId").is(payOrderParam.getPerformanceId()).and("status").in(0, 1));
-                queryTicket.addCriteria(Criteria.where("ticketId").is(payOrderParam.getTicketId()).and("status").in(0, 1));
+                queryPerformance.addCriteria(Criteria.where("performanceId").is(payOrderParam.getPerformanceId()).and("status").in(KylinTableStatusConst.ORDER_STATUS0, KylinTableStatusConst.ORDER_STATUS1));
+                queryTicket.addCriteria(Criteria.where("ticketId").is(payOrderParam.getTicketId()).and("status").in(KylinTableStatusConst.ORDER_STATUS0, KylinTableStatusConst.ORDER_STATUS1));
                 int performanceBuyCount = 0; //演出下所有票种购买数量
                 int ticketBuyCount = 0;// 单一票种购买数量
                 if (isTrueName == 1) {
@@ -354,10 +358,10 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
         orderTicketStatus.setOrderTicketStatusId(orderTicketStatusId);
         orderTicketStatus.setOrderId(orderTicketId);
         orderTicketStatus.setExpressType(payOrderParam.getExpressType());
-        orderTicketStatus.setTransferStatus(0);
-        orderTicketStatus.setStatus(0);
+        orderTicketStatus.setTransferStatus(KylinTableStatusConst.ORDER_TRANSFER_STATUS0);
+        orderTicketStatus.setStatus(KylinTableStatusConst.ORDER_STATUS0);
         orderTicketStatus.setIsStudent(isStudent);
-        orderTicketStatus.setPayStatus(0);
+        orderTicketStatus.setPayStatus(KylinTableStatusConst.ORDER_PAY_STATUS0);
         orderTicketStatus.setCreatedAt(LocalDateTime.now());
         orderTicketStatus.setUpdatedAt(null);
         sqls.add("kylin_order_ticket_status.add");
@@ -396,10 +400,10 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                 orderTicketEntities.setEnterName(enters.getName());
                 orderTicketEntities.setEnterMobile(enters.getMobile());
                 orderTicketEntities.setEnterIdCode(enters.getIdCard());
-                orderTicketEntities.setStatus(0);
+                orderTicketEntities.setStatus(KylinTableStatusConst.ENTITIES_STATUS0);
                 orderTicketEntities.setSysDamai(ticketData.getSysDamai());
                 orderTicketEntities.setCheckClient("");
-                orderTicketEntities.setIsPayment(0);
+                orderTicketEntities.setIsPayment(KylinTableStatusConst.ENTITIES_IS_PAYMENT0);
                 orderTicketEntities.setComment("");
                 orderTicketEntities.setCreatedAt(LocalDateTime.now());
                 orderTicketEntities.setUpdatedAt(null);
@@ -428,10 +432,10 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                 orderTicketEntities.setEnterName("");
                 orderTicketEntities.setEnterMobile("");
                 orderTicketEntities.setEnterIdCode("");
-                orderTicketEntities.setStatus(0);
+                orderTicketEntities.setStatus(KylinTableStatusConst.ENTITIES_STATUS0);
                 orderTicketEntities.setSysDamai(ticketData.getSysDamai());
                 orderTicketEntities.setCheckClient("");
-                orderTicketEntities.setIsPayment(0);
+                orderTicketEntities.setIsPayment(KylinTableStatusConst.ENTITIES_IS_PAYMENT0);
                 orderTicketEntities.setComment("");
                 orderTicketEntities.setCreatedAt(LocalDateTime.now());
                 orderTicketEntities.setUpdatedAt(null);
@@ -452,11 +456,15 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
         // 调用支付
         LinkedMultiValueMap<String, String> httpData = new LinkedMultiValueMap<String, String>();
         httpData.add("type", "TICKET");
-        httpData.add("price", "0.01");
+        if (Arrays.asList("dev", "test").contains(environment.getProperty("spring.profiles.active"))) {
+            httpData.add("price", orderTickets.getPriceActual().toString());
+        }else{
+            httpData.add("price", "0.01");
+        }
         httpData.add("name", ticketData.getUseStart() + "" + ticketData.getTitle());
         httpData.add("detail", performanceData.getTitle() + "-" + ticketData.getTitle() + "-" + ticketData.getUseStart());
         httpData.add("order_code", orderTickets.getOrderCode());
-        httpData.add("client_ip", "127.0.0.1");
+        httpData.add("client_ip", CurrentUtil.getCliIpAddr());
         httpData.add("notify_url", synUrl);
         httpData.add("create_date", orderTickets.getCreatedAt().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
         httpData.add("expire_time", orderTickets.getPayCountdownMinute().toString());
@@ -491,8 +499,8 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
         orderTicketVo.setCreatedAt(orderTickets.getCreatedAt().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
         mongoTemplate.insert(orderTicketVo, KylinOrderTicketVo.class.getSimpleName());
         // 执行sql
-//        rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
-//                SqlMapping.get(sqls, paramsList));
+        rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+                SqlMapping.get(sqls, paramsList));
         return ResponseDto.success(payResultVo);
     }
 
@@ -507,10 +515,10 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                 return ResponseDto.failure("订单不存在");
             }
 
-            if (orderTicketData.getStatus() == 1) {
+            if (orderTicketData.getStatus() == KylinTableStatusConst.ORDER_STATUS1) {
                 return ResponseDto.failure("订单已支付");
             } else {
-                if (orderTicketData.getStatus() != 0) {
+                if (orderTicketData.getStatus() != KylinTableStatusConst.ORDER_STATUS0) {
                     return ResponseDto.failure("订单已关闭");
                 }
             }
@@ -529,11 +537,15 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
 
                 LinkedMultiValueMap<String, String> httpData = new LinkedMultiValueMap<String, String>();
                 httpData.add("type", "TICKET");
-                httpData.add("price", "0.01");
+                if (Arrays.asList("dev", "test").contains(environment.getProperty("spring.profiles.active"))) {
+                    httpData.add("price", orderTicketData.getPriceActual().toString());
+                }else{
+                    httpData.add("price", "0.01");
+                }
                 httpData.add("name", entitiesData.getUseStart() + "" + entitiesData.getPerformanceTitle());
                 httpData.add("detail", entitiesData.getPerformanceTitle() + "-" + entitiesData.getTicketTitle() + "-" + entitiesData.getUseStart());
                 httpData.add("order_code", orderTicketData.getOrderCode());
-                httpData.add("client_ip", "127.0.0.1");
+                httpData.add("client_ip", CurrentUtil.getCliIpAddr());
                 httpData.add("notify_url", synUrl);
                 httpData.add("create_date", orderTicketData.getCreatedAt());
                 httpData.add("expire_time", orderTicketData.getPayCountdownMinute().toString());
@@ -571,8 +583,8 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                 );
                 dataUtils.delOrderTicketRedis(orderTickets.getOrderTicketsId());
 
-//            rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
-//                    SqlMapping.get("kylin_order_ticket.payAgain", orderTickets.getPayAgainObject()));
+            rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+                    SqlMapping.get("kylin_order_ticket.payAgain", orderTickets.getPayAgainObject()));
                 return ResponseDto.success(payResultVo);
             }
             return ResponseDto.failure("未选择支付方式");
@@ -601,8 +613,8 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
             return "fail";//订单不存在
         }
 
-        if (orderTicketData.getStatus() != 0) {
-            if (orderTicketData.getPayCode().equals(syncOrderParam.getCode()) && orderTicketData.getStatus() == 1) {
+        if (orderTicketData.getStatus() != KylinTableStatusConst.ORDER_STATUS0) {
+            if (orderTicketData.getPayCode().equals(syncOrderParam.getCode()) && orderTicketData.getStatus() == KylinTableStatusConst.ORDER_STATUS1) {
                 lock.unlock();
                 return "success";//已经支付
             }
@@ -634,7 +646,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
 
         KylinOrderTicketStatus orderTicketStatus = new KylinOrderTicketStatus();
         orderTicketStatus.setOrderId(orderTicketData.getOrderTicketsId());
-        orderTicketStatus.setStatus(1);
+        orderTicketStatus.setStatus(KylinTableStatusConst.ORDER_STATUS1);
         orderTicketStatus.setPayStatus(syncOrderParam.getStatus());
         orderTicketStatus.setUpdatedAt(orderTickets.getUpdatedAt());
         sqls.add("kylin_order_ticket_status.synPay");
@@ -642,7 +654,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
 
         KylinOrderTicketEntities orderTicketEntities = new KylinOrderTicketEntities();
         orderTicketEntities.setOrderId(orderTicketData.getOrderTicketsId());
-        orderTicketEntities.setIsPayment(1);
+        orderTicketEntities.setIsPayment(KylinTableStatusConst.ENTITIES_IS_PAYMENT1);
         orderTicketEntities.setUpdatedAt(orderTickets.getUpdatedAt());
         sqls.add("kylin_order_ticket_entities.synPay");
         paramsList.add(orderTicketEntities.getSynOrderObject());
@@ -654,7 +666,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
         orderTicketVo.put("payCode", orderTickets.getPayCode());
         orderTicketVo.put("timePay", orderTickets.getTimePay());
         orderTicketVo.put("qrCode", orderTickets.getQrCode());
-        orderTicketVo.put("status", 1);
+        orderTicketVo.put("status", KylinTableStatusConst.ORDER_STATUS1);
         orderTicketVo.put("payStatus", orderTicketStatus.getStatus());
         orderTicketVo.put("updatedAt", timePay);
         mongoTemplate.getCollection(KylinOrderTicketVo.class.getSimpleName()).updateOne(
@@ -664,7 +676,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
         dataUtils.delOrderTicketRedis(orderTickets.getOrderTicketsId());
 
         HashMap<String, Object> orderTicketEntitiesVo = new HashMap<>();
-        orderTicketEntitiesVo.put("isPayment", 1);
+        orderTicketEntitiesVo.put("isPayment", KylinTableStatusConst.ENTITIES_IS_PAYMENT1);
         orderTicketEntitiesVo.put("updatedAt", timePay);
         mongoTemplate.getCollection(KylinOrderTicketEntitiesVo.class.getSimpleName()).updateMany(
                 Query.query(Criteria.where("orderId").is(orderTickets.getOrderTicketsId())).getQueryObject(),
@@ -675,8 +687,8 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
             dataUtils.delOrderTicketEntitiesRedis(item.getOrderTicketEntitiesId());
         }
 
-//        rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
-//                SqlMapping.get(sqls, paramsList));
+        rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+                SqlMapping.get(sqls, paramsList));
 
         // 发短信
         return "success";
@@ -715,7 +727,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                     item.setKuaidi_status(-2);
                 }
 
-                if (item.getStatus() == 0) {
+                if (item.getStatus() == KylinTableStatusConst.ORDER_STATUS0) {
                     item.setRestTime(DateUtil.intervalSeconds(
                             DateUtil.parse(item.getOverdueAt(), "yyyy-MM-dd HH:mm:ss"),
                             DateUtil.parse(DateUtil.getNowTime(), "yyyy-MM-dd HH:mm:ss")
@@ -756,7 +768,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                     }
                 }
                 //计算 倒计时
-                if (orderTicketVo.getStatus() == 0) {
+                if (orderTicketVo.getStatus() == KylinTableStatusConst.ORDER_STATUS0) {
                     vo.setRestTime(DateUtil.intervalSeconds(
                             DateUtil.parse(orderTicketVo.getOverdueAt(), "yyyy-MM-dd HH:mm:ss"),
                             DateUtil.parse(DateUtil.getNowTime(), "yyyy-MM-dd HH:mm:ss")
@@ -789,7 +801,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
     public boolean checkOrderTime(String userId) {
         try {
             Query query = new Query();
-            query.addCriteria(Criteria.where("status").is(0).and("overdueAt").lte(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))));
+            query.addCriteria(Criteria.where("status").is(KylinTableStatusConst.ORDER_STATUS0).and("overdueAt").lte(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))));
             if (null != userId) {
                 query.addCriteria(Criteria.where("userId").is(userId));
             }
@@ -802,7 +814,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                 }
                 RLock lock = redisLockUtil.lock("order_lock:" + item.getOrderCode(), 240);
                 KylinOrderTicketVo itemData = dataUtils.getOrderTicketVo(item.getOrderTicketsId());
-                if (itemData.getStatus() == 0) {
+                if (itemData.getStatus() == KylinTableStatusConst.ORDER_STATUS0) {
                     LocalDateTime now = LocalDateTime.now();
                     try {
                         //mysql
@@ -812,12 +824,12 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
 
                         KylinOrderTicketStatus orderTicketStatus = new KylinOrderTicketStatus();
                         orderTicketStatus.setOrderId(item.getOrderTicketsId());
-                        orderTicketStatus.setStatus(2);
+                        orderTicketStatus.setStatus(KylinTableStatusConst.ORDER_STATUS2);
                         orderTicketStatus.setUpdatedAt(now);
 
                         //vo
                         HashMap<String, Object> map = new HashMap<>();
-                        map.put("status", 2);
+                        map.put("status", KylinTableStatusConst.ORDER_STATUS2);
                         map.put("updatedAt", now.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
                         mongoTemplate.getCollection(KylinOrderTicketVo.class.getSimpleName()).updateOne(
                                 Query.query(Criteria.where("orderTicketsId").is(orderTickets.getOrderTicketsId())).getQueryObject(),
@@ -828,10 +840,10 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                         dataUtils.changeSurplusGeneral(itemData.getTicketId(), itemData.getNumber());
 
 
-//                    rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
-//                            SqlMapping.get("kylin_order_ticket.close", orderTickets.getCloseOrderObject()));
-//                    rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
-//                            SqlMapping.get("kylin_order_ticket_status.close", orderTicketStatus.getCloseOrderObject()));
+                    rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+                            SqlMapping.get("kylin_order_ticket.close", orderTickets.getCloseOrderObject()));
+                    rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+                            SqlMapping.get("kylin_order_ticket_status.close", orderTicketStatus.getCloseOrderObject()));
 
                     } catch (Exception e) {
                         lock.unlock();