提交

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/CommonUser.java

@@ -94,6 +94,12 @@ public class CommonUser extends BaseModel<CommonUser> {
     @TableField(exist = false)
     private String  identityFlag ;
 
+    /**
+     * 身份信息
+     */
+    @TableField(exist = false)
+    private String  driverFlag ;
+
 
     @Override
     protected Serializable pkVal() {

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/CommonUserServiceImpl.java

@@ -246,20 +246,12 @@ public class CommonUserServiceImpl extends ServiceImpl<CommonUserMapper, CommonU
                 .eq("delete_flag","0").eq("authentication_status_key","7"));
         List<DriverViewInfo> driverViewInfos = iDriverViewInfoService.selectList(new EntityWrapper<DriverViewInfo>()
                 .eq("driver_phone",userDTO.getPhone()));
-        String flag = "";
         if(!CollectionUtils.isEmpty(identityAuthenticationInfos)){
-            flag = "粮商";
+            userDTO.setIdentityFlag("1");
         }
         if(!CollectionUtils.isEmpty(driverViewInfos)){
-            if(!StringUtils.isEmpty(flag)){
-                flag = flag+ "、物流";
-            }
-            else{
-                flag = "物流";
-            }
-
+            userDTO.setDriverFlag("1");
         }
-        userDTO.setIdentityFlag(flag);
         return userDTO;
     }
 
@@ -332,17 +324,11 @@ public class CommonUserServiceImpl extends ServiceImpl<CommonUserMapper, CommonU
         .eq("driver_phone",user.getPhone()));
         String flag = "";
         if(!CollectionUtils.isEmpty(identityAuthenticationInfos)){
-            flag = "粮商";
+            user.setIdentityFlag("1");
         }
         if(!CollectionUtils.isEmpty(driverViewInfos)){
-            if(!StringUtils.isEmpty(flag)){
-                flag = flag+ "、物流";
-            }
-            else{
-                flag = "物流";
-            }
+            user.setDriverFlag("1");
         }
-        user.setIdentityFlag(flag);
         return user;
     }