From b22a9106fe358c891fe446343a3ccb106674a802 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 17 Aug 2023 11:00:32 +0800
Subject: [PATCH] 后台修改

---
 src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java |   27 +++++++++++++++++++++++++--
 1 files changed, 25 insertions(+), 2 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 1629870..7618041 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
@@ -524,8 +524,12 @@
 
         DappWalletMineEntity dappWalletMineEntity = dappWalletMineDao.selectByMemberId(member.getId());
         dappMemberInfoVo.setScore(ObjectUtil.isEmpty(dappWalletMineEntity) ? BigDecimal.ZERO : dappWalletMineEntity.getTotalAmount());
-        Integer selectCount = dappMemberDao.selectOrderCntByMemberIdAndStatus(member.getId(),1);
-        dappMemberInfoVo.setWaitPayCnt(selectCount);
+        Integer waitPayCnt = dappMemberDao.selectOrderCntByMemberIdAndStatus(member.getId(),1);
+        Integer payCnt = dappMemberDao.selectOrderCntByMemberIdAndStatus(member.getId(),2);
+        Integer cancelCnt = dappMemberDao.selectOrderCntByMemberIdAndStatus(member.getId(),3);
+        dappMemberInfoVo.setWaitPayCnt(waitPayCnt);
+        dappMemberInfoVo.setPayCnt(payCnt);
+        dappMemberInfoVo.setCancelCnt(cancelCnt);
         return new FebsResponse().success().data(dappMemberInfoVo);
     }
 
@@ -1259,6 +1263,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