From d5934d6253fd5029bf06fb26611dad47d0c0cb0b Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 16 Jul 2021 15:42:54 +0800
Subject: [PATCH] 202107016

---
 gc-user/src/main/java/com/xzx/gc/user/vo/OrderItemsVo.java        |    6 ++++++
 gc-user/src/main/java/com/xzx/gc/user/service/DistribService.java |    3 +++
 gc-user/src/main/resources/mapper/user/AccountMapper.xml          |    3 +++
 3 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/gc-user/src/main/java/com/xzx/gc/user/service/DistribService.java b/gc-user/src/main/java/com/xzx/gc/user/service/DistribService.java
index b46eba3..ef30097 100644
--- a/gc-user/src/main/java/com/xzx/gc/user/service/DistribService.java
+++ b/gc-user/src/main/java/com/xzx/gc/user/service/DistribService.java
@@ -305,6 +305,9 @@
         if(CollUtil.isNotEmpty(orderItemsVos)){
             for(OrderItemsVo orderItemsVo : orderItemsVos){
                 if(ObjectUtil.isNotEmpty(orderItemsVo)){
+                    String nickname = orderItemsVo.getNickname();
+                    String decode = StringUtils.decode(nickname);
+                    orderItemsVo.setNickname(decode);
                     Long orderId = orderItemsVo.getOrderId();
                     List<JhyOrderItems> jhyOrderItems = accountMapper.selectOrderById(orderId);
                     if(CollUtil.isNotEmpty(jhyOrderItems)){
diff --git a/gc-user/src/main/java/com/xzx/gc/user/vo/OrderItemsVo.java b/gc-user/src/main/java/com/xzx/gc/user/vo/OrderItemsVo.java
index f2481b4..bb8ace0 100644
--- a/gc-user/src/main/java/com/xzx/gc/user/vo/OrderItemsVo.java
+++ b/gc-user/src/main/java/com/xzx/gc/user/vo/OrderItemsVo.java
@@ -17,6 +17,12 @@
     @ApiModelProperty(value="订单编号")
     private String orderNo;
 
+    @ApiModelProperty(value="团员名字")
+    private String nickname;
+
+    @ApiModelProperty(value="手机号")
+    private String phone;
+
     @ApiModelProperty(value="回收品类")
     private List<JhyOrderItems> OrderItems;
 
diff --git a/gc-user/src/main/resources/mapper/user/AccountMapper.xml b/gc-user/src/main/resources/mapper/user/AccountMapper.xml
index ef1568b..82bc3bf 100644
--- a/gc-user/src/main/resources/mapper/user/AccountMapper.xml
+++ b/gc-user/src/main/resources/mapper/user/AccountMapper.xml
@@ -252,11 +252,14 @@
             a.order_no orderNo,
             a.score scoreReward,
             a.amount amountReward,
+            a.nick_name nickname,
+            a.mobile_phone phone,
             (select sum(score) from xzx_jhy_order_items where b.id = order_id) score,
             (select sum(score/ 40) from xzx_jhy_order_items where b.id = order_id) amount
         FROM
             xzx_user_head_details a
                 LEFT JOIN xzx_jhy_order b ON a.order_no = b.order_no
+                LEFT JOIN xzx_user_info c on a.user_id = c.user_id
         WHERE
             a.head_user_id = #{userId}
     </select>

--
Gitblit v1.9.1