From f20015f5b2a2ac70dcb640d524196efe2c6786d3 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 01 九月 2025 17:14:40 +0800
Subject: [PATCH] 复用问题,以及订单列表页面相关信息新增
---
framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java | 42 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 37 insertions(+), 5 deletions(-)
diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
index b41cddb..f73c50e 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
@@ -23,11 +23,14 @@
import cn.lili.common.utils.CurrencyUtil;
import cn.lili.common.utils.SnowFlake;
import cn.lili.common.utils.StringUtils;
+import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.goods.entity.dos.Goods;
import cn.lili.modules.goods.entity.dto.GoodsCompleteMessage;
import cn.lili.modules.goods.service.GoodsService;
import cn.lili.modules.lmk.enums.general.AdminRoleEnum;
+import cn.lili.modules.member.entity.dos.Member;
import cn.lili.modules.member.entity.dto.MemberAddressDTO;
+import cn.lili.modules.member.mapper.MemberMapper;
import cn.lili.modules.order.cart.entity.dto.TradeDTO;
import cn.lili.modules.order.cart.entity.enums.DeliveryMethodEnum;
import cn.lili.modules.order.order.aop.OrderLogPoint;
@@ -107,6 +110,8 @@
private static final String ORDER_SN_COLUMN = "order_sn";
+ @Autowired
+ private MemberMapper memberMapperMapper;
/**
* 寤舵椂浠诲姟
*/
@@ -239,16 +244,24 @@
}
@Override
- public IPage<OrderSimpleVO> queryByParams(OrderSearchParams orderSearchParams) {
+ public IPage<OrderSimpleVO> queryByParams(OrderSearchParams orderSearchParams,Boolean needHide) {
QueryWrapper queryWrapper = orderSearchParams.queryWrapper();
queryWrapper.groupBy("o.id");
queryWrapper.orderByDesc("o.id");
IPage<OrderSimpleVO> page = this.baseMapper.queryByParams(PageUtil.initPage(orderSearchParams), queryWrapper);
+ if (needHide){
+ if (!adminUserService.havePermissionRole(AdminRoleEnum.ORDER_INFO_PERMISSION)){
+ for (OrderSimpleVO vo : page.getRecords()){
+ vo.setConsigneeName(CommonUtil.maskName(vo.getConsigneeName()));
+ vo.setConsigneeMobile(CommonUtil.maskMobile(vo.getConsigneeMobile()));
+ }
+ }
+ }
- if (!adminUserService.havePermissionRole(AdminRoleEnum.ORDER_INFO_PERMISSION)){
- for (OrderSimpleVO vo : page.getRecords()){
- vo.setConsigneeName(CommonUtil.maskName(vo.getConsigneeName()));
- vo.setConsigneeMobile(CommonUtil.maskMobile(vo.getConsigneeMobile()));
+ for (OrderSimpleVO vo : page.getRecords()){
+ Member member = memberMapperMapper.selectById(vo.getMemberId());
+ if (member != null){
+ vo.setNickName(member.getNickName());
}
}
return page;
@@ -443,6 +456,25 @@
}
@Override
+ @Transactional
+ public String sendMqMessage(String snNo) {
+ Order order = this.getBySn(snNo);
+ if (order == null) {
+ throw new ServiceException(ResultCode.ORDER_NOT_EXIST);
+ }
+ if (!OrderStatusEnum.PAID.name().equals(order.getOrderStatus())) {
+ throw new ServiceException("璁㈠崟鐘舵�佷笉鏄凡鏀粯鐘舵��");
+ }
+ OrderMessage orderMessage = new OrderMessage();
+ //鍙戦�佽鍗曞凡浠樻娑堟伅
+ orderMessage.setOrderSn(order.getSn());
+ orderMessage.setPaymentMethod(order.getPaymentMethod());
+ orderMessage.setNewStatus(OrderStatusEnum.PAID);
+ this.sendUpdateStatusMessage(orderMessage);
+ return null;
+ }
+
+ @Override
@OrderLogPoint(description = "'璁㈠崟['+#orderSn+']鍙栨秷锛屽師鍥犱负锛�'+#reason", orderSn = "#orderSn")
@Transactional(rollbackFor = Exception.class)
public Order cancel(String orderSn, String reason) {
--
Gitblit v1.8.0