新需求

src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserController.java

@@ -25,10 +25,12 @@ import com.huiju.estateagents.common.MD5Utils;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.SysButtonInMenu;
 import com.huiju.estateagents.entity.SysMenu;
+import com.huiju.estateagents.entity.TaMiniapp;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaRole;
 import com.huiju.estateagents.mapper.TaRoleMapper;
+import com.huiju.estateagents.service.ITaMiniappService;
 import com.huiju.estateagents.service.ITaPersonBuildingService;
 import com.huiju.estateagents.service.ITaPersonService;
 import com.huiju.estateagents.service.ITaRoleService;
@@ -88,6 +90,9 @@ public class TaUserController extends BaseController {
     @Autowired
     private ITaPersonService iTaPersonService;
 
+    @Autowired
+    private ITaMiniappService iTaMiniappService;
+
     /**
      * 分页查询列表
      * @param pageNum
@@ -294,10 +299,15 @@ public class TaUserController extends BaseController {
             List<TaRole> roles = iTaRoleService.getRolesByUser(taUser.getUserId());
             ResponseBean authMenu = iTaUserAuthMenuService.getMenuByUserId(null, null, taUser.getUserId().toString(),taUser.getOrgId());
             ResponseBean authButton = iTaUserAuthButtonService.getButtonByUserId(null, null, taUser.getUserId().toString());
+            QueryWrapper<TaMiniapp> taMiniappQueryWrapper = new QueryWrapper<>();
+            taMiniappQueryWrapper.eq("org_id", getOrgId(request));
+            TaMiniapp taMiniapp = iTaMiniappService.getOne(taMiniappQueryWrapper);
+
             taUser.setMenus((List<SysMenu>) authMenu.getData());
             taUser.setButtons((List<SysButtonInMenu>) authButton.getData());
             taUser.setRoles(roles);
             taUser.setLoginPassword("");
+            taUser.setMiniAppName(taMiniapp.getName());
 
             //获取所有菜单
             List<SysMenu> allMenus = (List<SysMenu>) iTaUserAuthMenuService.getAllMenu(null, null,taUser.getOrgId(), roles).getData();
@@ -361,7 +371,7 @@ public class TaUserController extends BaseController {
         Map<String, Object> result = new HashMap<>();
         result.put("token", token);
         result.put("user", taUser);
-    
+
         return ResponseBean.success(result);
     }
     

src/main/java/com/huiju/estateagents/center/taUser/entity/TaUser.java

@@ -232,4 +232,7 @@ public class TaUser implements Serializable {
      */
     @TableField(exist = false)
     private List<TaPerson> personIds;
+
+    @TableField(exist = false)
+    private String miniAppName;
 }

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

@@ -251,19 +251,19 @@ public class MiniAppController extends BaseController {
             taPerson.setMiniappId(appid);
             taPersonService.updateById(taPerson);
 
-            // 增加积分线程
-            ExecutorService threadPool = Executors.newCachedThreadPool();
-            threadPool.execute(() -> {
-//                if (null != from && from.contains("share") && !com.huiju.estateagents.common.StringUtils.isEmpty(recommender) && count > 0) {
-                if (null != from && from.contains("share") && !com.huiju.estateagents.common.StringUtils.isEmpty(recommender)) {
-                    // 校验是否点击过此人的分享
-                    boolean checkPoint = checkSharePersonFrom(from, taPerson.getPersonId(), targetId, orgId);
-                    if (checkPoint) {
-                        // 添加积分
-                        applicationContext.publishEvent(new EventBus(recommender, EventBus.EventType.SharePosterAll, orgId));
-                    }
-                }
-            });
+            // 增加积分线程 --- 3.5.23版本授权手机分享者增加积分，单纯分享不增加积分
+//            ExecutorService threadPool = Executors.newCachedThreadPool();
+//            threadPool.execute(() -> {
+////                if (null != from && from.contains("share") && !com.huiju.estateagents.common.StringUtils.isEmpty(recommender) && count > 0) {
+//                if (null != from && from.contains("share") && !com.huiju.estateagents.common.StringUtils.isEmpty(recommender)) {
+//                    // 校验是否点击过此人的分享
+//                    boolean checkPoint = checkSharePersonFrom(from, taPerson.getPersonId(), targetId, orgId);
+//                    if (checkPoint) {
+//                        // 添加积分
+//                        applicationContext.publishEvent(new EventBus(recommender, EventBus.EventType.SharePosterAll, orgId));
+//                    }
+//                }
+//            });
 
             if (StringUtils.isNotBlank(from) && StringUtils.isNotBlank(recommender) && StringUtils.isNotBlank(targetId)) {
                 TaSharePersonFrom taSharePersonFrom = new TaSharePersonFrom();

src/main/java/com/huiju/estateagents/service/impl/TaPersonServiceImpl.java

@@ -99,6 +99,8 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
     @Autowired
     private TaShareContentService taShareContentService;
 
+    @Autowired
+    private TaSharePersonFromServiceImpl taSharePersonFromService;
 
     @Resource
     private ApplicationContext applicationContext;
@@ -894,6 +896,13 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         // 2. 发放积分
         applicationContext.publishEvent(new EventBus(person, EventBus.EventType.SignUpAgent, orgId));
 
+        //授权手机给推广人加积分
+        String sharePersonId = getSharePersonFrom(person);
+
+        if (validateSceneId(sceneId) && !StringUtils.isEmpty(sharePersonId)){
+            applicationContext.publishEvent(new EventBus(promoter != null ? promoter : sharePersonId, EventBus.EventType.SharePosterAll, orgId));
+        }
+
         // 3. 处理推广人
         TaPerson recPerson = taPersonMapper.getById(promoter);
         if (recPerson != null && CommConstant.STATUS_DELETE.equals(recPerson.getStatus())) {
@@ -1019,6 +1028,34 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         taCustomerFromMapper.insert(customerFrom);
     }
 
+    private String getSharePersonFrom(TaPerson person){
+        QueryWrapper<TaSharePersonFrom> taSharePersonFromQueryWrapper = new QueryWrapper<>();
+        taSharePersonFromQueryWrapper.eq("person_id", person.getPersonId());
+        taSharePersonFromQueryWrapper.eq("is_first_time", CommConstant.STATUS_NORMAL);
+        taSharePersonFromQueryWrapper.eq("status", 1);
+        List<TaSharePersonFrom> taSharePersonFroms = taSharePersonFromService.list(taSharePersonFromQueryWrapper);
+        if (CollectionUtils.isEmpty(taSharePersonFroms)){
+            return null;
+        }
+
+        TaSharePersonFrom taSharePersonFrom = taSharePersonFroms.get(0);
+        if (CommConstant.PERSON_REALTY_CONSULTANT.equals(taSharePersonFrom.getSharePersonType())){
+            QueryWrapper<TaPerson> taPersonQueryWrapper = new QueryWrapper<>();
+            taPersonQueryWrapper.eq("user_id" , taSharePersonFrom.getSharePerson());
+            taPersonQueryWrapper.eq("status" , CommConstant.STATUS_NORMAL);
+            TaPerson taPerson = taPersonMapper.selectOne(taPersonQueryWrapper);
+            return taPerson.getPersonId();
+        }
+        return taSharePersonFrom.getSharePerson();
+    }
+
+    public boolean validateSceneId(String sceneId){
+        if ("1047".equals(sceneId) || "1048".equals(sceneId) || "1007".equals(sceneId)){
+            return true;
+        }
+        return false;
+    }
+
     private void fixCustomerPersonId(TaPerson person) {
         // 先更新之前的数据, 有一种可能的情况, 客户是推荐的，之前未进入过小程序
         // 后面所有的查询就可以不需要 phone , 改用 person_id 了