diff --git a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml index de879b6140..6568614a58 100644 --- a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-point-server: container_name: epmet-point-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.28 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.29 ports: - "8112:8112" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-point/epmet-point-server/pom.xml b/epmet-module/epmet-point/epmet-point-server/pom.xml index 192bf1dba9..14f20cec2b 100644 --- a/epmet-module/epmet-point/epmet-point-server/pom.xml +++ b/epmet-module/epmet-point/epmet-point-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - 0.0.28 + 0.0.29 epmet-point com.epmet diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/MqPointCallbackController.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/MqPointCallbackController.java index 47cf9bd8b7..df85fc7a91 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/MqPointCallbackController.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/MqPointCallbackController.java @@ -77,7 +77,7 @@ public class MqPointCallbackController { try { //TODO 调用调整积分方法去给用户加减积分 userPointActionLogService. formList.forEach(obj -> { - userPointActionLogService.grantPointByEvent(EventEnum.ACTIVE_INSERT_LIVE.getEventTag(),obj); + userPointActionLogService.grantPointByEvent(EventEnum.REGISTER_VOLUNTEER.getEventTag(),obj); }); diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java index 3bac5c525f..0f33787a49 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java @@ -361,8 +361,8 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl SELECT EVENT_NAME AS TITLE, - EVENT_STATEMENT AS REMARK, + IFNULL(EVENT_STATEMENT,'') AS REMARK, CASE ACTION_FLAG WHEN 'plus' THEN concat('+',POINT) ELSE POINT END AS point, DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') AS DATE, DATE_FORMAT(CREATED_TIME,'%H:%i') AS TIME diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointTotalDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointTotalDao.xml index cc797271a4..db72188a9e 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointTotalDao.xml +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointTotalDao.xml @@ -40,7 +40,7 @@ point.total_point, @point := point.total_point FROM - ( SELECT * FROM user_point_total ORDER BY total_point DESC ) point, + ( SELECT * FROM user_point_total WHERE CUSTOMER_ID = #{customerId} ORDER BY total_point DESC ) point, ( SELECT @point := NULL, @rank := 1 ) a diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml index d409fc8a91..3c0801797b 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.106 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.107 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 427be0755d..173587ae25 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.106 + 0.3.107 com.epmet epmet-user diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java index ceb8b5c4d1..5da4155b92 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java @@ -26,12 +26,14 @@ import com.epmet.constant.UserRedisKeys; import com.epmet.dao.GridLatestDao; import com.epmet.dao.RegisterRelationDao; import com.epmet.dao.UserBaseInfoDao; +import com.epmet.dao.UserWechatDao; import com.epmet.dto.form.BelongGridNameFormDTO; import com.epmet.dto.result.BelongGridNameResultDTO; import com.epmet.dto.result.LatestGridInfoResultDTO; import com.epmet.dto.result.UserBaseInfoResultDTO; import com.epmet.entity.RegisterRelationEntity; import com.epmet.entity.UserBaseInfoEntity; +import com.epmet.entity.UserWechatEntity; import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.util.ModuleConstant; import org.apache.commons.lang3.StringUtils; @@ -39,6 +41,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import java.lang.reflect.Field; +import java.util.List; import java.util.Map; import static com.epmet.commons.tools.redis.RedisUtils.NOT_EXPIRE; @@ -61,6 +64,8 @@ public class UserBaseInfoRedis { private GovOrgOpenFeignClient govOrgOpenFeignClient; @Autowired private GridLatestDao gridLatestDao; + @Autowired + private UserWechatDao userWechatDao; public void delete(Object[] ids) { @@ -102,9 +107,11 @@ public class UserBaseInfoRedis { } //缓存中没有数据，先查数据库，放入缓存后再返回 UserBaseInfoResultDTO baseInfo = userBaseInfoDao.selectListByUserIdList(userId); + if(null != baseInfo && StringUtils.isNotBlank(baseInfo.getId())){ - RegisterRelationEntity relation = registerRelationDao.selectRegisteredGridIdByUserId(userId); + //如果没有首次注册网格，则没有网格名称(xx机关-xx网格)、显示昵称(xx网格-x先生/女士) + RegisterRelationEntity relation = registerRelationDao.selectRegisteredGridIdByUserId(userId); if(null != relation && StringUtils.isNotBlank(relation.getGridId())){ baseInfo.setCustomerId(relation.getCustomerId()); BelongGridNameFormDTO gridParam = new BelongGridNameFormDTO(); @@ -140,6 +147,27 @@ public class UserBaseInfoRedis { } set(baseInfo); return baseInfo; + }else{ + //如果没有，说明这里是陌生人 + //陌生人不放入缓存，也不更新用户基础信息表 + baseInfo = new UserBaseInfoResultDTO(); + baseInfo.setUserId(userId); + List wechatInfo = userWechatDao.selectByUserId(userId); + if(null != wechatInfo && !wechatInfo.isEmpty()){ + baseInfo.setNickname(wechatInfo.get(NumConstant.ZERO).getNickname()); + }else{ + return null; + } + RegisterRelationEntity relation = registerRelationDao.selectRegisteredGridIdByUserId(userId); + if(null != relation && StringUtils.isNotBlank(relation.getGridId())){ + baseInfo.setCustomerId(relation.getCustomerId()); + }else{ + LatestGridInfoResultDTO gridLatest = + gridLatestDao.selectLatestGridInfoByUserId(userId); + if(null != gridLatest){ + baseInfo.setCustomerId(gridLatest.getCustomerId()); + } + } } }