Merge remote-tracking branch 'origin/dev' into dev

epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-third-server:
     container_name: epmet-third-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.75
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.76
     ports:
       - "8110:8110"
     network_mode: host # 使用现有网络

epmet-module/epmet-third/epmet-third-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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.0.75</version>
+    <version>0.0.76</version>
 
     <parent>
         <groupId>com.epmet</groupId>

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaUserServiceImpl.java

@@ -34,12 +34,14 @@ import com.epmet.dto.PaCustomerDTO;
 import com.epmet.dto.PaUserDTO;
 import com.epmet.dto.PaUserVisitedDTO;
 import com.epmet.dto.PaUserWechatDTO;
+import com.epmet.dto.form.SaveUserVisitedFormDTO;
 import com.epmet.dto.result.CustomerUserResultDTO;
 import com.epmet.dto.result.SaveUserResultDTO;
 import com.epmet.entity.PaUserEntity;
 import com.epmet.entity.PaUserWechatEntity;
 import com.epmet.redis.PaUserRedis;
 import com.epmet.service.PaUserService;
+import com.epmet.service.PaUserVisitedService;
 import com.epmet.service.PaUserWechatService;
 import me.chanjar.weixin.mp.bean.result.WxMpUser;
 import org.apache.commons.lang3.StringUtils;
@@ -72,6 +74,8 @@ public class PaUserServiceImpl extends BaseServiceImpl<PaUserDao, PaUserEntity>
     private PaUserWechatDao paUserWechatDao;
     @Autowired
     private PaUserVisitedDao paUserVisitedDao;
+    @Autowired
+    private PaUserVisitedService paUserVisitedService;
 
     @Override
     public PageData<PaUserDTO> page(Map<String, Object> params) {
@@ -156,10 +160,15 @@ public class PaUserServiceImpl extends BaseServiceImpl<PaUserDao, PaUserEntity>
             wechatEntity.setCity(null == wxMpUser.getCity() ? "" : wxMpUser.getCity());
             wechatEntity.setLanguage(null == wxMpUser.getLanguage() ? "" : wxMpUser.getLanguage());
             paUserWechatService.insert(wechatEntity);
+            //2.3、pa_user_visited表新增访问记录数据
+            SaveUserVisitedFormDTO visited = new SaveUserVisitedFormDTO();
+            visited.setUserId(userEntity.getId());
+            visited.setLogonUserId(userEntity.getId());
+            paUserVisitedService.saveUserVisited(visited);
 
             resultDTO.setUserId(userEntity.getId());
         } else {
-            //2.3、批量更新user_wechat表数据
+            //2.4、批量更新user_wechat表数据
             List<PaUserWechatEntity> wechatEntity = ConvertUtils.sourceToTarget(wechatDTO, PaUserWechatEntity.class);
             for(PaUserWechatEntity entity : wechatEntity){
                 entity.setGender(wxMpUser.getSex().toString());
@@ -172,7 +181,7 @@ public class PaUserServiceImpl extends BaseServiceImpl<PaUserDao, PaUserEntity>
             }
             paUserWechatService.updateBatchById(wechatEntity);
 
-            //2.4、根据openid查询用户登陆访问记录表数据，按登陆时间倒序
+            //2.5、根据openid查询用户登陆访问记录表数据，按登陆时间倒序
             PaUserVisitedDTO visitedDTO = paUserVisitedDao.selectByOpenId(wxMpUser.getOpenId());
             if (null == visitedDTO || "".equals(visitedDTO.getUserId())) {
                 logger.error("根据openid查询用户访问记录表数据失败，openid->"+wxMpUser.getOpenId());

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaUserVisitedServiceImpl.java

@@ -134,7 +134,9 @@ public class PaUserVisitedServiceImpl extends BaseServiceImpl<PaUserVisitedDao,
         entity.setUserId(visited.getUserId());
         entity.setWxOpenId(userEntity.getWxOpenId());
         entity.setOpenId(openId);
-        entity.setPhone(visited.getPhone());
+        if (null != visited.getPhone()) {
+            entity.setPhone(visited.getPhone());
+        }
         baseDao.insert(entity);
     }
 

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxLoginServiceImpl.java

@@ -52,6 +52,7 @@ public class WxLoginServiceImpl implements WxLoginService {
 		HashMap<String, String> hashMap = JSON.parseObject(resultStr, HashMap.class);
 		if (null != hashMap.get("errcode")) {
 			logger.error("wxcode换取openid接口调用失败");
+			logger.error("对应参数:小程序appId->"+appId+"第三方component_appid->"+componentAppId+",第三方component_access_token->"+componentAccessToken);
 			throw new RenException(hashMap.get("errmsg"));
 		}
 		String openid = hashMap.get("openid");