From 7992cd7adb57f8f2cb4b4fa295afb8894c24d0bf Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 18 May 2022 17:19:34 +0800
Subject: [PATCH] add export for deliver

---
 src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java |   25 +++++++++++++++++++++++++
 1 files changed, 25 insertions(+), 0 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java
index 7919c46..da38eb6 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java
@@ -17,12 +17,14 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
 @Slf4j
 @Service
 @RequiredArgsConstructor
+@Transactional
 public class AdminMallOrderService extends ServiceImpl<MallOrderInfoMapper, MallOrderInfo> implements IAdminMallOrderService {
 
     private final MallOrderInfoMapper mallOrderInfoMapper;
@@ -44,6 +46,12 @@
     private final MallMemberPaymentMapper mallMemberPaymentMapper;
 
     private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
+
+    @Override
+    public IPage<MallOrderInfo> findOrderListInPage(MallOrderInfo mallOrderInfo, QueryRequest request) {
+        Page<MallOrderInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
+        return this.baseMapper.selectInPage(mallOrderInfo, page);
+    }
 
     @Override
     public IPage<AdminMallOrderInfoVo> getOrderListInPage(MallOrderInfoDto mallOrderInfo, QueryRequest request) {
@@ -357,5 +365,22 @@
         return adminMallMemberPaymentVo;
     }
 
+    @Override
+    public void deliverGoodsByOrderNo(DeliverGoodsDto deliverGoodsDto) {
+        MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectByOrderNo(deliverGoodsDto.getOrderNo());
+        if (mallOrderInfo == null) {
+            return;
+        }
 
+        MallExpressInfo mallExpressInfo = new MallExpressInfo();
+        mallExpressInfo.setMemberId(mallOrderInfo.getMemberId());
+        mallExpressInfo.setOrderId(mallOrderInfo.getId());
+        mallExpressInfo.setExpressNo(deliverGoodsDto.getExpressNo());
+        mallExpressInfo.setExpressCom(deliverGoodsDto.getExpressCom());
+        mallExpressInfo.setExpressCode(deliverGoodsDto.getExpressCode());
+        mallExpressInfoMapper.insert(mallExpressInfo);
+
+        mallOrderInfo.setStatus(3);
+        mallOrderInfoMapper.updateById(mallOrderInfo);
+    }
 }

--
Gitblit v1.9.1