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-04-08 15:46:25 +08:00
parent ff27979337
commit fa33586aae
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cash-common/cash-common-tools/src/main/java/com/czg/enums/ShopUserFlowBizEnum.java
View File

@@ -11,7 +11,7 @@ public enum ShopUserFlowBizEnum {
// 会员充值
CASH_IN("cashIn", "会员充值"),
CASHBACK("cashback", "消费返现"),
CASHBACK_REFUND("cashback_refund", "消费返现扣减"),
CASHBACK_REFUND("cashbackRefund", "消费返现扣减"),
FREE_IN("freeIn", "霸王餐充值"),
// 重置奖励
@@ -21,7 +21,7 @@ public enum ShopUserFlowBizEnum {
// 支付宝小程序重置
ALIPAY_IN("alipayIn", "支付宝小程序充值"),
// 订单支付奖励
ORDER_PAY("orderPay", "订单支付奖励"),
ORDER_PAY("orderPay", "订单支付"),
// 订单退款
ORDER_REFUND("orderRefund", "订单退款"),
// 充值退款

4
cash-service/market-service/src/main/java/com/czg/service/market/mapper/OrderInfoMapper.java
View File

@@ -81,8 +81,8 @@ public interface OrderInfoMapper extends BaseMapper<OrderInfo> {
BigDecimal countReturnDish(Long shopId, String loginTime, String handoverTime);
@Select("SELECT " +
" SUM(CASE WHEN biz_code IN ('cashIn', 'wechatIn', 'alipayIn', 'adminIn') THEN amount ELSE 0 END) AS recharge," +
" SUM(CASE WHEN biz_code IN ('rechargeRefund', 'rechargeCashRefund') THEN amount ELSE 0 END) AS refundAmount " +
" SUM(CASE WHEN biz_code IN ('cashIn', 'wechatIn', 'alipayIn', 'adminIn','freeIn') THEN amount ELSE 0 END) AS recharge," +
" SUM(CASE WHEN biz_code IN ('rechargeRefund') THEN amount ELSE 0 END) AS refundAmount " +
"FROM `tb_shop_user_flow` " +
" WHERE" +
" shop_id = #{shopId} " +