czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/prod' into prod

Browse Source
This commit is contained in:
张松
2025-11-08 11:24:19 +08:00
parent 237133d72f 84bdfe1742
commit 69e54ec5a1
1 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkConsumeCashbackServiceImpl.java
View File

@@ -5,7 +5,6 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONArray;
import com.czg.account.dto.shopuser.ShopUserMoneyEditDTO; import com.czg.account.dto.shopuser.ShopUserMoneyEditDTO;
import com.czg.account.entity.ShopConfig;
import com.czg.account.entity.ShopInfo; import com.czg.account.entity.ShopInfo;
import com.czg.account.entity.ShopUser; import com.czg.account.entity.ShopUser;
import com.czg.account.service.ShopConfigService; 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.account.service.ShopUserService;
import com.czg.constant.TableValueConstant; import com.czg.constant.TableValueConstant;
import com.czg.enums.ShopUserFlowBizEnum; import com.czg.enums.ShopUserFlowBizEnum;
import com.czg.exception.ApiNotPrintException;
import com.czg.market.dto.MkConsumeCashbackDTO; import com.czg.market.dto.MkConsumeCashbackDTO;
import com.czg.market.dto.MkConsumeDiscountDTO; import com.czg.market.entity.MkConsumeCashback;
import com.czg.market.entity.*; import com.czg.market.entity.MkConsumeCashbackRecord;
import com.czg.market.entity.MkConsumeCashbackStep;
import com.czg.market.service.MkConsumeCashbackRecordService; import com.czg.market.service.MkConsumeCashbackRecordService;
import com.czg.market.service.MkConsumeCashbackService;
import com.czg.market.vo.MkConsumeCashbackVO; import com.czg.market.vo.MkConsumeCashbackVO;
import com.czg.order.entity.OrderInfo; import com.czg.order.entity.OrderInfo;
import com.czg.order.service.OrderInfoService; import com.czg.order.service.OrderInfoService;
import com.czg.service.market.enums.OrderStatusEnums; import com.czg.service.market.enums.OrderStatusEnums;
import com.czg.service.market.mapper.MkConsumeCashbackMapper;
import com.czg.utils.AssertUtil; import com.czg.utils.AssertUtil;
import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.core.query.QueryWrapper;
import com.mybatisflex.core.update.UpdateWrapper;
import com.mybatisflex.spring.service.impl.ServiceImpl; 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 jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.config.annotation.DubboReference; import org.apache.dubbo.config.annotation.DubboReference;
@@ -61,6 +59,7 @@ public class MkConsumeCashbackServiceImpl extends ServiceImpl<MkConsumeCashbackM
private OrderInfoService orderInfoService; private OrderInfoService orderInfoService;
@DubboReference @DubboReference
private ShopConfigService shopConfigService; private ShopConfigService shopConfigService;
BigDecimal bili = BigDecimal.valueOf(100);
@Resource @Resource
private MkConsumeCashbackRecordService consumeCashbackRecordService; private MkConsumeCashbackRecordService consumeCashbackRecordService;
@@ -126,8 +125,10 @@ public class MkConsumeCashbackServiceImpl extends ServiceImpl<MkConsumeCashbackM
if (StrUtil.isNotBlank(config.getApplicableUser()) && !"all".equals(config.getApplicableUser())) { if (StrUtil.isNotBlank(config.getApplicableUser()) && !"all".equals(config.getApplicableUser())) {
if ("new".equals(config.getApplicableUser())) { if ("new".equals(config.getApplicableUser())) {
long count = orderInfoService.count(new QueryWrapper().eq(OrderInfo::getUserId, shopUser.getUserId()) long count = orderInfoService.count(new QueryWrapper().eq(OrderInfo::getUserId, shopUser.getUserId())
.eq(OrderInfo::getShopId, shopUser.getSourceShopId()).eq(OrderInfo::getStatus, OrderStatusEnums.DONE)); .eq(OrderInfo::getShopId, shopId).eq(OrderInfo::getStatus, OrderStatusEnums.DONE));
if (count > 0) { log.info("消费返现 new用户校验1, orderId: {}, count: {}", orderId, count);
if (count > 0L) {
log.info("消费返现 new用户校验2, orderId: {}, count: {}", orderId, count);
return; return;
} }
} else if ("vip".equals(config.getApplicableUser()) && shopUser.getIsVip() != 1) { } else if ("vip".equals(config.getApplicableUser()) && shopUser.getIsVip() != 1) {
@@ -147,7 +148,7 @@ public class MkConsumeCashbackServiceImpl extends ServiceImpl<MkConsumeCashbackM
if (TableValueConstant.MkConsumeCashback.CashbackType.FIX.getCode().equals(config.getCashbackType())) { if (TableValueConstant.MkConsumeCashback.CashbackType.FIX.getCode().equals(config.getCashbackType())) {
cashbackAmount = cashbackStep.getCashbackAmount(); cashbackAmount = cashbackStep.getCashbackAmount();
} else { } else {
cashbackAmount = amount.multiply(cashbackStep.getCashbackAmount().divide(BigDecimal.valueOf(100), RoundingMode.DOWN)); cashbackAmount = amount.multiply(cashbackStep.getCashbackAmount().divide(bili, 2, RoundingMode.DOWN)).setScale(2, RoundingMode.DOWN);
} }
if (cashbackAmount.compareTo(BigDecimal.ZERO) <= 0) { if (cashbackAmount.compareTo(BigDecimal.ZERO) <= 0) {
return; return;
@@ -166,4 +167,11 @@ public class MkConsumeCashbackServiceImpl extends ServiceImpl<MkConsumeCashbackM
} }
} }
} }
public static void main(String[] args) {
long count = 15L;
if (count > 0) {
System.out.println(1);
}
}
} }