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 1e4ddbf67..05dafc9ce 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 @@ -113,14 +113,12 @@ public class MkConsumeCashbackServiceImpl extends ServiceImpl cashbackStepList = config.getCashbackStepList(); - log.info("消费返现2, orderId: {}, cashbackStepList:{}", orderId, cashbackStepList); if (CollUtil.isNotEmpty(cashbackStepList)) { config.setCashbackStepList(cashbackStepList.stream().sorted(Comparator.comparing(MkConsumeCashbackStep::getAmount).reversed()).collect(Collectors.toList())); for (MkConsumeCashbackStep cashbackStep : config.getCashbackStepList()) { - log.info("消费返现3, cashbackStep: {}, userId: {}, amount: {}, orderId: {}", cashbackStep, userId, amount, orderId); if (cashbackStep.getAmount().compareTo(amount) <= 0) { BigDecimal cashbackAmount; // 固定金额 @@ -159,17 +155,10 @@ public class MkConsumeCashbackServiceImpl extends ServiceImpl 0) { - System.out.println(1); - } - } } diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java index 6a64840d3..398f206f8 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java @@ -1278,7 +1278,6 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService { log.error("订单{}消费赠券失败", orderInfo.getId(), e); } } - log.info("消费返现 start, orderId: {}, payType1: {} ,payType2: {}", orderInfo.getId(), orderInfo.getPayType(), payType); String[] payTypes = {PayEnums.VIP_PAY.getValue(), PayEnums.CREDIT_PAY.getValue()}; if ((orderInfo.getPayType() != null && !ArrayUtil.contains(payTypes, orderInfo.getPayType())) || (payType != null && !ArrayUtil.contains(payTypes, payType))) { diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopOrderStatisticServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopOrderStatisticServiceImpl.java index 47286a836..09e43696b 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopOrderStatisticServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopOrderStatisticServiceImpl.java @@ -3,7 +3,6 @@ package com.czg.service.order.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import cn.hutool.core.collection.CollUtil; -import com.alibaba.fastjson2.JSONObject; import com.czg.exception.CzgException; import com.czg.order.entity.ShopOrderStatistic; import com.czg.order.service.ShopOrderStatisticService; @@ -19,7 +18,10 @@ import org.springframework.stereotype.Service; import java.math.BigDecimal; import java.math.RoundingMode; import java.time.LocalDate; -import java.util.*; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; @@ -124,15 +126,12 @@ public class ShopOrderStatisticServiceImpl extends ServiceImpl