快递

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

@@ -71,6 +71,7 @@
     var placeOrderFlag = [[${@permission.hasPermi('kylin:performancesExpress:placeOrder')}]];
     var cancelOrderFlag = [[${@permission.hasPermi('kylin:performancesExpress:cancelOrder')}]];
     var getResultFlag = [[${@permission.hasPermi('kylin:performancesExpress:getResult')}]];
+    var getFreightFlag = [[${@permission.hasPermi('kylin:performancesExpress:getFreight')}]];
     var getListFreightFlag = [[${@permission.hasPermi('kylin:performancesExpress:getListFreight')}]];
     var listOrderRouteFlag = [[${@permission.hasPermi('kylin:performancesExpress:listOrderRoute')}]];
 
@@ -84,8 +85,9 @@
             modalName: "演出订单",
             placeOrderUrl: prefix + "/placeOrder",
             cancelOrderUrl: prefix + "/cancelOrder",
-            getResultUrl: prefix + "/getResult",
+            getFreightUrl: prefix + "/getFreight",
             getListFreightUrl: prefix + "/getListFreight",
+            getResultUrl: prefix + "/getResult",
             listOrderRouteUrl: prefix + "/listOrderRoute",
             columns: [{
                 checkbox: true
@@ -146,6 +148,7 @@
                         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-default btn-xs ' + getResultFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderTicketsId + '\', \'确定获取快递信息吗？\', table.options.getResultUrl)"></i>主动获取下单信息</a> ');
+                        actions.push('<a class="btn btn-default btn-xs ' + getFreightFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderTicketsId + '\', \'确定获取估算运费吗？\', table.options.getFreightUrl)"></i>运费估算</a> ');
                         actions.push('<a class="btn btn-default btn-xs ' + getListFreightFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderTicketsId + '\', \'确定获取运费信息吗？\', table.options.getListFreightUrl)"></i>主动获取运费</a> ');
                         actions.push('<a class="btn btn-default 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

@@ -3,8 +3,6 @@ package com.liquidnet.client.admin.zhengzai.kylin.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.liquidnet.client.admin.common.json.JSONObject;
 import com.liquidnet.client.admin.common.utils.StringUtils;
 import com.liquidnet.client.admin.zhengzai.kylin.utils.ShunfengSignUtils;
 import com.liquidnet.commons.lang.util.*;
@@ -22,7 +20,6 @@ import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -355,18 +352,21 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
                     new QueryWrapper<KylinOrderExpress>().eq("order_tickets_id", orderTicketsId)
                             .notIn("express_status", expressStatus)
             );
+            KylinOrderTickets orderInfo = kylinOrderTicketsMapper.selectOne(
+                    new QueryWrapper<KylinOrderTickets>().eq("order_tickets_id", orderTicketsId)
+            );
             if (null != orderExpressInfo) {
                 HashMap<String, Object> hBody = new HashMap<>();
-                hBody.put("jProvince", "");
-                hBody.put("jCity", "");
-                hBody.put("jAddress", "");
-
-                hBody.put("dProvince", "");
-                hBody.put("dCity", "");
-                hBody.put("dAddress", "");
-                hBody.put("expressType", "");
-                hBody.put("parcelWeighs", 2.00);
-                hBody.put("volume", "10,10,20");
+                hBody.put("jProvince", jProvince);
+                hBody.put("jCity", jCity);
+                hBody.put("jAddress", jAddress);
+
+                hBody.put("dProvince", "北京市");
+                hBody.put("dCity", "北京城区");
+                hBody.put("dAddress", orderInfo.getExpressAddress());
+                hBody.put("expressType", expressType);
+//                hBody.put("parcelWeighs", 2.00);
+//                hBody.put("volume", "10,10,20");
 
                 // 生成签名并请求
                 String result = shunfengSignUtils.generateSignatureAndRequest(hBody, "/public/order/v1/getFreight");