胡轶钦 5 år sedan
förälder
incheckning
cd7f744cd6
21 ändrade filer med 93 tillägg och 61 borttagningar
  1. 20
    1
      src/main/java/com/huiju/estateagents/base/BaseController.java
  2. 16
    7
      src/main/java/com/huiju/estateagents/controller/MiniAppController.java
  3. 2
    2
      src/main/java/com/huiju/estateagents/controller/TaBuildingController.java
  4. 6
    4
      src/main/java/com/huiju/estateagents/controller/TaBuildingDynamicController.java
  5. 3
    3
      src/main/java/com/huiju/estateagents/controller/TaChatController.java
  6. 2
    2
      src/main/java/com/huiju/estateagents/controller/TaCheckinController.java
  7. 1
    1
      src/main/java/com/huiju/estateagents/controller/TaCustomerMessageController.java
  8. 2
    2
      src/main/java/com/huiju/estateagents/controller/TaFavorController.java
  9. 2
    2
      src/main/java/com/huiju/estateagents/controller/TaGoodsController.java
  10. 1
    1
      src/main/java/com/huiju/estateagents/controller/TaMiniFormidsController.java
  11. 2
    2
      src/main/java/com/huiju/estateagents/controller/TaNewsController.java
  12. 15
    15
      src/main/java/com/huiju/estateagents/controller/TaPersonController.java
  13. 1
    1
      src/main/java/com/huiju/estateagents/controller/TaPersonVisitRecordController.java
  14. 2
    2
      src/main/java/com/huiju/estateagents/controller/TaPointsRecordsController.java
  15. 2
    2
      src/main/java/com/huiju/estateagents/controller/TaPolicyController.java
  16. 8
    8
      src/main/java/com/huiju/estateagents/controller/TaRecommendCustomerController.java
  17. 2
    2
      src/main/java/com/huiju/estateagents/controller/TaSaveController.java
  18. 2
    2
      src/main/java/com/huiju/estateagents/controller/TaShareController.java
  19. 1
    1
      src/main/java/com/huiju/estateagents/controller/TaUvController.java
  20. 2
    0
      src/main/java/com/huiju/estateagents/entity/TaActivityDynamicEnlist.java
  21. 1
    1
      src/main/resources/application-dev.yml

+ 20
- 1
src/main/java/com/huiju/estateagents/base/BaseController.java Visa fil

25
 		
25
 		
26
 		return null;
26
 		return null;
27
 	}
27
 	}
28
-	
28
+
29
+	public String getOpenId(HttpServletRequest request){
30
+
31
+		Map map = JWTUtils.getUserIdAndOrgId(request);
32
+		if (null != map && null != map.get("openId")){
33
+			return map.get("openId").toString();
34
+		}
35
+
36
+		return null;
37
+	}
38
+
39
+	public String getPersonId(HttpServletRequest request){
40
+
41
+		Map map = JWTUtils.getUserIdAndOrgId(request);
42
+		if (null != map && null != map.get("personId")){
43
+			return map.get("personId").toString();
44
+		}
45
+
46
+		return null;
47
+	}
29
 	/**
48
 	/**
30
 	 * 获取orgId
49
 	 * 获取orgId
31
 	 * @param request
50
 	 * @param request

+ 16
- 7
src/main/java/com/huiju/estateagents/controller/MiniAppController.java Visa fil

6
 import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
6
 import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
7
 import com.alibaba.fastjson.JSONObject;
7
 import com.alibaba.fastjson.JSONObject;
8
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
8
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
9
+import com.huiju.estateagents.base.BaseController;
9
 import com.huiju.estateagents.base.ResponseBean;
10
 import com.huiju.estateagents.base.ResponseBean;
10
 import com.huiju.estateagents.center.sysUser.entity.SysToken;
11
 import com.huiju.estateagents.center.sysUser.entity.SysToken;
11
 import com.huiju.estateagents.center.sysUser.service.ISysTokenService;
12
 import com.huiju.estateagents.center.sysUser.service.ISysTokenService;
32
 
33
 
33
 @RestController
34
 @RestController
34
 @RequestMapping("/api/wx")
35
 @RequestMapping("/api/wx")
35
-public class MiniAppController {
36
+public class MiniAppController extends BaseController {
36
     @Autowired
37
     @Autowired
37
     private ITaPersonService taPersonService;
38
     private ITaPersonService taPersonService;
38
 
39
 
51
     @Autowired
52
     @Autowired
52
     private ISysTokenService sysTokenService;
53
     private ISysTokenService sysTokenService;
53
 
54
 
55
+    @Autowired
56
+    private ITaMiniappService taMiniappService;
57
+
54
 
58
 
55
 
59
 
56
 
60
 
85
         }
89
         }
86
 
90
 
87
         try {
91
         try {
88
-
92
+            TaMiniapp miniapp = taMiniappService.getById(appid);
89
             WxMaJscode2SessionResult session = miniAppService.getSessionInfo(code, appid);
93
             WxMaJscode2SessionResult session = miniAppService.getSessionInfo(code, appid);
90
-            Integer orgId =getOrgId(request);
94
+            Integer orgId =miniapp.getOrgId();
91
             Map<String, String> miniResp = new HashMap<>();
95
             Map<String, String> miniResp = new HashMap<>();
92
             miniResp.put("openid", session.getOpenid());
96
             miniResp.put("openid", session.getOpenid());
93
             miniResp.put("sessionKey", session.getSessionKey());
97
             miniResp.put("sessionKey", session.getSessionKey());
94
             miniResp.put("unionid", session.getUnionid());
98
             miniResp.put("unionid", session.getUnionid());
95
-            miniResp.put("token", JWTUtils.newToken(session.getOpenid()));
99
+
96
             //如果是分享进来且没有进入过小程序,给分享人发放积分
100
             //如果是分享进来且没有进入过小程序,给分享人发放积分
97
             QueryWrapper<TaPerson> personQueryWrapper = new QueryWrapper<>();
101
             QueryWrapper<TaPerson> personQueryWrapper = new QueryWrapper<>();
98
             personQueryWrapper.eq("mini_openid",session.getOpenid());
102
             personQueryWrapper.eq("mini_openid",session.getOpenid());
107
             if (null == taPerson) {
111
             if (null == taPerson) {
108
                 return ResponseBean.error("发生未知错误", ResponseBean.ERROR_UNAVAILABLE);
112
                 return ResponseBean.error("发生未知错误", ResponseBean.ERROR_UNAVAILABLE);
109
             }
113
             }
114
+            Map<Object,Object> map = new HashMap<>();
115
+            map.put("openId",session.getOpenid());
116
+            map.put("orgId",orgId);
117
+            map.put("personId",taPerson.getPersonId());
118
+            miniResp.put("token", JWTUtils.newTokenByMap(map));
110
             if(StringUtils.isEmpty(taPerson.getFromCode())){
119
             if(StringUtils.isEmpty(taPerson.getFromCode())){
111
                 taPerson.setFromCode(from);
120
                 taPerson.setFromCode(from);
112
             }
121
             }
153
      */
162
      */
154
     @PostMapping("/logout")
163
     @PostMapping("/logout")
155
     public ResponseBean logout(HttpServletRequest request) {
164
     public ResponseBean logout(HttpServletRequest request) {
156
-        String openid = JWTUtils.getSubject(request);
165
+        String openid = getOpenId(request);
157
         List<TaPerson> persons = taPersonService.getPersonsByOpenId(openid);
166
         List<TaPerson> persons = taPersonService.getPersonsByOpenId(openid);
158
         if (null == persons || persons.size() == 0) {
167
         if (null == persons || persons.size() == 0) {
159
             return ResponseBean.success("");
168
             return ResponseBean.success("");
172
         TaPerson person = null;
181
         TaPerson person = null;
173
 
182
 
174
         if (null == paramStr || "".equals(paramStr.trim()) || "{}".equals(paramStr.trim())) {
183
         if (null == paramStr || "".equals(paramStr.trim()) || "{}".equals(paramStr.trim())) {
175
-            String openid = JWTUtils.getSubject(request);
184
+            String openid = getOpenId(request);
176
             List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
185
             List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
177
             if (null == taPersons || taPersons.size() != 1) {
186
             if (null == taPersons || taPersons.size() != 1) {
178
                 return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
187
                 return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
236
         WxMaPhoneNumberInfo phoneNoInfo = miniAppService.getPhoneNoInfo(sessionKey, encryptedData, iv, appid);
245
         WxMaPhoneNumberInfo phoneNoInfo = miniAppService.getPhoneNoInfo(sessionKey, encryptedData, iv, appid);
237
 
246
 
238
         // 更新用户绑定手机
247
         // 更新用户绑定手机
239
-        String openid = JWTUtils.getSubject(request);
248
+        String openid = getOpenId(request);
240
         Integer orgId = getOrgId(request);
249
         Integer orgId = getOrgId(request);
241
         taPersonService.updatePersonPhone(openid, phoneNoInfo.getPhoneNumber(),orgId);
250
         taPersonService.updatePersonPhone(openid, phoneNoInfo.getPhoneNumber(),orgId);
242
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
251
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);

+ 2
- 2
src/main/java/com/huiju/estateagents/controller/TaBuildingController.java Visa fil

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

+ 6
- 4
src/main/java/com/huiju/estateagents/controller/TaBuildingDynamicController.java Visa fil

102
                                                @RequestParam(defaultValue = "false" )boolean mine,
102
                                                @RequestParam(defaultValue = "false" )boolean mine,
103
                                                @RequestParam(value = "cityId", required = false)Integer cityId,
103
                                                @RequestParam(value = "cityId", required = false)Integer cityId,
104
                                                HttpServletRequest request){
104
                                                HttpServletRequest request){
105
-        String openid = JWTUtils.getSubject(request);
105
+        String openid = getOpenId(request);
106
         Integer orgId = getOrgId(request);
106
         Integer orgId = getOrgId(request);
107
         ResponseBean  responseBean = new ResponseBean();
107
         ResponseBean  responseBean = new ResponseBean();
108
         if(mine){
108
         if(mine){
131
                                                @RequestParam(value = "pageNum",defaultValue = "1")Integer pageNum,
131
                                                @RequestParam(value = "pageNum",defaultValue = "1")Integer pageNum,
132
                                                @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize,
132
                                                @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize,
133
                                                HttpServletRequest request){
133
                                                HttpServletRequest request){
134
-        String openid = JWTUtils.getSubject(request);
134
+        String openid = getOpenId(request);
135
         ResponseBean  responseBean = new ResponseBean();
135
         ResponseBean  responseBean = new ResponseBean();
136
             List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
136
             List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
137
             if (null == taPersons || taPersons.size() != 1) {
137
             if (null == taPersons || taPersons.size() != 1) {
171
     @RequestMapping(value = "/wx/buildingDynamiceInfo/{dynamicId}", method = RequestMethod.GET)
171
     @RequestMapping(value = "/wx/buildingDynamiceInfo/{dynamicId}", method = RequestMethod.GET)
172
     public ResponseBean iBuildingDynamicInfo(@PathVariable(value = "dynamicId") String dynamicId,
172
     public ResponseBean iBuildingDynamicInfo(@PathVariable(value = "dynamicId") String dynamicId,
173
                                              HttpServletRequest request){
173
                                              HttpServletRequest request){
174
-        String openid = JWTUtils.getSubject(request);
174
+        String openid = getOpenId(request);
175
         String buildingId = "";
175
         String buildingId = "";
176
         ResponseBean  responseBean = iBuildingDynamicService.getWxBuildingDynamiceInfo(dynamicId,buildingId,openid);
176
         ResponseBean  responseBean = iBuildingDynamicService.getWxBuildingDynamiceInfo(dynamicId,buildingId,openid);
177
         return responseBean;
177
         return responseBean;
186
     @RequestMapping(value = "/wx/activityDynamicEnlistAdd", method = RequestMethod.POST)
186
     @RequestMapping(value = "/wx/activityDynamicEnlistAdd", method = RequestMethod.POST)
187
     public ResponseBean taActivityDynamicEnlist(@RequestBody TaActivityDynamicEnlist taActivityDynamicEnlist,
187
     public ResponseBean taActivityDynamicEnlist(@RequestBody TaActivityDynamicEnlist taActivityDynamicEnlist,
188
                                                 HttpServletRequest request){
188
                                                 HttpServletRequest request){
189
-        String openid = JWTUtils.getSubject(request);
189
+        String openid = getOpenId(request);
190
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
190
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
191
         if (null == taPersons || taPersons.size() != 1) {
191
         if (null == taPersons || taPersons.size() != 1) {
192
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
192
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
193
         }
193
         }
194
         TaPerson person = taPersons.get(0);
194
         TaPerson person = taPersons.get(0);
195
+        Integer orgId = getOrgId(request);
195
         taActivityDynamicEnlist.setPersonId(person.getPersonId());
196
         taActivityDynamicEnlist.setPersonId(person.getPersonId());
197
+        taActivityDynamicEnlist.setOrgId(orgId);
196
         ResponseBean  responseBean = iBuildingDynamicService.taActivityDynamicEnlistAdd(taActivityDynamicEnlist);
198
         ResponseBean  responseBean = iBuildingDynamicService.taActivityDynamicEnlistAdd(taActivityDynamicEnlist);
197
         return responseBean;
199
         return responseBean;
198
     }
200
     }

+ 3
- 3
src/main/java/com/huiju/estateagents/controller/TaChatController.java Visa fil

39
     @GetMapping("/wx/chat/history")
39
     @GetMapping("/wx/chat/history")
40
     public ResponseBean getChatHistory(@RequestParam String chatWith, @RequestParam int pageNumber, @RequestParam int pageSize, HttpServletRequest request) {
40
     public ResponseBean getChatHistory(@RequestParam String chatWith, @RequestParam int pageNumber, @RequestParam int pageSize, HttpServletRequest request) {
41
         // 消息发送人
41
         // 消息发送人
42
-        String openid = JWTUtils.getSubject(request);
42
+        String openid = getOpenId(request);
43
 
43
 
44
         return taChatService.getChatHistory(openid, chatWith, pageNumber, pageSize);
44
         return taChatService.getChatHistory(openid, chatWith, pageNumber, pageSize);
45
     }
45
     }
52
     @GetMapping("/wx/chat/with")
52
     @GetMapping("/wx/chat/with")
53
     public ResponseBean getChatWithList( @RequestParam int pageNumber, @RequestParam int pageSize, HttpServletRequest request) {
53
     public ResponseBean getChatWithList( @RequestParam int pageNumber, @RequestParam int pageSize, HttpServletRequest request) {
54
         // 当前人员
54
         // 当前人员
55
-        String openid = JWTUtils.getSubject(request);
55
+        String openid = getOpenId(request);
56
 
56
 
57
         return taChatService.getChatWithList(openid, pageNumber, pageSize);
57
         return taChatService.getChatWithList(openid, pageNumber, pageSize);
58
     }
58
     }
65
     @PutMapping("/wx/chat/message")
65
     @PutMapping("/wx/chat/message")
66
     public ResponseBean updateMessageReaded(HttpServletRequest request) {
66
     public ResponseBean updateMessageReaded(HttpServletRequest request) {
67
         // 当前人员
67
         // 当前人员
68
-        String openid = JWTUtils.getSubject(request);
68
+        String openid = getOpenId(request);
69
         return taChatService.updateMessageReadedOf(openid);
69
         return taChatService.updateMessageReadedOf(openid);
70
     }
70
     }
71
 }
71
 }

+ 2
- 2
src/main/java/com/huiju/estateagents/controller/TaCheckinController.java Visa fil

97
      */
97
      */
98
     @RequestMapping(value="/wx/taCheckin/activity/{activity}",method= RequestMethod.POST)
98
     @RequestMapping(value="/wx/taCheckin/activity/{activity}",method= RequestMethod.POST)
99
     public ResponseBean taCheckinAdd(@PathVariable String activity, HttpServletRequest request){
99
     public ResponseBean taCheckinAdd(@PathVariable String activity, HttpServletRequest request){
100
-        String openid = JWTUtils.getSubject(request);
100
+        String openid = getOpenId(request);
101
         List<TaPerson> taPersons = iTaPersonService.getPersonsByOpenId(openid);
101
         List<TaPerson> taPersons = iTaPersonService.getPersonsByOpenId(openid);
102
         if (null == taPersons || taPersons.size() != 1) {
102
         if (null == taPersons || taPersons.size() != 1) {
103
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
103
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
131
 
131
 
132
     @GetMapping("/wx/taCheckin/activity/{activityId}/isChecked")
132
     @GetMapping("/wx/taCheckin/activity/{activityId}/isChecked")
133
     public ResponseBean isChecked(@PathVariable String activityId, HttpServletRequest request) {
133
     public ResponseBean isChecked(@PathVariable String activityId, HttpServletRequest request) {
134
-        String openid = JWTUtils.getSubject(request);
134
+        String openid = getOpenId(request);
135
         List<TaPerson> taPersons = iTaPersonService.getPersonsByOpenId(openid);
135
         List<TaPerson> taPersons = iTaPersonService.getPersonsByOpenId(openid);
136
         if (null == taPersons || taPersons.size() != 1) {
136
         if (null == taPersons || taPersons.size() != 1) {
137
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
137
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);

+ 1
- 1
src/main/java/com/huiju/estateagents/controller/TaCustomerMessageController.java Visa fil

170
     public ResponseBean wxCustomerMessageAdd(@RequestBody TaCustomerMessage taCustomerMessage, HttpServletRequest request){
170
     public ResponseBean wxCustomerMessageAdd(@RequestBody TaCustomerMessage taCustomerMessage, HttpServletRequest request){
171
         ResponseBean responseBean = new ResponseBean();
171
         ResponseBean responseBean = new ResponseBean();
172
         try {
172
         try {
173
-            String openid = JWTUtils.getSubject(request);
173
+            String openid = getOpenId(request);
174
             TaPerson taPersons = taPersonService.getPersonsByOpenId(openid).get(0);
174
             TaPerson taPersons = taPersonService.getPersonsByOpenId(openid).get(0);
175
             taCustomerMessage.setStatus(CommConstant.STATUS_UNACCALIMED);
175
             taCustomerMessage.setStatus(CommConstant.STATUS_UNACCALIMED);
176
             taCustomerMessage.setCreateDate(LocalDateTime.now());
176
             taCustomerMessage.setCreateDate(LocalDateTime.now());

+ 2
- 2
src/main/java/com/huiju/estateagents/controller/TaFavorController.java Visa fil

35
      */
35
      */
36
     @PostMapping("/wx/{typeOf}/like/{id}")
36
     @PostMapping("/wx/{typeOf}/like/{id}")
37
     public ResponseBean giveFavor(@PathVariable String typeOf, @PathVariable String id, HttpServletRequest request) {
37
     public ResponseBean giveFavor(@PathVariable String typeOf, @PathVariable String id, HttpServletRequest request) {
38
-        String openid = JWTUtils.getSubject(request);
38
+        String openid = getOpenId(request);
39
 
39
 
40
         return taFavorService.postLike(openid, typeOf, id);
40
         return taFavorService.postLike(openid, typeOf, id);
41
     }
41
     }
49
      */
49
      */
50
     @DeleteMapping("/wx/{typeOf}/like/{id}")
50
     @DeleteMapping("/wx/{typeOf}/like/{id}")
51
     public ResponseBean cancelFavor(@PathVariable String typeOf, @PathVariable String id, HttpServletRequest request) {
51
     public ResponseBean cancelFavor(@PathVariable String typeOf, @PathVariable String id, HttpServletRequest request) {
52
-        String openid = JWTUtils.getSubject(request);
52
+        String openid = getOpenId(request);
53
         return taFavorService.cancelLike(openid, typeOf, id);
53
         return taFavorService.cancelLike(openid, typeOf, id);
54
     }
54
     }
55
 }
55
 }

+ 2
- 2
src/main/java/com/huiju/estateagents/controller/TaGoodsController.java Visa fil

221
                                     @RequestParam(value = "buildingId",required = false) String buildingId,
221
                                     @RequestParam(value = "buildingId",required = false) String buildingId,
222
                                     HttpServletRequest request){
222
                                     HttpServletRequest request){
223
         ResponseBean responseBean = new ResponseBean();
223
         ResponseBean responseBean = new ResponseBean();
224
-        String openid = JWTUtils.getSubject(request);
224
+        String openid = getOpenId(request);
225
         Integer orgId = getOrgId(request);
225
         Integer orgId = getOrgId(request);
226
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
226
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
227
         if (null == taPersons || taPersons.size() != 1) {
227
         if (null == taPersons || taPersons.size() != 1) {
283
     public ResponseBean wxExchangeGoods(@PathVariable Integer id, HttpServletRequest request){
283
     public ResponseBean wxExchangeGoods(@PathVariable Integer id, HttpServletRequest request){
284
         ResponseBean responseBean = new ResponseBean();
284
         ResponseBean responseBean = new ResponseBean();
285
         try {
285
         try {
286
-            String openid = JWTUtils.getSubject(request);
286
+            String openid = getOpenId(request);
287
             //兑换商品
287
             //兑换商品
288
             String state = iTaGoodsService.exchangeGoods(id,openid);
288
             String state = iTaGoodsService.exchangeGoods(id,openid);
289
             if (state.equals(CommConstant.SUCCESS)){
289
             if (state.equals(CommConstant.SUCCESS)){

+ 1
- 1
src/main/java/com/huiju/estateagents/controller/TaMiniFormidsController.java Visa fil

18
 
18
 
19
     @PostMapping("/formid")
19
     @PostMapping("/formid")
20
     public ResponseBean save(@RequestBody String paramStr, HttpServletRequest request) {
20
     public ResponseBean save(@RequestBody String paramStr, HttpServletRequest request) {
21
-        String openid = JWTUtils.getSubject(request);
21
+        String openid = getOpenId(request);
22
 
22
 
23
         return taMiniFormidsService.saveFormidBy(openid, paramStr);
23
         return taMiniFormidsService.saveFormidBy(openid, paramStr);
24
     }
24
     }

+ 2
- 2
src/main/java/com/huiju/estateagents/controller/TaNewsController.java Visa fil

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

+ 15
- 15
src/main/java/com/huiju/estateagents/controller/TaPersonController.java Visa fil

77
         }
77
         }
78
         Integer orgId = getOrgId(request);
78
         Integer orgId = getOrgId(request);
79
         if (mine){
79
         if (mine){
80
-            String openid = JWTUtils.getSubject(request);
80
+            String openid = getOpenId(request);
81
             List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
81
             List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
82
             if (null == taPersons || taPersons.size() != 1) {
82
             if (null == taPersons || taPersons.size() != 1) {
83
                 return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
83
                 return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
100
             responseBean.addError("验证码错误。");
100
             responseBean.addError("验证码错误。");
101
         }
101
         }
102
         Integer orgId =getOrgId(request);
102
         Integer orgId =getOrgId(request);
103
-        String openid = JWTUtils.getSubject(request);
103
+        String openid = getOpenId(request);
104
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
104
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
105
         if (null == taPersons || taPersons.size() != 1) {
105
         if (null == taPersons || taPersons.size() != 1) {
106
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
106
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
135
     public ResponseBean registerAgent(@RequestParam(required = false) String recommendAgentCode, @RequestParam(required = false) String channelCode,HttpServletRequest request) {
135
     public ResponseBean registerAgent(@RequestParam(required = false) String recommendAgentCode, @RequestParam(required = false) String channelCode,HttpServletRequest request) {
136
         ResponseBean responseBean = new ResponseBean();
136
         ResponseBean responseBean = new ResponseBean();
137
         Integer orgId =getOrgId(request);
137
         Integer orgId =getOrgId(request);
138
-        String openid = JWTUtils.getSubject(request);
138
+        String openid = getOpenId(request);
139
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
139
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
140
         if (null == taPersons || taPersons.size() != 1) {
140
         if (null == taPersons || taPersons.size() != 1) {
141
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
141
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
189
         JSONObject params = JSONObject.parseObject(paramStr);
189
         JSONObject params = JSONObject.parseObject(paramStr);
190
         String phone = (String) params.get("phone");
190
         String phone = (String) params.get("phone");
191
         String pass = (String) params.get("pass");
191
         String pass = (String) params.get("pass");
192
-        String openid = JWTUtils.getSubject(request);
192
+        String openid = getOpenId(request);
193
 
193
 
194
         if (isEmpty(phone) || isEmpty(pass)) {
194
         if (isEmpty(phone) || isEmpty(pass)) {
195
             return ResponseBean.error("参数不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
195
             return ResponseBean.error("参数不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
215
         if (isEmpty(id)) {
215
         if (isEmpty(id)) {
216
             return ResponseBean.error("参数不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
216
             return ResponseBean.error("参数不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
217
         }
217
         }
218
-        String openid = JWTUtils.getSubject(request);
218
+        String openid = getOpenId(request);
219
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
219
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
220
         if (null == taPersons || taPersons.size() != 1) {
220
         if (null == taPersons || taPersons.size() != 1) {
221
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
221
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
278
         }
278
         }
279
 
279
 
280
         // 当前人员
280
         // 当前人员
281
-        String openid = JWTUtils.getSubject(request);
281
+        String openid = getOpenId(request);
282
 
282
 
283
         return taPersonService.resgiteAgent(name, phone, sex, explain, openid);
283
         return taPersonService.resgiteAgent(name, phone, sex, explain, openid);
284
     }
284
     }
308
      */
308
      */
309
     @GetMapping("/wx/user/info")
309
     @GetMapping("/wx/user/info")
310
     public ResponseBean getUserInfo(HttpServletRequest request) {
310
     public ResponseBean getUserInfo(HttpServletRequest request) {
311
-        String openid = JWTUtils.getSubject(request);
311
+        String openid = getOpenId(request);
312
 
312
 
313
         return taPersonService.getWxUser(openid);
313
         return taPersonService.getWxUser(openid);
314
     }
314
     }
320
      */
320
      */
321
     @PostMapping("/wx/user/signin")
321
     @PostMapping("/wx/user/signin")
322
     public ResponseBean userSign(HttpServletRequest request) {
322
     public ResponseBean userSign(HttpServletRequest request) {
323
-        String openid = JWTUtils.getSubject(request);
323
+        String openid = getOpenId(request);
324
 
324
 
325
         return taPersonService.getWxUserSign(openid);
325
         return taPersonService.getWxUserSign(openid);
326
     }
326
     }
378
      */
378
      */
379
     @GetMapping("/admin/user/current")
379
     @GetMapping("/admin/user/current")
380
     public ResponseBean getCurrentPerson(HttpServletRequest request) {
380
     public ResponseBean getCurrentPerson(HttpServletRequest request) {
381
-        String personId = JWTUtils.getSubject(request);
381
+        String personId = getPersonId(request);
382
         TaPerson taPerson = taPersonService.getById(personId);
382
         TaPerson taPerson = taPersonService.getById(personId);
383
         if (null == taPerson || taPerson.getStatus() != CommConstant.STATUS_NORMAL) {
383
         if (null == taPerson || taPerson.getStatus() != CommConstant.STATUS_NORMAL) {
384
             return ResponseBean.error("用户状态异常", ResponseBean.ERROR_AUTH_EXPIRED);
384
             return ResponseBean.error("用户状态异常", ResponseBean.ERROR_AUTH_EXPIRED);
433
     @PutMapping("/wx/editPerson")
433
     @PutMapping("/wx/editPerson")
434
     public ResponseBean editWxConsultant(@RequestParam(required = false)String name,@RequestParam(required = false)String avatar,@RequestParam(required = false)String phone,HttpServletRequest request) {
434
     public ResponseBean editWxConsultant(@RequestParam(required = false)String name,@RequestParam(required = false)String avatar,@RequestParam(required = false)String phone,HttpServletRequest request) {
435
         ResponseBean responseBean = new ResponseBean();
435
         ResponseBean responseBean = new ResponseBean();
436
-        String openid = JWTUtils.getSubject(request);
436
+        String openid = getOpenId(request);
437
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
437
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
438
         if (null == taPersons || taPersons.size() != 1) {
438
         if (null == taPersons || taPersons.size() != 1) {
439
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
439
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
473
 //    @GetMapping("/wx/savedPerson")
473
 //    @GetMapping("/wx/savedPerson")
474
 //    public ResponseBean getSavedConsaultants(@RequestParam(defaultValue = "1") int pageNumber,
474
 //    public ResponseBean getSavedConsaultants(@RequestParam(defaultValue = "1") int pageNumber,
475
 //                                    @RequestParam(defaultValue = "10") int pageSize,HttpServletRequest request) {
475
 //                                    @RequestParam(defaultValue = "10") int pageSize,HttpServletRequest request) {
476
-//        String openid = JWTUtils.getSubject(request);
476
+//        String openid = getOpenId(request);
477
 //        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
477
 //        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
478
 //        if (null == taPersons || taPersons.size() != 1) {
478
 //        if (null == taPersons || taPersons.size() != 1) {
479
 //            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
479
 //            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
499
     @RequestMapping(value="/wx/customer/recommend/becomeChannel",method= RequestMethod.PUT)
499
     @RequestMapping(value="/wx/customer/recommend/becomeChannel",method= RequestMethod.PUT)
500
     public ResponseBean taRecommendAgentBecomeChannel(@RequestParam(required = false) String channelCode,HttpServletRequest request,@RequestParam("personType")String personType){
500
     public ResponseBean taRecommendAgentBecomeChannel(@RequestParam(required = false) String channelCode,HttpServletRequest request,@RequestParam("personType")String personType){
501
         ResponseBean responseBean = new ResponseBean();
501
         ResponseBean responseBean = new ResponseBean();
502
-        String openid = JWTUtils.getSubject(request);
502
+        String openid = getOpenId(request);
503
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
503
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
504
         if (null == taPersons || taPersons.size() != 1) {
504
         if (null == taPersons || taPersons.size() != 1) {
505
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
505
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
556
     @GetMapping("/wx/agent/recommend/mine")
556
     @GetMapping("/wx/agent/recommend/mine")
557
     public ResponseBean getAgentIRecommend(@RequestParam(defaultValue = "1") int pageNum,
557
     public ResponseBean getAgentIRecommend(@RequestParam(defaultValue = "1") int pageNum,
558
                                            @RequestParam(defaultValue = "10") int pageSize, HttpServletRequest request) {
558
                                            @RequestParam(defaultValue = "10") int pageSize, HttpServletRequest request) {
559
-        String openid = JWTUtils.getSubject(request);
559
+        String openid = getOpenId(request);
560
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
560
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
561
         if (null == taPersons || taPersons.size() != 1) {
561
         if (null == taPersons || taPersons.size() != 1) {
562
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
562
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
583
      */
583
      */
584
     @GetMapping("/wx/user/current")
584
     @GetMapping("/wx/user/current")
585
     public ResponseBean getWxCurrentPerson(HttpServletRequest request) {
585
     public ResponseBean getWxCurrentPerson(HttpServletRequest request) {
586
-        String personId = JWTUtils.getSubject(request);
586
+        String personId = getPersonId(request);
587
         TaPerson taPerson = taPersonService.getById(personId);
587
         TaPerson taPerson = taPersonService.getById(personId);
588
         if (null == taPerson || taPerson.getStatus() != CommConstant.STATUS_NORMAL) {
588
         if (null == taPerson || taPerson.getStatus() != CommConstant.STATUS_NORMAL) {
589
             return ResponseBean.error("用户状态异常", ResponseBean.ERROR_AUTH_EXPIRED);
589
             return ResponseBean.error("用户状态异常", ResponseBean.ERROR_AUTH_EXPIRED);
602
     @PutMapping("/wx/person/city")
602
     @PutMapping("/wx/person/city")
603
     public ResponseBean updatePersonCity(@RequestBody String params, HttpServletRequest request) {
603
     public ResponseBean updatePersonCity(@RequestBody String params, HttpServletRequest request) {
604
         ResponseBean responseBean = new ResponseBean();
604
         ResponseBean responseBean = new ResponseBean();
605
-        String openid = JWTUtils.getSubject(request);
605
+        String openid = getOpenId(request);
606
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
606
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
607
         if (null == taPersons || taPersons.size() != 1) {
607
         if (null == taPersons || taPersons.size() != 1) {
608
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
608
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);

+ 1
- 1
src/main/java/com/huiju/estateagents/controller/TaPersonVisitRecordController.java Visa fil

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

+ 2
- 2
src/main/java/com/huiju/estateagents/controller/TaPointsRecordsController.java Visa fil

91
                                               HttpServletRequest request){
91
                                               HttpServletRequest request){
92
         ResponseBean responseBean = new ResponseBean();
92
         ResponseBean responseBean = new ResponseBean();
93
         try {
93
         try {
94
-            String openid = JWTUtils.getSubject(request);
94
+            String openid = getOpenId(request);
95
             Integer orgId = getOrgId(request);
95
             Integer orgId = getOrgId(request);
96
             List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
96
             List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
97
             if (null == taPersons || taPersons.size() != 1) {
97
             if (null == taPersons || taPersons.size() != 1) {
231
 //                                            HttpServletRequest request){
231
 //                                            HttpServletRequest request){
232
 //        ResponseBean responseBean = new ResponseBean();
232
 //        ResponseBean responseBean = new ResponseBean();
233
 //        try {
233
 //        try {
234
-//            String openid = JWTUtils.getSubject(request);
234
+//            String openid = getOpenId(request);
235
 //            TaPerson taPerson = taPersonService.getPersonsByOpenId(openid).get(0);
235
 //            TaPerson taPerson = taPersonService.getPersonsByOpenId(openid).get(0);
236
 //            //使用分页插件
236
 //            //使用分页插件
237
 //            IPage<TaPointsRecords> pg = new Page<>(pageNum, pageSize);
237
 //            IPage<TaPointsRecords> pg = new Page<>(pageNum, pageSize);

+ 2
- 2
src/main/java/com/huiju/estateagents/controller/TaPolicyController.java Visa fil

117
 
117
 
118
             if(taPolicy.getPublishStatus().equals(CommConstant.IS_PUBLISH)){
118
             if(taPolicy.getPublishStatus().equals(CommConstant.IS_PUBLISH)){
119
                 taPolicy.setPublishDate(LocalDateTime.now());
119
                 taPolicy.setPublishDate(LocalDateTime.now());
120
-                String personId = JWTUtils.getSubject(request);
120
+                String personId = getPersonId(request);
121
                 taPolicy.setPublishUser(personId);
121
                 taPolicy.setPublishUser(personId);
122
             }
122
             }
123
 
123
 
179
 
179
 
180
             if(taPolicy.getPublishStatus().equals(CommConstant.IS_PUBLISH)){
180
             if(taPolicy.getPublishStatus().equals(CommConstant.IS_PUBLISH)){
181
                 taPolicy.setPublishDate(LocalDateTime.now());
181
                 taPolicy.setPublishDate(LocalDateTime.now());
182
-                String personId = JWTUtils.getSubject(request);
182
+                String personId = getPersonId(request);
183
                 taPolicy.setPublishUser(personId);
183
                 taPolicy.setPublishUser(personId);
184
             }
184
             }
185
 
185
 

+ 8
- 8
src/main/java/com/huiju/estateagents/controller/TaRecommendCustomerController.java Visa fil

69
             return ResponseBean.error("分页参数不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
69
             return ResponseBean.error("分页参数不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
70
         }
70
         }
71
 
71
 
72
-        String openid = JWTUtils.getSubject(request);
72
+        String openid = getOpenId(request);
73
         return taRecommendCustomerService.getMyCustList(openid, keywords, pageNumber, pageSize);
73
         return taRecommendCustomerService.getMyCustList(openid, keywords, pageNumber, pageSize);
74
     }
74
     }
75
 
75
 
105
      */
105
      */
106
     @PostMapping("/wx/customer/new")
106
     @PostMapping("/wx/customer/new")
107
     public ResponseBean recommendCust(@RequestBody String paramStr, HttpServletRequest request) {
107
     public ResponseBean recommendCust(@RequestBody String paramStr, HttpServletRequest request) {
108
-        String openid = JWTUtils.getSubject(request);
108
+        String openid = getOpenId(request);
109
         Integer orgId = getOrgId(request);
109
         Integer orgId = getOrgId(request);
110
         return taRecommendCustomerService.recommendCust(paramStr, openid,orgId);
110
         return taRecommendCustomerService.recommendCust(paramStr, openid,orgId);
111
     }
111
     }
118
      */
118
      */
119
     @PostMapping("/wx/customer/report")
119
     @PostMapping("/wx/customer/report")
120
     public ResponseBean reportCust(@RequestBody String paramStr, HttpServletRequest request) {
120
     public ResponseBean reportCust(@RequestBody String paramStr, HttpServletRequest request) {
121
-        String openid = JWTUtils.getSubject(request);
121
+        String openid = getOpenId(request);
122
         Integer orgId = getOrgId(request);
122
         Integer orgId = getOrgId(request);
123
         return taRecommendCustomerService.reportCust(paramStr, openid,orgId);
123
         return taRecommendCustomerService.reportCust(paramStr, openid,orgId);
124
     }
124
     }
128
                                                   @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
128
                                                   @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
129
                                                   @RequestParam(value ="buildingId") String buildingId,
129
                                                   @RequestParam(value ="buildingId") String buildingId,
130
                                                   HttpServletRequest request){
130
                                                   HttpServletRequest request){
131
-        String openid = JWTUtils.getSubject(request);
131
+        String openid = getOpenId(request);
132
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
132
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
133
         if (null == taPersons || taPersons.size() != 1) {
133
         if (null == taPersons || taPersons.size() != 1) {
134
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
134
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
146
     public ResponseBean getCustomerIReport (HttpServletRequest request,
146
     public ResponseBean getCustomerIReport (HttpServletRequest request,
147
                                          @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
147
                                          @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
148
                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
148
                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
149
-        String openid = JWTUtils.getSubject(request);
149
+        String openid = getOpenId(request);
150
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
150
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
151
         if (null == taPersons || taPersons.size() != 1) {
151
         if (null == taPersons || taPersons.size() != 1) {
152
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
152
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
171
     public ResponseBean getMyCustomer (     @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
171
     public ResponseBean getMyCustomer (     @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
172
                                             @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
172
                                             @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
173
                                             HttpServletRequest request){
173
                                             HttpServletRequest request){
174
-        String openid = JWTUtils.getSubject(request);
174
+        String openid = getOpenId(request);
175
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
175
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
176
         if (null == taPersons || taPersons.size() != 1) {
176
         if (null == taPersons || taPersons.size() != 1) {
177
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
177
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
182
             IPage<TaRecommendCustomer>pg = new Page<>(pageNumber,pageSize);
182
             IPage<TaRecommendCustomer>pg = new Page<>(pageNumber,pageSize);
183
             QueryWrapper<TaRecommendCustomer>queryWrapper = new QueryWrapper<>();
183
             QueryWrapper<TaRecommendCustomer>queryWrapper = new QueryWrapper<>();
184
             queryWrapper.eq("realty_consultant",person.getPersonId());
184
             queryWrapper.eq("realty_consultant",person.getPersonId());
185
-            queryWrapper.eq("report_recommend_status",CommConstant.REPORTED);
185
+           // queryWrapper.eq("report_recommend_status",CommConstant.REPORTED);
186
             queryWrapper.gt("status",CommConstant.CUSTOMER_REPORT);
186
             queryWrapper.gt("status",CommConstant.CUSTOMER_REPORT);
187
             queryWrapper.orderByDesc("create_date");
187
             queryWrapper.orderByDesc("create_date");
188
             IPage<TaRecommendCustomer>result = taRecommendCustomerService.page(pg,queryWrapper);
188
             IPage<TaRecommendCustomer>result = taRecommendCustomerService.page(pg,queryWrapper);
316
     @GetMapping("/wx/customer/recommend/mine")
316
     @GetMapping("/wx/customer/recommend/mine")
317
     public ResponseBean getWxCustomersIRecommended (@RequestParam int pageNumber, @RequestParam int pageSize,HttpServletRequest request){
317
     public ResponseBean getWxCustomersIRecommended (@RequestParam int pageNumber, @RequestParam int pageSize,HttpServletRequest request){
318
         Integer orgId =getOrgId(request);
318
         Integer orgId =getOrgId(request);
319
-        String openid = JWTUtils.getSubject(request);
319
+        String openid = getOpenId(request);
320
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
320
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
321
         if (null == taPersons || taPersons.size() != 1) {
321
         if (null == taPersons || taPersons.size() != 1) {
322
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
322
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);

+ 2
- 2
src/main/java/com/huiju/estateagents/controller/TaSaveController.java Visa fil

34
      */
34
      */
35
     @PostMapping("/wx/{typeOf}/save/{id}")
35
     @PostMapping("/wx/{typeOf}/save/{id}")
36
     public ResponseBean giveFavor(@PathVariable String typeOf, @PathVariable String id, HttpServletRequest request) {
36
     public ResponseBean giveFavor(@PathVariable String typeOf, @PathVariable String id, HttpServletRequest request) {
37
-        String openid = JWTUtils.getSubject(request);
37
+        String openid = getOpenId(request);
38
 
38
 
39
         return iTaSaveService.postLike(openid, typeOf, id);
39
         return iTaSaveService.postLike(openid, typeOf, id);
40
     }
40
     }
48
      */
48
      */
49
     @DeleteMapping("/wx/{typeOf}/save/{id}")
49
     @DeleteMapping("/wx/{typeOf}/save/{id}")
50
     public ResponseBean cancelFavor(@PathVariable String typeOf, @PathVariable String id, HttpServletRequest request) {
50
     public ResponseBean cancelFavor(@PathVariable String typeOf, @PathVariable String id, HttpServletRequest request) {
51
-        String openid = JWTUtils.getSubject(request);
51
+        String openid = getOpenId(request);
52
         return iTaSaveService.cancelLike(openid, typeOf, id);
52
         return iTaSaveService.cancelLike(openid, typeOf, id);
53
     }
53
     }
54
 
54
 

+ 2
- 2
src/main/java/com/huiju/estateagents/controller/TaShareController.java Visa fil

27
 
27
 
28
     @PostMapping("/wx/{typeOf}/share/{id}")
28
     @PostMapping("/wx/{typeOf}/share/{id}")
29
     public ResponseBean save(@PathVariable String typeOf, @PathVariable String id, HttpServletRequest request) {
29
     public ResponseBean save(@PathVariable String typeOf, @PathVariable String id, HttpServletRequest request) {
30
-        String openid = JWTUtils.getSubject(request);
30
+        String openid = getOpenId(request);
31
         return taShareService.saveData(openid, typeOf, id);
31
         return taShareService.saveData(openid, typeOf, id);
32
     }
32
     }
33
 
33
 
48
      */
48
      */
49
     @PutMapping("/wx/{typeOf}/share/{id}")
49
     @PutMapping("/wx/{typeOf}/share/{id}")
50
     public ResponseBean makeSure(@PathVariable String typeOf, @PathVariable String id, HttpServletRequest request) {
50
     public ResponseBean makeSure(@PathVariable String typeOf, @PathVariable String id, HttpServletRequest request) {
51
-        String openid = JWTUtils.getSubject(request);
51
+        String openid = getOpenId(request);
52
         taShareService.makeSure(openid, typeOf, id);
52
         taShareService.makeSure(openid, typeOf, id);
53
         return ResponseBean.success("");
53
         return ResponseBean.success("");
54
     }
54
     }

+ 1
- 1
src/main/java/com/huiju/estateagents/controller/TaUvController.java Visa fil

29
 
29
 
30
     @PostMapping("/wx/{typeOf}/hot/{id}")
30
     @PostMapping("/wx/{typeOf}/hot/{id}")
31
     public ResponseBean save(@PathVariable String typeOf, @PathVariable String id, HttpServletRequest request) {
31
     public ResponseBean save(@PathVariable String typeOf, @PathVariable String id, HttpServletRequest request) {
32
-        String openid = JWTUtils.getSubject(request);
32
+        String openid = getOpenId(request);
33
         return taUvService.saveData(openid, typeOf, id);
33
         return taUvService.saveData(openid, typeOf, id);
34
     }
34
     }
35
 
35
 

+ 2
- 0
src/main/java/com/huiju/estateagents/entity/TaActivityDynamicEnlist.java Visa fil

50
      */
50
      */
51
     private String phone;
51
     private String phone;
52
 
52
 
53
+    private Integer orgId;
54
+
53
 }
55
 }

+ 1
- 1
src/main/resources/application-dev.yml Visa fil

68
     # 验证码长度
68
     # 验证码长度
69
     size: 4
69
     size: 4
70
     # 短信签名
70
     # 短信签名
71
-    sign:營銷雲
71
+    sign: 营销云
72
 
72
 
73
   visitor:
73
   visitor:
74
     code: "0501"
74
     code: "0501"