From 800e79d3387513962302c675f55078d47fe68f94 Mon Sep 17 00:00:00 2001 From: cheney <1251790704@qq.com> Date: Thu, 11 Jan 2024 15:53:48 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=B8=AA=E4=BA=BA=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../huoran/nakadai/controller/MyOrderController.java | 6 +++++- .../java/com/huoran/nakadai/mapper/xml/OrderMapper.xml | 10 ++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/nakadai/src/main/java/com/huoran/nakadai/controller/MyOrderController.java b/nakadai/src/main/java/com/huoran/nakadai/controller/MyOrderController.java index beb31f0..8d71ece 100644 --- a/nakadai/src/main/java/com/huoran/nakadai/controller/MyOrderController.java +++ b/nakadai/src/main/java/com/huoran/nakadai/controller/MyOrderController.java @@ -131,13 +131,17 @@ public class MyOrderController { UserAccount userAccount = platformTeamAccountMapper.selectAccountPlatform(order.getUserId()); List userAccountList = platformTeamClassificationMapper.selectAccountList(userAccount.getAppOpenId()); for (UserAccount account : userAccountList) { + if (account.getPhone()!=null){ + orderShopDto.setPhone(account.getPhone()); + } if ("7".equals(account.getPlatformId())){ QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("account_id", account.getId()); UserAuthenticationInformation userAuthenticationInformation = userAuthenticationInformationService.getOne(queryWrapper); - orderShopDto.setPhone(account.getPhone()); + orderShopDto.setAuthentication("未认证"); orderShopDto.setPurchasingPerson(account.getAccount()); if (userAuthenticationInformation!=null){ + orderShopDto.setAuthentication("已认证"); orderShopDto.setPurchasingPerson(userAuthenticationInformation.getRealName()); } }else { diff --git a/nakadai/src/main/java/com/huoran/nakadai/mapper/xml/OrderMapper.xml b/nakadai/src/main/java/com/huoran/nakadai/mapper/xml/OrderMapper.xml index 3617e0f..a086877 100644 --- a/nakadai/src/main/java/com/huoran/nakadai/mapper/xml/OrderMapper.xml +++ b/nakadai/src/main/java/com/huoran/nakadai/mapper/xml/OrderMapper.xml @@ -374,7 +374,7 @@ WHEN o.order_type = 2 THEN IFNULL( ec.company_name, ua.account ) WHEN o.order_type = 1 THEN - IFNULL( uai.real_name, ua.account ) + IFNULL( uai.real_name, avatars.account ) END AS purchasingPerson, CASE WHEN o.order_type = 2 THEN @@ -397,7 +397,8 @@ LEFT JOIN ( SELECT a.app_open_id, - i.user_avatars + i.user_avatars, + a.account FROM hr_user_account a JOIN hr_user_info i ON i.user_id = a.user_id AND a.platform_id = 7 and a.is_del = 0 and i.is_del = 0 @@ -432,7 +433,7 @@ WHEN o.order_type = 2 THEN IFNULL( ec.company_name, ua.account ) WHEN o.order_type = 1 THEN - IFNULL( uai.real_name, ua.account ) + IFNULL( uai.real_name, avatars.account ) END AS purchasingPerson, CASE WHEN o.order_type = 2 THEN @@ -455,7 +456,8 @@ LEFT JOIN ( SELECT a.app_open_id, - i.user_avatars + i.user_avatars, + a.account FROM hr_user_account a JOIN hr_user_info i ON i.user_id = a.user_id AND a.platform_id = 7 and a.is_del = 0 and i.is_del = 0