diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserInfoResultDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserInfoResultDTO.java index 5a8f24e4..bb1f0937 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserInfoResultDTO.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserInfoResultDTO.java @@ -21,4 +21,13 @@ public class EpdcUserInfoResultDTO implements Serializable { private String faceImg; private String partyFlag; + /** + * 用户积分 + */ + private Integer points; + + /** + * 用户积分等级 + */ + private Integer grade; } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml index 6f8da34c..3fc75fb5 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml @@ -19,11 +19,18 @@ eu.ROAD AS road, eu.VILLAGE_NAME AS villageName, eu.DWELLING_PLACE AS dwellingPlace, - eu.PARTY_FLAG AS partyFlag + eu.PARTY_FLAG AS partyFlag, + eu.POINTS as points, + CASE + WHEN IFNULL(eu.POINTS_TOTLE,0) <= 0 THEN 0 + ELSE + ROUND(IFNULL(eu.POINTS_TOTLE,0) / IFNULL(g.POINTS,0) * IFNULL(g.GRADE,0),0) + END grade FROM epdc_user eu Left Join (select * from epdc_user_grid_relation where USER_ID = #{id} order by UPDATED_TIME desc limit 0,1) eugr on(eu.id=eugr.USER_ID) + left join epdc_points_grade g ON 1=1 AND g.DEL_FLAG = 0 WHERE eu.ID = #{id}