Merge branch 'v3' of http://git.ycjcjy.com/zhiyuxing/estateagents into v3

src/main/java/com/huiju/estateagents/base/BaseController.java

@@ -25,7 +25,26 @@ public class BaseController {
 		
 		return null;
 	}
-	
+
+	public String getOpenId(HttpServletRequest request){
+
+		Map map = JWTUtils.getUserIdAndOrgId(request);
+		if (null != map && null != map.get("openId")){
+			return map.get("openId").toString();
+		}
+
+		return null;
+	}
+
+	public String getPersonId(HttpServletRequest request){
+
+		Map map = JWTUtils.getUserIdAndOrgId(request);
+		if (null != map && null != map.get("personId")){
+			return map.get("personId").toString();
+		}
+
+		return null;
+	}
 	/**
 	 * 获取orgId
 	 * @param request

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

@@ -6,6 +6,7 @@ import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
 import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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;
@@ -32,7 +33,7 @@ import java.util.Map;
 
 @RestController
 @RequestMapping("/api/wx")
-public class MiniAppController {
+public class MiniAppController extends BaseController {
     @Autowired
     private ITaPersonService taPersonService;
 
@@ -51,6 +52,9 @@ public class MiniAppController {
     @Autowired
     private ISysTokenService sysTokenService;
 
+    @Autowired
+    private ITaMiniappService taMiniappService;
+
 
 
 
@@ -85,14 +89,14 @@ public class MiniAppController {
         }
 
         try {
-
+            TaMiniapp miniapp = taMiniappService.getById(appid);
             WxMaJscode2SessionResult session = miniAppService.getSessionInfo(code, appid);
-            Integer orgId =getOrgId(request);
+            Integer orgId =miniapp.getOrgId();
             Map<String, String> miniResp = new HashMap<>();
             miniResp.put("openid", session.getOpenid());
             miniResp.put("sessionKey", session.getSessionKey());
             miniResp.put("unionid", session.getUnionid());
-            miniResp.put("token", JWTUtils.newToken(session.getOpenid()));
+
             //如果是分享进来且没有进入过小程序，给分享人发放积分
             QueryWrapper<TaPerson> personQueryWrapper = new QueryWrapper<>();
             personQueryWrapper.eq("mini_openid",session.getOpenid());
@@ -107,6 +111,11 @@ public class MiniAppController {
             if (null == taPerson) {
                 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);
             }
@@ -153,7 +162,7 @@ public class MiniAppController {
      */
     @PostMapping("/logout")
     public ResponseBean logout(HttpServletRequest request) {
-        String openid = JWTUtils.getSubject(request);
+        String openid = getOpenId(request);
         List<TaPerson> persons = taPersonService.getPersonsByOpenId(openid);
         if (null == persons || persons.size() == 0) {
             return ResponseBean.success("");
@@ -172,7 +181,7 @@ public class MiniAppController {
         TaPerson person = null;
 
         if (null == paramStr || "".equals(paramStr.trim()) || "{}".equals(paramStr.trim())) {
-            String openid = JWTUtils.getSubject(request);
+            String openid = getOpenId(request);
             List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
             if (null == taPersons || taPersons.size() != 1) {
                 return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
@@ -236,7 +245,7 @@ public class MiniAppController {
         WxMaPhoneNumberInfo phoneNoInfo = miniAppService.getPhoneNoInfo(sessionKey, encryptedData, iv, appid);
 
         // 更新用户绑定手机
-        String openid = JWTUtils.getSubject(request);
+        String openid = getOpenId(request);
         Integer orgId = getOrgId(request);
         taPersonService.updatePersonPhone(openid, phoneNoInfo.getPhoneNumber(),orgId);
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);

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

@@ -207,7 +207,7 @@ public class TaBuildingController extends BaseController {
         Integer orgId = getOrgId(request);
         List<String> targets = null;
         if (null != mine && mine) {
-            String openid = JWTUtils.getSubject(request);
+            String openid = getOpenId(request);
             List<TaPerson> persons = iTaPersonService.getPersonsByOpenId(openid);
             if (null == persons || persons.size() == 0) {
                 return ResponseBean.error("当前账户信息异常, 清除缓存重试", ResponseBean.ERROR_UNAVAILABLE);
@@ -272,7 +272,7 @@ public class TaBuildingController extends BaseController {
      */
     @RequestMapping(value = "/wx/buildingSelectId/{id}", method = RequestMethod.GET)
     public ResponseBean wxBuildingSelectId(@PathVariable(value = "id") String id,HttpServletRequest request){
-        String openid = JWTUtils.getSubject(request);
+        String openid = getOpenId(request);
         List<TaPerson> persons = iTaPersonService.getPersonsByOpenId(openid);
         if (null == persons || persons.size() == 0) {
             return ResponseBean.error("当前账户信息异常, 清除缓存重试", ResponseBean.ERROR_UNAVAILABLE);

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

@@ -102,7 +102,7 @@ public class TaBuildingDynamicController extends BaseController {
                                                @RequestParam(defaultValue = "false" )boolean mine,
                                                @RequestParam(value = "cityId", required = false)Integer cityId,
                                                HttpServletRequest request){
-        String openid = JWTUtils.getSubject(request);
+        String openid = getOpenId(request);
         Integer orgId = getOrgId(request);
         ResponseBean  responseBean = new ResponseBean();
         if(mine){
@@ -131,7 +131,7 @@ public class TaBuildingDynamicController extends BaseController {
                                                @RequestParam(value = "pageNum",defaultValue = "1")Integer pageNum,
                                                @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize,
                                                HttpServletRequest request){
-        String openid = JWTUtils.getSubject(request);
+        String openid = getOpenId(request);
         ResponseBean  responseBean = new ResponseBean();
             List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
             if (null == taPersons || taPersons.size() != 1) {
@@ -171,7 +171,7 @@ public class TaBuildingDynamicController extends BaseController {
     @RequestMapping(value = "/wx/buildingDynamiceInfo/{dynamicId}", method = RequestMethod.GET)
     public ResponseBean iBuildingDynamicInfo(@PathVariable(value = "dynamicId") String dynamicId,
                                              HttpServletRequest request){
-        String openid = JWTUtils.getSubject(request);
+        String openid = getOpenId(request);
         String buildingId = "";
         ResponseBean  responseBean = iBuildingDynamicService.getWxBuildingDynamiceInfo(dynamicId,buildingId,openid);
         return responseBean;
@@ -186,13 +186,15 @@ public class TaBuildingDynamicController extends BaseController {
     @RequestMapping(value = "/wx/activityDynamicEnlistAdd", method = RequestMethod.POST)
     public ResponseBean taActivityDynamicEnlist(@RequestBody TaActivityDynamicEnlist taActivityDynamicEnlist,
                                                 HttpServletRequest request){
-        String openid = JWTUtils.getSubject(request);
+        String openid = getOpenId(request);
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
         if (null == taPersons || taPersons.size() != 1) {
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
         }
         TaPerson person = taPersons.get(0);
+        Integer orgId = getOrgId(request);
         taActivityDynamicEnlist.setPersonId(person.getPersonId());
+        taActivityDynamicEnlist.setOrgId(orgId);
         ResponseBean  responseBean = iBuildingDynamicService.taActivityDynamicEnlistAdd(taActivityDynamicEnlist);
         return responseBean;
     }

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

@@ -39,7 +39,7 @@ public class TaChatController extends BaseController {
     @GetMapping("/wx/chat/history")
     public ResponseBean getChatHistory(@RequestParam String chatWith, @RequestParam int pageNumber, @RequestParam int pageSize, HttpServletRequest request) {
         // 消息发送人
-        String openid = JWTUtils.getSubject(request);
+        String openid = getOpenId(request);
 
         return taChatService.getChatHistory(openid, chatWith, pageNumber, pageSize);
     }
@@ -52,7 +52,7 @@ public class TaChatController extends BaseController {
     @GetMapping("/wx/chat/with")
     public ResponseBean getChatWithList( @RequestParam int pageNumber, @RequestParam int pageSize, HttpServletRequest request) {
         // 当前人员
-        String openid = JWTUtils.getSubject(request);
+        String openid = getOpenId(request);
 
         return taChatService.getChatWithList(openid, pageNumber, pageSize);
     }
@@ -65,7 +65,7 @@ public class TaChatController extends BaseController {
     @PutMapping("/wx/chat/message")
     public ResponseBean updateMessageReaded(HttpServletRequest request) {
         // 当前人员
-        String openid = JWTUtils.getSubject(request);
+        String openid = getOpenId(request);
         return taChatService.updateMessageReadedOf(openid);
     }
 }

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

@@ -97,7 +97,7 @@ public class TaCheckinController extends BaseController {
      */
     @RequestMapping(value="/wx/taCheckin/activity/{activity}",method= RequestMethod.POST)
     public ResponseBean taCheckinAdd(@PathVariable String activity, HttpServletRequest request){
-        String openid = JWTUtils.getSubject(request);
+        String openid = getOpenId(request);
         List<TaPerson> taPersons = iTaPersonService.getPersonsByOpenId(openid);
         if (null == taPersons || taPersons.size() != 1) {
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
@@ -131,7 +131,7 @@ public class TaCheckinController extends BaseController {
 
     @GetMapping("/wx/taCheckin/activity/{activityId}/isChecked")
     public ResponseBean isChecked(@PathVariable String activityId, HttpServletRequest request) {
-        String openid = JWTUtils.getSubject(request);
+        String openid = getOpenId(request);
         List<TaPerson> taPersons = iTaPersonService.getPersonsByOpenId(openid);
         if (null == taPersons || taPersons.size() != 1) {
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);

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

@@ -170,7 +170,7 @@ public class TaCustomerMessageController extends BaseController {
     public ResponseBean wxCustomerMessageAdd(@RequestBody TaCustomerMessage taCustomerMessage, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
-            String openid = JWTUtils.getSubject(request);
+            String openid = getOpenId(request);
             TaPerson taPersons = taPersonService.getPersonsByOpenId(openid).get(0);
             taCustomerMessage.setStatus(CommConstant.STATUS_UNACCALIMED);
             taCustomerMessage.setCreateDate(LocalDateTime.now());

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

@@ -35,7 +35,7 @@ public class TaFavorController extends BaseController {
      */
     @PostMapping("/wx/{typeOf}/like/{id}")
     public ResponseBean giveFavor(@PathVariable String typeOf, @PathVariable String id, HttpServletRequest request) {
-        String openid = JWTUtils.getSubject(request);
+        String openid = getOpenId(request);
 
         return taFavorService.postLike(openid, typeOf, id);
     }
@@ -49,7 +49,7 @@ public class TaFavorController extends BaseController {
      */
     @DeleteMapping("/wx/{typeOf}/like/{id}")
     public ResponseBean cancelFavor(@PathVariable String typeOf, @PathVariable String id, HttpServletRequest request) {
-        String openid = JWTUtils.getSubject(request);
+        String openid = getOpenId(request);
         return taFavorService.cancelLike(openid, typeOf, id);
     }
 }

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

@@ -221,7 +221,7 @@ public class TaGoodsController extends BaseController {
                                     @RequestParam(value = "buildingId",required = false) String buildingId,
                                     HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
-        String openid = JWTUtils.getSubject(request);
+        String openid = getOpenId(request);
         Integer orgId = getOrgId(request);
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
         if (null == taPersons || taPersons.size() != 1) {
@@ -283,7 +283,7 @@ public class TaGoodsController extends BaseController {
     public ResponseBean wxExchangeGoods(@PathVariable Integer id, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
-            String openid = JWTUtils.getSubject(request);
+            String openid = getOpenId(request);
             //兑换商品
             String state = iTaGoodsService.exchangeGoods(id,openid);
             if (state.equals(CommConstant.SUCCESS)){

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

@@ -18,7 +18,7 @@ public class TaMiniFormidsController extends BaseController {
 
     @PostMapping("/formid")
     public ResponseBean save(@RequestBody String paramStr, HttpServletRequest request) {
-        String openid = JWTUtils.getSubject(request);
+        String openid = getOpenId(request);
 
         return taMiniFormidsService.saveFormidBy(openid, paramStr);
     }

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

@@ -90,7 +90,7 @@ public class TaNewsController extends BaseController {
         List<String> targets = new ArrayList<>();
         Integer orgId = getOrgId(request);
         if (null != mine && mine) {
-            String openid = JWTUtils.getSubject(request);
+            String openid = getOpenId(request);
             List<TaPerson> persons = iTaPersonService.getPersonsByOpenId(openid);
             if (null == persons || persons.size() == 0) {
                 return ResponseBean.error("当前账户信息异常, 清除缓存重试", ResponseBean.ERROR_UNAVAILABLE);
@@ -162,7 +162,7 @@ public class TaNewsController extends BaseController {
      */
     @RequestMapping(value="/wx/taNews/{id}",method= RequestMethod.GET)
     public ResponseBean wxTaNewsGet(@PathVariable Integer id,HttpServletRequest request){
-        String openid = JWTUtils.getSubject(request);
+        String openid = getOpenId(request);
         List<TaPerson> persons = iTaPersonService.getPersonsByOpenId(openid);
         if (null == persons || persons.size() == 0) {
             return ResponseBean.error("当前账户信息异常, 清除缓存重试", ResponseBean.ERROR_UNAVAILABLE);

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

@@ -77,7 +77,7 @@ public class TaPersonController extends BaseController {
         }
         Integer orgId = getOrgId(request);
         if (mine){
-            String openid = JWTUtils.getSubject(request);
+            String openid = getOpenId(request);
             List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
             if (null == taPersons || taPersons.size() != 1) {
                 return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
@@ -100,7 +100,7 @@ public class TaPersonController extends BaseController {
             responseBean.addError("验证码错误。");
         }
         Integer orgId =getOrgId(request);
-        String openid = JWTUtils.getSubject(request);
+        String openid = getOpenId(request);
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
         if (null == taPersons || taPersons.size() != 1) {
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
@@ -135,7 +135,7 @@ public class TaPersonController extends BaseController {
     public ResponseBean registerAgent(@RequestParam(required = false) String recommendAgentCode, @RequestParam(required = false) String channelCode,HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         Integer orgId =getOrgId(request);
-        String openid = JWTUtils.getSubject(request);
+        String openid = getOpenId(request);
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
         if (null == taPersons || taPersons.size() != 1) {
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
@@ -189,7 +189,7 @@ public class TaPersonController extends BaseController {
         JSONObject params = JSONObject.parseObject(paramStr);
         String phone = (String) params.get("phone");
         String pass = (String) params.get("pass");
-        String openid = JWTUtils.getSubject(request);
+        String openid = getOpenId(request);
 
         if (isEmpty(phone) || isEmpty(pass)) {
             return ResponseBean.error("参数不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
@@ -215,7 +215,7 @@ public class TaPersonController extends BaseController {
         if (isEmpty(id)) {
             return ResponseBean.error("参数不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
-        String openid = JWTUtils.getSubject(request);
+        String openid = getOpenId(request);
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
         if (null == taPersons || taPersons.size() != 1) {
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
@@ -278,7 +278,7 @@ public class TaPersonController extends BaseController {
         }
 
         // 当前人员
-        String openid = JWTUtils.getSubject(request);
+        String openid = getOpenId(request);
 
         return taPersonService.resgiteAgent(name, phone, sex, explain, openid);
     }
@@ -308,7 +308,7 @@ public class TaPersonController extends BaseController {
      */
     @GetMapping("/wx/user/info")
     public ResponseBean getUserInfo(HttpServletRequest request) {
-        String openid = JWTUtils.getSubject(request);
+        String openid = getOpenId(request);
 
         return taPersonService.getWxUser(openid);
     }
@@ -320,7 +320,7 @@ public class TaPersonController extends BaseController {
      */
     @PostMapping("/wx/user/signin")
     public ResponseBean userSign(HttpServletRequest request) {
-        String openid = JWTUtils.getSubject(request);
+        String openid = getOpenId(request);
 
         return taPersonService.getWxUserSign(openid);
     }
@@ -378,7 +378,7 @@ public class TaPersonController extends BaseController {
      */
     @GetMapping("/admin/user/current")
     public ResponseBean getCurrentPerson(HttpServletRequest request) {
-        String personId = JWTUtils.getSubject(request);
+        String personId = getPersonId(request);
         TaPerson taPerson = taPersonService.getById(personId);
         if (null == taPerson || taPerson.getStatus() != CommConstant.STATUS_NORMAL) {
             return ResponseBean.error("用户状态异常", ResponseBean.ERROR_AUTH_EXPIRED);
@@ -433,7 +433,7 @@ public class TaPersonController extends BaseController {
     @PutMapping("/wx/editPerson")
     public ResponseBean editWxConsultant(@RequestParam(required = false)String name,@RequestParam(required = false)String avatar,@RequestParam(required = false)String phone,HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
-        String openid = JWTUtils.getSubject(request);
+        String openid = getOpenId(request);
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
         if (null == taPersons || taPersons.size() != 1) {
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
@@ -473,7 +473,7 @@ public class TaPersonController extends BaseController {
 //    @GetMapping("/wx/savedPerson")
 //    public ResponseBean getSavedConsaultants(@RequestParam(defaultValue = "1") int pageNumber,
 //                                    @RequestParam(defaultValue = "10") int pageSize,HttpServletRequest request) {
-//        String openid = JWTUtils.getSubject(request);
+//        String openid = getOpenId(request);
 //        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
 //        if (null == taPersons || taPersons.size() != 1) {
 //            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
@@ -499,7 +499,7 @@ public class TaPersonController extends BaseController {
     @RequestMapping(value="/wx/customer/recommend/becomeChannel",method= RequestMethod.PUT)
     public ResponseBean taRecommendAgentBecomeChannel(@RequestParam(required = false) String channelCode,HttpServletRequest request,@RequestParam("personType")String personType){
         ResponseBean responseBean = new ResponseBean();
-        String openid = JWTUtils.getSubject(request);
+        String openid = getOpenId(request);
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
         if (null == taPersons || taPersons.size() != 1) {
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
@@ -556,7 +556,7 @@ public class TaPersonController extends BaseController {
     @GetMapping("/wx/agent/recommend/mine")
     public ResponseBean getAgentIRecommend(@RequestParam(defaultValue = "1") int pageNum,
                                            @RequestParam(defaultValue = "10") int pageSize, HttpServletRequest request) {
-        String openid = JWTUtils.getSubject(request);
+        String openid = getOpenId(request);
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
         if (null == taPersons || taPersons.size() != 1) {
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
@@ -583,7 +583,7 @@ public class TaPersonController extends BaseController {
      */
     @GetMapping("/wx/user/current")
     public ResponseBean getWxCurrentPerson(HttpServletRequest request) {
-        String personId = JWTUtils.getSubject(request);
+        String personId = getPersonId(request);
         TaPerson taPerson = taPersonService.getById(personId);
         if (null == taPerson || taPerson.getStatus() != CommConstant.STATUS_NORMAL) {
             return ResponseBean.error("用户状态异常", ResponseBean.ERROR_AUTH_EXPIRED);
@@ -602,7 +602,7 @@ public class TaPersonController extends BaseController {
     @PutMapping("/wx/person/city")
     public ResponseBean updatePersonCity(@RequestBody String params, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
-        String openid = JWTUtils.getSubject(request);
+        String openid = getOpenId(request);
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
         if (null == taPersons || taPersons.size() != 1) {
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);

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

@@ -80,7 +80,7 @@ public class TaPersonVisitRecordController extends BaseController {
      */
     @RequestMapping(value="/wx/taPersonVisitRecord",method= RequestMethod.POST)
     public ResponseBean taPersonVisitRecordAdd(@RequestBody TaPersonVisitRecord taPersonVisitRecord, HttpServletRequest request){
-        String openid = JWTUtils.getSubject(request);
+        String openid = getOpenId(request);
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
         if (null == taPersons || taPersons.size() != 1) {
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);

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

@@ -91,7 +91,7 @@ public class TaPointsRecordsController extends BaseController {
                                               HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
-            String openid = JWTUtils.getSubject(request);
+            String openid = getOpenId(request);
             Integer orgId = getOrgId(request);
             List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
             if (null == taPersons || taPersons.size() != 1) {
@@ -231,7 +231,7 @@ public class TaPointsRecordsController extends BaseController {
 //                                            HttpServletRequest request){
 //        ResponseBean responseBean = new ResponseBean();
 //        try {
-//            String openid = JWTUtils.getSubject(request);
+//            String openid = getOpenId(request);
 //            TaPerson taPerson = taPersonService.getPersonsByOpenId(openid).get(0);
 //            //使用分页插件
 //            IPage<TaPointsRecords> pg = new Page<>(pageNum, pageSize);

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

@@ -117,7 +117,7 @@ public class TaPolicyController extends BaseController {
 
             if(taPolicy.getPublishStatus().equals(CommConstant.IS_PUBLISH)){
                 taPolicy.setPublishDate(LocalDateTime.now());
-                String personId = JWTUtils.getSubject(request);
+                String personId = getPersonId(request);
                 taPolicy.setPublishUser(personId);
             }
 
@@ -179,7 +179,7 @@ public class TaPolicyController extends BaseController {
 
             if(taPolicy.getPublishStatus().equals(CommConstant.IS_PUBLISH)){
                 taPolicy.setPublishDate(LocalDateTime.now());
-                String personId = JWTUtils.getSubject(request);
+                String personId = getPersonId(request);
                 taPolicy.setPublishUser(personId);
             }
 

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

@@ -79,7 +79,7 @@ public class TaRecommendCustomerController extends BaseController {
             return ResponseBean.error("分页参数不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
 
-        String openid = JWTUtils.getSubject(request);
+        String openid = getOpenId(request);
         return taRecommendCustomerService.getMyCustList(openid, keywords, pageNumber, pageSize);
     }
 
@@ -115,7 +115,7 @@ public class TaRecommendCustomerController extends BaseController {
      */
     @PostMapping("/wx/customer/new")
     public ResponseBean recommendCust(@RequestBody String paramStr, HttpServletRequest request) {
-        String openid = JWTUtils.getSubject(request);
+        String openid = getOpenId(request);
         Integer orgId = getOrgId(request);
         return taRecommendCustomerService.recommendCust(paramStr, openid,orgId);
     }
@@ -128,7 +128,7 @@ public class TaRecommendCustomerController extends BaseController {
      */
     @PostMapping("/wx/customer/report")
     public ResponseBean reportCust(@RequestBody String paramStr, HttpServletRequest request) {
-        String openid = JWTUtils.getSubject(request);
+        String openid = getOpenId(request);
         Integer orgId = getOrgId(request);
         return taRecommendCustomerService.reportCust(paramStr, openid,orgId);
     }
@@ -138,7 +138,7 @@ public class TaRecommendCustomerController extends BaseController {
                                                   @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                                   @RequestParam(value ="buildingId") String buildingId,
                                                   HttpServletRequest request){
-        String openid = JWTUtils.getSubject(request);
+        String openid = getOpenId(request);
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
         if (null == taPersons || taPersons.size() != 1) {
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
@@ -156,7 +156,7 @@ public class TaRecommendCustomerController extends BaseController {
     public ResponseBean getCustomerIReport (HttpServletRequest request,
                                          @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
-        String openid = JWTUtils.getSubject(request);
+        String openid = getOpenId(request);
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
         if (null == taPersons || taPersons.size() != 1) {
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
@@ -181,7 +181,7 @@ public class TaRecommendCustomerController extends BaseController {
     public ResponseBean getMyCustomer (     @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
                                             @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                             HttpServletRequest request){
-        String openid = JWTUtils.getSubject(request);
+        String openid = getOpenId(request);
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
         if (null == taPersons || taPersons.size() != 1) {
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
@@ -192,7 +192,7 @@ public class TaRecommendCustomerController extends BaseController {
             IPage<TaRecommendCustomer>pg = new Page<>(pageNumber,pageSize);
             QueryWrapper<TaRecommendCustomer>queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("realty_consultant",person.getPersonId());
-            queryWrapper.eq("report_recommend_status",CommConstant.REPORTED);
+           // queryWrapper.eq("report_recommend_status",CommConstant.REPORTED);
             queryWrapper.gt("status",CommConstant.CUSTOMER_REPORT);
             queryWrapper.orderByDesc("create_date");
             IPage<TaRecommendCustomer>result = taRecommendCustomerService.page(pg,queryWrapper);
@@ -326,7 +326,7 @@ public class TaRecommendCustomerController extends BaseController {
     @GetMapping("/wx/customer/recommend/mine")
     public ResponseBean getWxCustomersIRecommended (@RequestParam int pageNumber, @RequestParam int pageSize,HttpServletRequest request){
         Integer orgId =getOrgId(request);
-        String openid = JWTUtils.getSubject(request);
+        String openid = getOpenId(request);
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
         if (null == taPersons || taPersons.size() != 1) {
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);

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

@@ -34,7 +34,7 @@ public class TaSaveController extends BaseController {
      */
     @PostMapping("/wx/{typeOf}/save/{id}")
     public ResponseBean giveFavor(@PathVariable String typeOf, @PathVariable String id, HttpServletRequest request) {
-        String openid = JWTUtils.getSubject(request);
+        String openid = getOpenId(request);
 
         return iTaSaveService.postLike(openid, typeOf, id);
     }
@@ -48,7 +48,7 @@ public class TaSaveController extends BaseController {
      */
     @DeleteMapping("/wx/{typeOf}/save/{id}")
     public ResponseBean cancelFavor(@PathVariable String typeOf, @PathVariable String id, HttpServletRequest request) {
-        String openid = JWTUtils.getSubject(request);
+        String openid = getOpenId(request);
         return iTaSaveService.cancelLike(openid, typeOf, id);
     }
 

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

@@ -27,7 +27,7 @@ public class TaShareController extends BaseController {
 
     @PostMapping("/wx/{typeOf}/share/{id}")
     public ResponseBean save(@PathVariable String typeOf, @PathVariable String id, HttpServletRequest request) {
-        String openid = JWTUtils.getSubject(request);
+        String openid = getOpenId(request);
         return taShareService.saveData(openid, typeOf, id);
     }
 
@@ -48,7 +48,7 @@ public class TaShareController extends BaseController {
      */
     @PutMapping("/wx/{typeOf}/share/{id}")
     public ResponseBean makeSure(@PathVariable String typeOf, @PathVariable String id, HttpServletRequest request) {
-        String openid = JWTUtils.getSubject(request);
+        String openid = getOpenId(request);
         taShareService.makeSure(openid, typeOf, id);
         return ResponseBean.success("");
     }

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

@@ -29,7 +29,7 @@ public class TaUvController extends BaseController {
 
     @PostMapping("/wx/{typeOf}/hot/{id}")
     public ResponseBean save(@PathVariable String typeOf, @PathVariable String id, HttpServletRequest request) {
-        String openid = JWTUtils.getSubject(request);
+        String openid = getOpenId(request);
         return taUvService.saveData(openid, typeOf, id);
     }
 

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

@@ -50,4 +50,6 @@ public class TaActivityDynamicEnlist implements Serializable {
      */
     private String phone;
 
+    private Integer orgId;
+
 }