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

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

@@ -62,16 +62,27 @@
                                 <!-- 包含取消的3 未下单null 下单失败1 -->
                                 <option value="1">未下单</option>
                                 <option value="2">已下单</option>
-<!--                                <option value="50">已揽收</option>-->
+                                <!--                                <option value="50">已揽收</option>-->
                                 <option value="70">运输中</option>
                                 <option value="80">已签收</option>
                             </select>
                         </li>
+                        <li>
+                            <label>快递方式：</label>
+                            <select name="prizeType"
+                                    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="ticketsId">
                                 <option value="">所有</option>
-                                <option th:each="ticket : ${performancesTicketList}" th:text="${ticket.title +'/'+ ticket.timeTitle}" th:value="${ticket.ticketsId}"></option>
+                                <option th:each="ticket : ${performancesTicketList}"
+                                        th:text="${ticket.title +'/'+ ticket.timeTitle}"
+                                        th:value="${ticket.ticketsId}"></option>
                             </select>
                         </li>
                         <li>
@@ -112,6 +123,8 @@
 
 <th:block th:include="include :: footer"/>
 <script th:inline="javascript">
+    var expressType = [[${@dict.getType('zhengzai_kylin_express_type')}]];
+
     var placeOrderFlag = [[${@permission.hasPermi('kylin:performancesExpress:placeOrder')}]];
     var cancelOrderFlag = [[${@permission.hasPermi('kylin:performancesExpress:cancelOrder')}]];
     var getResultFlag = [[${@permission.hasPermi('kylin:performancesExpress:getResult')}]];
@@ -428,19 +441,9 @@
                 {
                     field: '',
                     title: '快递方式',
-                    formatter: function (value, row, index) {
-                        var expressType = '';
-                        var freightPrice = row.freightPrice;
-                        if (row.expressType == 1) {
-                            expressType = "寄付";
-                        } else {
-                            expressType = "到付";
-                        }
-                        if (null == freightPrice) {
-                            freightPrice = '';
-                        }
-                        return expressType;
-                        // return '快递方式：'+expressType+'<br>'+'已支付快递费：'+row.priceExpress+'<br>'+'预估快递费：'+freightPrice;
+                    formatter: function (value, row) {
+                        let dictLabel = $.table.selectDictLabel(prizeType, value);
+                        return '快递方式：' + dictLabel + '<br>' + '已支付快递费：' + row.priceExpress;
                     }
                 },
                 {

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

@@ -186,10 +186,10 @@ liquidnet:
     client-secret: YXA6olr2qaW65xlkFixS81kiWnplrW4
   express:
     shunfeng:
-      url: "https://butler-dev.sit.sf-express.com"
-      sk: 21e9a70f677a2bf29dfa2b3bead4f018
-      appid: 557104628450889728
-      custid: 7551234567
+      url: https://butler-ms.sf-express.com
+      sk: ab85956fcb97382e05396b67f3666098
+      appid: 572271814718803968
+      custid: 0102790784
       jCompany: 北京正在映画互联网有限公司
       jContact: 摩登天空票务部
       jTel: 4006310750

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

@@ -21,6 +21,7 @@ public class PerformanceExpressPerformanceOrderListAdminDao {
     String expressAddress;
     String expressPhone;
 
+    // 1寄付|2到付|3包邮
     Integer expressType;
 
     String orderExpressId;