From e5f2d62c6cc448c217ad5c87f189d8283239065b Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Wed, 08 Jan 2025 14:22:21 +0800
Subject: [PATCH] refactor(mall): 优化 ApiMallNewsServiceImpl 中的代码 - 移除了未使用的 QueryWrapper 导入 - 使用 LambdaQueryWrapper 替代 QueryWrapper 进行查询 - 简化了 mallActivityMapper.selectById 的调用
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 116 ++++++++++++++++++++++++++++++---------------------------
1 files changed, 61 insertions(+), 55 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
index 1b46a1c..57034a7 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -8,19 +8,19 @@
import cc.mrbird.febs.mall.conversion.MallGoodsCommentConversion;
import cc.mrbird.febs.mall.conversion.MallOrderInfoConversion;
import cc.mrbird.febs.mall.conversion.MallOrderRefundConversion;
-import cc.mrbird.febs.mall.conversion.MallTeamLeaderConversion;
import cc.mrbird.febs.mall.dto.*;
import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.mapper.*;
import cc.mrbird.febs.mall.service.*;
-import cc.mrbird.febs.mall.vo.*;
+import cc.mrbird.febs.mall.vo.ApiCouponAmountMapVo;
+import cc.mrbird.febs.mall.vo.OrderDetailVo;
+import cc.mrbird.febs.mall.vo.OrderListVo;
+import cc.mrbird.febs.mall.vo.OrderRefundVo;
import cc.mrbird.febs.pay.model.BrandWCPayRequestData;
-import cc.mrbird.febs.pay.model.OrderStateDto;
import cc.mrbird.febs.pay.service.IPayService;
import cc.mrbird.febs.pay.service.IXcxPayService;
import cc.mrbird.febs.pay.util.WeixinServiceUtil;
import cc.mrbird.febs.rabbit.producter.AgentProducer;
-import cc.mrbird.febs.vip.service.IMallVipConfigBenefitsService;
import cc.mrbird.febs.vip.service.IMallVipConfigService;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUnit;
@@ -28,8 +28,6 @@
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.crypto.SecureUtil;
-import cn.hutool.json.JSONArray;
-import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -44,6 +42,7 @@
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.util.*;
import java.util.stream.Collectors;
@@ -94,11 +93,6 @@
public Long createOrder(AddOrderDto addOrderDto) {
Long memberId = LoginUserUtil.getLoginUser().getId();
MallMember member = mallMemberMapper.selectById(memberId);
-
- //验证用户的等级
-// if(AgentLevelEnum.ZERO_LEVEL.name().equals(member.getLevel())){
-// throw new FebsException("请先申请成为代理人");
-// }
//订单范围内才允许下单
MallAddressInfo address = mallAddressInfoMapper.selectAddressInfoByMemberIdAndId(member.getId(), addOrderDto.getAddressId());
@@ -292,75 +286,84 @@
@Override
public Map<Long,BigDecimal> getCouponAmountMap(Long memberCouponId,List<AddOrderItemDto> items){
HashMap<Long,BigDecimal> couponAmountMap = new HashMap<>();
- MallMemberCoupon mallMemberCoupon = mallMemberCouponMapper.selectById(memberCouponId);
- if(ObjectUtil.isEmpty(mallMemberCoupon)){
+ // 获取优惠券信息
+ Optional<MallMemberCoupon> optionalMallMemberCoupon = Optional.ofNullable(mallMemberCouponMapper.selectById(memberCouponId));
+ MallMemberCoupon mallMemberCoupon = optionalMallMemberCoupon.orElse(null);
+
+ if (mallMemberCoupon == null || mallMemberCoupon.getState() != 1) {
return couponAmountMap;
}
- Integer state = mallMemberCoupon.getState();
- if(1 != state){
- return couponAmountMap;
- }
+
+
Long couponId = mallMemberCoupon.getCouponId();//优惠卷ID
List<Long> goodsIdsAll = couponGoodsMapper.selectByCouponId(couponId);
List<MallGoodsSku> skusAll = mallGoodsSkuMapper.selectSkuIdsByGoodsId(goodsIdsAll);//获取该优惠卷绑定的全部商品sku
- List<Long> skuIdsAll = skusAll.stream().map(MallGoodsSku::getId).collect(Collectors.toList());//获取该优惠卷绑定的全部商品skuIDS
- List<Long> skuIds = items.stream().map(AddOrderItemDto::getSkuId).collect(Collectors.toList());//订单中的全部skuIds
+ Set<Long> skuIdsAll = skusAll.stream().map(MallGoodsSku::getId).collect(Collectors.toSet());//获取该优惠卷绑定的全部商品skuIDS
+ Set<Long> skuIds = items.stream().map(AddOrderItemDto::getSkuId).collect(Collectors.toSet());//订单中的全部skuIds
- /**
- * 获取这张优惠卷生效的skuIds
- */
- Set<Long> intersection = skuIdsAll.stream()
- .filter(item -> skuIds.contains(item))
- .collect(Collectors.toSet());//获取两个集合的交集
- if(CollUtil.isEmpty(intersection)){
+ // 获取交集
+ Set<Long> intersection = skuIds.stream()
+ .filter(skuIdsAll::contains)
+ .collect(Collectors.toSet());
+
+ if (intersection.isEmpty()) {
return couponAmountMap;
}
- HashMap<Long,BigDecimal> skuMap = new HashMap<>();//每个订单详情的ID和amount的map
- List<MallGoodsSku> skus = mallGoodsSkuMapper.selectByIds(new ArrayList<>(intersection));
- BigDecimal totalAmount = BigDecimal.ZERO;//订单中的总金额
- Map<Long, AddOrderItemDto> itemMap = new HashMap<>();// 预先将items转换为Map，以skuId作为键
- for (AddOrderItemDto addOrderItemDto : items) {
- itemMap.put(addOrderItemDto.getSkuId(), addOrderItemDto);
- }
- for(MallGoodsSku mallGoodsSku : skus){
+
+ // 获取订单详情的ID和amount的map
+ Map<Long, AddOrderItemDto> itemMap = items.stream()
+ .collect(Collectors.toMap(AddOrderItemDto::getSkuId, item -> item));
+
+ List<MallGoodsSku> skus = mallGoodsSkuMapper.selectList(
+ new LambdaQueryWrapper<MallGoodsSku>()
+ .select(MallGoodsSku::getId, MallGoodsSku::getPresentPrice)
+ .in(MallGoodsSku::getId, intersection)
+ );
+ BigDecimal totalAmount = BigDecimal.ZERO;
+ Map<Long, BigDecimal> skuMap = new HashMap<>();
+
+ for (MallGoodsSku mallGoodsSku : skus) {
Long id = mallGoodsSku.getId();
BigDecimal presentPrice = mallGoodsSku.getPresentPrice();
- // 检查itemMap中是否存在该商品
AddOrderItemDto addOrderItemDto = itemMap.get(id);
if (addOrderItemDto != null) {
BigDecimal skuAmount = presentPrice.multiply(BigDecimal.valueOf(addOrderItemDto.getCnt()));
totalAmount = totalAmount.add(skuAmount);
- skuMap.put(id,skuAmount);
+ skuMap.put(id, skuAmount);
}
}
- /**
- * 计算每个商品利用优惠卷打折的具体金额
- */
- MallGoodsCoupon mallGoodsCoupon = mallGoodsCouponMapper.selectById(mallMemberCoupon.getCouponId());
- BigDecimal costAmount = mallGoodsCoupon.getCostAmount();
- BigDecimal realAmount = mallGoodsCoupon.getRealAmount();
- if(totalAmount.compareTo(costAmount) < 0){
+ // 计算每个商品利用优惠卷打折的具体金额
+ Optional<MallGoodsCoupon> optionalMallGoodsCoupon = Optional.ofNullable(mallGoodsCouponMapper.selectById(mallMemberCoupon.getCouponId()));
+ MallGoodsCoupon mallGoodsCoupon = optionalMallGoodsCoupon.orElse(null);
+ if (mallGoodsCoupon == null) {
return couponAmountMap;
}
- HashMap<Long,BigDecimal> skuMapPercent = new HashMap<>();//每个订单详情的ID和amount的map
+
+ BigDecimal costAmount = mallGoodsCoupon.getCostAmount();
+ BigDecimal realAmount = mallGoodsCoupon.getRealAmount();
+
+ if (totalAmount.compareTo(costAmount) < 0) {
+ return couponAmountMap;
+ }
for (Map.Entry<Long,BigDecimal> entry : skuMap.entrySet()) {
Long keySkuId = entry.getKey();
BigDecimal valueSkuAmount = entry.getValue();
- BigDecimal divide = valueSkuAmount.divide(totalAmount, 4, BigDecimal.ROUND_DOWN);//每个商品占符合满减的总额的比例
- skuMapPercent.put(keySkuId,divide);
+ BigDecimal divide = valueSkuAmount.divide(totalAmount, 4, RoundingMode.DOWN);//每个商品占符合满减的总额的比例
Integer type = mallGoodsCoupon.getType();
if(MallGoodsCoupon.TYPE_ONE == type){
- BigDecimal bigDecimal = realAmount.multiply(divide).setScale(0, BigDecimal.ROUND_DOWN);//每个SKU的减免金额(比例*减免金额)
- BigDecimal skuRealAmount = valueSkuAmount.subtract(bigDecimal.compareTo(BigDecimal.ZERO) > 0 ? bigDecimal : BigDecimal.ZERO);//实际支付金额
- couponAmountMap.put(keySkuId,skuRealAmount);
+ BigDecimal bigDecimalOne = realAmount.multiply(divide).setScale(2, RoundingMode.DOWN);//每个SKU的减免金额(比例*减免金额)
+ BigDecimal skuRealAmountOne = valueSkuAmount.subtract(bigDecimalOne.max(BigDecimal.ZERO));//实际支付金额
+ couponAmountMap.put(keySkuId, skuRealAmountOne);
+ continue;
}
if(MallGoodsCoupon.TYPE_TWO == type){
- BigDecimal divideTime = totalAmount.divide(costAmount, 0, BigDecimal.ROUND_DOWN);//累计减免次数
+ BigDecimal divideTime = totalAmount.divide(costAmount, 0, RoundingMode.DOWN);//累计减免次数
BigDecimal multiply = divideTime.multiply(realAmount);//实际减免金额
- BigDecimal bigDecimal = multiply.multiply(divide).setScale(0, BigDecimal.ROUND_DOWN);//每个SKU的减免金额(比例*实际减免金额)
- BigDecimal skuRealAmount = valueSkuAmount.subtract(bigDecimal.compareTo(BigDecimal.ZERO) > 0 ? bigDecimal : BigDecimal.ZERO);//实际支付金额
- couponAmountMap.put(keySkuId,skuRealAmount);
+ BigDecimal bigDecimalTwo = multiply.multiply(divide).setScale(2, RoundingMode.DOWN);//每个SKU的减免金额(比例*实际减免金额)
+ BigDecimal skuRealAmountTwo = valueSkuAmount.subtract(bigDecimalTwo.max(BigDecimal.ZERO));//实际支付金额
+ couponAmountMap.put(keySkuId, skuRealAmountTwo);
+ continue;
}
}
return couponAmountMap;
@@ -667,8 +670,10 @@
orderInfo.setStatus(OrderStatusEnum.FINISH.getValue());
orderInfo.setReceivingTime(new Date());
this.baseMapper.updateById(orderInfo);
-
- agentProducer.sendGetScoreMsg(orderInfo.getId());
+ //普通订单才产生积分，积分订单不产生积分
+ if(1 == orderInfo.getOrderType()){
+ agentProducer.sendGetScoreMsg(orderInfo.getId());
+ }
//生成一条团长提成记录
// Long orderInfoId = orderInfo.getId();
// List<MallOrderItem> mallOrderItemList = mallOrderItemMapper.selectListByOrderId(orderInfoId);
@@ -942,6 +947,7 @@
apiLeaderRefundOrderDto.setOrderId(mallOrderInfo.getId());
apiLeaderRefundOrderDto.setItemId(mallOrderItem.getId());
apiLeaderRefundOrderDto.setAgreeState(1);
+ apiLeaderRefundOrderDto.setAgreeType(1);
iApiMallTeamLeaderService.leaderRefundOrder(apiLeaderRefundOrderDto);
}
return new FebsResponse().success();
--
Gitblit v1.9.1