Merge remote-tracking branch 'origin/jxl_220621_express' into pre

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

@@ -243,11 +243,24 @@
         LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体");
         LODOP.SET_PRINT_STYLEA(0, "FontSize", 8);
         LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
-        if (dataInfo.freightPrice > 0) {
+        /*if (dataInfo.freightPrice > 0) {
             LODOP.ADD_PRINT_TEXT(233, 26, 105, 20, "到付 " + dataInfo.freightPrice + "元");
         } else {
             LODOP.ADD_PRINT_TEXT(233, 26, 105, 20, "到付");
+        }*/
+        var orderExpressTypeName = "";
+        switch (dataInfo.orderExpressType) {
+            case 1:
+                orderExpressTypeName = '寄付';
+                break;
+            case 2:
+                orderExpressTypeName = '到付';
+                break;
+            case 3:
+                orderExpressTypeName = '寄付';
+                break;
         }
+        LODOP.ADD_PRINT_TEXT(233, 26, 105, 20, orderExpressTypeName);
         LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体");
         LODOP.SET_PRINT_STYLEA(0, "Alignment", 2);
         LODOP.SET_PRINT_STYLEA(0, "Bold", 1)

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

@@ -177,11 +177,24 @@
         LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体");
         LODOP.SET_PRINT_STYLEA(0, "FontSize", 8);
         LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
-        if (dataInfo.freightPrice > 0) {
+        /*if (dataInfo.freightPrice > 0) {
             LODOP.ADD_PRINT_TEXT(233, 26, 105, 20, "到付 " + dataInfo.freightPrice + "元");
         } else {
             LODOP.ADD_PRINT_TEXT(233, 26, 105, 20, "到付");
+        }*/
+        var orderExpressTypeName = "";
+        switch (dataInfo.orderExpressType) {
+            case 1:
+                orderExpressTypeName = '寄付';
+                break;
+            case 2:
+                orderExpressTypeName = '到付';
+                break;
+            case 3:
+                orderExpressTypeName = '寄付';
+                break;
         }
+        LODOP.ADD_PRINT_TEXT(233, 26, 105, 20, orderExpressTypeName);
         LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体");
         LODOP.SET_PRINT_STYLEA(0, "Alignment", 2);
         LODOP.SET_PRINT_STYLEA(0, "Bold", 1)

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

@@ -63,6 +63,7 @@ public class OrderExpressListDao implements Serializable {
     private String city;
     private String county;
     private String number;
+    private Integer orderExpressType;
 
     private String useStart;
     private String timeTitle;

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

@@ -4,12 +4,13 @@
 
     <select id="selectPrintList" resultType="com.liquidnet.service.kylin.dao.OrderExpressListDao">
         SELECT a.*,
-               b.express_contacts, b.express_address, b.express_phone, b.province, b.city, b.county, b.number,
+               b.express_contacts, b.express_address, b.express_phone, b.province, b.city, b.county, b.number, kots.express_type AS order_express_type,
                d.use_start, d.title AS time_title, d.type AS time_type,
                e.title AS tickets_title, e.type AS tickets_type
         FROM kylin_order_express a
         INNER JOIN kylin_order_tickets b ON a.order_tickets_id = b.order_tickets_id
         INNER JOIN kylin_order_ticket_relations c ON b.order_tickets_id = c.order_id
+        LEFT JOIN kylin_order_ticket_status kots ON a.order_tickets_id = kots.order_id
         LEFT JOIN kylin_ticket_times d ON c.time_id = d.ticket_times_id
         LEFT JOIN kylin_tickets e ON c.ticket_id = e.tickets_id
         <where>
@@ -24,12 +25,13 @@
     </select>
     <select id="selectPrintListOfPerformanceId" resultType="com.liquidnet.service.kylin.dao.OrderExpressListDao">
         SELECT a.*,
-        b.express_contacts, b.express_address, b.express_phone, b.province, b.city, b.county, b.number,
+        b.express_contacts, b.express_address, b.express_phone, b.province, b.city, b.county, b.number, kots.express_type AS order_express_type,
         d.use_start, d.title AS time_title, d.type AS time_type,
         e.title AS tickets_title, e.type AS tickets_type
         FROM kylin_order_express a
         INNER JOIN kylin_order_tickets b ON a.order_tickets_id = b.order_tickets_id
         INNER JOIN kylin_order_ticket_relations c ON b.order_tickets_id = c.order_id
+        LEFT JOIN kylin_order_ticket_status kots ON a.order_tickets_id = kots.order_id
         LEFT JOIN kylin_ticket_times d ON c.time_id = d.ticket_times_id
         LEFT JOIN kylin_tickets e ON c.ticket_id = e.tickets_id
         <where>