Merge remote-tracking branch 'origin/jxl_1214_refund' into dev_merchant

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

 package com.liquidnet.client.admin.web.controller.zhengzai.kylin;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.liquidnet.client.admin.common.annotation.Log;
 import com.liquidnet.client.admin.common.core.controller.BaseController;
 import com.liquidnet.client.admin.common.core.domain.AjaxResult;
@@ -16,6 +17,8 @@ import com.liquidnet.service.kylin.dao.PerformanceExpressPerformanceOrderListAdm
 import com.liquidnet.service.kylin.dao.PerformancesTicketListDao;
 import com.liquidnet.service.kylin.dto.param.PerformanceExpressSearchAdminParam;
 import com.liquidnet.service.kylin.dto.vo.express.KylinOrderExpressPrintVo;
+import com.liquidnet.service.kylin.entity.KylinExpressModule;
+import com.liquidnet.service.kylin.mapper.KylinExpressModuleMapper;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -44,6 +47,9 @@ public class PerformancesExpressController extends BaseController {
     @Autowired
     private PerformancesExpressServiceImpl performancesExpressServiceImpl;
 
+    @Autowired
+    private KylinExpressModuleMapper kylinExpressModuleMapper;
+
     /**
      * 查询演出列表
      */
@@ -70,8 +76,10 @@ public class PerformancesExpressController extends BaseController {
     @GetMapping("performanceOrderList/{id}")
     public String performanceOrderListView(@PathVariable("id") String id, ModelMap mmap) {
         List<PerformancesTicketListDao> performancesTicketList = performancesExpressServiceImpl.getPerformancesTicketList(id);
+        List<KylinExpressModule> expressModuleList = kylinExpressModuleMapper.selectList(Wrappers.lambdaQuery(KylinExpressModule.class));
         mmap.put("performancesId", id);
         mmap.put("performancesTicketList", performancesTicketList);
+        mmap.put("expressModuleList", expressModuleList);
         return prefix + "/performanceOrderList";
     }
 

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

@@ -69,13 +69,22 @@
                         </li>
                         <li>
                             <label>快递方式：</label>
-                            <select name="prizeType"
+                            <select name="expressType"
                                     th:with="type=${@dict.getType('zhengzai_kylin_express_type')}">
                                 <option value="">全部</option>
                                 <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
                                         th:value="${dict.dictValue}"></option>
                             </select>
                         </li>
+                        <li>
+                            <label>快递产品：</label>
+                            <select name="productCode">
+                                <option value="">所有</option>
+                                <option th:each="module : ${expressModuleList}"
+                                        th:text="${module.title}"
+                                        th:value="${module.productCode}"></option>
+                            </select>
+                        </li>
                         <li>
                             <label>票种：</label>
                             <select name="ticketsId">
@@ -439,7 +448,11 @@
                     title: '购票数量'
                 },
                 {
-                    field: '',
+                    field: 'produceTitle',
+                    title: '快递产品'
+                },
+                {
+                    field: 'expressType',
                     title: '快递方式',
                     formatter: function (value, row) {
                         let dictLabel = $.table.selectDictLabel(expressType, value);

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

@@ -23,6 +23,9 @@ public class PerformanceExpressPerformanceOrderListAdminDao {
 
     // 1寄付|2到付|3包邮
     Integer expressType;
+    // 标快 特快
+    Integer produceCode;
+    Integer produceTitle;
 
     String orderExpressId;
     String mailno;

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

@@ -305,6 +305,9 @@
 
         kots.status,
         kots.express_type,
+        kots.produce_code,
+
+        kem.title as produce_title,
 
         oe.order_express_id,
         oe.mailno,
@@ -312,6 +315,7 @@
         oe.express_status
         FROM kylin_order_tickets kot
         INNER JOIN kylin_order_ticket_status kots ON kot.order_tickets_id = kots.order_id
+        INNER JOIN kylin_express_module kem ON kem.product_code = kots.product_code
         INNER JOIN kylin_order_ticket_relations kotr ON kot.order_tickets_id = kotr.order_id
         LEFT JOIN (SELECT * FROM kylin_order_express WHERE express_status NOT IN (1, 3) AND send_type = 1) AS oe ON
         oe.order_tickets_id = kot.order_tickets_id
@@ -345,6 +349,8 @@
             <if test="expressStatus == 80">AND (oe.express_status = 80 OR oe.express_status = 8000)</if>
             <if test="mailno != ''">AND oe.mailno LIKE concat('%', #{mailno}, '%')</if>
             <if test="ticketsId != '' and ticketsId != null">AND kotr.ticket_id = ${ticketsId}</if>
+            <if test="expressType != '' and expressType != null">AND kots.express_type = ${expressType}</if>
+            <if test="produceCode != '' and produceCode != null">AND kots.produce_code = ${produceCode}</if>
         </where>
         ORDER BY kot.mid DESC
     </select>