From 2f6809e5c55453a31a807e948d566f22e866f67e Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 14 Aug 2023 12:29:47 +0800
Subject: [PATCH] 后台修改

---
 src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java |   20 ++++++++++++++++++++
 1 files changed, 20 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 3131500..1ee9713 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
@@ -649,6 +649,10 @@
         mallOrderInfo.setOrderTime(DateUtil.date());
         mallOrderInfo.setAmount(totalAmount);
         mallOrderInfo.setStatus(MallOrderInfo.STATUS_WAIT);
+        mallOrderInfo.setDeliverType(addOrderDto.getDeliverType());
+        if(1 == addOrderDto.getDeliverType()){
+            mallOrderInfo.setAddressId(addOrderDto.getAddressId());
+        }
         mallOrderInfo.setOrderType(1);
         mallOrderInfoMapper.insert(mallOrderInfo);
         MallOrderItem mallOrderItem = new MallOrderItem();
@@ -743,6 +747,7 @@
         orderInfo.setPayMethod("余额支付");
         orderInfo.setPayResult(1);
         orderInfo.setStatus(MallOrderInfo.STATUS_PAY);
+        orderInfo.setDeliverState(MallOrderInfo.DELIVER_STATUS_WAIT);
         mallOrderInfoMapper.updateById(orderInfo);
         /**
          * 更新用户余额
@@ -887,6 +892,21 @@
         return memberMoneyFlowVos;
     }
 
+    @Override
+    public void delOrder(Long id) {
+        Long memberId = LoginUserUtil.getAppUser().getId();
+
+        mallOrderInfoMapper.deleteById(id);
+        QueryWrapper<MallOrderItem> objectQueryWrapper = new QueryWrapper<>();
+        objectQueryWrapper.eq("order_id", id);
+        List<MallOrderItem> mallOrderItems = mallOrderItemMapper.selectList(objectQueryWrapper);
+        if(CollUtil.isNotEmpty(mallOrderItems)){
+            for(MallOrderItem mallOrderItem : mallOrderItems){
+                mallOrderItemMapper.deleteById(mallOrderItem.getId());
+            }
+        }
+    }
+
     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