浏览代码

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

魏熙美 5 年前
父节点
当前提交
31a101564e

+ 24
- 0
src/main/java/com/huiju/estateagents/controller/MiniAppController.java 查看文件

55
     @Autowired
55
     @Autowired
56
     private ITaMiniappService taMiniappService;
56
     private ITaMiniappService taMiniappService;
57
 
57
 
58
+    @Autowired
59
+    private ITaSharePersonFromService taSharePersonFromService;
60
+
58
 
61
 
59
 
62
 
60
 
63
 
108
                 // 添加积分
111
                 // 添加积分
109
                  applicationContext.publishEvent(new EventBus(recommender, EventBus.EventType.SharePosterAll));
112
                  applicationContext.publishEvent(new EventBus(recommender, EventBus.EventType.SharePosterAll));
110
             }
113
             }
114
+
111
             TaPerson taPerson = taPersonService.newPersonByOpenid(session.getOpenid(), orgId);
115
             TaPerson taPerson = taPersonService.newPersonByOpenid(session.getOpenid(), orgId);
112
             if (null == taPerson) {
116
             if (null == taPerson) {
113
                 return ResponseBean.error("发生未知错误", ResponseBean.ERROR_UNAVAILABLE);
117
                 return ResponseBean.error("发生未知错误", ResponseBean.ERROR_UNAVAILABLE);
131
             }
135
             }
132
             taPerson.setMiniappId(appid);
136
             taPerson.setMiniappId(appid);
133
             taPersonService.updateById(taPerson);
137
             taPersonService.updateById(taPerson);
138
+            if(StringUtils.isNotBlank(from) &&StringUtils.isNotBlank(recommender) &&StringUtils.isNotBlank(targetId)){
139
+                TaSharePersonFrom taSharePersonFrom = new TaSharePersonFrom();
140
+                TaPerson recommenderPerson = taPersonService.getById(recommender);
141
+                taSharePersonFrom.setCreateDate(LocalDateTime.now());
142
+                taSharePersonFrom.setOrgId(getOrgId(request));
143
+                taSharePersonFrom.setPersonId(taPerson.getPersonId());
144
+                taSharePersonFrom.setSharePersonType(recommenderPerson.getPersonType());
145
+                if(CommConstant.PERSON_REALTY_CONSULTANT.equals(recommenderPerson.getPersonType())){
146
+                    taSharePersonFrom.setSharePerson(recommenderPerson.getUserId().toString());
147
+                }else {
148
+                    taSharePersonFrom.setSharePerson(recommenderPerson.getPersonId());
149
+                }
150
+                if(from.equals("activity_share")){
151
+                    taSharePersonFrom.setStatus(CommConstant.STATUS_UNACCALIMED);
152
+                }else {
153
+                    taSharePersonFrom.setStatus(CommConstant.STATUS_NORMAL);
154
+                }
155
+                taSharePersonFromService.save(taSharePersonFrom);
156
+
157
+            }
134
 
158
 
135
             taPerson.setPassword(null);
159
             taPerson.setPassword(null);
136
 
160
 

+ 2
- 0
src/main/java/com/huiju/estateagents/entity/TaSharePersonFrom.java 查看文件

70
      */
70
      */
71
     private String buildingId;
71
     private String buildingId;
72
 
72
 
73
+    private Integer status;
74
+
73
 
75
 
74
 }
76
 }