From c2d38efe0c2516295abb968442ef765e3da9544d Mon Sep 17 00:00:00 2001
From: zhanglin8526 <852614290@qq.com>
Date: 星期二, 09 五月 2023 18:38:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
index fa69482..3c76a3a 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
@@ -780,6 +780,21 @@
@Override
public List<MerOrderPageVo> pageMerOrder(Page page, MerOrderPageDto merOrderPageDto){
List<MerOrderPageVo> merOrderPageVoList = orderMapper.pageMerOrder(page, merOrderPageDto);
+ if(merOrderPageVoList!=null&&!merOrderPageVoList.isEmpty()){
+ Long userId;
+ Member member;
+ Integer orderFrom;
+ String orderFromDesc;
+ for(MerOrderPageVo merOrderPageVo : merOrderPageVoList){
+ userId = merOrderPageVo.getUserId();
+ member = remoteMemberService.getMember(userId).getData();
+ merOrderPageVo.setUserName(member.getRealName());
+ merOrderPageVo.setUserMobile(member.getMobile());
+ orderFrom = merOrderPageVo.getOrderFrom();
+ orderFromDesc = "商城订单";
+ merOrderPageVo.setOrderFromDesc(orderFromDesc);
+ }
+ }
return merOrderPageVoList;
}
--
Gitblit v1.7.1