演出订单

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

@@ -16,8 +16,12 @@ public class PerformanceExpressSearchAdminParam {
     // 订单搜索
     private String orderCode;
     private String orderTicketsId;
-    private String userMobile;
     private String orderStatus;
+
+    private String userMobile;
     private String expressStatus;
 
+    private String expressContacts;
+    private String expressPhone;
+
 }

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

@@ -27,6 +27,14 @@
                             <label>购买人姓名：</label>
                             <input type="text" name="userName"/>
                         </li>
+                        <li>
+                            <label>收货人电话：</label>
+                            <input type="text" name="expressContacts"/>
+                        </li>
+                        <li>
+                            <label>收货人姓名：</label>
+                            <input type="text" name="expressPhone"/>
+                        </li>
                         <li>
                             <label>订单状态：</label>
                             <select name="orderStatus" th:with="type=${@dict.getType('zhengzai_order_status')}">
@@ -87,24 +95,40 @@
                     }
                 },
                 {
-                    field: 'priceActual',
-                    title: '总价格'
-                },
-                {
-                    field: 'number',
-                    title: '购票量'
+                    field: 'priceExpress',
+                    title: '快递费'
                 },
                 {
-                    field: 'userId',
-                    title: '用户ID'
+                    field: '',
+                    title: '快递方式',
+                    formatter: function (value, row, index) {
+                        if (row.expressType == 1) {
+                            return "寄付";
+                        } else {
+                            return "到付";
+                        }
+                    }
                 },
                 {
-                    field: 'userMobile',
-                    title: '账户名'
+                    field: '',
+                    title: '购买用户',
+                    formatter: function(value, row, index) {
+                        var userId = row.userId;
+                        var userMobile = row.userMobile;
+                        var userName = row.userName;
+                        return 'ID：'+userId+'<br>'+'姓名：'+userName+'<br>'+'手机号：'+userMobile;
+                    }
                 },
                 {
-                    field: 'userMobile',
-                    title: '手机号'
+                    field: '',
+                    title: '收获用户',
+                    formatter: function(value, row, index) {
+                        console.log(row)
+                        var expressContacts = row.expressContacts;
+                        var expressAddress = row.expressAddress;
+                        var expressPhone = row.expressPhone;
+                        return '姓名：'+expressContacts+'<br>'+'手机号：'+expressPhone+'<br>'+'地址：'+expressPhone;
+                    }
                 },
                 {
                     title: '操作',

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

@@ -16,7 +16,7 @@
                         </li>
                         <li>
                             <label>演出ID：</label>
-                            <input type="text" name="performanceId"/>
+                            <input type="text" name="performancesId"/>
                         </li>
                         <li>
                             <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i

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

@@ -41,7 +41,6 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinPerformance
             Map<String, Object> map = BeanUtil.convertBeanToMap(performanceExpressSearchAdminParam);
             voList = performancesMapper.performanceExpressPerformanceList(map);
         } catch (Exception e) {
-            e.printStackTrace();
             return null;
         }
         return voList;
@@ -53,7 +52,6 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinPerformance
             Map<String, Object> map = BeanUtil.convertBeanToMap(performanceExpressSearchAdminParam);
             voList = kylinOrderTicketsMapper.performanceExpressPerformanceOrderList(map);
         } catch (Exception e) {
-            e.printStackTrace();
             return null;
         }
         return voList;

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

@@ -2,29 +2,24 @@ package com.liquidnet.service.kylin.dao;
 
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 @Data
 public class PerformanceExpressPerformanceOrderListAdminDao {
 
     String orderTicketsId;
-    String sponsor;
     String orderCode;
-    String title;
-    String status;
-    String getTicketType;
-    String payType;
-    String paymentType;
-    String tied;
-    String price;
-    String number;
-    String priceMember;
-    String priceTotal;
-    String priceVoucher;
-    String priceActual;
-    String priceExpress;
-    String priceRefund;
-    String refundNumber;
+    Integer status;
+    BigDecimal priceExpress;
+
     String userId;
     String userName;
     String userMobile;
 
+    String express_contacts;
+    String express_address;
+    String express_phone;
+
+    Integer expressType;
+
 }

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

@@ -219,7 +219,7 @@
         kot.express_address,
         kot.express_phone,
 
-        kots.status
+        kots.status,
         kots.express_type
 
         FROM kylin_order_tickets kot
@@ -232,14 +232,13 @@
             AND kots.pay_status = 1
             <if test="orderCode != null  and orderCode != ''">AND kot.order_code = #{orderCode}</if>
             <if test="orderTicketsId != null  and orderTicketsId != ''">AND kot.order_tickets_id = #{orderTicketsId}</if>
+            <if test="orderStatus!=null and orderStatus!=''">AND kots.status = #{orderStatus}</if>
 
             <if test="userMobile != null  and userMobile != ''">AND kot.user_mobile = #{userMobile}</if>
             <if test="userName != null  and userName != ''">AND kot.user_name like concat('%', #{userName}, '%')</if>
 
-            <if test="orderCode != null  and orderCode != ''">AND kot.order_code = #{orderCode}</if>
-            <if test="expressContacts != null  and expressContacts != ''">AND kot.express_contacts = #{expressContacts}</if>
+            <if test="expressContacts != null  and expressContacts != ''">AND kot.express_contacts = like concat('%', #{expressContacts}, '%')</if>
             <if test="expressPhone != null  and expressPhone != ''">AND kot.express_phone = #{expressPhone}</if>
-            <if test="orderStatus!=null and orderStatus!=''">AND kots.status = #{orderStatus}</if>
         </where>
     </select>
 </mapper>

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

@@ -463,8 +463,8 @@
             <if test="title!=''">
                 AND title LIKE concat('%', #{title}, '%')
             </if>
-            <if test="performanceId!=''">
-                AND performance_id = #{performanceId}
+            <if test="performancesId!=''">
+                AND performances_id = #{performancesId}
             </if>
         </where>
         ORDER BY created_at DESC