From 24b3557d1cf0658d4ce86f242eab5df539e786af Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 23 Sep 2021 10:30:47 +0800
Subject: [PATCH] fix carts del goods

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java |   24 +++++++++++++++++++++++-
 1 files changed, 23 insertions(+), 1 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 421cf56..5ccdcba 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
@@ -24,6 +24,7 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
@@ -49,6 +50,7 @@
     private final MallExpressInfoMapper expressInfoMapper;
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Long createOrder(AddOrderDto addOrderDto) {
         MallMember member = LoginUserUtil.getLoginUser();
 
@@ -96,6 +98,8 @@
             orderItem.setGoodsName(sku.getGoodsName());
             orderItem.setSkuId(sku.getId());
             orderItem.setStyleName(sku.getStyleName());
+            orderItem.setSkuName(sku.getSkuName());
+            orderItem.setSkuImage(sku.getSkuImage());
 
             total = total.add(amount);
             mallOrderItemMapper.insert(orderItem);
@@ -104,11 +108,14 @@
             mallGoodsSkuMapper.updateById(sku);
         }
 
+        orderInfo.setAmount(total);
+        this.baseMapper.updateById(orderInfo);
 
         return orderInfo.getId();
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void cancelOrder(Long id) {
         MallMember member = LoginUserUtil.getLoginUser();
         MallOrderInfo orderInfo = this.baseMapper.selectOrderByMemberIdAndId(member.getId(), id);
@@ -126,6 +133,7 @@
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public String payOrder(PayOrderDto payOrderDto) {
         MallMember member = LoginUserUtil.getLoginUser();
         MallOrderInfo orderInfo = this.baseMapper.selectOrderByMemberIdAndId(member.getId(), payOrderDto.getId());
@@ -171,7 +179,7 @@
     public List<OrderListVo> findOrderList(OrderListDto orderListDto) {
         IPage<MallOrderInfo> page = new Page<>(orderListDto.getPageNum(), orderListDto.getPageSize());
 
-        IPage<MallOrderInfo> mallOrderInfos = this.baseMapper.selectOrderListInPage(page, orderListDto);
+        IPage<MallOrderInfo> mallOrderInfos = this.baseMapper.selectApiOrderListInPage(page, orderListDto);
         return MallOrderInfoConversion.INSTANCE.entitysToVos(mallOrderInfos.getRecords());
     }
 
@@ -191,4 +199,18 @@
         }
         return orderDetailVo;
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void confirmOrder(Long id) {
+        MallMember member = LoginUserUtil.getLoginUser();
+        MallOrderInfo orderInfo = this.baseMapper.selectOrderByMemberIdAndId(member.getId(), id);
+        if (orderInfo == null) {
+            throw new FebsException("订单不存在");
+        }
+
+        orderInfo.setStatus(OrderStatusEnum.FINISH.getValue());
+        orderInfo.setReceivingTime(new Date());
+        this.baseMapper.updateById(orderInfo);
+    }
 }

--
Gitblit v1.9.1