Browse Source

fix: 修改确认单导出excelLogo,订单合计添加应收款和已付款

luofeiyun 15 hours atrás
parent
commit
420275bf46

+ 3 - 0
ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/order/vo/order/OrderTotalRespVO.java

@@ -50,6 +50,9 @@ public class OrderTotalRespVO {
     @Schema(description = "应收款")
     private BigDecimal payAmount;
 
+    @Schema(description = "实收款")
+    private BigDecimal realPayAmount;
+
     @Schema(description = "其它费用")
     private BigDecimal otherMoney;
 

+ 1 - 1
ship-module-trade/ship-module-trade-biz/src/main/resources/mapper/order/TradeOrderMapper.xml

@@ -2527,7 +2527,7 @@
     </select>
     <select id="selectTotal1ByOrderIds"
             resultType="com.yc.ship.module.trade.controller.admin.order.vo.order.OrderTotalRespVO">
-        select sum(deposi) deposi, sum(damaged) damaged, sum(supplement_amount) supplement_amount from trade_order
+        select sum(deposi) deposi, sum(damaged) damaged, sum(supplement_amount) supplement_amount, sum(pay_amount) pay_amount, sum(real_pay_amount) real_pay_amount from trade_order
         where 1=1 and id in
         <foreach collection="orderIds" item="item" separator=","  open="(" close=")">
             #{item}

BIN
ship-module-trade/ship-module-trade-biz/src/main/resources/templates/confirmation_template.xlsx