Merge remote-tracking branch 'origin/master'

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

@@ -613,6 +613,33 @@ public class UserLogic {
     public AdminWebsit userWebsit(String lng, String lat,HttpServletRequest request) {
         CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat(request);
         User user = userService.getById(currentCompanyWechat.getUserId());
+
+
+        if (!StringUtil.isEmpty(currentCompanyWechat.getUser().getWebsitId())) {
+            AdminWebsit adminWebsit = adminWebsitService.getById(currentCompanyWechat.getUser().getWebsitId());
+            if (adminWebsit.getStatus().equals("OFF")){
+                AdminWebsit adminWebsitU = userInfoMapper.userWebsit(user.getUserId(), lng, lat);
+
+                if (adminWebsitU == null)
+                    return null;
+
+                user.setType("GENERAL");
+                user.setWebsitId(adminWebsitU.getWebsitId());
+                user.setWebsitName(adminWebsitU.getName());
+                user.setCompanyName(adminWebsitU.getCompanyName());
+                user.setCompanyId(adminWebsitU.getCompanyId());
+                user.updateById();
+
+                userService.lambdaUpdate()
+                        .eq(User::getUserId,currentCompanyWechat.getUserId())
+                        .set(User::getServiceId,null)
+                        .set(User::getServiceTime,null)
+                        .update();
+                return adminWebsit;
+            }
+        }
+
+
         if (!StringUtil.isEmpty(user.getServiceId())) {
             AdminWebsit adminWebsit = adminWebsitService.getById(user.getWebsitId());
             return adminWebsit;

src/main/resources/mapper/UserInfoMapper.xml

@@ -27,6 +27,7 @@
         (6371 * acos(cos(radians(#{lat})) * cos(radians(lat)) * cos(radians(lng) - radians(#{lng})) + sin(radians(#{lat})) * sin(radians(lat)))) AS distance
         FROM
         admin_websit
+        where status = 'ON'
         HAVING
         distance <= 50
         ORDER BY