diff --git a/cash-api/market-server/src/main/resources/logback.xml b/cash-api/market-server/src/main/resources/logback.xml
index c0a6819b9..3fa38e249 100644
--- a/cash-api/market-server/src/main/resources/logback.xml
+++ b/cash-api/market-server/src/main/resources/logback.xml
@@ -18,7 +18,7 @@
logs/market/logback.log
- logs/product/history/%d{yyyy-MM-dd}/logback.%i.log.gz
+ logs/market/history/%d{yyyy-MM-dd}/logback.%i.log.gz
30
20MB
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/entity/OrderDetail.java b/cash-common/cash-common-service/src/main/java/com/czg/order/entity/OrderDetail.java
index 1286e8790..5e1591777 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/order/entity/OrderDetail.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/order/entity/OrderDetail.java
@@ -67,6 +67,10 @@ public class OrderDetail implements Serializable {
* 最终单价
*/
private BigDecimal unitPrice;
+ /**
+ * 是否赠送 0否 1是
+ */
+ private Integer isGift;
/**
* 折扣金额(商品优惠券抵扣金额)
@@ -195,19 +199,6 @@ public class OrderDetail implements Serializable {
*/
private LocalDateTime foodServeTime;
- /**
- * 是否赠送 0否 1是
- */
- @Column(ignore = true)
- private Integer isGift = 0;
-
-
- public void initGift() {
- if (price.compareTo(BigDecimal.ZERO) == 0) {
- isGift = 1;
- }
- }
-
public BigDecimal getRefundNum() {
return refundNum == null ? BigDecimal.ZERO : refundNum;
}
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 78653feac..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
@@ -203,7 +203,6 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService {
if ("Array".equals(orderDetail.getProGroupInfo())) {
orderDetail.setProGroupInfo("");
}
- orderDetail.initGift();
// 获取当前订单详情的 placeNum
Integer placeNum = orderDetail.getPlaceNum();
// 检查 Map 中是否已经存在该 placeNum 对应的列表
@@ -250,7 +249,6 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService {
Map> resultMap = new HashMap<>();
// 遍历订单详情列表
for (OrderDetail orderDetail : orderDetails) {
- orderDetail.initGift();
// 获取当前订单详情的 placeNum
Integer placeNum = orderDetail.getPlaceNum();
// 检查 Map 中是否已经存在该 placeNum 对应的列表
@@ -926,7 +924,9 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService {
public void getOrderAmount(List orderDetails, BigDecimalDTO totalAmount, BigDecimalDTO packAmount,
BigDecimalDTO tempAmount, LimitRateDTO limitRate, boolean isAllPack, Integer userAllPack, boolean isVipPrice) {
for (OrderDetail orderDetail : orderDetails) {
- if (orderDetail.getDiscountSaleAmount() != null && orderDetail.getDiscountSaleAmount().compareTo(BigDecimal.ZERO) > 0) {
+ if (orderDetail.getIsGift() == 1) {
+ orderDetail.setUnitPrice(BigDecimal.ZERO);
+ } else if (orderDetail.getDiscountSaleAmount() != null && orderDetail.getDiscountSaleAmount().compareTo(BigDecimal.ZERO) > 0) {
orderDetail.setUnitPrice(orderDetail.getDiscountSaleAmount());
} else {
if (orderDetail.getIsTimeDiscount() == 1) {
@@ -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