From cad69fd8620d6317fe09efdd4eee730bf8e2d053 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 22 Sep 2021 17:53:15 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 34 ++++++++++++++++++++++++++++++++++
1 files changed, 34 insertions(+), 0 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 e02856a..421cf56 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
@@ -4,16 +4,22 @@
import cc.mrbird.febs.common.exception.FebsException;
import cc.mrbird.febs.common.utils.LoginUserUtil;
import cc.mrbird.febs.common.utils.MallUtils;
+import cc.mrbird.febs.mall.conversion.MallOrderInfoConversion;
import cc.mrbird.febs.mall.dto.AddOrderDto;
import cc.mrbird.febs.mall.dto.AddOrderItemDto;
+import cc.mrbird.febs.mall.dto.OrderListDto;
import cc.mrbird.febs.mall.dto.PayOrderDto;
import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.mapper.*;
import cc.mrbird.febs.mall.service.IApiMallMemberWalletService;
import cc.mrbird.febs.mall.service.IApiMallOrderInfoService;
+import cc.mrbird.febs.mall.vo.OrderDetailVo;
+import cc.mrbird.febs.mall.vo.OrderListVo;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.crypto.SecureUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -22,6 +28,7 @@
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.List;
import java.util.Random;
/**
@@ -39,6 +46,7 @@
private final MallOrderItemMapper mallOrderItemMapper;
private final MallMemberMapper memberMapper;
private final IApiMallMemberWalletService memberWalletService;
+ private final MallExpressInfoMapper expressInfoMapper;
@Override
public Long createOrder(AddOrderDto addOrderDto) {
@@ -157,4 +165,30 @@
memberWalletService.reduceBalance(orderInfo.getAmount(), mallMember.getId());
return orderInfo.getOrderNo();
}
+
+
+ @Override
+ public List<OrderListVo> findOrderList(OrderListDto orderListDto) {
+ IPage<MallOrderInfo> page = new Page<>(orderListDto.getPageNum(), orderListDto.getPageSize());
+
+ IPage<MallOrderInfo> mallOrderInfos = this.baseMapper.selectOrderListInPage(page, orderListDto);
+ return MallOrderInfoConversion.INSTANCE.entitysToVos(mallOrderInfos.getRecords());
+ }
+
+ @Override
+ public OrderDetailVo findOrderDetailsById(Long id) {
+ MallOrderInfo orderInfo = this.baseMapper.selectOrderDetailsById(id);
+ if (orderInfo == null) {
+ throw new FebsException("订单不存在");
+ }
+
+ OrderDetailVo orderDetailVo = MallOrderInfoConversion.INSTANCE.entityToDetailVo(orderInfo);
+
+ if (orderInfo.getStatus() == OrderStatusEnum.WAIT_FINISH.getValue()) {
+ MallExpressInfo expressInfo = expressInfoMapper.selectByOrderId(orderInfo.getId());
+ orderDetailVo.setExpressNo(expressInfo.getExpressNo());
+ orderDetailVo.setExpressCom(expressInfo.getExpressCom());
+ }
+ return orderDetailVo;
+ }
}
--
Gitblit v1.9.1