顺丰费用系数以及费用明细

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/logistics/controller/BizWaybillCostDetailsController.java

@@ -42,6 +42,23 @@ public class BizWaybillCostDetailsController extends BaseController
     private IRptFinancialMonthSummaryService rptFinancialMonthSummaryService;
 
 
+
+    //运单中的费用明细
+    @GetMapping("/detaillist")
+    public TableDataInfo detaillist(BizWaybillCostDetails bizWaybillCostDetails)
+    {
+        startPage();
+        List<BizWaybillCostDetails> list = bizWaybillCostDetailsService.detaillist(bizWaybillCostDetails);
+        return getDataTable(list);
+    }
+
+
+
+
+
+
+
+
     /**
      * 查询运单明细列表
      * 这个在财务月度汇总需传入供应商id以及外部运单号  查询详情列表

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/logistics/mapper/BizWaybillCostDetailsMapper.java

@@ -62,4 +62,6 @@ public interface BizWaybillCostDetailsMapper
     List<BizWaybillCostDetails> selectBizWaybillCostDetailsListByWx(BizWaybillCostDetails bizWaybillCostDetails);
 
     BizWaybillCostDetails getAccountAdjustmentById(BizWaybillCostDetails bizWaybillCostDetails);
+
+    List<BizWaybillCostDetails> detaillist(BizWaybillCostDetails bizWaybillCostDetails);
 }

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

@@ -69,4 +69,6 @@ public interface IBizWaybillCostDetailsService
     int accountAdjustment(BizWaybillCostDetails bizWaybillCostDetails);
 
     BizWaybillCostDetails getAccountAdjustmentById(BizWaybillCostDetails bizWaybillCostDetails);
+
+    List<BizWaybillCostDetails> detaillist(BizWaybillCostDetails bizWaybillCostDetails);
 }

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

@@ -171,4 +171,10 @@ catch(Exception e)
     public BizWaybillCostDetails getAccountAdjustmentById(BizWaybillCostDetails bizWaybillCostDetails) {
         return bizWaybillCostDetailsMapper.getAccountAdjustmentById(bizWaybillCostDetails);
     }
+
+    @Override
+    public List<BizWaybillCostDetails> detaillist(BizWaybillCostDetails bizWaybillCostDetails) {
+        return bizWaybillCostDetailsMapper.detaillist(bizWaybillCostDetails);
+
+    }
 }

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

@@ -61,7 +61,7 @@ public class FeePushService {
             Long userId=orderList.get(0).getUserId();
             Long waybillId=orderList.get(0).getWaybillId();
 
-            SysDept sysDept = sysDeptService.selectDeptById(bizWaybillOrder.getDeptId());
+            SysDept sysDept = sysDeptService.selectDeptById(orderList.get(0).getDeptId());
 
             // TODO:先写死  这里差一个查询供应商费率的查询
             String  Rate=sysDept.getRateValue();

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

@@ -74,8 +74,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="summaryMonth != null "> AND DATE_FORMAT( b.sign_time, '%Y.%m' ) = #{summaryMonth}</if>
             <if test="deptId != null "> AND a.dept_id = #{deptId}</if>
             <if test="externalWaybillNo != null  and externalWaybillNo != ''"> and a.external_waybill_no = #{externalWaybillNo}</if>
-
-
             ${params.dataScope}
 
            <!-- <if test="waybillId != null "> and waybill_id = #{waybillId}</if>
@@ -92,6 +90,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 
+    <select id="detaillist" parameterType="com.ruoyi.logistics.domain.BizWaybillCostDetails" resultMap="BizWaybillCostDetailsResult">
+        <include refid="selectBizWaybillCostDetailsVo"/>
+        <where>
+
+            <if test="waybillId != null "> and a.waybill_id = #{waybillId}</if>
+
+        </where>
+    </select>
 
     <select id="selectBizWaybillCostDetailsListByWx" parameterType="com.ruoyi.logistics.domain.BizWaybillCostDetails" resultMap="BizWaybillCostDetailsResult">
         select waybill_detail_id, waybill_id, external_waybill_no, fee_item_code, fee_item_name, fee_name, amount, rate_amount, adjust_amount, remark, create_time, update_time, dept_id, user_id, del_flag, create_by, update_by from biz_waybill_cost_details

jd-logistics-ui-v3/src/api/logistics/order.js

@@ -67,7 +67,7 @@ export function deliverTrace(data) {
 // 查询物流费用
 export function deliverFree(data) {
   return request({
-    url: '/system/costDetails/list',
+    url: '/system/costDetails/detaillist',
     method: 'get',
     params: data
   })