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

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

@@ -55,6 +55,9 @@ public class MiniAppController extends BaseController {
     @Autowired
     private ITaMiniappService taMiniappService;
 
+    @Autowired
+    private ITaSharePersonFromService taSharePersonFromService;
+
 
 
 
@@ -108,6 +111,7 @@ public class MiniAppController extends BaseController {
                 // 添加积分
                  applicationContext.publishEvent(new EventBus(recommender, EventBus.EventType.SharePosterAll));
             }
+
             TaPerson taPerson = taPersonService.newPersonByOpenid(session.getOpenid(), orgId);
             if (null == taPerson) {
                 return ResponseBean.error("发生未知错误", ResponseBean.ERROR_UNAVAILABLE);
@@ -131,6 +135,26 @@ public class MiniAppController extends BaseController {
             }
             taPerson.setMiniappId(appid);
             taPersonService.updateById(taPerson);
+            if(StringUtils.isNotBlank(from) &&StringUtils.isNotBlank(recommender) &&StringUtils.isNotBlank(targetId)){
+                TaSharePersonFrom taSharePersonFrom = new TaSharePersonFrom();
+                TaPerson recommenderPerson = taPersonService.getById(recommender);
+                taSharePersonFrom.setCreateDate(LocalDateTime.now());
+                taSharePersonFrom.setOrgId(getOrgId(request));
+                taSharePersonFrom.setPersonId(taPerson.getPersonId());
+                taSharePersonFrom.setSharePersonType(recommenderPerson.getPersonType());
+                if(CommConstant.PERSON_REALTY_CONSULTANT.equals(recommenderPerson.getPersonType())){
+                    taSharePersonFrom.setSharePerson(recommenderPerson.getUserId().toString());
+                }else {
+                    taSharePersonFrom.setSharePerson(recommenderPerson.getPersonId());
+                }
+                if(from.equals("activity_share")){
+                    taSharePersonFrom.setStatus(CommConstant.STATUS_UNACCALIMED);
+                }else {
+                    taSharePersonFrom.setStatus(CommConstant.STATUS_NORMAL);
+                }
+                taSharePersonFromService.save(taSharePersonFrom);
+
+            }
 
             taPerson.setPassword(null);
 

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

@@ -70,5 +70,7 @@ public class TaSharePersonFrom implements Serializable {
      */
     private String buildingId;
 
+    private Integer status;
+
 
 }