diff --git a/cash-common/cash-common-tools/src/main/java/com/czg/enums/ShopUserFlowBizEnum.java b/cash-common/cash-common-tools/src/main/java/com/czg/enums/ShopUserFlowBizEnum.java index 9351fe249..d34ff6ef0 100644 --- a/cash-common/cash-common-tools/src/main/java/com/czg/enums/ShopUserFlowBizEnum.java +++ b/cash-common/cash-common-tools/src/main/java/com/czg/enums/ShopUserFlowBizEnum.java @@ -11,6 +11,8 @@ public enum ShopUserFlowBizEnum { // 会员充值 CASH_IN("cashIn", "会员充值"), CASHBACK("cashback", "消费返现"), + CASHBACK_REFUND("cashback_refund", "消费返现扣减"), + FREE_IN("freeIn", "霸王餐充值"), // 重置奖励 AWARD_IN("awardIn", "充值奖励"), diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkConsumeCashbackServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkConsumeCashbackServiceImpl.java index bde15ea62..87ab18ba0 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkConsumeCashbackServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkConsumeCashbackServiceImpl.java @@ -203,7 +203,7 @@ public class MkConsumeCashbackServiceImpl extends ServiceImpl implements OrderPaymentService{ +public class OrderPaymentServiceImpl extends ServiceImpl implements OrderPaymentService { + @Override + public BigDecimal countMemberInAmount(Long shopId, Long shopUserId) { + return getOneAs(QueryWrapper.create().select("sum(amount)") + .eq(OrderPayment::getShopId, 143) + .eq(OrderPayment::getSourceType, PayTypeConstants.SourceType.MEMBER_IN) + .eq(OrderPayment::getPayType, PayTypeConstants.PayType.PAY) + .eq(OrderPayment::getSourceId, 127452) + .eq(OrderPayment::getPayStatus, PayTypeConstants.PayStatus.SUCCESS), BigDecimal.class); + } }