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 d3ff5b8e..24120e3d 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 @@ -17,6 +17,9 @@ import com.czg.market.dto.MkConsumeDiscountDTO; import com.czg.market.entity.*; import com.czg.market.service.MkConsumeCashbackRecordService; 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.utils.AssertUtil; import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.core.update.UpdateWrapper; @@ -48,6 +51,8 @@ public class MkConsumeCashbackServiceImpl extends ServiceImpl 0) { + return; + } + } else if ("vip".equals(config.getApplicableUser()) && shopUser.getIsVip() != 1) { + return; + } + } List cashbackStepList = config.getCashbackStepList(); log.info("消费返现2, orderId: {}, cashbackStepList:{}", orderId, cashbackStepList); if (CollUtil.isNotEmpty(cashbackStepList)) {