|
|
@@ -1,6 +1,5 @@
|
|
1
|
1
|
package com.huiju.estateagents.controller;
|
|
2
|
2
|
|
|
3
|
|
-import cn.binarywang.wx.miniapp.api.WxMaService;
|
|
4
|
3
|
import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
|
|
5
|
4
|
import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
|
|
6
|
5
|
import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
|
|
|
@@ -8,22 +7,19 @@ import com.alibaba.fastjson.JSONObject;
|
|
8
|
7
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
9
|
8
|
import com.huiju.estateagents.base.BaseController;
|
|
10
|
9
|
import com.huiju.estateagents.base.ResponseBean;
|
|
11
|
|
-import com.huiju.estateagents.center.sysUser.entity.SysToken;
|
|
12
|
10
|
import com.huiju.estateagents.center.sysUser.service.ISysTokenService;
|
|
13
|
11
|
import com.huiju.estateagents.center.taUser.entity.TaUser;
|
|
14
|
12
|
import com.huiju.estateagents.center.taUser.service.ITaUserService;
|
|
15
|
13
|
import com.huiju.estateagents.common.CommConstant;
|
|
16
|
|
-import com.huiju.estateagents.common.WxUtils;
|
|
|
14
|
+import com.huiju.estateagents.common.JWTUtils;
|
|
|
15
|
+import com.huiju.estateagents.drainage.entity.TaDrainage;
|
|
|
16
|
+import com.huiju.estateagents.drainage.service.ITaDrainageService;
|
|
17
|
17
|
import com.huiju.estateagents.entity.*;
|
|
18
|
18
|
import com.huiju.estateagents.event.EventBus;
|
|
19
|
19
|
import com.huiju.estateagents.mapper.TaOrgCityMapper;
|
|
20
|
|
-import com.huiju.estateagents.mapper.TaShareMapper;
|
|
21
|
20
|
import com.huiju.estateagents.service.*;
|
|
22
|
|
-import com.huiju.estateagents.common.JWTUtils;
|
|
23
|
|
-import com.huiju.estateagents.third.entity.TaThirdPartyMiniappConfig;
|
|
24
|
21
|
import com.huiju.estateagents.third.service.ITaThirdPartyMiniappConfigService;
|
|
25
|
22
|
import me.chanjar.weixin.common.error.WxErrorException;
|
|
26
|
|
-import net.bytebuddy.asm.Advice;
|
|
27
|
23
|
import org.apache.commons.collections.CollectionUtils;
|
|
28
|
24
|
import org.apache.commons.lang3.StringUtils;
|
|
29
|
25
|
import org.apache.http.HttpStatus;
|
|
|
@@ -36,7 +32,6 @@ import org.springframework.web.bind.annotation.*;
|
|
36
|
32
|
import javax.annotation.Resource;
|
|
37
|
33
|
import javax.servlet.http.HttpServletRequest;
|
|
38
|
34
|
import java.time.LocalDateTime;
|
|
39
|
|
-import java.util.Collections;
|
|
40
|
35
|
import java.util.HashMap;
|
|
41
|
36
|
import java.util.List;
|
|
42
|
37
|
import java.util.Map;
|
|
|
@@ -103,6 +98,18 @@ public class MiniAppController extends BaseController {
|
|
103
|
98
|
@Autowired
|
|
104
|
99
|
public ITdCityService iTdCityService;
|
|
105
|
100
|
|
|
|
101
|
+ @Autowired
|
|
|
102
|
+ private IHelpActivityService helpActivityService;
|
|
|
103
|
+
|
|
|
104
|
+ @Autowired
|
|
|
105
|
+ private ITaShareActivityService taShareActivityService;
|
|
|
106
|
+
|
|
|
107
|
+ @Autowired
|
|
|
108
|
+ private ITaLiveActivityService taLiveActivityService;
|
|
|
109
|
+
|
|
|
110
|
+ @Autowired
|
|
|
111
|
+ private ITaDrainageService taDrainageService;
|
|
|
112
|
+
|
|
106
|
113
|
/**
|
|
107
|
114
|
* 验证接入
|
|
108
|
115
|
*/
|
|
|
@@ -295,6 +302,22 @@ public class MiniAppController extends BaseController {
|
|
295
|
302
|
} else if (from.contains("building")) {
|
|
296
|
303
|
taSharePersonFrom.setBuildingId(targetId);
|
|
297
|
304
|
sharePersonFromQueryWrapper.eq("building_id", targetId);
|
|
|
305
|
+ }else if (from.contains("help")) {
|
|
|
306
|
+ HelpActivity helpActivity = helpActivityService.getById(targetId);
|
|
|
307
|
+ taSharePersonFrom.setBuildingId(helpActivity.getBuildingId());
|
|
|
308
|
+ sharePersonFromQueryWrapper.eq("building_id", helpActivity.getBuildingId());
|
|
|
309
|
+ }else if (from.contains("group")) {
|
|
|
310
|
+ TaShareActivity taShareActivity = taShareActivityService.getById(targetId);
|
|
|
311
|
+ taSharePersonFrom.setBuildingId(taShareActivity.getBuildingId());
|
|
|
312
|
+ sharePersonFromQueryWrapper.eq("building_id", taShareActivity.getBuildingId());
|
|
|
313
|
+ }else if (from.contains("live")) {
|
|
|
314
|
+ TaLiveActivity liveActivity = taLiveActivityService.getById(targetId);
|
|
|
315
|
+ taSharePersonFrom.setBuildingId(liveActivity.getBuildingId());
|
|
|
316
|
+ sharePersonFromQueryWrapper.eq("building_id", liveActivity.getBuildingId());
|
|
|
317
|
+ }else if (from.contains("h5")) {
|
|
|
318
|
+ TaDrainage taDrainage = taDrainageService.getById(targetId);
|
|
|
319
|
+ taSharePersonFrom.setBuildingId(taDrainage.getBuildingId());
|
|
|
320
|
+ sharePersonFromQueryWrapper.eq("building_id", taDrainage.getBuildingId());
|
|
298
|
321
|
}
|
|
299
|
322
|
Integer isFirstTime = taSharePersonFromService.count(sharePersonFromQueryWrapper);
|
|
300
|
323
|
if (isFirstTime > 0) {
|
