订单个人认证返回

nakadai/src/main/java/com/huoran/nakadai/controller/MyOrderController.java

@@ -131,13 +131,17 @@ public class MyOrderController {
         UserAccount userAccount = platformTeamAccountMapper.selectAccountPlatform(order.getUserId());
         List<UserAccount> userAccountList = platformTeamClassificationMapper.selectAccountList(userAccount.getAppOpenId());
         for (UserAccount account : userAccountList) {
+            if (account.getPhone()!=null){
+                orderShopDto.setPhone(account.getPhone());
+            }
             if ("7".equals(account.getPlatformId())){
                 QueryWrapper<UserAuthenticationInformation> 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 {

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