wx orgId

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

@@ -182,22 +182,22 @@ public class CommConstant {
     /**
      * 客户报备
      */
-    public static final String CUSTOMER_REPORT = "1";
+    public static final Integer CUSTOMER_REPORT = 1;
 
     /**
      * 客户到访
      */
-    public static final String CUSTOMER_VISITE = "2";
+    public static final Integer CUSTOMER_VISITE = 2;
 
     /**
      * 客户认购
      */
-    public static final String CUSTOMER_PREORDER = "3";
+    public static final Integer CUSTOMER_PREORDER = 3 ;
 
     /**
      * 客户签约
      */
-    public static final String CUSTOMER_SIGNED = "4";
+    public static final Integer CUSTOMER_SIGNED = 4;
 
 
     /**

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

@@ -71,13 +71,13 @@ public class MiniAppController {
      * 登陆接口
      */
     @PostMapping("/login")
-    public ResponseBean login(String code,@RequestParam(required = false) String from,@RequestParam(required = false)String recommender) {
+    public ResponseBean login(String code,@RequestParam(required = false) String from,@RequestParam(required = false)String recommender,HttpServletRequest request) {
         if (StringUtils.isBlank(code)) {
             return ResponseBean.error("参数 code 不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
         try {
             WxMaJscode2SessionResult session = miniAppService.getSessionInfo(code);
-
+            Integer orgId =getOrgId(request);
             Map<String, String> miniResp = new HashMap<>();
             miniResp.put("openid", session.getOpenid());
             miniResp.put("sessionKey", session.getSessionKey());
@@ -86,13 +86,14 @@ public class MiniAppController {
             //如果是分享进来且没有进入过小程序，给分享人发放积分
             QueryWrapper<TaPerson> personQueryWrapper = new QueryWrapper<>();
             personQueryWrapper.eq("mini_openid",session.getOpenid());
+            personQueryWrapper.eq("org_id",orgId);
             int count = taPersonService.count(personQueryWrapper);
 
             if(from.contains("share") && StringUtils.isNotBlank(recommender) && count>0){
                 // 添加积分
                  applicationContext.publishEvent(new EventBus(recommender, EventBus.EventType.SharePosterAll));
             }
-            TaPerson taPerson = taPersonService.newPersonByOpenid(session.getOpenid());
+            TaPerson taPerson = taPersonService.newPersonByOpenid(session.getOpenid(),orgId);
             if (null == taPerson) {
                 return ResponseBean.error("发生未知错误", ResponseBean.ERROR_UNAVAILABLE);
             }
@@ -221,14 +222,13 @@ public class MiniAppController {
 
         // 更新用户绑定手机
         String openid = JWTUtils.getSubject(request);
-        taPersonService.updatePersonPhone(openid, phoneNoInfo.getPhoneNumber());
+        Integer orgId = getOrgId(request);
+        taPersonService.updatePersonPhone(openid, phoneNoInfo.getPhoneNumber(),orgId);
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
         if (null == taPersons || taPersons.size() != 1) {
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
         }
         TaPerson person = taPersons.get(0);
-        person.setPersonType(CommConstant.PERSON_ESTATE_CUSTOMER);
-        taPersonService.updateById(person);
         QueryWrapper<TaRecommendCustomer> cus= new QueryWrapper<>();
         cus.eq("phone",phoneNoInfo.getPhoneNumber());
         cus.orderByDesc("create_date");
@@ -262,23 +262,6 @@ public class MiniAppController {
 //            if(list.size()<=0){
 //                taCustomerPersonService.insertBean(person.getPersonId(),customers.getCustomerId());
 //            }
-        } else{
-            TaRecommendCustomer reCustomer = new TaRecommendCustomer();
-            reCustomer.setVerifyStatus(CommConstant.VERIFY_AGREE);
-            reCustomer.setName(person.getNickname());
-            reCustomer.setPhone(phoneNoInfo.getPhoneNumber());
-            reCustomer.setSex(Integer.valueOf(person.getGender()));
-            reCustomer.setPersonId(person.getPersonId());
-            reCustomer.setPicture(person.getAvatarurl());
-            reCustomer.setCountry(person.getCountry());
-            reCustomer.setCity(person.getCity());
-            reCustomer.setProvince(person.getProvince());
-            reCustomer.setEntryType(CommConstant.ENTRY_VOLUNTEER);
-            reCustomer.setCreateDate(LocalDateTime.now());
-            reCustomer.setReportRecommendStatus(CommConstant.READY);
-            if(!taRecommendCustomerService.save(reCustomer)){
-                return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
-            }
         }
         return ResponseBean.success(phoneNoInfo);
     }
@@ -312,4 +295,15 @@ public class MiniAppController {
             return ResponseBean.error("获取二维码参数失败: " + e.getMessage(), HttpStatus.SC_INTERNAL_SERVER_ERROR);
         }
     }
+
+
+    public Integer getOrgId(HttpServletRequest request){
+
+        Map map = JWTUtils.getUserIdAndOrgId(request);
+        if (null != map && null != map.get("orgId")){
+            return Integer.valueOf(map.get("orgId").toString());
+        }
+
+        return null;
+    }
 }

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

@@ -70,6 +70,7 @@ public class TaPersonController extends BaseController {
         if (pageNumber < 0 || pageSize < 0) {
             return ResponseBean.error("分页参数不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
+        Integer orgId = getOrgId(request);
         if (mine){
             String openid = JWTUtils.getSubject(request);
             List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
@@ -80,7 +81,7 @@ public class TaPersonController extends BaseController {
             IPage<Map<String, Object>>  result = taPersonService.getSavedConsaultants(pageNumber,pageSize,person.getPersonId());
             return ResponseBean.success(result);
         }else {
-            IPage<Map<String, Object>> result = taPersonService.getCardList(pageNumber, pageSize,buildingId);
+            IPage<Map<String, Object>> result = taPersonService.getCardList(pageNumber, pageSize,buildingId,orgId);
             return ResponseBean.success(result);
         }
 
@@ -88,7 +89,8 @@ public class TaPersonController extends BaseController {
     }
 
     @PutMapping("/wx/registerConsultant")
-    public ResponseBean registerConsultant(@RequestParam Integer orgId,HttpServletRequest request) {
+    public ResponseBean registerConsultant(HttpServletRequest request) {
+        Integer orgId =getOrgId(request);
         ResponseBean responseBean = new ResponseBean();
         String openid = JWTUtils.getSubject(request);
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
@@ -114,8 +116,9 @@ public class TaPersonController extends BaseController {
     }
 
     @PutMapping("/wx/registerAgent")
-    public ResponseBean registerAgent(@RequestParam String recommendAgentCode, @RequestParam String channelCode,@RequestParam Integer orgId,HttpServletRequest request) {
+    public ResponseBean registerAgent(@RequestParam String recommendAgentCode, @RequestParam String channelCode,HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
+        Integer orgId =getOrgId(request);
         String openid = JWTUtils.getSubject(request);
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
         if (null == taPersons || taPersons.size() != 1) {

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

@@ -95,7 +95,8 @@ public class TaRecommendCustomerController extends BaseController {
     @PostMapping("/wx/customer/new")
     public ResponseBean recommendCust(@RequestBody String paramStr, HttpServletRequest request) {
         String openid = JWTUtils.getSubject(request);
-        return taRecommendCustomerService.recommendCust(paramStr, openid);
+        Integer orgId = getOrgId(request);
+        return taRecommendCustomerService.recommendCust(paramStr, openid,orgId);
     }
 
     /**
@@ -107,7 +108,8 @@ public class TaRecommendCustomerController extends BaseController {
     @PostMapping("/wx/customer/report")
     public ResponseBean reportCust(@RequestBody String paramStr, HttpServletRequest request) {
         String openid = JWTUtils.getSubject(request);
-        return taRecommendCustomerService.reportCust(paramStr, openid);
+        Integer orgId = getOrgId(request);
+        return taRecommendCustomerService.reportCust(paramStr, openid,orgId);
     }
 
     @PostMapping("/wx/customer/recommend")

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

@@ -228,7 +228,7 @@ public class TaPerson implements Serializable {
 
     private String fromCode;
 
-    private String orgId;
+    private Integer orgId;
 
     private Integer userId;
 

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

@@ -105,7 +105,7 @@ public class TaRecommendCustomer implements Serializable {
      * 状态
      */
     @TableField(value = "`status`")
-    private String status;
+    private Integer status;
 
     /**
      * 推荐人
@@ -147,6 +147,8 @@ public class TaRecommendCustomer implements Serializable {
 
     private Integer reportRecommendStatus;
 
+    private Integer orgId;
+
     @TableField(exist = false)
     private List<TaPersonVisitRecord> visitRecords;
 

src/main/java/com/huiju/estateagents/mapper/TaPersonMapper.java

@@ -23,7 +23,7 @@ import java.util.Map;
  */
 @Mapper
 public interface TaPersonMapper extends BaseMapper<TaPerson> {
-    List<Map<String,Object>> selectCardList(IPage<Map<String,Object>> page, @Param("personType") String personType, @Param("status") int status,@Param("buildingId")String buildingId);
+    List<Map<String,Object>> selectCardList(IPage<Map<String,Object>> page, @Param("personType") String personType, @Param("status") int status,@Param("buildingId")String buildingId,@Param("orgId")Integer orgId);
 
     int setFieldIncrement(@Param("personId") String personId, @Param("field") String field, @Param("increment") int increment);
 

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

@@ -22,9 +22,9 @@ import java.util.Map;
 public interface ITaPersonService extends IService<TaPerson> {
     TaPerson mergePersonWxInfo(WxMaUserInfo userInfo);
 
-    TaPerson updatePersonPhone(String miniOpenid, String phone);
+    TaPerson updatePersonPhone(String miniOpenid, String phone,Integer orgId);
 
-    IPage<Map<String, Object>> getCardList(int pageNumber, int pageSize,String buildingId);
+    IPage<Map<String, Object>> getCardList(int pageNumber, int pageSize,String buildingId,Integer orgId);
 
     ResponseBean checkPhoneAndPass(String phone, String pass);
 
@@ -42,7 +42,7 @@ public interface ITaPersonService extends IService<TaPerson> {
 
     IPage<TaPerson> getPersonList(int pageNumber, int pageSize, String personType, String name, String phone,Integer status,String buildingId,String personTags);
 
-    TaPerson newPersonByOpenid(String openid);
+    TaPerson newPersonByOpenid(String openid,Integer orgId);
 
     ResponseBean bindCard(String phone, String pass, String openid);
 

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

@@ -22,9 +22,9 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
 
     ResponseBean updateCustByJSON(String paramStr);
 
-    ResponseBean recommendCust(String paramStr, String openid);
+    ResponseBean recommendCust(String paramStr, String openid,Integer orgId);
 
-    ResponseBean reportCust(String paramStr, String openid);
+    ResponseBean reportCust(String paramStr, String openid,Integer orgId);
 
     IPage<TaRecommendCustomer> getUnSignedCustomerList(int pageNumber, int pageSize, String building,String personId);
 

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

@@ -123,7 +123,7 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
     }
 
     @Override
-    public TaPerson updatePersonPhone(String miniOpenid, String phone) {
+    public TaPerson updatePersonPhone(String miniOpenid, String phone,Integer orgId) {
         // 先查询是否存在用户
         TaPerson person = null;
         List<TaPerson> taPersons = getPersonsByOpenId(miniOpenid);
@@ -145,9 +145,9 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
 
         UpdateWrapper<TaPerson> wrapper = new UpdateWrapper<>();
         wrapper.set("phone", phone);
-        wrapper.set("person_type",CommConstant.PERSON_ESTATE_AGENT);
+        wrapper.set("person_type",CommConstant.PERSON_ESTATE_CUSTOMER);
         wrapper.eq("mini_openid", miniOpenid);
-        wrapper.isNull("person_type");
+        wrapper.eq("person_type",CommConstant.PERSON_ESTATE_DRIFT);
         taPersonMapper.update(new TaPerson(), wrapper);
 
         person.setPhone(phone);
@@ -155,7 +155,7 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
             person.setTel(phone);
         }
 
-        iTaRecommendCustomerService.newByPerson(person);
+       // iTaRecommendCustomerService.newByPerson(person);
         
         // 发放积分
         applicationContext.publishEvent(new EventBus(person, EventBus.EventType.SignUpAgent));
@@ -164,13 +164,13 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
     }
 
     @Override
-    public IPage<Map<String, Object>> getCardList(int pageNumber, int pageSize,String buildingId) {
+    public IPage<Map<String, Object>> getCardList(int pageNumber, int pageSize,String buildingId,Integer orgId) {
         Page<Map<String, Object>> page = new Page<>();
         page.setSize(pageSize);
         page.setPages(pageNumber);
         page.setCurrent(pageNumber);
 
-        List<Map<String, Object>> result = taPersonMapper.selectCardList(page, CommConstant.PERSON_REALTY_CONSULTANT, CommConstant.STATUS_NORMAL,buildingId);
+        List<Map<String, Object>> result = taPersonMapper.selectCardList(page, CommConstant.PERSON_REALTY_CONSULTANT, CommConstant.STATUS_NORMAL,buildingId,orgId);
         page.setRecords(result);
 
         return page;
@@ -398,13 +398,15 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
     }
 
     @Override
-    public TaPerson newPersonByOpenid(String openid) {
+    public TaPerson newPersonByOpenid(String openid,Integer orgId) {
         List<TaPerson> taPersons = getPersonsByOpenId(openid);
         if (null == taPersons || taPersons.size() != 1) {
             TaPerson taPerson = new TaPerson();
             taPerson.setMiniOpenid(openid);
             taPerson.setNickname("匿名用户");
+            taPerson.setOrgId(orgId);
             taPerson.setAvatarurl(CommConstant.MINIAPP_DEFAULT_AVATAR);
+            taPerson.setPersonType(CommConstant.PERSON_ESTATE_DRIFT);
             taPerson.setStatus(CommConstant.STATUS_NORMAL);
             taPerson.setCreateDate(LocalDateTime.now());
             if (taPersonMapper.insert(taPerson) > 0) {

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

@@ -140,7 +140,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     }
 
     @Override
-    public ResponseBean recommendCust(String paramStr, String openid) {
+    public ResponseBean recommendCust(String paramStr, String openid,Integer orgId) {
         JSONObject params = JSONObject.parseObject(paramStr);
         if (null == params) {
             return ResponseBean.error("解析参数失败", ResponseBean.ERROR_ILLEGAL_PARAMS);
@@ -159,6 +159,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         TaRecommendCustomer taRecommendCustomer = new TaRecommendCustomer();
 
         taRecommendCustomer.setName(params.getString("name"));
+        taRecommendCustomer.setOrgId(orgId);
         taRecommendCustomer.setPicture(params.getString("picture"));
         taRecommendCustomer.setPhone(params.getString("phone"));
         taRecommendCustomer.setSex(params.getInteger("sex"));
@@ -186,8 +187,9 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 
 
         String status = params.getString("status");
-        if (null == status) status = "1";
-        taRecommendCustomer.setStatus(status);
+        int statusInt = 0;
+        if (null == status) statusInt = Integer.parseInt(status);
+        taRecommendCustomer.setStatus(statusInt);
         taRecommendCustomer.setRecommendPerson(taPerson.getPersonId());
 
         // 报备有 10 天有效期
@@ -218,7 +220,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 
 
     @Override
-    public ResponseBean reportCust(String paramStr, String openid) {
+    public ResponseBean reportCust(String paramStr, String openid,Integer orgId) {
         JSONObject params = JSONObject.parseObject(paramStr);
         if (null == params) {
             return ResponseBean.error("解析参数失败", ResponseBean.ERROR_ILLEGAL_PARAMS);
@@ -235,7 +237,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 //        }
 
         TaRecommendCustomer taRecommendCustomer = new TaRecommendCustomer();
-
+        taRecommendCustomer.setOrgId(orgId);
         taRecommendCustomer.setName(taPerson.getNickname());
         taRecommendCustomer.setPicture(taPerson.getAvatarurl());
         taRecommendCustomer.setPhone(params.getString("phone"));
@@ -243,7 +245,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 //        taRecommendCustomer.setDescribe(params.getString("describe"));
         taRecommendCustomer.setRealtyConsultant(params.getString("realtyConsultant"));
         taRecommendCustomer.setBuildingId(params.getString("buildingId"));
-        taRecommendCustomer.setReportRecommendStatus(CommConstant.REPORTED);
+        taRecommendCustomer.setReportRecommendStatus(CommConstant.READY);
         taRecommendCustomer.setCreateDate(LocalDateTime.now());
         taRecommendCustomer.setReportDate(LocalDateTime.now());
 
@@ -260,8 +262,8 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 //        taRecommendCustomer.setDemandType(params.getString("demandType"));
 //        taRecommendCustomer.setPriceRange(params.getString("priceRange"));
         taRecommendCustomer.setEntryType(CommConstant.ENTRY_VERIFY);
-        taRecommendCustomer.setVerifyStatus(CommConstant.VERIFY_AGREE);
-        taRecommendCustomer.setStatus(CommConstant.STATUS_NORMAL + "");
+        taRecommendCustomer.setVerifyStatus(CommConstant.READY);
+        taRecommendCustomer.setStatus(CommConstant.CUSTOMER_REPORT);
 
 
 //        String status = params.getString("status");

src/main/resources/mapper/TaPersonMapper.xml

@@ -17,6 +17,7 @@
         WHERE
             t.person_type = #{personType}
         AND t.status = #{status}
+        and t.org_id = #{orgId}
         <if test="buildingId != null and buildingId != ''">
             and p.building_id = #{buildingId}
         </if>