优化直播订单导出明细时物流代收金额取值有误

fs-service-system/src/main/java/com/fs/live/domain/LiveOrder.java

@@ -80,10 +80,13 @@ public class LiveOrder extends BaseEntity {
     @Excel(name = "实付金额",cellType= Excel.ColumnType.NUMERIC)
     private BigDecimal payMoney;
 
-    @Excel(name = "物流代收金额",cellType= Excel.ColumnType.NUMERIC)
+    @Excel(name = "物流代收金额", cellType= Excel.ColumnType.NUMERIC)
+    private BigDecimal deliveryCollectionAmount;
+
+    @Excel(name = "支付邮费",cellType= Excel.ColumnType.NUMERIC)
     private BigDecimal payDelivery = BigDecimal.ZERO;
 
-    @Excel(name = "支付邮费", cellType= Excel.ColumnType.NUMERIC)
+    //@Excel(name = "支付邮费", cellType= Excel.ColumnType.NUMERIC)
     private BigDecimal payPostage;
 
     /** 抵扣金额 */

fs-service-system/src/main/resources/mapper/live/LiveOrderMapper.xml

@@ -109,7 +109,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         a.delivery_pay_money,	a.delivery_import_time,	a.delivery_send_time,	a.is_after_sales,	a.dept_id,
         a.channel,	a.source,	a.bill_price,	a.total_postage,	a.pay_postage,	a.gain_integral,
         a.use_integral,	a.pay_integral,	a.back_integral,	a.is_edit_money,	b.product_info as product_introduce,a.customer_id,
-        b.product_name as product_name
+        b.product_name as product_name,a.total_price - a.pay_money as delivery_collection_amount
         FROM
         live_order a LEFT JOIN fs_store_product b ON a.product_id = b.product_id
         left join company_user cu on a.company_user_id = cu.user_id
@@ -199,7 +199,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             a.refund_time,	a.refund_reason,	a.refund_money,	a.delivery_code,	a.delivery_name,	a.delivery_sn,
             a.remark,	a.is_del,	a.cost_price,	a.verify_code,	a.shipping_type,	a.is_channel,	a.finish_time,
             a.delivery_time,	a.tui_money,	a.tui_money_status,	a.tui_user_id,	a.item_json,	a.discount_money,
-            a.user_coupon_id,	a.company_id,	a.company_user_id,	a.store_house_code,	a.extend_order_id,	a.pay_delivery,
+            a.user_coupon_id,	a.company_id,	a.company_user_id,	a.store_house_code,	a.extend_order_id,	a.pay_delivery,a.pay_postage,
             a.pay_remain,	a.delivery_status,	a.delivery_pay_status,	a.delivery_pay_time,	a.delivery_type,
             a.delivery_pay_money,	a.delivery_import_time,	a.delivery_send_time,	a.is_after_sales,	a.dept_id,
             a.channel,	a.source,	a.bill_price,	a.total_postage,	a.pay_postage,	a.gain_integral,