From de09da99330cf51bdab4934dae143a6cc72014d6 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期六, 26 十月 2024 11:26:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java | 12 ------------
1 files changed, 0 insertions(+), 12 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java
index 82c41ed..0e55c4c 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java
@@ -115,7 +115,6 @@
BigDecimal vipActivity = new BigDecimal("0");
// 赠送会员
BigDecimal grantVip = new BigDecimal("0");
- SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
for (TActivityStatisticslVO tActivityStatisticslVO : list1) {
TAppUser data = appUserClient.getUserById(tActivityStatisticslVO.getAppUserId()).getData();
if (data!=null){
@@ -191,7 +190,6 @@
}
}
for (TActivityStatisticslVO tActivityStatisticslVO : list) {
-
// 判断享有了哪些类型
switch (tActivityStatisticslVO.getOrderType()){
case 1:
@@ -201,7 +199,6 @@
if (tActivityStatisticslVO.getCouponDiscountAmount()!=null
&&
(tActivityStatisticslVO.getCouponDiscountAmount().compareTo(BigDecimal.ZERO)>0)){
- coupon = coupon.add(tActivityStatisticslVO.getCouponDiscountAmount());
stringBuilder.append("优惠券抵扣").append("+");
}
if (tActivityStatisticslVO.getVipDiscountAmount()!=null &&(tActivityStatisticslVO.getVipDiscountAmount().compareTo(BigDecimal.ZERO)>0)){
@@ -221,13 +218,11 @@
if (tActivityStatisticslVO.getCouponDiscountAmount()!=null
&&
(tActivityStatisticslVO.getCouponDiscountAmount().compareTo(BigDecimal.ZERO)>0)){
- coupon = coupon.add(tActivityStatisticslVO.getCouponDiscountAmount());
stringBuilder1.append("优惠券抵扣").append("+");
}
if (tActivityStatisticslVO.getVipDiscountAmount()!=null
&&
(tActivityStatisticslVO.getVipDiscountAmount().compareTo(BigDecimal.ZERO)>0)){
- discount = discount.add(tActivityStatisticslVO.getVipDiscountAmount());
stringBuilder1.append("会员抵扣").append("+");
}
if (stringBuilder1.length()>0){
@@ -238,23 +233,16 @@
break;
case 3:
// 会员订单 优惠金额大于0
- if (tActivityStatisticslVO.getVipDiscountAmount()!=null
- &&
- (tActivityStatisticslVO.getCouponDiscountAmount().compareTo(BigDecimal.ZERO)>0)){
- vipActivity = vipActivity.add(tActivityStatisticslVO.getVipDiscountAmount());
- }
tActivityStatisticslVO.setType("会员活动");
tActivityStatisticslVO.setTime(tActivityStatisticslVO.getCreateTime());
break;
case 4:
// 赠送会员订单 如果支付金额为0 那么就是后台赠送的会员
if (tActivityStatisticslVO.getPaymentAmount().compareTo(BigDecimal.ZERO)==0){
- grantVip = grantVip.add(tActivityStatisticslVO.getOrderAmount());
tActivityStatisticslVO.setType("赠送会员");
tActivityStatisticslVO.setTime(tActivityStatisticslVO.getCreateTime());
}else{
// 赠送
- grantVip = grantVip.add(tActivityStatisticslVO.getVipDiscountAmount());
tActivityStatisticslVO.setType("赠送会员");
tActivityStatisticslVO.setTime(tActivityStatisticslVO.getCreateTime());
}
--
Gitblit v1.7.1