From 3b83d210dcbb61e53a3a715ef043e187b2277b2a Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Thu, 25 Dec 2025 18:29:21 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=20=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/czg/enums/ShopUserFlowBizEnum.java     |  2 ++
 .../impl/MkConsumeCashbackServiceImpl.java     |  2 +-
 .../service/impl/OrderPaymentServiceImpl.java  | 18 +++++++++++++++---
 3 files changed, 18 insertions(+), 4 deletions(-)

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<MkConsumeCashbackM
                 .setType(0)
                 .setRelationId(mkConsumeCashbackRecord.getId())
                 .setMoney(record.getCashbackAmount())
-                .setBizEnum(ShopUserFlowBizEnum.CASHBACK)
+                .setBizEnum(ShopUserFlowBizEnum.CASHBACK_REFUND)
                 .setRemark(StrUtil.format("订单退款，扣除返现: {}", record.getCashbackAmount())));
         log.info("订单退款扣除返现 订单ID:{}, 店铺用户id: {},  扣除返现: {}", orderId, record.getShopUserId(), record.getCashbackAmount());
 
diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderPaymentServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderPaymentServiceImpl.java
index 5faa2deec..0ca7dda58 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderPaymentServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderPaymentServiceImpl.java
@@ -1,11 +1,14 @@
 package com.czg.service.order.service.impl;
 
-import com.mybatisflex.spring.service.impl.ServiceImpl;
+import com.czg.constants.PayTypeConstants;
 import com.czg.order.entity.OrderPayment;
 import com.czg.order.service.OrderPaymentService;
 import com.czg.service.order.mapper.OrderPaymentMapper;
+import com.mybatisflex.core.query.QueryWrapper;
+import com.mybatisflex.spring.service.impl.ServiceImpl;
 import org.apache.dubbo.config.annotation.DubboService;
-import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
 
 /**
  * 支付详情 服务层实现。
@@ -14,6 +17,15 @@ import org.springframework.stereotype.Service;
  * @since 2025-02-15
  */
 @DubboService
-public class OrderPaymentServiceImpl extends ServiceImpl<OrderPaymentMapper, OrderPayment> implements OrderPaymentService{
+public class OrderPaymentServiceImpl extends ServiceImpl<OrderPaymentMapper, OrderPayment> 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);
+    }
 }