快递管理 演出订单列表增加购票数量、搜索增加票种搜索

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

@@ -10,6 +10,7 @@ public class PerformanceExpressSearchAdminParam {
     // 演出搜索
     private String title;
     private String performancesId;
+    private String ticketsId;
 
     // 分页
     private Integer pageSize;

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

@@ -69,7 +69,9 @@ public class PerformancesExpressController extends BaseController {
     @RequiresPermissions("kylin:performancesExpress:performanceOrderList")
     @GetMapping("performanceOrderList/{id}")
     public String performanceOrderListView(@PathVariable("id") String id, ModelMap mmap) {
+        List<PerformancesTicketListDao> performancesTicketList = performancesExpressServiceImpl.getPerformancesTicketList(id);
         mmap.put("performancesId", id);
+        mmap.put("performancesTicketList", performancesTicketList);
         return prefix + "/performanceOrderList";
     }
 

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

@@ -67,6 +67,13 @@
                                 <option value="80">已签收</option>
                             </select>
                         </li>
+                        <li>
+                            <label>票种：</label>
+                            <select name="ticketsId">
+                                <option value="">所有</option>
+                                <option th:each="ticket : ${performancesTicketList}" th:text="${ticket.title + ticket.timeTitle}" th:value="${ticket.ticketsId}"></option>
+                            </select>
+                        </li>
                         <li>
                             <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
                                     class="fa fa-search"></i>&nbsp;搜索</a>
@@ -414,6 +421,10 @@
                         return '姓名：' + expressContacts + '<br>' + '手机号：' + expressPhone + '<br>' + '地址：' + expressAddress;
                     }
                 },
+                {
+                    field: 'number',
+                    title: '购票数量'
+                },
                 {
                     field: '',
                     title: '快递方式',

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

@@ -9,6 +9,7 @@ public class PerformanceExpressPerformanceOrderListAdminDao {
 
     String orderTicketsId;
     String orderCode;
+    Integer number;
     Integer status;
     BigDecimal priceExpress;
 

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

@@ -346,6 +346,7 @@
             </if>
             <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>
 
         </where>
     </select>