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 8c27a07dc..c892ea551 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 @@ -5,7 +5,6 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson2.JSONArray; import com.czg.account.dto.shopuser.ShopUserMoneyEditDTO; -import com.czg.account.entity.ShopConfig; import com.czg.account.entity.ShopInfo; import com.czg.account.entity.ShopUser; import com.czg.account.service.ShopConfigService; @@ -13,21 +12,20 @@ import com.czg.account.service.ShopInfoService; import com.czg.account.service.ShopUserService; import com.czg.constant.TableValueConstant; import com.czg.enums.ShopUserFlowBizEnum; -import com.czg.exception.ApiNotPrintException; import com.czg.market.dto.MkConsumeCashbackDTO; -import com.czg.market.dto.MkConsumeDiscountDTO; -import com.czg.market.entity.*; +import com.czg.market.entity.MkConsumeCashback; +import com.czg.market.entity.MkConsumeCashbackRecord; +import com.czg.market.entity.MkConsumeCashbackStep; import com.czg.market.service.MkConsumeCashbackRecordService; +import com.czg.market.service.MkConsumeCashbackService; import com.czg.market.vo.MkConsumeCashbackVO; import com.czg.order.entity.OrderInfo; import com.czg.order.service.OrderInfoService; import com.czg.service.market.enums.OrderStatusEnums; +import com.czg.service.market.mapper.MkConsumeCashbackMapper; import com.czg.utils.AssertUtil; import com.mybatisflex.core.query.QueryWrapper; -import com.mybatisflex.core.update.UpdateWrapper; import com.mybatisflex.spring.service.impl.ServiceImpl; -import com.czg.market.service.MkConsumeCashbackService; -import com.czg.service.market.mapper.MkConsumeCashbackMapper; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboReference; @@ -61,6 +59,7 @@ public class MkConsumeCashbackServiceImpl extends ServiceImpl 0) { + .eq(OrderInfo::getShopId, shopId).eq(OrderInfo::getStatus, OrderStatusEnums.DONE)); + log.info("消费返现 new用户校验1, orderId: {}, count: {}", orderId, count); + if (count > 0L) { + log.info("消费返现 new用户校验2, orderId: {}, count: {}", orderId, count); return; } } else if ("vip".equals(config.getApplicableUser()) && shopUser.getIsVip() != 1) { @@ -147,7 +148,7 @@ public class MkConsumeCashbackServiceImpl extends ServiceImpl 0) { + System.out.println(1); + } + } }