yovinchen/xlcs
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

后端bug修复

Browse Source
This commit is contained in:
yovinchen
2024-05-09 14:08:19 +08:00
parent 1e0827b60a
commit 423ae62e51
9 changed files with 118 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
xlcs-parent/service/service-activity/src/main/java/com/yovinchen/xlcs/activity/service/impl/ActivityInfoServiceImpl.java
View File

@@ -1,5 +1,10 @@
package com.yovinchen.xlcs.activity.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yovinchen.xlcs.activity.mapper.ActivityInfoMapper;
import com.yovinchen.xlcs.activity.mapper.ActivityRuleMapper;
import com.yovinchen.xlcs.activity.mapper.ActivitySkuMapper;
@@ -16,11 +21,6 @@ import com.yovinchen.xlcs.model.product.SkuInfo;
import com.yovinchen.xlcs.vo.activity.ActivityRuleVo;
import com.yovinchen.xlcs.vo.order.CartInfoVo;
import com.yovinchen.xlcs.vo.order.OrderConfirmVo;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -70,10 +70,10 @@ public class ActivityInfoServiceImpl extends ServiceImpl<ActivityInfoMapper, Act
IPage<ActivityInfo> page = activityInfoMapper.selectPage(pageParam, queryWrapper);
page.getRecords()
.forEach(item -> {
item.setActivityTypeString(item.getActivityType()
.getComment());
});
.forEach(item -> {
item.setActivityTypeString(item.getActivityType()
.getComment());
});
return page;
}
@@ -96,8 +96,8 @@ public class ActivityInfoServiceImpl extends ServiceImpl<ActivityInfoMapper, Act
activitySkuQueryWrapper.eq(ActivitySku::getActivityId, activityId);
List<ActivitySku> activitySkuList = activitySkuMapper.selectList(activitySkuQueryWrapper);
List<Long> skuIdList = activitySkuList.stream()
.map(ActivitySku::getSkuId)
.collect(Collectors.toList());
.map(ActivitySku::getSkuId)
.collect(Collectors.toList());
List<SkuInfo> skuInfoList = null;
if (!skuIdList.isEmpty()) {
@@ -159,8 +159,8 @@ public class ActivityInfoServiceImpl extends ServiceImpl<ActivityInfoMapper, Act
//从skuInfoList集合获取所有skuId
List<Long> skuIdList = skuInfoList.stream()
.map(SkuInfo::getId)
.collect(Collectors.toList());
.map(SkuInfo::getId)
.collect(Collectors.toList());
//第二步 判断添加商品之前是否参加过活动，
// 如果之前参加过，活动正在进行中，排除商品
@@ -436,22 +436,10 @@ public class ActivityInfoServiceImpl extends ServiceImpl<ActivityInfoMapper, Act
optimalActivityRule.setReduceAmount(new BigDecimal("0"));
optimalActivityRule.setSelectType(1);
String ruleDesc = "满" +
optimalActivityRule.getConditionNum() +
"元打" +
optimalActivityRule.getBenefitDiscount() +
"折，还差" +
(totalNum - optimalActivityRule.getConditionNum()) +
"件";
String ruleDesc = "满" + optimalActivityRule.getConditionNum() + "元打" + optimalActivityRule.getBenefitDiscount() + "折，还差" + (totalNum - optimalActivityRule.getConditionNum()) + "件";
optimalActivityRule.setRuleDesc(ruleDesc);
} else {
String ruleDesc = "满" +
optimalActivityRule.getConditionNum() +
"元打" +
optimalActivityRule.getBenefitDiscount() +
"折，已减" +
optimalActivityRule.getReduceAmount() +
"元";
String ruleDesc = "满" + optimalActivityRule.getConditionNum() + "元打" + optimalActivityRule.getBenefitDiscount() + "折，已减" + optimalActivityRule.getReduceAmount() + "元";
optimalActivityRule.setRuleDesc(ruleDesc);
optimalActivityRule.setSelectType(2);
}
@@ -483,22 +471,10 @@ public class ActivityInfoServiceImpl extends ServiceImpl<ActivityInfoMapper, Act
optimalActivityRule.setReduceAmount(new BigDecimal("0"));
optimalActivityRule.setSelectType(1);
String ruleDesc = "满" +
optimalActivityRule.getConditionAmount() +
"元减" +
optimalActivityRule.getBenefitAmount() +
"元，还差" +
totalAmount.subtract(optimalActivityRule.getConditionAmount()) +
"元";
String ruleDesc = "满" + optimalActivityRule.getConditionAmount() + "元减" + optimalActivityRule.getBenefitAmount() + "元，还差" + totalAmount.subtract(optimalActivityRule.getConditionAmount()) + "元";
optimalActivityRule.setRuleDesc(ruleDesc);
} else {
String ruleDesc = "满" +
optimalActivityRule.getConditionAmount() +
"元减" +
optimalActivityRule.getBenefitAmount() +
"元，已减" +
optimalActivityRule.getReduceAmount() +
"元";
String ruleDesc = "满" + optimalActivityRule.getConditionAmount() + "元减" + optimalActivityRule.getBenefitAmount() + "元，已减" + optimalActivityRule.getReduceAmount() + "元";
optimalActivityRule.setRuleDesc(ruleDesc);
optimalActivityRule.setSelectType(2);
}