From 6d232c656cd75577509f17e418defd964f5f5171 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 24 十月 2024 10:14:05 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java
index 05e1997..4783fdf 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java
@@ -117,6 +117,10 @@
BigDecimal grantVip = new BigDecimal("0");
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
for (TActivityStatisticslVO tActivityStatisticslVO : list1) {
+ TAppUser data = appUserClient.getUserById(tActivityStatisticslVO.getAppUserId()).getData();
+ if (data!=null){
+ tActivityStatisticslVO.setPhone(data.getPhone());
+ }
// 判断享有了哪些类型
switch (tActivityStatisticslVO.getOrderType()){
case 1:
@@ -187,6 +191,7 @@
}
}
for (TActivityStatisticslVO tActivityStatisticslVO : list) {
+
// 判断享有了哪些类型
switch (tActivityStatisticslVO.getOrderType()){
case 1:
--
Gitblit v1.7.1