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

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/user/UserController.java

@@ -152,9 +152,9 @@ public class UserController {
             @ApiParam(required = true, value = "code") @RequestParam(required = true) String userId,
             HttpServletRequest request
     ) throws RemoteServiceException {
-        log.info("打印请求时间"+ DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss"));
+        log.info("打印请求时间"+userId+"开始时间"+ DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss"));
         UserWxBean userWxBean = userLogic.userDetail(userId,request);
-        log.info("打印请求结束"+ DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss"));
+        log.info("打印请求时间"+userId+"结束时间"+ DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss"));
         return ResponseHelper.success(userWxBean);
     }
 

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/user/UserLogic.java

@@ -1199,12 +1199,12 @@ public class UserLogic {
      */
     public void addVisit(HttpServletRequest request, String userId) {
         try {
-            CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat(request);
+            User user = userService.getById(userId);
             UserVisit userVisit = new UserVisit();
             userVisit.setUserId(userId);
             userVisit.setVisitTime(new Date());
-            userVisit.setCompanyWechatId(currentCompanyWechat.getCurrentCompanyWechatId());
-            userVisit.setCompanyName(currentCompanyWechat.getCurrentCompanyName());
+            userVisit.setCompanyWechatId(user.getCompanyWechatId());
+            userVisit.setCompanyName(user.getCompanyName());
             userVisit.insert();
         } catch (Exception e) {
             log.error("新增用户访问记录失败", e);