From 464254ba0e542c22fac68c7512f06a9a8df34b28 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 13 六月 2024 21:09:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 119 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 117 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
index 7ccf90f..5b27bff 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -12,13 +12,18 @@
import com.ruoyi.common.core.enums.PaymentMethodEnum;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.core.utils.page.BeanUtils;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.order.controller.management.dto.MgtMallOrderQuery;
+import com.ruoyi.order.controller.management.dto.MgtOrderConfirmShipmentDTO;
import com.ruoyi.order.controller.management.vo.MgtMallOrderVO;
+import com.ruoyi.order.controller.management.vo.MgtOrderReturnRequestVO;
+import com.ruoyi.order.domain.OrderReturnRequest;
import com.ruoyi.order.domain.Paylog;
import com.ruoyi.order.mapper.OrderAuctionBondMapper;
import com.ruoyi.order.mapper.OrderMapper;
+import com.ruoyi.order.service.IOrderReturnRequestService;
import com.ruoyi.order.service.IOrderService;
import com.ruoyi.order.service.IPaylogService;
import com.ruoyi.order.util.OrderUtil;
@@ -28,12 +33,14 @@
import com.ruoyi.system.api.domain.GoodsGroupPurchase;
import com.ruoyi.system.api.domain.GoodsSeckill;
import com.ruoyi.system.api.domain.GoodsSku;
+import com.ruoyi.system.api.domain.Member;
import com.ruoyi.system.api.domain.MemberAddress;
import com.ruoyi.system.api.domain.Order;
import com.ruoyi.system.api.domain.OrderAuctionBond;
import com.ruoyi.system.api.domain.dto.CouponMemberDTO;
import com.ruoyi.system.api.domain.dto.GoodsStockUpdDTO;
import com.ruoyi.system.api.domain.dto.HomeGoodsSkuDTO;
+import com.ruoyi.system.api.domain.dto.MemberDTO;
import com.ruoyi.system.api.domain.dto.MemberOrderDTO;
import com.ruoyi.system.api.domain.dto.MemberOrderListDTO;
import com.ruoyi.system.api.domain.dto.OrderDTO;
@@ -49,9 +56,11 @@
import java.time.LocalDateTime;
import java.util.Collection;
import java.util.List;
+import java.util.Set;
import java.util.concurrent.TimeUnit;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import java.util.stream.Collectors;
import javax.annotation.Resource;
import lombok.Synchronized;
@@ -91,6 +100,9 @@
@Resource
private SysUserClient sysUserClient;
+
+ @Resource
+ private IOrderReturnRequestService orderReturnRequestService;
@Resource
private RedissonClient redissonClient;
@@ -540,7 +552,7 @@
Order order = baseMapper.selectById(memberOrderListDTO.getId());
OrderVO orderVO=new OrderVO();
try {
- BeanUtils.copyProperties(orderVO,order);
+ orderVO = BeanUtils.copyBean(order, OrderVO.class);
} catch (Exception e) {
throw new RuntimeException(e);
}
@@ -669,6 +681,109 @@
*/
@Override
public PageDTO<MgtMallOrderVO> getMallOrderPage(MgtMallOrderQuery query) {
- return null;
+ PageDTO<MgtMallOrderVO> pageVO;
+ // 封装会员条件查询对象
+ MemberDTO memberDTO = null;
+ Set<Long> memberIdSet = null;
+ Page<Order> page = new Page<>(query.getPageCurr(), query.getPageSize());
+ if (StringUtils.isNotBlank(query.getNickname()) || StringUtils.isNotBlank(
+ query.getPhone())) {
+ memberDTO = new MemberDTO();
+ memberDTO.setNickname(query.getNickname());
+ memberDTO.setPhone(query.getPhone());
+ }
+ if (StringUtils.isNotNull(memberDTO)) {
+ // 远程调用会员服务进行条件查询
+ List<Member> memberList = memberClient.getMemberListByCondition(memberDTO,
+ SecurityConstants.INNER).getData();
+ if (StringUtils.isEmpty(memberList)) {
+ return PageDTO.empty(page);
+ }
+ memberIdSet = memberList.stream().map(Member::getId)
+ .collect(Collectors.toSet());
+ }
+ page = this.lambdaQuery()
+ .in(StringUtils.isNotEmpty(memberIdSet), Order::getMemberId, memberIdSet)
+ .like(StringUtils.isNotBlank(query.getOrderNo()), Order::getOrderNo,
+ query.getOrderNo())
+ .eq(StringUtils.isNotNull(query.getOrderFrom()), Order::getOrderFrom,
+ query.getOrderFrom())
+ .like(StringUtils.isNotBlank(query.getSkuName()), Order::getSkuName,
+ query.getSkuName())
+ .eq(StringUtils.isNotNull(query.getOrderStatus()), Order::getOrderStatus,
+ query.getOrderStatus())
+ .page(new Page<>(query.getPageCurr(), query.getPageSize()));
+ if (StringUtils.isEmpty(page.getRecords())) {
+ pageVO = PageDTO.empty(page);
+ }
+ pageVO = PageDTO.of(page, MgtMallOrderVO.class);
+ return pageVO;
+ }
+
+ /**
+ * 获取商城订单详情
+ *
+ * @param id 订单id
+ * @return MgtMallOrderVO
+ */
+ @Override
+ public MgtMallOrderVO getMallOrderDetail(Long id) {
+ Order order = this.getById(id);
+ MgtMallOrderVO mgtMallOrderVO = BeanUtils.copyBean(order, MgtMallOrderVO.class);
+ // 查询用户信息
+ Member member = memberClient.getMembeOne(order.getMemberId(), SecurityConstants.INNER)
+ .getData();
+ if (StringUtils.isNotNull(member)) {
+ mgtMallOrderVO.setNickname(member.getNickname());
+ mgtMallOrderVO.setPhone(member.getPhone());
+ }
+ // 查询售后信息
+ if (order.getOrderStatus() == OrderStatusEnum.AFTER_SALE) {
+ OrderReturnRequest orderReturnRequest = orderReturnRequestService.getOne(
+ Wrappers.lambdaQuery(OrderReturnRequest.class)
+ .eq(OrderReturnRequest::getOrderId,
+ order.getId()).last("limit 1"));
+ if (StringUtils.isNotNull(orderReturnRequest)) {
+ mgtMallOrderVO.setReturnRequestVO(BeanUtils.copyBean(orderReturnRequest,
+ MgtOrderReturnRequestVO.class));
+ }
+ }
+ return mgtMallOrderVO;
+ }
+
+ /**
+ * 确认发货
+ *
+ * @param dto 确认收货请求对象
+ */
+ @Override
+ public void confirmShipmentOrder(MgtOrderConfirmShipmentDTO dto) {
+ Order order = this.getById(dto.getId());
+ if (StringUtils.isNull(order)) {
+ throw new ServiceException("订单不存在");
+ }
+ order.setOrderStatus(OrderStatusEnum.GOODS_TO_BE_RECEIVED);
+ order.setDeliveryTime(LocalDateTime.now());
+ order.setCourierNumber(dto.getCourierNumber());
+ order.setLogisticsNum(dto.getLogisticsNum());
+ this.updateById(order);
+ }
+
+ /**
+ * 已收货
+ *
+ * @param id 订单id
+ */
+ @Override
+ public void receivedGoods(Long id) {
+ Order order = this.getById(id);
+ if (StringUtils.isNull(order)) {
+ throw new ServiceException("订单不存在");
+ }
+ if (order.getOrderStatus() == OrderStatusEnum.GOODS_TO_BE_RECEIVED) {
+ order.setOrderStatus(OrderStatusEnum.FINISHED);
+ order.setReceiveTime(LocalDateTime.now());
+ this.updateById(order);
+ }
}
}
--
Gitblit v1.7.1