From feadb77af6143fdf3bfc312bba7279f5695bb9ba Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 11 Aug 2021 10:59:35 +0800
Subject: [PATCH] 20210811
---
gc-core/src/main/java/com/xzx/gc/model/admin/UserModel.java | 2 ++
gc-user/src/main/resources/mapper/user/UserMapper.xml | 3 ++-
gc-user/src/main/java/com/xzx/gc/user/service/UserService.java | 6 ++++++
gc-user/src/main/resources/mapper/user/OrderMapper.xml | 11 +++++++++++
gc-user/src/main/java/com/xzx/gc/user/mapper/OrderMapper.java | 2 ++
5 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/gc-core/src/main/java/com/xzx/gc/model/admin/UserModel.java b/gc-core/src/main/java/com/xzx/gc/model/admin/UserModel.java
index 2f5f475..0d5088a 100644
--- a/gc-core/src/main/java/com/xzx/gc/model/admin/UserModel.java
+++ b/gc-core/src/main/java/com/xzx/gc/model/admin/UserModel.java
@@ -86,6 +86,8 @@
BigDecimal money;
@ApiModelProperty("积分数")
BigDecimal collectScore;
+ @ApiModelProperty("推广人电话号码")
+ String tgrPhone;
@ApiModelProperty("1:已删除 0：未删除")
String delFlag;
diff --git a/gc-user/src/main/java/com/xzx/gc/user/mapper/OrderMapper.java b/gc-user/src/main/java/com/xzx/gc/user/mapper/OrderMapper.java
index de5a947..e7e33e5 100644
--- a/gc-user/src/main/java/com/xzx/gc/user/mapper/OrderMapper.java
+++ b/gc-user/src/main/java/com/xzx/gc/user/mapper/OrderMapper.java
@@ -66,5 +66,7 @@
List<CategaryVo> selectListByOrderId(String orderId);
List<CategaryVo> selectJHYListByOrderId(String orderId);
+
+ String selectTGRMobileByPhone(@Param("mobilePhone")String mobilePhone);
}
diff --git a/gc-user/src/main/java/com/xzx/gc/user/service/UserService.java b/gc-user/src/main/java/com/xzx/gc/user/service/UserService.java
index ce6eb09..5d897d2 100644
--- a/gc-user/src/main/java/com/xzx/gc/user/service/UserService.java
+++ b/gc-user/src/main/java/com/xzx/gc/user/service/UserService.java
@@ -443,6 +443,12 @@
mx.setCollectScore(new BigDecimal(collectScore).setScale( 2, BigDecimal.ROUND_DOWN ));
}
+ String mobilePhone = mx.getMobilePhone();
+ if(StrUtil.isNotEmpty(mobilePhone)){
+ String tgrPhone = orderMapper.selectTGRMobileByPhone(mobilePhone);
+ mx.setTgrPhone(StrUtil.isEmpty(tgrPhone) ? "-" : tgrPhone);
+ }
+
}
//设置登录时间
diff --git a/gc-user/src/main/resources/mapper/user/OrderMapper.xml b/gc-user/src/main/resources/mapper/user/OrderMapper.xml
index b141ed5..f1b5c08 100644
--- a/gc-user/src/main/resources/mapper/user/OrderMapper.xml
+++ b/gc-user/src/main/resources/mapper/user/OrderMapper.xml
@@ -609,4 +609,15 @@
xzx_jhy_order_items a
WHERE a.order_id = (select b.id from xzx_jhy_order b where b.order_no = #{orderId})
</select>
+
+
+ <select id="selectTGRMobileByPhone" resultType="java.lang.String">
+
+ SELECT
+ a.mobile_phone tgrPhone
+ FROM
+ xzx_user_share_info a
+ WHERE a.register_mobile_phone = #{mobilePhone}
+ </select>
+
</mapper>
diff --git a/gc-user/src/main/resources/mapper/user/UserMapper.xml b/gc-user/src/main/resources/mapper/user/UserMapper.xml
index 06dc6e0..9fdad63 100644
--- a/gc-user/src/main/resources/mapper/user/UserMapper.xml
+++ b/gc-user/src/main/resources/mapper/user/UserMapper.xml
@@ -250,10 +250,11 @@
</update>
<select id="queryCuserDetail" resultType="java.util.HashMap">
- SELECT a.*, b.money,b.collect_score collectScore, b.withdraw_money, c.pay_type, SUM(c.money) as moneyx FROM xzx_user_info a
+ SELECT e.mobile_phone tgrPhone,a.*, b.money,b.collect_score collectScore, b.withdraw_money, c.pay_type, SUM(c.money) as moneyx FROM xzx_user_info a
LEFT JOIN xzx_account_info b ON a.user_id=b.user_id
LEFT JOIN xzx_pay_info c ON b.account_id=c.account_id
LEFT JOIN xzx_sys_config_info d ON c.pay_type=d.config_value AND d.config_type_code='PAY_TYPE'
+ LEFT JOIN xzx_user_share_info e ON e.register_mobile_phone=a.mobile_phone
WHERE a.mobile_phone=#{phone} AND a.user_type=#{userType} AND a.del_flag=0 GROUP BY c.pay_type
</select>
--
Gitblit v1.9.1