Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev

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 # 使用现有网络

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">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.0.28</version>
+    <version>0.0.29</version>
     <parent>
         <artifactId>epmet-point</artifactId>
         <groupId>com.epmet</groupId>

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);
 			});
 
 

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<UserPointActi
         action.setCustomerId(grantPoint.getCustomerId());
         action.setPoint(grantPoint.getPoint());
         action.setEventStatement(grantPoint.getRemark());
-        action.setEventName(EventEnum.ACTIVE_SEND_POINT.getEventDesc());
-        action.setEventId(ModuleConstant.COMMON_EVENT_ID);
+        action.setEventName(ModuleConstant.EVENT_NAME_PARTICIPATED_ACT);
+        action.setEventId(EventEnum.ACTIVE_SEND_POINT.getEventTag());
         action.setActionFlag(grantPoint.getActionFlag());
         action.setUserId(grantPoint.getUserId());
         action.setCreatedBy(grantPoint.getOperatorId());

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/utils/ModuleConstant.java

@@ -121,8 +121,5 @@ public interface ModuleConstant extends Constant {
 
     String EVENT_NAME_ADD_LIVE = "添加活动实况";
 
-    /**
-     * 通用事件，不走规则，但也是事件，所以在用户积分行为记录表中的eventId中要有值，与积分调整、积分兑换分开
-     * */
-    String COMMON_EVENT_ID = "COMMON";
+
 }

epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml

@@ -26,7 +26,7 @@
     <select id="selectPointActionLogList" resultType="com.epmet.dto.result.ResiPointLogPeriodResultDTO">
         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

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
     </select>
 

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 # 不会创建新的网络

epmet-user/epmet-user-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" 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">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.106</version>
+    <version>0.3.107</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-user</artifactId>

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<UserWechatEntity> 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());
+                    }
+                }
             }
 
         }