From 05d3159f2a95904a9669e09bbbbb00b3ba2f5530 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Fri, 07 Feb 2025 11:55:17 +0800
Subject: [PATCH] fix(mall): 修复退款订单状态字段错误
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 84 ++++++++++++++++++++++++------------------
1 files changed, 48 insertions(+), 36 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..c1e9602 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
@@ -285,8 +285,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 +295,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 +333,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<>();
@@ -879,23 +900,16 @@
@Transactional
public FebsResponse refundOrder(Long id) {
MallMember member = LoginUserUtil.getLoginUser();
- MallOrderInfo mallOrderInfo = this.baseMapper.selectById(id);
- if(ObjectUtil.isEmpty(mallOrderInfo)){
- return new FebsResponse().fail().message("订单不存在");
- }
+ MallOrderInfo mallOrderInfo = ValidateEntityUtils
+ .ensureColumnReturnEntity(id, MallOrderInfo::getId, this.baseMapper::selectOne, "订单不存在");
Integer status = mallOrderInfo.getStatus();
- if(OrderStatusEnum.WAIT_SHIPPING.getValue() != status){
- return new FebsResponse().fail().message("订单不是待发货状态");
- }
Integer deliveryState = mallOrderInfo.getDeliveryState();
- if(1 != deliveryState){
- return new FebsResponse().fail().message("订单不是待配送状态");
- }
+
+ ValidateEntityUtils.ensureEqual(OrderStatusEnum.WAIT_SHIPPING.getValue(),status,"订单不是待发货状态");
+ ValidateEntityUtils.ensureEqual(1,deliveryState,"订单不是待配送状态");
//根据子订单生成退款记录
- List<MallOrderItem> mallOrderItemList = mallOrderItemMapper.selectListByOrderId(id);
- if(CollUtil.isEmpty(mallOrderItemList)){
- return new FebsResponse().fail().message("订单不存在");
- }
+ List<MallOrderItem> mallOrderItemList = ValidateEntityUtils
+ .ensureColumnReturnEntityList(id, MallOrderItem::getOrderId, mallOrderItemMapper::selectList, "订单不存在");
for(MallOrderItem mallOrderItem : mallOrderItemList){
QueryWrapper<MallRefundEntity> objectQueryWrapper = new QueryWrapper<>();
objectQueryWrapper.eq("member_id",member.getId());
@@ -910,7 +924,7 @@
mallRefundEntity.setItemId(mallOrderItem.getId());
if("余额支付".equals(mallOrderInfo.getPayMethod())){
mallRefundEntity.setType(3);
- }else if("微信支付".equals(mallOrderInfo.getPayMethod())){
+ }else if("FIUU支付".equals(mallOrderInfo.getPayMethod())){
mallRefundEntity.setType(1);
}else{
mallRefundEntity.setType(3);
@@ -919,9 +933,7 @@
mallRefundEntity.setAmount(mallOrderItem.getAmount());
mallRefundMapper.insert(mallRefundEntity);
}else{
- if(mallRefund.getState() == 1){
- return new FebsResponse().fail().message("订单已退款");
- }
+ ValidateEntityUtils.ensureNotEqual(1,mallRefund.getState(),"订单已退款");
if(mallRefund.getState() == 2 || mallRefund.getState() == 3){
mallRefundEntity.setId(mallRefund.getId());
mallRefundEntity.setRefundNo(mallRefund.getRefundNo());
--
Gitblit v1.9.1