feats

src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserController.java

@@ -8,14 +8,9 @@ import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.sysUser.entity.SysToken;
 import com.huiju.estateagents.center.sysUser.service.ISysTokenService;
-import com.huiju.estateagents.center.taUser.entity.TaTagUser;
-import com.huiju.estateagents.center.taUser.entity.TaTags;
-import com.huiju.estateagents.center.taUser.entity.TaUser;
-import com.huiju.estateagents.center.taUser.entity.TaUserRole;
+import com.huiju.estateagents.center.taUser.entity.*;
 import com.huiju.estateagents.center.taUser.service.*;
-import com.huiju.estateagents.common.CommConstant;
-import com.huiju.estateagents.common.JWTUtils;
-import com.huiju.estateagents.common.MD5Utils;
+import com.huiju.estateagents.common.*;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.mapper.TaRoleMapper;
 import com.huiju.estateagents.service.ITaMiniappService;
@@ -82,6 +77,9 @@ public class TaUserController extends BaseController {
     @Autowired
     private ITaMiniappService iTaMiniappService;
 
+    @Autowired
+    private SMSUtils smsUtils;
+
     /**
      * 分页查询列表
      * @param pageNum
@@ -296,7 +294,7 @@ public class TaUserController extends BaseController {
             taUser.setButtons((List<SysButtonInMenu>) authButton.getData());
             taUser.setRoles(roles);
             taUser.setLoginPassword("");
-            taUser.setMiniAppName(taMiniapp.getName());
+            taUser.setMiniapp(taMiniapp);
 
             //获取所有菜单
             List<SysMenu> allMenus = (List<SysMenu>) iTaUserAuthMenuService.getAllMenu(null, null,taUser.getOrgId(), roles).getData();
@@ -555,4 +553,36 @@ public class TaUserController extends BaseController {
         responseBean = iTaUserService.departureUser(userId, customerIdList, consultantUserId);
         return responseBean;
     }
+
+    @PostMapping("/officeweb/signup")
+    public ResponseBean officeSignUp(@RequestBody OfficeSignUpEntity signUpEntity) {
+        if (StringUtils.isEmpty(signUpEntity.getCompany())) {
+            return ResponseBean.error("请填写公司", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+        if (StringUtils.isEmpty(signUpEntity.getPhone())) {
+            return ResponseBean.error("请填写手机号", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+        if (StringUtils.isEmpty(signUpEntity.getCaptcha())) {
+            return ResponseBean.error("请填写验证码", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+        if (StringUtils.isEmpty(signUpEntity.getPassword())) {
+            return ResponseBean.error("请填写密码", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+        if (null == signUpEntity.getCity()) {
+            return ResponseBean.error("请选择城市", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        if (!smsUtils.checkCaptcha(signUpEntity.getPhone(), signUpEntity.getCaptcha())) {
+            return ResponseBean.error("手机验证码不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        try {
+            TaUser taUser = iTaUserService.officeSignUp(signUpEntity);
+            return ResponseBean.success(taUser);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
 }

src/main/java/com/huiju/estateagents/center/taUser/entity/OfficeSignUpEntity.java

@@ -0,0 +1,31 @@
+package com.huiju.estateagents.center.taUser.entity;
+
+import lombok.Data;
+
+@Data
+public class OfficeSignUpEntity {
+    /**
+     * 公司
+     */
+    String company;
+
+    /**
+     * 手机
+     */
+    String phone;
+
+    /**
+     * 验证码
+     */
+    String captcha;
+
+    /**
+     * 密码
+     */
+    String password;
+
+    /**
+     * 城市
+     */
+    Integer city;
+}

src/main/java/com/huiju/estateagents/center/taUser/entity/TaUser.java

@@ -125,6 +125,16 @@ public class TaUser implements Serializable {
      */
     private Boolean isConsultant;
 
+    /**
+     * 是否官网注册
+     */
+    private Boolean isOffice;
+
+    /**
+     * 是否试用中
+     */
+    private Boolean onTrial;
+
     /**
      * 公司水印
      */
@@ -184,7 +194,7 @@ public class TaUser implements Serializable {
      * 前台传值城市
      */
     @TableField(exist = false)
-    private ArrayList<String> selectCityTree;
+    private List<String> selectCityTree;
 
     /**
      * 城市ID

src/main/java/com/huiju/estateagents/center/taUser/service/ITaUserService.java

@@ -3,6 +3,7 @@ package com.huiju.estateagents.center.taUser.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.OfficeSignUpEntity;
 import com.huiju.estateagents.center.taUser.entity.TaTags;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.entity.TaPersonBuilding;
@@ -75,4 +76,6 @@ public interface ITaUserService extends IService<TaUser> {
      * @return
      */
     TaUser getUserInfoById(Integer userId, Integer orgId);
+
+    TaUser officeSignUp(OfficeSignUpEntity signUpEntity) throws Exception;
 }

src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserServiceImpl.java

@@ -6,10 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
-import com.huiju.estateagents.center.taUser.entity.TaTagUser;
-import com.huiju.estateagents.center.taUser.entity.TaTags;
-import com.huiju.estateagents.center.taUser.entity.TaUser;
-import com.huiju.estateagents.center.taUser.entity.TaUserRole;
+import com.huiju.estateagents.center.taUser.entity.*;
 import com.huiju.estateagents.center.taUser.mapper.TaTagUserMapper;
 import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
 import com.huiju.estateagents.center.taUser.mapper.TaUserRoleMapper;
@@ -222,7 +219,7 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
     }
 
     // 维护公司所在城市
-    public void addAndupdate(ArrayList<String> selectCityTree, boolean isA, Integer orgid) {
+    public void addAndupdate(List<String> selectCityTree, boolean isA, Integer orgid) {
         // 查询当前所有的市
         QueryWrapper<TdCity> tdCityQuery = new QueryWrapper<>();
         tdCityQuery.eq("leveltype", 2);
@@ -262,7 +259,7 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
     }
 
     // 判断当前城市是否存在
-    public void verificationCity(ArrayList<String> selectCityTree, Integer city) throws Exception {
+    public void verificationCity(List<String> selectCityTree, Integer city) throws Exception {
         for (String id : selectCityTree) {
             if (id.equals(String.valueOf(city))) {
                 return;
@@ -685,6 +682,35 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
         return getOne(userQueryWrapper);
     }
 
+    @Override
+    public TaUser officeSignUp(OfficeSignUpEntity signUpEntity) throws Exception {
+        // 如果此处为 NULL, 需要手动插入一条网络推广的代理数据
+        TaChannelProxy taChannelProxy = taChannelProxyMapper.getOfficeWebProxy();
+        LocalDateTime now = LocalDateTime.now();
+        List<String> cities = new ArrayList<>();
+        cities.add(signUpEntity.getCity().toString());
+
+        TaUser taUser = new TaUser();
+        taUser.setUserName(signUpEntity.getCompany());
+        taUser.setPhone(signUpEntity.getPhone());
+        taUser.setLoginPassword(signUpEntity.getPassword());
+        taUser.setStatus(CommConstant.STATUS_NORMAL);
+        taUser.setCreateDate(now);
+        taUser.setExpDate(now.plusDays(7));     // 默认 7 天有效期
+        taUser.setIsAdmin(true);
+        taUser.setIsConsultant(false);
+        taUser.setOrgName(signUpEntity.getCompany());
+        taUser.setOrgNum(10);       // 默认创建 10 个楼盘
+        taUser.setDefaultCityId(signUpEntity.getCity());
+        taUser.setSelectCityTree(cities);
+        taUser.setIsOffice(true);
+        taUser.setOnTrial(true);
+
+        taUser = newUserAndOrg(taUser, taChannelProxy.getChannelId());
+
+        return taUser;
+    }
+
     private boolean updateUserStatus(TaUser user) {
         UpdateWrapper<TaUser> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("user_id", user.getUserId());

src/main/java/com/huiju/estateagents/channel/sysChannel/entity/TaChannelProxy.java

@@ -36,6 +36,8 @@ public class TaChannelProxy {
 
     private LocalDateTime createTime;
 
+    private Boolean isOffice;
+
     @TableField(exist = false)
     private Integer appCurrentNum;
 }

src/main/java/com/huiju/estateagents/channel/sysChannel/mapper/TaChannelProxyMapper.java

@@ -5,8 +5,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.channel.sysChannel.entity.TaChannelProxy;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 
 @Mapper
 public interface TaChannelProxyMapper extends BaseMapper<TaChannelProxy> {
     IPage<TaChannelProxy> getChannelList(IPage page);
+
+    @Select("select * from ta_channel_proxy where is_office = 1 and status = 1 limit 1")
+    TaChannelProxy getOfficeWebProxy();
 }

src/main/java/com/huiju/estateagents/common/SMSUtils.java

@@ -56,26 +56,47 @@ public class SMSUtils {
      * @return
      */
     public boolean checkCaptcha(String tel, String smsCaptcha) {
-        Phone phone = allPhones.get(tel);
-        if (null == phone) {
-            log.error("手机号 {} 的验证码未找到", tel);
-            return false;
+        return checkCaptcha(tel, smsCaptcha, true);
+    }
+
+    public boolean checkCaptcha(String tel, String smsCaptcha, boolean mustRemove) {
+        if (!isTestNo(smsCaptcha)) {
+            Phone phone = allPhones.get(tel);
+            if (null == phone) {
+                log.error("手机号 {} 的验证码未找到", tel);
+                return false;
+            }
+
+            if (null == smsCaptcha || !smsCaptcha.equals(phone.getCaptcha())) {
+                log.error("手机号 {} 校验验证码出错, 正确: {}, 错误: {}", tel, phone.getCaptcha(), smsCaptcha);
+                return false;
+            }
+
+            LocalDateTime now = LocalDateTime.now();
+            if (now.isAfter(phone.getExpire())) {
+                log.error("手机号 {} 的验证码已过期", tel);
+                return false;
+            }
         }
 
-        if (null == smsCaptcha || !smsCaptcha.equals(phone.getCaptcha())) {
-            log.error("手机号 {} 校验验证码出错, 正确: {}, 错误: {}", tel, phone.getCaptcha(), smsCaptcha);
-            return false;
+        // 如果验证成功, 则从缓存中删除
+        if (mustRemove) {
+            allPhones.remove(tel);
         }
+        return true;
+    }
 
+    /**
+     * 万能验证码 0 + 今年第几天
+     * @param smsCaptcha
+     * @return
+     */
+    private boolean isTestNo(String smsCaptcha) {
         LocalDateTime now = LocalDateTime.now();
-        if (now.isAfter(phone.getExpire())) {
-            log.error("手机号 {} 的验证码已过期", tel);
-            return false;
-        }
+        String day = String.valueOf(now.getDayOfYear());
+        String godNo = StringUtils.lpad(day, "0", 4);
 
-        // 如果验证成功, 则从缓存中删除
-        allPhones.remove(tel);
-        return true;
+        return godNo.equals(smsCaptcha);
     }
 
     public boolean sendVisitor(String tel, String name) {

src/main/java/com/huiju/estateagents/controller/CommonController.java

@@ -124,7 +124,7 @@ public class CommonController extends BaseController {
 
     @PostMapping("{plat}/check/captcha")
     public ResponseBean sendCaptcha(@RequestParam String tel,@RequestParam String captcha) {
-        boolean success = smsUtils.checkCaptcha(tel,captcha);
+        boolean success = smsUtils.checkCaptcha(tel,captcha, false);
         if (success) {
             return ResponseBean.success("验证码校验成功");
         } else {
@@ -197,4 +197,6 @@ public class CommonController extends BaseController {
             return ResponseBean.error("暂时不支持的字典请求", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
     }
+
+
 }

src/main/java/com/huiju/estateagents/controller/MiniAppController.java

@@ -231,26 +231,30 @@ public class MiniAppController extends BaseController {
                 return ResponseBean.error("发生未知错误", ResponseBean.ERROR_UNAVAILABLE);
             }
 
-            Map<Object, Object> map = new HashMap<>();
-            map.put("openId", session.getOpenid());
-            map.put("orgId", orgId);
-            map.put("personId", taPerson.getPersonId());
-            miniResp.put("token", JWTUtils.newTokenByMap(map));
-            if (StringUtils.isEmpty(taPerson.getFromCode())) {
-                taPerson.setFromCode(from);
-            }
-            if (StringUtils.isEmpty(taPerson.getRecommendPerson())) {
-                taPerson.setRecommendPerson(recommender);
-                TaPerson type = taPersonService.getById(recommender);
-                if (null != type) {
-                    if (!StringUtils.isEmpty(type.getPersonType())) {
-                        taPerson.setRecommendPersonType(type.getPersonType());
+            if ((new Boolean(true)).equals(taPerson.getIsNew())) {
+                if (StringUtils.isEmpty(taPerson.getFromCode())) {
+                    taPerson.setFromCode(from);
+                }
+                if (StringUtils.isEmpty(taPerson.getRecommendPerson())) {
+                    taPerson.setRecommendPerson(recommender);
+                    TaPerson type = taPersonService.getById(recommender);
+                    if (null != type) {
+                        if (!StringUtils.isEmpty(type.getPersonType())) {
+                            taPerson.setRecommendPersonType(type.getPersonType());
+                        }
                     }
                 }
             }
+
             taPerson.setMiniappId(appid);
             taPersonService.updateById(taPerson);
 
+            Map<Object, Object> map = new HashMap<>();
+            map.put("openId", session.getOpenid());
+            map.put("orgId", orgId);
+            map.put("personId", taPerson.getPersonId());
+            miniResp.put("token", JWTUtils.newTokenByMap(map));
+
             // 增加积分线程 --- 3.5.23版本授权手机分享者增加积分，单纯分享不增加积分
 //            ExecutorService threadPool = Executors.newCachedThreadPool();
 //            threadPool.execute(() -> {

src/main/java/com/huiju/estateagents/entity/TaPerson.java

@@ -340,4 +340,10 @@ public class TaPerson implements Serializable {
      * 推广码ID
      */
     private Integer qrCodeId;
+
+    /**
+     * 临时变量, 用于记录是否新增
+     */
+    @TableField(exist = false)
+    private Boolean isNew;
 }

src/main/java/com/huiju/estateagents/interceptor/AccessInterceptor.java

@@ -76,7 +76,8 @@ public class AccessInterceptor implements HandlerInterceptor {
             "/api/refund/",//微信退款所有回调放过
             "/api/fadd/",//所有的法大大回调放过
             "/api/third",
-            "/api/third/redirect/"
+            "/api/third/redirect/",
+            "/api/officeweb/signup"     // 官网注册
     };
 
     /*

src/main/java/com/huiju/estateagents/service/impl/TaPersonServiceImpl.java

@@ -565,13 +565,13 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
             taPerson.setStatus(CommConstant.STATUS_NORMAL);
             taPerson.setCreateDate(LocalDateTime.now());
             if (taPersonMapper.insert(taPerson) > 0) {
+                taPerson.setIsNew(true);
                 return taPerson;
             }
         } else {
             return taPersons.get(0);
         }
 
-
         return null;
     }
 

src/main/resources/mapper/redpack/TaRedPacketHistoryMapper.xml

@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.redpack.mapper.TaRedPacketHistoryMapper">
-
-
     <select id="getRanking" resultType="com.huiju.estateagents.redpack.entity.TaRedPacketHistory">
         SELECT
         t.helpPersonNum as help_person_num,