月度账单和明细调整

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/logistics/domain/BizWaybillCostDetails.java

@@ -53,6 +53,9 @@ public class BizWaybillCostDetails extends BaseEntity
     /** 调整金额 */
     @Excel(name = "调整金额")
     private BigDecimal adjustAmount;
+    @Excel(name = "折扣")
+    private String rate;
+
 
     /** 部门id */
     @Excel(name = "部门id")
@@ -96,10 +99,19 @@ public class BizWaybillCostDetails extends BaseEntity
 
     private String  adjustmentReason;
 
+
     /** 采购金额 */
     @Excel(name = "采购金额")
     private BigDecimal purchaseAmount;
 
+    public String getRate() {
+        return rate;
+    }
+
+    public void setRate(String rate) {
+        this.rate = rate;
+    }
+
     public String getAdjustmentReason() {
         return adjustmentReason;
     }

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/logistics/domain/RptFinancialMonthSummary.java

@@ -25,10 +25,14 @@ public class RptFinancialMonthSummary extends BaseEntity
 
     private String summaryMonthEnd;
 
+
+    @Excel(name = "标准价格")
+    private String amount;
     /** 应付金额 */
     @Excel(name = "应付金额")
     private String payableAmount;
-
+    @Excel(name = "采购价格")
+    private String purchaseAmount;
     /** 交易笔数 */
     @Excel(name = "订单笔数")
     private String transactionCount;

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

@@ -14,6 +14,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="amount"    column="amount"    />
         <result property="rateAmount"    column="rate_amount"    />
         <result property="adjustAmount"    column="adjust_amount"    />
+        <result property="purchaseAmount"    column="purchase_amount"    />
+        <result property="rate"    column="rate"    />
         <result property="remark"    column="remark"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateTime"    column="update_time"    />
@@ -53,6 +55,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             a.fee_item_name,
             a.amount,
             ifnull( a.adjust_amount, a.rate_amount ) rate_amount,
+            a.amount,
+            ifnull(a.rate,'--') rate,
+            a.purchase_amount,
             DATE_FORMAT( b.sign_time, '%Y.%m' )  summaryMonth,
             a.remark,
             a.create_time,

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

@@ -432,7 +432,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateRateByMonthAndDept" parameterType="java.util.Map">
         UPDATE biz_waybill_cost_details
         SET
-            rate_amount = ROUND(amount * #{rate} / 10, 2)
+            rate_amount = ROUND(amount * #{rate} / 10, 2),
+            rate = #{rate}
 
         WHERE
             external_waybill_no in (

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

@@ -7,7 +7,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="com.ruoyi.logistics.domain.RptFinancialMonthSummary" id="RptFinancialMonthSummaryResult">
         <result property="summaryId"    column="summary_id"    />
         <result property="summaryMonth"    column="summary_month"    />
+        <result property="amount"    column="amount"    />
         <result property="payableAmount"    column="payable_amount"    />
+        <result property="purchaseAmount"    column="purchase_amount"    />
         <result property="transactionCount"    column="transaction_count"    />
         <result property="status"    column="status"    />
         <result property="createTime"    column="create_time"    />
@@ -186,7 +188,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             a.dept_id,
             count( DISTINCT a.external_waybill_no ) transaction_count,
             sum(
-                    ifnull(adjust_amount, rate_amount  )) payable_amount
+                    ifnull(adjust_amount, rate_amount  )) payable_amount,
+        sum(amount)  amount,
+        sum(purchase_amount) purchase_amount
         FROM
             ( SELECT * FROM biz_waybill_order WHERE order_status = 5 AND DATE_FORMAT( sign_time, '%Y.%m' )= #{monthCode}
         <if test="deptId != null and deptId !='' "> and  dept_id = #{deptId}</if>
@@ -224,12 +228,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <insert id="insertBachRptFinancialMonthSummary" parameterType="java.util.List"  >
-        INSERT INTO rpt_financial_month_summary (summary_month, payable_amount, transaction_count,dept_id,status,create_time) VALUES
+        INSERT INTO rpt_financial_month_summary (summary_month,amount, payable_amount,purchase_amount ,transaction_count,dept_id,status,create_time) VALUES
         <foreach collection="list" item="item" separator=",">
-            (#{item.summary_month}, #{item.payable_amount}, #{item.transaction_count}, #{item.dept_id},'1',now())
+            (#{item.summary_month}, #{item.amount},#{item.payable_amount},#{item.purchase_amount}, #{item.transaction_count}, #{item.dept_id},'1',now())
         </foreach>
         ON DUPLICATE KEY UPDATE
+        amount = VALUES(amount),
         payable_amount = VALUES(payable_amount),
+        purchase_amount = VALUES(purchase_amount),
         transaction_count = VALUES(transaction_count),
         dept_id = VALUES(dept_id),
         update_time = NOW()