From c014190d15b41704085d2e96b3fb51d39d8c2016 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Wed, 12 Feb 2025 13:39:07 +0800
Subject: [PATCH] refactor(mall): 优化订单商品名称的显示格式
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java | 104 ++++++++++++++++++----------------------------------
1 files changed, 36 insertions(+), 68 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java
index 7c79417..c4ce447 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java
@@ -5,6 +5,7 @@
import cc.mrbird.febs.common.properties.XcxProperties;
import cc.mrbird.febs.common.utils.LoginUserUtil;
import cc.mrbird.febs.common.utils.SpringContextHolder;
+import cc.mrbird.febs.common.utils.ValidateEntityUtils;
import cc.mrbird.febs.mall.conversion.MallLeaderAchieveConversion;
import cc.mrbird.febs.mall.conversion.MallOrderInfoConversion;
import cc.mrbird.febs.mall.conversion.MallTeamLeaderConversion;
@@ -17,6 +18,7 @@
import cc.mrbird.febs.mall.vo.*;
import cc.mrbird.febs.pay.model.OrderStateDto;
import cc.mrbird.febs.pay.service.IXcxPayService;
+import cc.mrbird.febs.pay.util.FiuuUtil;
import cc.mrbird.febs.pay.util.WeixinServiceUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil;
@@ -57,6 +59,8 @@
private final MallRefundMapper mallRefundMapper;
@Autowired
private WeixinServiceUtil weixinServiceUtil;
+ @Autowired
+ private FiuuUtil fiuuUtil;
private final XcxProperties xcxProperties = SpringContextHolder.getBean(XcxProperties.class);
private final IMallMoneyFlowService mallMoneyFlowService;
private final IApiMallMemberWalletService memberWalletService;
@@ -388,13 +392,16 @@
//获取退款订单信息
Long orderId = apiLeaderRefundOrderDto.getOrderId();
Long itemId = apiLeaderRefundOrderDto.getItemId();
-
- MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectById(orderId);
- MallOrderItem mallOrderItem = mallOrderItemMapper.selectById(itemId);
- MallGoodsSku mallGoodsSku = mallGoodsSkuMapper.selectById(mallOrderItem.getSkuId());
- if(ObjectUtil.isEmpty(mallGoodsSku)){
+ Integer agreeType = apiLeaderRefundOrderDto.getAgreeType();
+ if(!(1 == agreeType || 2 == agreeType)){
return new FebsResponse().fail().message("退款失败，请联系客服人员");
}
+ MallOrderInfo mallOrderInfo = ValidateEntityUtils
+ .ensureColumnReturnEntity(orderId, MallOrderInfo::getId, mallOrderInfoMapper::selectOne, "订单不存在");
+ MallOrderItem mallOrderItem = ValidateEntityUtils
+ .ensureColumnReturnEntity(itemId, MallOrderItem::getId, mallOrderItemMapper::selectOne, "订单不存在");
+ MallGoodsSku mallGoodsSku = ValidateEntityUtils
+ .ensureColumnReturnEntity(mallOrderItem.getSkuId(), MallGoodsSku::getId, mallGoodsSkuMapper::selectOne, "订单不存在，退款失败，请联系客服人员");
List<MallRefundEntity> mallRefundEntities = mallRefundMapper.selectByItemIdAndOrderIdAndState(itemId, orderId, 3);
if(CollUtil.isEmpty(mallRefundEntities)){
return new FebsResponse().fail().message("退款失败，请联系客服人员");
@@ -417,28 +424,35 @@
String refundNo = mallRefundEntity.getRefundNo();
//退款订单金额
BigDecimal orderAmount = mallOrderInfo.getAmount();
- BigDecimal aa = new BigDecimal(100);
- int orderMoney = orderAmount.multiply(aa).intValue();
//退款退款金额
- BigDecimal refundAmount = mallRefundEntity.getAmount();
- List<MallOrderItem> mallOrderItemListOnly = mallOrderItemMapper.selectListByStateAndOrderId(1,orderId);
- if(CollUtil.isNotEmpty(mallOrderItemListOnly)){
- if(1==mallOrderItemListOnly.size()){
- refundAmount = refundAmount.add(mallOrderInfo.getCarriage());
- log.info("退款订单编号为{}，订单金额：{}，待退款订单：{}，退款金额：{}", refundNo,orderAmount,mallOrderItemListOnly.size(),refundAmount);
- }
- }
// BigDecimal refundAmount = mallRefundEntity.getAmount();
// List<MallOrderItem> mallOrderItemListOnly = mallOrderItemMapper.selectListByStateAndOrderId(1,orderId);
-// List<MallOrderItem> mallOrderItemListIng = mallOrderItemMapper.selectListByStateAndOrderId(2,orderId);
-// if(CollUtil.isEmpty(mallOrderItemListOnly) && CollUtil.isNotEmpty(mallOrderItemListIng) ){
-// if(1 == mallOrderItemListIng.size() ){
+// if(CollUtil.isNotEmpty(mallOrderItemListOnly)){
+// if(1==mallOrderItemListOnly.size()){
// refundAmount = refundAmount.add(mallOrderInfo.getCarriage());
// log.info("退款订单编号为{}，订单金额：{}，待退款订单：{}，退款金额：{}", refundNo,orderAmount,mallOrderItemListOnly.size(),refundAmount);
// }
// }
-// refundAmount = refundAmount.add(mallOrderInfo.getCarriage());
+ BigDecimal refundAmount = mallRefundEntity.getAmount();
+ if(agreeType == 1){
+ List<MallOrderItem> mallOrderItemListOnly = mallOrderItemMapper.selectListByStateAndOrderId(1,orderId);
+ if(CollUtil.isNotEmpty(mallOrderItemListOnly)){
+ if(1==mallOrderItemListOnly.size()){
+ refundAmount = refundAmount.add(mallOrderInfo.getCarriage());
+ log.info("退款订单编号为{}，订单金额：{}，待退款订单：{}，退款金额：{}", refundNo,orderAmount,mallOrderItemListOnly.size(),refundAmount);
+ }
+ }
+ }else if(agreeType == 2){
+ List<MallOrderItem> mallOrderItemListOnly = mallOrderItemMapper.selectListByStateAndOrderId(1,orderId);
+ List<MallOrderItem> mallOrderItemListIng = mallOrderItemMapper.selectListByStateAndOrderId(2,orderId);
+ if(CollUtil.isEmpty(mallOrderItemListOnly) && CollUtil.isNotEmpty(mallOrderItemListIng) ){
+ if(1 == mallOrderItemListIng.size() ){
+ refundAmount = refundAmount.add(mallOrderInfo.getCarriage());
+ log.info("退款订单编号为{}，订单金额：{}，待退款订单：{}，退款金额：{}", refundNo,orderAmount,mallOrderItemListOnly.size(),refundAmount);
+ }
+ }
+ }
BigDecimal bb = new BigDecimal(100);
int refundMoney = refundAmount.multiply(bb).intValue();
@@ -471,55 +485,9 @@
return new FebsResponse().success().message("退款成功");
}
- Boolean flag = false;
- Boolean debug = xcxProperties.getDebug();
- if (debug) {
- boolean b = weixinServiceUtil.comRefund(orderNo, refundNo, 1, 1, null);
- flag = b;
- } else {
- log.info("开始调用退款接口。。。退款编号为{}", refundNo);
- boolean b = weixinServiceUtil.comRefund(orderNo, refundNo, orderMoney, refundMoney, null);
- flag = b;
- }
-
- if(flag){
- //更新订单详情
- mallOrderItem.setState(3);
- mallOrderItemMapper.updateById(mallOrderItem);
- //更新库存信息
- MallGoods mallGoods = mallGoodsMapper.selectById(mallOrderItem.getGoodsId());
- mallGoods.setStock(mallGoods.getStock() + mallOrderItem.getCnt());
- mallGoods.setVolume(mallGoods.getVolume() - mallOrderItem.getCnt());
- mallGoodsMapper.updateById(mallGoods);
-
-// MallGoodsSku mallGoodsSku = mallGoodsSkuMapper.selectById(mallOrderItem.getSkuId());
- mallGoodsSku.setStock(mallGoodsSku.getStock() + mallOrderItem.getCnt());
- mallGoodsSku.setSkuVolume(mallGoodsSku.getSkuVolume() - mallOrderItem.getCnt());
- mallGoodsSkuMapper.updateById(mallGoodsSku);
-
- //更新退款订单
- mallRefundEntity.setState(1);
- mallRefundEntity.setUpdatedTime(DateUtil.date());
- mallRefundMapper.updateById(mallRefundEntity);
- mallMoneyFlowService.addMoneyFlow(mallOrderInfo.getMemberId(), refundAmount, MoneyFlowTypeEnum.WECHAT_REFUND.getValue(), mallOrderInfo.getOrderNo(), FlowTypeEnum.WECHAT.getValue(),"微信退款",2);
-
- List<MallOrderItem> mallOrderItemList = mallOrderItemMapper.selectListByNotInStateAndOrderId(3,orderId);
- if(CollUtil.isEmpty(mallOrderItemList)){
- MallOrderInfo mallOrderRefund = mallOrderInfoMapper.selectById(orderId);
- mallOrderRefund.setStatus(6);
- mallOrderInfoMapper.updateById(mallOrderRefund);
- }
- }else{
-
- //更新订单详情
- mallOrderItem.setState(1);
- mallOrderItemMapper.updateById(mallOrderItem);
-
- mallRefundEntity.setState(2);
- mallRefundMapper.updateById(mallRefundEntity);
- return new FebsResponse().fail().message("退款失败，请联系客服人员");
- }
- return new FebsResponse().success().message("退款成功");
+ log.info("开始调用退款接口。。。退款编号为{}", refundNo);
+ fiuuUtil.comRefund(mallOrderInfo.getPayOrderNo(), refundNo, orderAmount.toString());
+ return new FebsResponse().success().message("已申请退款");
}
}
--
Gitblit v1.9.1