czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

挂账退款

Browse Source
This commit is contained in:
wangw
2026-02-05 10:57:02 +08:00
parent 746c5c83da
commit a53911aaa5
4 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

@@ -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 = '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 = '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 = 'vip_pay' THEN 1 ELSE 0 END) as memberPayCount," +
" SUM(CASE WHEN pay_type = 'cash_pay' THEN 1 ELSE 0 END) as cashPayCount," + " SUM(CASE WHEN pay_type = 'cash_pay' THEN 1 ELSE 0 END) as cashPayCount," +

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

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