feats

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

 
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Random;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
         prefix = prefix.substring(0, padLen);
         return prefix + src;
     }
+
+    /**
+     * 解析标准的 k=v&k=v 格式串
+     * 暂时不支持数组
+     * @param queryStr
+     * @return
+     */
+    public static Map<String, String> parseQuery(String queryStr) {
+        try {
+            if (isEmpty(queryStr)) {
+                return null;
+            }
+
+            String[] pairs = queryStr.split("&");
+            if (pairs.length < 1) {
+                return null;
+            }
+
+            Map<String, String> rtn = new HashMap<>();
+            for (String item : pairs) {
+                if (isEmpty(item)) {
+                    continue;
+                }
+
+                String[] kv = item.split("=");
+                if (kv.length != 2) {
+                    continue;
+                }
+
+                rtn.put(kv[0], kv[1]);
+            }
+
+            return rtn;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
 }

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

 import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
 import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
 import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huiju.estateagents.base.BaseController;
 import me.chanjar.weixin.common.error.WxErrorException;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.http.HttpStatus;
+import org.checkerframework.checker.units.qual.A;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
             String query,
             Integer scene
     ) {
+        Map<String, Object> resp = new HashMap<>();
+
         // 获取小程序信息
         TaMiniapp taMiniapp = iTaMiniappService.getInfoWithTpls(appid);
+        resp.put("miniapp", taMiniapp);
         if (null == taMiniapp) {
             return ResponseBean.error("当前 appid 未在系统内注册", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
 
         // 获取组织信息
         TaOrg taOrg = taOrgService.getById(taMiniapp.getOrgId());
+        resp.put("org", taOrg);
         if (null == taOrg) {
             return ResponseBean.error("当前 appid 未设置对应组织", ResponseBean.ERROR_UNAVAILABLE);
         }
 
-        // 获取城市列表
-        QueryWrapper<TaOrgCity> queryCity = new QueryWrapper<>();
-        queryCity.eq("id", taOrg.getOrgId());
-        queryCity.eq("status", CommConstant.STATUS_NORMAL);
-        List<TaOrgCity> taOrgCityList = taOrgCityMapper.selectList(queryCity);
-
-        // 获取默认扩展设置
-        QueryWrapper<TaCustomImg> queryExt = new QueryWrapper<>();
-        queryExt.eq("org_id", taOrg.getOrgId());
-        queryExt.eq("status", CommConstant.STATUS_NORMAL);
-        List<TaCustomImg> taCustomImg = iTaCustomImgService.list(queryExt);
-
-        return ResponseBean.success(new HashMap<String, Object>() {{
-            put("miniapp", taMiniapp);
-            put("org", taOrg);
-            put("cityList", taOrgCityList);
-            put("customImg", taCustomImg);
-        }});
+        //把積分規則返回給小程序
+        QueryWrapper<TdPointsRules> tdPointsRulesQueryWrapper = new QueryWrapper<>();
+        tdPointsRulesQueryWrapper.eq("org_id", taOrg.getOrgId());
+        List<TdPointsRules> rulesPointList = iTdPointsRulesService.list(tdPointsRulesQueryWrapper);
+        resp.put("pointRuleList", rulesPointList);
+
+        return ResponseBean.success(resp);
     }
 
     /**
             @RequestParam(required = false) String from,
             @RequestParam(required = false) String recommender,
             @RequestParam(required = false) String targetId,
-            @RequestParam(required = false) String lon,
-            @RequestParam(required = false) String lat,
+            @RequestParam(required = false) Integer scene,
             HttpServletRequest request) {
         String appid = request.getHeader("appid");
 
             TaMiniapp miniapp = taMiniappService.getById(appid);
             WxMaJscode2SessionResult session = miniAppService.getSessionInfo(code, appid);
             Integer orgId = miniapp.getOrgId();
-            Map<String, Object> miniResp = new HashMap<>();
-            miniResp.put("openid", session.getOpenid());
-            miniResp.put("sessionKey", session.getSessionKey());
-            miniResp.put("unionid", session.getUnionid());
-            miniResp.put("name", miniapp.getName());
-            miniResp.put("tpls", miniAppService.getTpls(appid));
-            miniResp.put("fddServerHost", miniapp.getFddServerHost());
-
-            // 2020年3月30日 与曹建芳讨论 去掉此规则
-//            //如果是分享进来且没有进入过小程序，给分享人发放积分
-//            QueryWrapper<TaPerson> personQueryWrapper = new QueryWrapper<>();
-//            personQueryWrapper.eq("mini_openid", session.getOpenid());
-//            personQueryWrapper.eq("org_id", orgId);
-//            int count = taPersonService.count(personQueryWrapper);
-
-            TaPerson taPerson = taPersonService.newPersonByOpenid(session.getOpenid(), orgId);
+
+            // 如果是扫码进来的
+            Map<String, String> sceneParams = null;
+            if (null != scene) {
+                TaMiniappQrcode qrcode = miniAppService.getQrCodeBySerialNo(scene);
+                if (null != qrcode) {
+                    String paramStr = qrcode.getQrParams();
+                    JSONObject params = JSON.parseObject(paramStr);
+                    sceneParams = StringUtils.parseQuery(params.getString("scene"));
+
+                    from = sceneParams.get("from");
+                    recommender = sceneParams.get("recommender");
+                    targetId = sceneParams.get("id");
+                }
+            }
+
+            TaPerson taPerson = taPersonService.newPersonByOpenid(session.getOpenid(), miniapp, from, recommender);
             if (null == taPerson) {
                 return ResponseBean.error("发生未知错误", ResponseBean.ERROR_UNAVAILABLE);
             }
+            taPerson.setPassword(null);
 
             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());
-                    }
-                }
-            }
-            taPerson.setMiniappId(appid);
-            taPersonService.updateById(taPerson);
-
-            // 增加积分线程 --- 3.5.23版本授权手机分享者增加积分，单纯分享不增加积分
-//            ExecutorService threadPool = Executors.newCachedThreadPool();
-//            threadPool.execute(() -> {
-////                if (null != from && from.contains("share") && !StringUtils.isEmpty(recommender) && count > 0) {
-//                if (null != from && from.contains("share") && !StringUtils.isEmpty(recommender)) {
-//                    // 校验是否点击过此人的分享
-//                    boolean checkPoint = checkSharePersonFrom(from, taPerson.getPersonId(), targetId, orgId);
-//                    if (checkPoint) {
-//                        // 添加积分
-//                        applicationContext.publishEvent(new EventBus(recommender, EventBus.EventType.SharePosterAll, orgId));
-//                    }
-//                }
-//            });
+
+            String token = JWTUtils.newTokenByMap(map);
+            sysTokenService.saveToken(token);
 
             if (!StringUtils.isEmpty(from) && !StringUtils.isEmpty(recommender) && !StringUtils.isEmpty(targetId)) {
-                TaSharePersonFrom taSharePersonFrom = new TaSharePersonFrom();
-                TaPerson recommenderPerson = taPersonService.getById(recommender);
-                taSharePersonFrom.setCreateDate(LocalDateTime.now());
-                taSharePersonFrom.setOrgId(orgId);
-                taSharePersonFrom.setPersonId(taPerson.getPersonId());
-                taSharePersonFrom.setSharePersonType(recommenderPerson.getPersonType());
-                taSharePersonFrom.setTargetId(targetId);
-                taSharePersonFrom.setTargetType(from);
-                if (CommConstant.PERSON_REALTY_CONSULTANT.equals(recommenderPerson.getPersonType())) {
-                    taSharePersonFrom.setSharePerson(recommenderPerson.getUserId().toString());
-                } else {
-                    taSharePersonFrom.setSharePerson(recommenderPerson.getPersonId());
-                }
-                QueryWrapper<TaSharePersonFrom> sharePersonFromQueryWrapper = new QueryWrapper<>();
-                sharePersonFromQueryWrapper.eq("person_id", taPerson.getPersonId());
-                if (from.equals("dynamic_share")) { // activity_share
-                    //产品不认了
-                    taSharePersonFrom.setStatus(CommConstant.STATUS_NORMAL);
-                    TaBuildingDynamic buildingDynamic = buildingDynamicService.getById(targetId);
-                    taSharePersonFrom.setBuildingId(buildingDynamic.getBuildingId());
-                    sharePersonFromQueryWrapper.eq("building_id", buildingDynamic.getBuildingId());
-                } else {
-                    taSharePersonFrom.setStatus(CommConstant.STATUS_NORMAL);
-                }
-                if (from.contains("card")) {
-                    // 因为targetId 是 personId ，需要查询出 userId
-                    TaPerson person = taPersonService.getById(targetId);
-
-                    QueryWrapper<TaPersonBuilding> personBuildingQueryWrapper = new QueryWrapper<>();
-                    personBuildingQueryWrapper.eq("user_id", person.getUserId());
-                    TaPersonBuilding personBuilding = personBuildingService.getOne(personBuildingQueryWrapper);
-                    taSharePersonFrom.setBuildingId(personBuilding.getBuildingId());
-                    sharePersonFromQueryWrapper.eq("building_id", personBuilding.getBuildingId());
-                } else if (from.contains("news")) {
-                    TaNews news = newsService.getById(targetId);
-                    taSharePersonFrom.setBuildingId(news.getBuildingId());
-                    sharePersonFromQueryWrapper.eq("building_id", news.getBuildingId());
-                } else if (from.contains("building")) {
-                    taSharePersonFrom.setBuildingId(targetId);
-                    sharePersonFromQueryWrapper.eq("building_id", targetId);
-                }else if (from.contains("help")) {
-                    HelpActivity helpActivity = helpActivityService.getById(targetId);
-                    taSharePersonFrom.setBuildingId(helpActivity.getBuildingId());
-                    sharePersonFromQueryWrapper.eq("building_id", helpActivity.getBuildingId());
-                }else if (from.contains("group")) {
-                    TaShareActivity taShareActivity = taShareActivityService.getById(targetId);
-                    taSharePersonFrom.setBuildingId(taShareActivity.getBuildingId());
-                    sharePersonFromQueryWrapper.eq("building_id", taShareActivity.getBuildingId());
-                }else if (from.contains("live")) {
-                    TaLiveActivity liveActivity = taLiveActivityService.getById(targetId);
-                    taSharePersonFrom.setBuildingId(liveActivity.getBuildingId());
-                    sharePersonFromQueryWrapper.eq("building_id", liveActivity.getBuildingId());
-                }else if (from.contains("h5")) {
-                    TaDrainage taDrainage = taDrainageService.getById(targetId);
-                    taSharePersonFrom.setBuildingId(taDrainage.getBuildingId());
-                    sharePersonFromQueryWrapper.eq("building_id", taDrainage.getBuildingId());
-                }else if (from.contains("house")) {
-                    TaSalesBatch taSalesBatch = taSalesBatchMapper.selectById(targetId);
-                    taSharePersonFrom.setBuildingId(taSalesBatch.getBuildingId());
-                    sharePersonFromQueryWrapper.eq("building_id", taSalesBatch.getBuildingId());
-                }
-                Integer isFirstTime = taSharePersonFromService.count(sharePersonFromQueryWrapper);
-                if (isFirstTime > 0) {
-                    taSharePersonFrom.setIsFirstTime(false);
-                } else {
-                    taSharePersonFrom.setIsFirstTime(true);
-                }
-                taSharePersonFromService.save(taSharePersonFrom);
+                taSharePersonFromService.createBy(taPerson, from, recommender, targetId);
             }
 
-            taPerson.setPassword(null);
-
-            // 获取其余信息
-            Map<String, Object> extraInfo = taPersonService.getExtraInfo(taPerson.getPersonId());
-            // 所有人员都返回 org yansen 2019-11-13 19:56:18
-//            if (CommConstant.PERSON_REALTY_CONSULTANT.equals(taPerson.getPersonType())){
-            QueryWrapper<TaOrg> orgQueryWrapper = new QueryWrapper<>();
-            orgQueryWrapper.eq("org_id", orgId);
-            TaOrg org = taOrgService.getOne(orgQueryWrapper);
-            taPerson.setOrg(org);
-//            }
             Map<String, Object> result = new HashMap<>();
-            result.put("miniApp", miniResp);
             result.put("person", taPerson);
-            result.put("extraInfo", extraInfo);
-            result.put("miniAuthorized", null != taPerson.getAvatarurl() && taPerson.getAvatarurl().indexOf("wx.qlogo.cn") > 0);
-
-            //返回是否授权标识
-            QueryWrapper<TaCustomImg> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("org_id", orgId);
-            queryWrapper.eq("img_type", "auth");
-            List<TaCustomImg> taCustomImgs = iTaCustomImgService.list(queryWrapper);
-            result.put("avatarAuth", CollectionUtils.isEmpty(taCustomImgs) ? false : "1".equals(taCustomImgs.get(0).getImgUrl()) ? true : false);
-
-            String token = (String) miniResp.get("token");
-            sysTokenService.saveToken(token);
-
-            //把積分規則返回給小程序
-            QueryWrapper<TdPointsRules> tdPointsRulesQueryWrapper = new QueryWrapper<>();
-            tdPointsRulesQueryWrapper.eq("org_id", orgId);
-            List<TdPointsRules> rulesPointList = iTdPointsRulesService.list(tdPointsRulesQueryWrapper);
-            result.put("rulesPointList", rulesPointList);
-
-            // 定位城市
-            String location = null == lon ? null : lon + "," + lat;
-            TdCity tdCity = iTdCityService.getLocationCity(location, orgId, taPerson.getPersonId());
-            result.put("city", tdCity);
+            result.put("token", token);
+            if (null != sceneParams) {
+                result.put("scene", sceneParams);
+            }
 
             return ResponseBean.success(result);
         } catch (WxErrorException e) {
         }
     }
 
+//    @PostMapping("/share-person")
+//    public ResponseBean sharePerson(@RequestParam(required = false) String from,
+//                                    @RequestParam(required = false) String recommender,
+//                                    @RequestParam(required = false) String targetId,
+//                                    @RequestParam(required = false) Integer scene,
+//                                    HttpServletRequest request) {
+//        String openid = getOpenId(request);
+//        List<TaPerson> persons = taPersonService.getPersonsByOpenId(openid);
+//        if (null == persons || persons.size() < 1) {
+//            return ResponseBean.error("校验人员信息出错", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//
+//        // 如果是扫码进来的
+//        Map<String, String> sceneParams = null;
+//        if (null != scene) {
+//            TaMiniappQrcode qrcode = miniAppService.getQrCodeBySerialNo(scene);
+//            if (null != qrcode) {
+//                String paramStr = qrcode.getQrParams();
+//                JSONObject params = JSON.parseObject(paramStr);
+//                sceneParams = StringUtils.parseQuery(params.getString("scene"));
+//
+//                from = sceneParams.get("from");
+//                recommender = sceneParams.get("recommender");
+//                targetId = sceneParams.get("id");
+//            }
+//        }
+//
+//        taSharePersonFromService.createBy(persons.get(0), from, recommender, targetId);
+//
+//        return ResponseBean.success("success");
+//    }
+
     private ResponseBean checkMiniappStatus(String appid) {
         TaUser taUser = userService.getAdminByAppID(appid);
 

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

 import com.huiju.estateagents.entity.TaChannelPerson;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaPersonBuilding;
-import com.huiju.estateagents.service.ITaPersonBuildingService;
-import com.huiju.estateagents.service.ITaPersonService;
-import com.huiju.estateagents.service.TaChannelPersonService;
-import com.huiju.estateagents.service.TaChannelService;
+import com.huiju.estateagents.service.*;
 import com.huiju.estateagents.third.entity.TaThirdPartyMiniappConfig;
 import com.huiju.estateagents.third.service.ITaThirdPartyMiniappConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
     @Autowired
     ITaPersonBuildingService taPersonBuildingService;
 
+    @Autowired
+    ITaSharePersonFromService iTaSharePersonFromService;
+
     @Autowired
     public ITaThirdPartyMiniappConfigService iTaThirdPartyMiniappConfigService;
 
         return taPersonService.getWxUserSign(openid, orgId);
     }
 
-
     /**
      *
      *

src/main/java/com/huiju/estateagents/service/ITaPersonService.java

 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
-import com.huiju.estateagents.entity.TaCustomerFrom;
-import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.entity.*;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.huiju.estateagents.entity.TaPersonBuilding;
-import com.huiju.estateagents.entity.TaPersonPositon;
 
 import java.util.List;
 import java.util.Map;
 
     IPage<TaUser> getBuildingConsultantList(int pageNumber, int pageSize, String buildingId);
 
-    TaPerson newPersonByOpenid(String openid, Integer orgId);
+    TaPerson newPersonByOpenid(String openid, TaMiniapp miniapp, String from, String recommender);
 
     ResponseBean bindCard(String phone, String pass, String openid);
 

src/main/java/com/huiju/estateagents/service/ITaSharePersonFromService.java

 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaSharePersonFrom;
 
 /**
     ResponseBean selectHouseVisitList(Integer pageNum, Integer pageSize, Integer orgId, String personType, String sceneType, String phone, String saleBatchId);
 
     ResponseBean selectLiveActivityVisitList(Integer pageNum, Integer pageSize, Integer orgId, String personType, String sceneType, String phone, String liveActivityId);
+
+    TaSharePersonFrom createBy(TaPerson taPerson, String from, String recommender, String targetId);
 }

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

 package com.huiju.estateagents.service.impl;
 
-import ch.qos.logback.core.pattern.util.RegularEscapeUtil;
 import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
-import org.checkerframework.checker.units.qual.C;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Service;
     }
 
     @Override
-    public TaPerson newPersonByOpenid(String openid,Integer orgId) {
+    public TaPerson newPersonByOpenid(String openid, TaMiniapp miniapp, String from, String recommender) {
         List<TaPerson> taPersons = getPersonsByOpenId(openid);
         if (null == taPersons || taPersons.size() == 0) {
             TaPerson taPerson = new TaPerson();
             taPerson.setMiniOpenid(openid);
-            taPerson.setNickname("匿名用户");
-            taPerson.setOrgId(orgId);
-            taPerson.setAvatarurl(CommConstant.MINIAPP_DEFAULT_AVATAR);
+            taPerson.setOrgId(miniapp.getOrgId());
+            taPerson.setMiniappId(miniapp.getMiniappId());
+//            taPerson.setNickname("匿名用户");
+//            taPerson.setAvatarurl(CommConstant.MINIAPP_DEFAULT_AVATAR);
             taPerson.setPersonType(CommConstant.PERSON_ESTATE_DRIFT);
             taPerson.setStatus(CommConstant.STATUS_NORMAL);
             taPerson.setCreateDate(LocalDateTime.now());
+            taPerson.setFromCode(from);
+            taPerson.setRecommendPerson(recommender);
+            if (StringUtils.isEmpty(recommender)) {
+                TaPerson type = getById(recommender);
+                if (null != type) {
+                    if (!StringUtils.isEmpty(type.getPersonType())) {
+                        taPerson.setRecommendPersonType(type.getPersonType());
+                    }
+                }
+            }
+
             if (taPersonMapper.insert(taPerson) > 0) {
                 return taPerson;
             }
         int havaSigned =  null == taPersonSign || !DateUtils.sameDay(LocalDateTime.now(), taPersonSign.getSignDate()) ? 0 : 1;
         result.put("havaSigned", havaSigned);
 
-        // 查询我的客户记录
-        Integer customerNum = taRecommendCustomerMapper.getMyCutsomerNum(personId);
-        result.put("customerNum", null == customerNum ? 0 : customerNum.intValue());
+//        // 查询我的客户记录
+//        Integer customerNum = taRecommendCustomerMapper.getMyCutsomerNum(personId);
+//        result.put("customerNum", null == customerNum ? 0 : customerNum.intValue());
 
         return result;
     }

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

         page.setRecords(list);
         return ResponseBean.success(page);
     }
+
+    @Override
+    public TaSharePersonFrom createBy(TaPerson taPerson, String from, String recommender, String targetId) {
+        TaSharePersonFrom taSharePersonFrom = new TaSharePersonFrom();
+        TaPerson recommenderPerson = taPersonMapper.getById(recommender);
+        taSharePersonFrom.setCreateDate(LocalDateTime.now());
+        taSharePersonFrom.setOrgId(taPerson.getOrgId());
+        taSharePersonFrom.setPersonId(taPerson.getPersonId());
+        taSharePersonFrom.setSharePersonType(recommenderPerson.getPersonType());
+        taSharePersonFrom.setTargetId(targetId);
+        taSharePersonFrom.setTargetType(from);
+        taSharePersonFrom.setStatus(CommConstant.STATUS_NORMAL);
+        if (CommConstant.PERSON_REALTY_CONSULTANT.equals(recommenderPerson.getPersonType())) {
+            taSharePersonFrom.setSharePerson(recommenderPerson.getUserId().toString());
+        } else {
+            taSharePersonFrom.setSharePerson(recommenderPerson.getPersonId());
+        }
+        QueryWrapper<TaSharePersonFrom> sharePersonFromQueryWrapper = new QueryWrapper<>();
+        sharePersonFromQueryWrapper.eq("person_id", taPerson.getPersonId());
+        int isFirstTime = this.count(sharePersonFromQueryWrapper);
+        if (isFirstTime > 0) {
+            taSharePersonFrom.setIsFirstTime(false);
+        } else {
+            taSharePersonFrom.setIsFirstTime(true);
+        }
+        this.save(taSharePersonFrom);
+
+        return taSharePersonFrom;
+    }
 }