feat: 数据大屏省份查询轨迹接口增加金额汇总；

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/logistics/service/impl/BizWaybillOrderServiceImpl.java

@@ -366,7 +366,7 @@ public class BizWaybillOrderServiceImpl implements IBizWaybillOrderService
         JSONObject jsonObject = logisticsOrderService.queryWaybillPdf(bizWaybillOrder);
         if (jsonObject.getBoolean("success")) {
             if(1==bizWaybillOrder.getOrderType()) {
-                bizWaybillOrder.setPdfUrl(jsonObject.getString("msg"));
+                bizWaybillOrder.setPdfUrl(jsonObject.getString("url"));
                 bizWaybillOrderMapper.updateBizWaybillOrder(bizWaybillOrder);
             }
         }

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/logistics/service/impl/LargeScreenReportServiceImpl.java

@@ -199,6 +199,7 @@ public class LargeScreenReportServiceImpl  implements LargeScreenReportService {
             outflowProvince.put("form",largeRequest.getSearchProvince());
             outflowProvince.put("to",Outflow.get(i).get("provinceName"));
             outflowProvince.put("value",Outflow.get(i).get("num"));
+            outflowProvince.put("amt",Outflow.get(i).get("amt"));
             OutflowProvince.add(outflowProvince);
             //给经纬度也加上
             List<Double> locationOn = new ArrayList<>();
@@ -214,6 +215,7 @@ public class LargeScreenReportServiceImpl  implements LargeScreenReportService {
             inflowProvince.put("form",inflow.get(i).get("provinceName"));
             inflowProvince.put("to",largeRequest.getSearchProvince());
             inflowProvince.put("value",inflow.get(i).get("num"));
+            inflowProvince.put("amt",inflow.get(i).get("amt"));
             InflowProvince.add(inflowProvince);
             //给经纬度也加上
             List<Double> locationOn = new ArrayList<>();

jd-logistics-modules/jd-logistics-system/src/main/resources/mapper/logistics/LargeScreenReportMapper.xml

@@ -170,12 +170,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <!-- 物流轨迹省份查询流出-->
     <select id="queryLogisticsTrajectoryOutflow"  parameterType="java.util.Map" resultType="java.util.HashMap"  >
         SELECT
-            receiver_province provinceName,
-            lng,
-            lat,count(1) num
+            d.receiver_province provinceName,
+            b.lng,
+            b.lat,
+            count(1) num,
+            IFNULL(SUM(IFNULL(c.adjust_amount, c.rate_amount)), 0.00) amt
         FROM
             biz_waybill_order d
                 LEFT JOIN sys_city b ON  d.receiver_province = b.NAME
+                LEFT JOIN biz_waybill_cost_details c ON d.waybill_id = c.waybill_id
         WHERE
             b.LEVEL = 0
        and    d.order_status != 6
@@ -195,17 +198,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and  d.sender_province = #{searchProvince}
         </if>
         ${params.dataScope}
-        group by receiver_province
+        group by d.receiver_province
     </select>
     <!-- 物流轨迹省份查询流入-->
     <select id="queryLogisticsTrajectoryinflow"  parameterType="java.util.Map" resultType="java.util.HashMap"  >
         SELECT
-            sender_province provinceName,
-            lng,
-            lat ,count(1) num
+            d.sender_province provinceName,
+            b.lng,
+            b.lat,
+            count(1) num,
+            IFNULL(SUM(IFNULL(c.adjust_amount, c.rate_amount)), 0.00) amt
         FROM
             biz_waybill_order    d
                 LEFT JOIN sys_city b ON d.sender_province = b.NAME
+                LEFT JOIN biz_waybill_cost_details c ON d.waybill_id = c.waybill_id
         WHERE
             b.LEVEL = 0
         and  d.order_status != 6
@@ -225,7 +231,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and  d.receiver_province = #{searchProvince}
         </if>
         ${params.dataScope}
-        group by sender_province
+        group by d.sender_province
 
     </select>
     <!-- 按照快递快运区分统计-->