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

多余 注释

Browse Source
This commit is contained in:
wangw
2025-11-27 10:02:02 +08:00
parent 85e4d11d6e
commit 56983f9eee
3 changed files with 5 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java
View File

@@ -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))) {

9
cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopOrderStatisticServiceImpl.java
View File

@@ -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<ShopOrderStatisti
CopyOptions copyOptions = CopyOptions.create().setIgnoreNullValue(true);
if (onlineStat != null) {
BeanUtil.copyProperties(onlineStat, result, copyOptions);
log.info("合并onlineStat后 result:{}", JSONObject.toJSONString(result));
}
if (orderStat != null) {
BeanUtil.copyProperties(orderStat, result, copyOptions);
log.info("合并orderStat后 result:{}", JSONObject.toJSONString(result));
}
if (userFlowStat != null) {
BeanUtil.copyProperties(userFlowStat, result, copyOptions);
log.info("合并userFlowStat后 result:{}", JSONObject.toJSONString(result));
}
result.setShopId(shopId);