Merge branch 'event0827' into 'master'

Event0827

See merge request !6

src/main/java/cn/quantgroup/xyqb/controller/internal/user/AppController.java

@@ -197,9 +197,11 @@ public class AppController implements IBaseController {
         }
         log.info("第三方用户登录 [AppController] loginSuper --> loginFrom:{},phoneNo:{},appChannel:{},channelId：{},btRegisterChannelId:{} requestIp:{},idNo:{},name:{}", registerFrom, phoneNo, appChannel, channelId, btRegisterChannelId, IpUtil.getRemoteIP(request), idNo, name);
         User user = userService.findByPhoneInDb(phoneNo);
+        boolean isRegister=false;
         if (user == null) {
             try {
                 user = userRegisterService.register(registerFrom, phoneNo, idNo, name, channelId, btRegisterChannelId);
+                isRegister=true;
             } catch (PersistenceException e) {
                 user = userService.findByPhoneInDb(phoneNo);
             }
@@ -220,6 +222,11 @@ public class AppController implements IBaseController {
         loginInfo.setUser(new UserRet(user));
         loginInfo.setHasPassword(user.getHasPassword());
         loginInfo.setToken(bean.getToken());
+        if(isRegister){
+            loginInfo.setRegister(true);
+        }else {
+            loginInfo.setRegister(false);
+        }
         LoginInfo.LoginContext context = new LoginInfo.LoginContext();
         context.setChannelId(channelId);
         context.setCreatedFrom(registerFrom);
@@ -228,14 +235,37 @@ public class AppController implements IBaseController {
         log.info("第三方用户获取信息登录成功 [AppController] loginSuper --> loginFrom:{}, phoneNo:{},appChannel:{},channelId:{}", registerFrom, phoneNo, appChannel, channelId);
 
         try {
-            EventRecord userRecord = EventRecord.builder().setDistinctId(user.getUuid()).isLoginId(Boolean.TRUE)
-                    .setEventName("PD_WUXIEC_UserLoginVccorCash")
-                    .addProperty("son_channel_id", user.getRegisteredFrom())
-                    .addProperty("parent_channel_id", -1L)
-                    .addProperty("vcccash_uuid", user.getUuid())
-                    .build();
-            iSensorsAnalytics.track(userRecord);
-            iSensorsAnalytics.flush();
+            String scDeviceId=request.getHeader("scDeviceId");
+            log.info("---------------scDeviceId{}",scDeviceId);
+            if(!StringUtils.isEmpty(scDeviceId)){
+                iSensorsAnalytics.trackSignUp( user.getUuid(),scDeviceId);
+            }
+            String terminal=request.getHeader("terminal");
+            String channel=request.getHeader("channel");
+            log.info("---------------terminal{},channel{}",terminal,channel);
+            if(!StringUtils.isEmpty(terminal)&&"APP".equals(terminal)||!StringUtils.isEmpty(channel)&&("214".equals(channel)||"217".equals(channel))){
+                if(isRegister){
+                    EventRecord userRecord = EventRecord.builder().setDistinctId(user.getUuid()).isLoginId(Boolean.TRUE)
+                            .setEventName("App_RegisterEvent")
+                            .build();
+                    iSensorsAnalytics.track(userRecord);
+                }else {
+                    EventRecord userRecord = EventRecord.builder().setDistinctId(user.getUuid()).isLoginId(Boolean.TRUE)
+                            .setEventName("App_LoginEvent")
+                            .build();
+                    iSensorsAnalytics.track(userRecord);
+                }
+                iSensorsAnalytics.flush();
+            }else {
+                EventRecord userRecord = EventRecord.builder().setDistinctId(user.getUuid()).isLoginId(Boolean.TRUE)
+                        .setEventName("PD_WUXIEC_UserLoginVccorCash")
+                        .addProperty("son_channel_id", user.getRegisteredFrom())
+                        .addProperty("parent_channel_id", -1L)
+                        .addProperty("vcccash_uuid", user.getUuid())
+                        .build();
+                iSensorsAnalytics.track(userRecord);
+                iSensorsAnalytics.flush();
+            }
         } catch (Exception e) {
             log.info("神策埋点出现问题", e);
         }

src/main/java/cn/quantgroup/xyqb/model/session/LoginInfo.java

@@ -12,6 +12,7 @@ public class LoginInfo {
     private String token;
     private UserRet user;
     private LoginContext loginContext;
+    private Boolean register;
     /**
      * 是否有密码
      * @return

src/main/java/cn/quantgroup/xyqb/service/user/impl/UserServiceImpl.java

@@ -356,14 +356,38 @@ public class UserServiceImpl implements IUserService, IBaseController {
             return JsonResult.buildErrorStateResult("登录时微信关联失败", null);
         }
         try {
-            EventRecord userRecord = EventRecord.builder().setDistinctId(user.getUuid()).isLoginId(Boolean.TRUE)
-                    .setEventName("PD_WUXIEC_UserLoginVccorCash")
-                    .addProperty("son_channel_id", user.getRegisteredFrom())
-                    .addProperty("parent_channel_id", -1L)
-                    .addProperty("vcccash_uuid", user.getUuid())
-                    .build();
-            iSensorsAnalytics.track(userRecord);
-            iSensorsAnalytics.flush();
+            String scDeviceId=request.getHeader("scDeviceId");
+            log.info("---------------scDeviceId{}",scDeviceId);
+            if(!StringUtils.isEmpty(scDeviceId)){
+                iSensorsAnalytics.trackSignUp( user.getUuid(),scDeviceId);
+            }
+            String terminal=request.getHeader("terminal");
+            String channel=request.getHeader("channel");
+            log.info("---------------terminal{},channel{}",terminal,channel);
+            if(!StringUtils.isEmpty(terminal)&&"APP".equals(terminal)||!StringUtils.isEmpty(channel)&&("214".equals(channel)||"217".equals(channel))){
+                if(register){
+                    EventRecord userRecord = EventRecord.builder().setDistinctId(user.getUuid()).isLoginId(Boolean.TRUE)
+                            .setEventName("App_RegisterEvent")
+                            .build();
+                    iSensorsAnalytics.track(userRecord);
+                }else {
+                    EventRecord userRecord = EventRecord.builder().setDistinctId(user.getUuid()).isLoginId(Boolean.TRUE)
+                            .setEventName("App_LoginEvent")
+                            .build();
+                    iSensorsAnalytics.track(userRecord);
+                }
+                iSensorsAnalytics.flush();
+            }else {
+                log.info("老神策埋点{},{}------------",user.getRegisteredFrom(),user.getUuid());
+                EventRecord userRecord = EventRecord.builder().setDistinctId(user.getUuid()).isLoginId(Boolean.TRUE)
+                        .setEventName("PD_WUXIEC_UserLoginVccorCash")
+                        .addProperty("son_channel_id", user.getRegisteredFrom())
+                        .addProperty("parent_channel_id", -1L)
+                        .addProperty("vcccash_uuid", user.getUuid())
+                        .build();
+                iSensorsAnalytics.track(userRecord);
+                iSensorsAnalytics.flush();
+            }
         } catch (Exception e) {
             log.info("神策埋点出现问题", e);
         }