From 02b98ce7472cfa06ae48f6bdb4145fc4e34f87af Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Thu, 23 Jan 2025 11:26:38 +0800
Subject: [PATCH] refactor(mall): 移除查找商品类别列表中的冗余代码
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 129 ++++++++++++++++++++++---------------------
1 files changed, 66 insertions(+), 63 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 cf964c3..6d1b1ce 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
@@ -123,14 +123,9 @@
MallMemberCoupon mallMemberCoupon = new MallMemberCoupon();
if(ObjectUtil.isNotEmpty(addOrderDto.getMemberCouponId())){
Long memberCouponId = addOrderDto.getMemberCouponId();
- mallMemberCoupon = mallMemberCouponMapper.selectById(memberCouponId);
- if(ObjectUtil.isEmpty(mallMemberCoupon)){
- throw new FebsException(mallMemberCoupon.getCouponName()+"无法使用");
- }
- Integer state = mallMemberCoupon.getState();
- if(1 != state){
- throw new FebsException(mallMemberCoupon.getCouponName()+"无法使用");
- }
+
+ mallMemberCoupon = ValidateEntityUtils.ensureColumnReturnEntity(memberCouponId, MallMemberCoupon::getId, mallMemberCouponMapper::selectOne, "优惠券不存在");
+ ValidateEntityUtils.ensureEqual(mallMemberCoupon.getState(),1, "优惠券状态异常");
List<AddOrderItemDto> items = addOrderDto.getItems();
couponAmountMap = getCouponAmountMap(memberCouponId, items);
}
@@ -143,10 +138,10 @@
if (mallGoods.getStock() < item.getCnt()) {
throw new FebsException(mallGoods.getGoodsName() + "库存不足");
}
-
- if (MallGoods.ISSALE_STATUS_DISABLED.equals(mallGoods.getIsSale())) {
- throw new FebsException(mallGoods.getGoodsName() + "已下架");
- }
+ ValidateEntityUtils.ensureNotEqual(mallGoods.getIsSale(),MallGoods.ISSALE_STATUS_DISABLED, "商品已下架");
+// if (MallGoods.ISSALE_STATUS_DISABLED.equals(mallGoods.getIsSale())) {
+// throw new FebsException(mallGoods.getGoodsName() + "已下架");
+// }
BigDecimal amount = mallGoods.getScore().multiply(BigDecimal.valueOf(item.getCnt()));
orderItem.setAmount(amount);
@@ -198,9 +193,7 @@
}
}
- if (MallGoods.ISSALE_STATUS_DISABLED.equals(mallGoods.getIsSale())) {
- throw new FebsException(mallGoods.getGoodsName() + "已下架");
- }
+ ValidateEntityUtils.ensureNotEqual(mallGoods.getIsSale(),MallGoods.ISSALE_STATUS_DISABLED, "商品已下架");
//商品库存销量计算
Integer goodsResult = mallGoodsMapper.upDateStockAndVolumeByGoodsId(mallGoods.getId(), item.getCnt());
if(1 != goodsResult){
@@ -285,8 +278,8 @@
* @return Map<Long,BigDecimal> skuId，实际支付金额
*/
@Override
- public Map<Long,BigDecimal> getCouponAmountMap(Long memberCouponId,List<AddOrderItemDto> items){
- HashMap<Long,BigDecimal> couponAmountMap = new HashMap<>();
+ public Map<Long, BigDecimal> getCouponAmountMap(Long memberCouponId, List<AddOrderItemDto> items) {
+ HashMap<Long, BigDecimal> couponAmountMap = new HashMap<>();
// 获取优惠券信息
Optional<MallMemberCoupon> optionalMallMemberCoupon = Optional.ofNullable(mallMemberCouponMapper.selectById(memberCouponId));
MallMemberCoupon mallMemberCoupon = optionalMallMemberCoupon.orElse(null);
@@ -295,7 +288,7 @@
return couponAmountMap;
}
- Set<Long> intersection = items.stream().map(AddOrderItemDto::getSkuId).collect(Collectors.toSet());//订单中的全部skuIds
+ Set<Long> intersection = items.stream().map(AddOrderItemDto::getSkuId).collect(Collectors.toSet()); // 订单中的全部skuIds
if (intersection.isEmpty()) {
return couponAmountMap;
@@ -333,32 +326,53 @@
BigDecimal costAmount = mallGoodsCoupon.getCostAmount();
BigDecimal realAmount = mallGoodsCoupon.getRealAmount();
+ Integer type = mallGoodsCoupon.getType();
+ if (MallGoodsCoupon.TYPE_ONE == type) {
+ realAmount = mallGoodsCoupon.getRealAmount();
+ } else if (MallGoodsCoupon.TYPE_TWO == type) {
+ BigDecimal divideTime = totalAmount.divide(costAmount, 0, RoundingMode.DOWN); // 累计减免次数
+ realAmount = divideTime.multiply(realAmount); // 实际减免金额
+ }
if (totalAmount.compareTo(costAmount) < 0) {
return couponAmountMap;
}
- for (Map.Entry<Long,BigDecimal> entry : skuMap.entrySet()) {
+
+ BigDecimal totalDiscount = BigDecimal.ZERO;
+ for (Map.Entry<Long, BigDecimal> entry : skuMap.entrySet()) {
Long keySkuId = entry.getKey();
BigDecimal valueSkuAmount = entry.getValue();
- BigDecimal divide = valueSkuAmount.divide(totalAmount, 4, RoundingMode.DOWN);//每个商品占符合满减的总额的比例
- Integer type = mallGoodsCoupon.getType();
- if(MallGoodsCoupon.TYPE_ONE == type){
- BigDecimal bigDecimalOne = realAmount.multiply(divide).setScale(2, RoundingMode.DOWN);//每个SKU的减免金额(比例*减免金额)
- BigDecimal skuRealAmountOne = valueSkuAmount.subtract(bigDecimalOne.max(BigDecimal.ZERO));//实际支付金额
- couponAmountMap.put(keySkuId, skuRealAmountOne);
- continue;
+ BigDecimal divide = valueSkuAmount.divide(totalAmount, 4, RoundingMode.DOWN); // 每个商品占符合满减的总额的比例
+ BigDecimal skuRealAmount = BigDecimal.ZERO;
+ if (MallGoodsCoupon.TYPE_ONE == type) {
+ BigDecimal bigDecimalOne = realAmount.multiply(divide).setScale(2, RoundingMode.DOWN); // 每个SKU的减免金额(比例*减免金额)
+ skuRealAmount = valueSkuAmount.subtract(bigDecimalOne.max(BigDecimal.ZERO)).setScale(2, RoundingMode.DOWN);
+ totalDiscount = totalDiscount.add(bigDecimalOne);
+ } else if (MallGoodsCoupon.TYPE_TWO == type) {
+ BigDecimal divideTime = totalAmount.divide(costAmount, 0, RoundingMode.DOWN); // 累计减免次数
+ BigDecimal multiply = divideTime.multiply(realAmount); // 实际减免金额
+ BigDecimal bigDecimalTwo = multiply.multiply(divide).setScale(2, RoundingMode.DOWN); // 每个SKU的减免金额(比例*实际减免金额)
+ skuRealAmount = valueSkuAmount.subtract(bigDecimalTwo.max(BigDecimal.ZERO)).setScale(2, RoundingMode.DOWN);
+ totalDiscount = totalDiscount.add(bigDecimalTwo);
}
- if(MallGoodsCoupon.TYPE_TWO == type){
- BigDecimal divideTime = totalAmount.divide(costAmount, 0, RoundingMode.DOWN);//累计减免次数
- BigDecimal multiply = divideTime.multiply(realAmount);//实际减免金额
- BigDecimal bigDecimalTwo = multiply.multiply(divide).setScale(2, RoundingMode.DOWN);//每个SKU的减免金额(比例*实际减免金额)
- BigDecimal skuRealAmountTwo = valueSkuAmount.subtract(bigDecimalTwo.max(BigDecimal.ZERO));//实际支付金额
- couponAmountMap.put(keySkuId, skuRealAmountTwo);
- continue;
+ couponAmountMap.put(keySkuId, skuRealAmount);
+ }
+
+ // 调整最后一个商品的减免金额以确保总减免金额达到预期
+ if (totalDiscount.compareTo(realAmount) < 0) {
+ BigDecimal difference = realAmount.subtract(totalDiscount);
+ for (Map.Entry<Long, BigDecimal> entry : couponAmountMap.entrySet()) {
+ Long keySkuId = entry.getKey();
+ BigDecimal skuRealAmount = entry.getValue();
+ BigDecimal newSkuRealAmount = skuRealAmount.subtract(difference).setScale(2, RoundingMode.DOWN);
+ couponAmountMap.put(keySkuId, newSkuRealAmount);
+ break; // 调整最后一个商品的减免金额
}
}
+
return couponAmountMap;
}
+
public static void main(String[] args) {
List<Integer> a = new ArrayList<>();
@@ -387,14 +401,13 @@
public void cancelOrder(Long id) {
MallMember member = LoginUserUtil.getLoginUser();
MallOrderInfo orderInfo = this.baseMapper.selectOrderByMemberIdAndId(member.getId(), id);
- if (orderInfo == null || AppContants.DEL_FLAG_Y == orderInfo.getDelFlag()) {
- throw new FebsException("订单不存在");
- }
+ ValidateEntityUtils.ensureNotEqual(orderInfo,null, "订单不存在");
+ ValidateEntityUtils.ensureNotEqual(orderInfo.getDelFlag(),AppContants.DEL_FLAG_Y, "订单已删除");
- if (OrderStatusEnum.WAIT_PAY.getValue() != orderInfo.getStatus()) {
- throw new FebsException("订单不是待付款, 无法取消");
+ if (OrderStatusEnum.WAIT_PAY.getValue() != orderInfo.getStatus()
+ && OrderStatusEnum.WAIT_SHIPPING.getValue() != orderInfo.getStatus() ) {
+ throw new FebsException("订单不是待付款或者待收货, 无法取消");
}
-
orderInfo.setStatus(OrderStatusEnum.CANCEL.getValue());
orderInfo.setCancelType(MallOrderInfo.CANCEL_BY_SELF);
this.baseMapper.updateById(orderInfo);
@@ -526,7 +539,7 @@
mallMoneyFlowService.addMoneyFlow(member.getId(), orderInfo.getAmount().negate(), MoneyFlowTypeEnum.PAY.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.BALANCE.getValue(),"余额支付",2);
- agentProducer.sendOrderCoupon(orderInfo.getId());
+// agentProducer.sendOrderCoupon(orderInfo.getId());
break;
case "4":
if (orderInfo.getOrderType() != 2) {
@@ -570,14 +583,12 @@
throw new FebsException("未设置支付密码");
}
- if (!SecureUtil.md5(tradePwd).equals(mallMember.getTradePassword())) {
- throw new FebsException("支付密码错误");
- }
+ ValidateEntityUtils.ensureEqual(SecureUtil.md5(tradePwd),mallMember.getTradePassword(),"支付密码错误");
- int reduce = memberWalletService.reduce(orderInfo.getAmount(), mallMember.getId(), field);
- if (reduce == 2) {
- throw new FebsException("余额不足");
- }
+// int reduce = memberWalletService.reduce(orderInfo.getAmount(), mallMember.getId(), field);
+// if (reduce == 2) {
+// throw new FebsException("余额不足");
+// }
return orderInfo.getOrderNo();
}
@@ -640,15 +651,10 @@
@Transactional(rollbackFor = Exception.class)
public void confirmOrder(Long id) {
MallMember member = LoginUserUtil.getLoginUser();
- MallOrderInfo orderInfo = this.baseMapper.selectOrderByMemberIdAndId(member.getId(), id);
- if (orderInfo == null || AppContants.DEL_FLAG_Y == orderInfo.getDelFlag()) {
- throw new FebsException("订单不存在");
- }
- if (orderInfo.getStatus() != OrderStatusEnum.WAIT_FINISH.getValue()) {
- throw new FebsException("该状态不能确认收货");
- }
-
+ MallOrderInfo orderInfo = ValidateEntityUtils.ensureColumnReturnEntity(id,MallOrderInfo::getId,this.baseMapper::selectOne,"订单不存在");
+ ValidateEntityUtils.ensureEqual(member.getId(), orderInfo.getMemberId(), "订单数据异常");
+ ValidateEntityUtils.ensureEqual(orderInfo.getStatus(), OrderStatusEnum.WAIT_FINISH.getValue(), "该状态不能确认收货");
// if (orderInfo.getDeliveryState() != OrderDeliveryStateEnum.DELIVERY_FINISH.getValue()) {
// throw new FebsException("还未送至自提点");
// }
@@ -662,9 +668,9 @@
orderInfo.setReceivingTime(new Date());
this.baseMapper.updateById(orderInfo);
//普通订单才产生积分，积分订单不产生积分
- if(1 == orderInfo.getOrderType()){
- agentProducer.sendGetScoreMsg(orderInfo.getId());
- }
+// if(1 == orderInfo.getOrderType()){
+// agentProducer.sendGetScoreMsg(orderInfo.getId());
+// }
//生成一条团长提成记录
// Long orderInfoId = orderInfo.getId();
// List<MallOrderItem> mallOrderItemList = mallOrderItemMapper.selectListByOrderId(orderInfoId);
@@ -698,11 +704,8 @@
@Override
public void delOrder(Long id) {
MallMember member = LoginUserUtil.getLoginUser();
- MallOrderInfo orderInfo = this.baseMapper.selectOrderByMemberIdAndId(member.getId(), id);
- if (orderInfo == null || AppContants.DEL_FLAG_Y == orderInfo.getDelFlag()) {
- throw new FebsException("订单不存在");
- }
-
+ MallOrderInfo orderInfo = ValidateEntityUtils.ensureColumnReturnEntity(id,MallOrderInfo::getId,this.baseMapper::selectOne,"订单不存在");
+ ValidateEntityUtils.ensureNotEqual(orderInfo.getDelFlag(),AppContants.DEL_FLAG_Y,"订单已删除");
orderInfo.setDelFlag(AppContants.DEL_FLAG_Y);
this.baseMapper.updateById(orderInfo);
}
--
Gitblit v1.9.1