From cacf9bc8c94295ec3296a8cb49bda2b95087afb7 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 16 Aug 2023 17:04:55 +0800
Subject: [PATCH] 后台修改

---
 src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+), 0 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
index 061076b..9408903 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
@@ -70,6 +70,7 @@
     private final MallAddressInfoMapper mallAddressInfoMapper;
     private final MallGoodsCategoryMapper mallGoodsCategoryMapper;
     private final PlatformBannerMapper platformBannerMapper;
+    private final MallGoodsImagesMapper goodsImagesMapper;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -615,6 +616,9 @@
     public MallGoodsListVo findGoodsDetailsById(Long id) {
         DappMemberEntity member = LoginUserUtil.getAppUser();
         MallGoodsListVo mallGoodsListVo = dappMemberDao.selectMallGoodsListVoById(id);
+
+        List<String> images = goodsImagesMapper.selectGoodsImagesByGoodsId(id);
+        mallGoodsListVo.setImages(images);
         return mallGoodsListVo;
     }
 
@@ -1255,6 +1259,25 @@
         this.baseMapper.updateIsDefault(MallAddressInfo.IS_YOUR_Y, memberId, id);
     }
 
+    @Override
+    public void confirmOrder(Long id) {
+        Long memberId = LoginUserUtil.getAppUser().getId();
+        MallOrderInfo orderInfo = mallOrderInfoMapper.selectById(id);
+        if (ObjectUtil.isEmpty(orderInfo)) {
+            throw new FebsException("订单不存在");
+        }
+
+        if (orderInfo.getStatus() != MallOrderInfo.STATUS_PAY) {
+            throw new FebsException("该状态不能确认收货");
+        }
+        if (orderInfo.getDeliverState() != MallOrderInfo.DELIVER_STATUS_DONE) {
+            throw new FebsException("该状态不能确认收货");
+        }
+
+        orderInfo.setDeliverState(MallOrderInfo.DELIVER_STATUS_OVER);
+        mallOrderInfoMapper.updateById(orderInfo);
+    }
+
     public static List<List<String>> partitionList(List<String> originalList, int partitionSize) {
         List<List<String>> partitionedList = new ArrayList<>();
         int size = originalList.size();

--
Gitblit v1.9.1