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/ApiMallOrderInfoServiceImpl.java | 62 ++++++++----------------------
1 files changed, 17 insertions(+), 45 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 534d61d..4f5edc2 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
@@ -93,13 +93,12 @@
@Transactional(rollbackFor = Exception.class)
public Long createOrder(AddOrderDto addOrderDto) {
Long memberId = LoginUserUtil.getLoginUser().getId();
- MallMember member = mallMemberMapper.selectById(memberId);
+ MallMember member = ValidateEntityUtils
+ .ensureColumnReturnEntity(memberId, MallMember::getId, mallMemberMapper::selectOne, "用户不存在");
//订单范围内才允许下单
- MallAddressInfo address = mallAddressInfoMapper.selectAddressInfoByMemberIdAndId(member.getId(), addOrderDto.getAddressId());
- if(ObjectUtil.isEmpty(address)){
- throw new FebsException("请重新选择收货地址信息");
- }
+ MallAddressInfo address = ValidateEntityUtils
+ .ensureColumnReturnEntity(addOrderDto.getAddressId(), MallAddressInfo::getId, mallAddressInfoMapper::selectOne, "收货地址信息不存在");
String orderNo = MallUtils.getOrderNum();
MallOrderInfo orderInfo = new MallOrderInfo();
@@ -173,18 +172,6 @@
throw new FebsException("购买商品或sku不存在");
}
-// if("样品".equals(sku.getSample())){
-// List<MallOrderItem> items = mallOrderItemMapper.selectItemBySkuIdUnCancel(sku.getId(), member.getId());
-// if (CollUtil.isNotEmpty(items)) {
-// throw new FebsException("样品一个用户只能购买一次");
-// }
-// Integer cnt = item.getCnt();
-// if(1 < cnt){
-// throw new FebsException("样品只能购买一件");
-// }
-//
-// }
-
if (sku.getStock() < item.getCnt()) {
throw new FebsException(sku.getSkuName() + "库存不足");
}
@@ -243,9 +230,7 @@
total = total.add(amount);
//规格的库存销量
Integer skuResult = mallGoodsSkuMapper.upDateStockAndVolumeBySkuId(sku.getId(),item.getCnt());
- if(1 != skuResult){
- throw new FebsException(sku.getSkuName() + "库存不足");
- }
+ ValidateEntityUtils.ensureEqual(1,skuResult,sku.getSkuName() + "库存不足");
if (addOrderDto.getType() == 1) {
mallShoppingCartMapper.delBySkuId(sku.getId(), member.getId());
}
@@ -501,14 +486,10 @@
@Transactional(rollbackFor = Exception.class)
public Map<String, Object> payOrder(PayOrderDto payOrderDto) {
MallMember member = LoginUserUtil.getLoginUser();
- MallOrderInfo orderInfo = this.baseMapper.selectOrderByMemberIdAndId(member.getId(), payOrderDto.getId());
- if (orderInfo == null || AppContants.DEL_FLAG_Y == orderInfo.getDelFlag()) {
- throw new FebsException("订单不存在");
- }
-
- if (OrderStatusEnum.WAIT_PAY.getValue() != orderInfo.getStatus()) {
- throw new FebsException("订单状态不能支付");
- }
+ MallOrderInfo orderInfo = ValidateEntityUtils
+ .ensureColumnReturnEntity(payOrderDto.getId(), MallOrderInfo::getId, this.baseMapper::selectOne, "订单不存在");
+ ValidateEntityUtils.ensureEqual(member.getId(),orderInfo.getMemberId(),"订单不存在");
+ ValidateEntityUtils.ensureEqual(OrderStatusEnum.WAIT_PAY.getValue(),orderInfo.getStatus(),"订单状态不能支付");
String payResultStr = "";
String wxResultStr = "";
@@ -900,23 +881,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());
@@ -940,9 +914,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