Procházet zdrojové kódy

Merge remote-tracking branch 'origin/dev' into dev

顾绍勇 před 5 roky
rodič
revize
6edaab908c

+ 1
- 1
src/main/java/com/huiju/estateagents/controller/MiniAppController.java Zobrazit soubor

509
         String targetId = params.getString("targetId");
509
         String targetId = params.getString("targetId");
510
         // 目标名称
510
         // 目标名称
511
         String targetName = params.getString("targetName");
511
         String targetName = params.getString("targetName");
512
-        // 推广用户
512
+        // 推广用户 - 分享人
513
         String promoter = params.getString("promoter");
513
         String promoter = params.getString("promoter");
514
         // 置业顾问
514
         // 置业顾问
515
         String consultantPersonId = request.getHeader("x-consultant");
515
         String consultantPersonId = request.getHeader("x-consultant");

+ 3
- 1
src/main/java/com/huiju/estateagents/service/impl/TaPersonServiceImpl.java Zobrazit soubor

954
 
954
 
955
                 //授权手机给推广人加积分
955
                 //授权手机给推广人加积分
956
                 String sharePersonId = getSharePersonFrom(person);
956
                 String sharePersonId = getSharePersonFrom(person);
957
-                if (validateSceneId(customerFrom.getSceneId()) && !StringUtils.isEmpty(sharePersonId)){
957
+                // 2020年5月29日 不清楚加场景限制的原因, 与芳芳讨论 先取消这个限制
958
+//                if (validateSceneId(customerFrom.getSceneId()) && !StringUtils.isEmpty(sharePersonId)){
959
+                if (!StringUtils.isEmpty(promoter) || !StringUtils.isEmpty(sharePersonId)){
958
                     applicationContext.publishEvent(new EventBus(promoter != null ? promoter : sharePersonId, EventBus.EventType.SharePosterAll, orgId));
960
                     applicationContext.publishEvent(new EventBus(promoter != null ? promoter : sharePersonId, EventBus.EventType.SharePosterAll, orgId));
959
                 }
961
                 }
960
             }
962
             }