挂账退款

cash-common/cash-common-service/src/main/java/com/czg/order/dto/FinanceStsDTO.java

@@ -186,6 +186,10 @@ public class FinanceStsDTO {
          * 现金退款金额
          */
         private BigDecimal cashRefundAmount;
+        /**
+         * 挂账退款金额
+         */
+        private BigDecimal creditRefundAmount;
 
         /**
          * 充值退款金额

cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopOrderStatistic.java

@@ -221,6 +221,8 @@ public class ShopOrderStatistic implements Serializable {
      */
     @ExcelProperty("订单退款金额")
     private BigDecimal refundAmount;
+    @ExcelProperty("订单挂账退款金额")
+    private BigDecimal creditRefundAmount;
     /**
      * 订单退款 线上退款金额
      */

cash-service/order-service/src/main/java/com/czg/service/order/mapper/ShopOrderStatisticMapper.java

@@ -210,6 +210,7 @@ public interface ShopOrderStatisticMapper extends BaseMapper<ShopOrderStatistic>
             " SUM(CASE WHEN pay_type = 'free_pay' THEN order_amount ELSE 0 END) AS backDiscountAmount," +
             " " +
             " SUM(CASE WHEN pay_type = 'vip_pay' THEN refund_amount ELSE 0 END) AS memberRefundAmount," +
+            " SUM(CASE WHEN pay_type = 'credit_pay' THEN refund_amount ELSE 0 END) AS creditRefundAmount," +
             " " +
             " SUM(CASE WHEN pay_type = 'vip_pay' THEN 1 ELSE 0 END) as memberPayCount," +
             " SUM(CASE WHEN pay_type = 'cash_pay' THEN 1 ELSE 0 END) as cashPayCount," +

cash-service/order-service/src/main/java/com/czg/service/order/service/impl/FinanceStsServiceImpl.java

@@ -62,6 +62,7 @@ public class FinanceStsServiceImpl implements FinanceStsService {
                         .setRefundAmount(statistic.getRefundAmount().add(statistic.getRechargeRefundAmount()))
                         .setOnlineRefundAmount(statistic.getOnlineRefundAmount())
                         .setCashRefundAmount(statistic.getCashRefundAmount())
+                        .setCreditRefundAmount(statistic.getCreditRefundAmount())
                         .setMemberRefundAmount(statistic.getMemberRefundAmount())
                         .setRechargeRefundAmount(statistic.getRechargeRefundAmount())
                         .setOnlineRechargeRefundAmount(statistic.getOnlineRechargeRefundAmount())