快递

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

@@ -12,7 +12,7 @@
                 <div class="select-list">
                     <ul>
                         <li>
-                            <label>订单号：</label>
+                            <label>订单编号：</label>
                             <input type="text" name="orderCode"/>
                         </li>
                         <li>
@@ -98,7 +98,7 @@
                 },
                 {
                     field: 'orderCode',
-                    title: '订单号'
+                    title: '订单编号'
                 },
                 {
                     field: 'status',
@@ -111,10 +111,11 @@
                     field: '',
                     title: '购买用户',
                     formatter: function(value, row, index) {
-                        var userId = row.userId;
+                        // var userId = row.userId;
                         var userMobile = row.userMobile;
                         var userName = row.userName;
-                        return 'ID：'+userId+'<br>'+'姓名：'+userName+'<br>'+'手机号：'+userMobile;
+                        // return 'ID：'+userId+'<br>'+'姓名：'+userName+'<br>'+'手机号：'+userMobile;
+                        return '昵称：'+userName+'<br>'+'手机号：'+userMobile;
                     }
                 },
                 {
@@ -124,12 +125,12 @@
                         var expressContacts = row.expressContacts;
                         var expressAddress = row.expressAddress;
                         var expressPhone = row.expressPhone;
-                        return '姓名：'+expressContacts+'<br>'+'地址：'+expressAddress+'<br>'+'手机号：'+expressPhone;
+                        return '姓名：'+expressContacts+'<br>'+'手机号：'+expressPhone+'<br>'+'地址：'+expressAddress;
                     }
                 },
                 {
                     field: '',
-                    title: '快递费',
+                    title: '快递方式',
                     formatter: function (value, row, index) {
                         var expressType = '';
                         var freightPrice = row.freightPrice;
@@ -141,7 +142,8 @@
                         if (null == freightPrice) {
                             freightPrice = '';
                         }
-                        return '快递方式：'+expressType+'<br>'+'已支付快递费：'+row.priceExpress+'<br>'+'预估快递费：'+freightPrice;
+                        return expressType;
+                        // return '快递方式：'+expressType+'<br>'+'已支付快递费：'+row.priceExpress+'<br>'+'预估快递费：'+freightPrice;
                     }
                 },
                 {
@@ -186,10 +188,10 @@
                         var actions = [];
                         actions.push('<a class="btn btn-success btn-xs ' + placeOrderFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderTicketsId + '\', \'确定下单吗？\', table.options.placeOrderUrl)"></i>下单</a> ');
                         actions.push('<a class="btn btn-danger btn-xs ' + cancelOrderFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderTicketsId + '\', \'确定取消快递单吗？\', table.options.cancelOrderUrl)"></i>取消</a> ');
-                        actions.push('<a class="btn btn-success btn-xs ' + getResultFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderTicketsId + '\', \'确定获取快递信息吗？\', table.options.getResultUrl)"></i>主动获取下单信息</a> ');
-                        actions.push('<a class="btn btn-success btn-xs ' + getFreightFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderTicketsId + '\', \'确定获取估算运费吗？\', table.options.getFreightUrl)"></i>运费估算</a> ');
+                        // actions.push('<a class="btn btn-success btn-xs ' + getResultFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderTicketsId + '\', \'确定获取快递信息吗？\', table.options.getResultUrl)"></i>主动获取下单信息</a> ');
+                        // actions.push('<a class="btn btn-success btn-xs ' + getFreightFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderTicketsId + '\', \'确定获取估算运费吗？\', table.options.getFreightUrl)"></i>运费估算</a> ');
                         // actions.push('<a class="btn btn-success btn-xs ' + getListFreightFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderTicketsId + '\', \'确定获取运费信息吗？\', table.options.getListFreightUrl)"></i>主动获取运费</a> ');
-                        actions.push('<a class="btn btn-success btn-xs ' + listOrderRouteFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderTicketsId + '\', \'确定获取路由信息吗？\', table.options.listOrderRouteUrl)"></i>路由主动查询</a> ');
+                        // actions.push('<a class="btn btn-success btn-xs ' + listOrderRouteFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderTicketsId + '\', \'确定获取路由信息吗？\', table.options.listOrderRouteUrl)"></i>路由主动查询</a> ');
                         return actions.join('');
                     }
                 }]

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

@@ -287,18 +287,20 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
         List<String> ids = performanceExpressSearchAdminParam.getIds();
         Integer[] expressStatus = {KylinTableStatusConst.ORDER_EXPRESS_STATUS1, KylinTableStatusConst.ORDER_EXPRESS_STATUS3};
         for (String orderTicketsId : ids) {
+            log.debug("id {}", orderTicketsId);
             KylinOrderExpress orderExpressInfo = kylinOrderExpressMapper.selectOne(
                     new QueryWrapper<KylinOrderExpress>().eq("order_tickets_id", orderTicketsId)
                             .notIn("express_status", expressStatus)
             );
             if (null != orderExpressInfo) {
+                log.debug("orderExpressInfo {}", "true");
                 Map<String, String> hBody = new HashMap<>();
                 hBody.put("orderId", orderExpressInfo.getOrderExpressCode());
 
                 // 生成签名并请求
                 String result = shunfengSignUtils.generateSignatureAndRequestNew(hBody, "/public/order/v1/cancelOrder");
                 HashMap hashMap = JsonUtils.fromJson(result, HashMap.class);
-                System.out.println(result);
+                log.debug("result {}", result);
                 if (hashMap.get("succ").equals("fail")) {
                     String msg = (String) hashMap.get("msg");
                     return ResponseDto.failure(msg);

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

@@ -337,7 +337,7 @@
         <where>
             kotr.performance_id = #{performanceId}
             AND kot.get_ticket_type = 'express'
-            AND koe.express_status = 2 -- 只能取消申请成功的
+            AND koe.express_status NOT IN (1, 3) -- 只能取消申请成功的
             AND kot.mid > ${mid}
         </where>
         LIMIT ${limitNum}