Merge branch 'dev' of GameCenter/game-center into master

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/impl/GameTencentMiniGameBackLogServiceImpl.java

@@ -85,8 +85,8 @@ public class GameTencentMiniGameBackLogServiceImpl extends ServiceImpl<GameTence
         TencentMiniGameBackRequest request = TencentMiniGameBackRequest.builder()
                 .actions(Collections.singletonList(TencentMiniGameBackRequest.Action.builder()
                         .action_time(DateUtil.localDateTimeToSecond(backLog.getActionTime()))
-                        .user_id(UserActionRpcDTO.UserIdRpcDTO.builder().wechatAppId(backLog.getWechatAppId()).wechatOpenid(backLog.getWechatOpenid()).build())
-                        .trace(UserActionRpcDTO.TraceRpcDTO.builder().clickId(backLog.getClickId()).build())
+                        .user_id(TencentMiniGameBackRequest.UserId.builder().wechat_app_id(backLog.getWechatAppId()).wechat_openid(backLog.getWechatOpenid()).build())
+                        .trace(TencentMiniGameBackRequest.Trace.builder().click_id(backLog.getClickId()).build())
                         .account_id(backLog.getAdAccountId())
                         .action_set_id(null)
                         .action_type(backLog.getActionType())
@@ -126,8 +126,8 @@ public class GameTencentMiniGameBackLogServiceImpl extends ServiceImpl<GameTence
 
             private Long action_time;
 
-            private UserActionRpcDTO.UserIdRpcDTO user_id;
-            private UserActionRpcDTO.TraceRpcDTO trace;
+            private UserId user_id;
+            private Trace trace;
 
             private Long account_id;
 
@@ -137,5 +137,25 @@ public class GameTencentMiniGameBackLogServiceImpl extends ServiceImpl<GameTence
 
             private Map<String, Object> action_param;
         }
+
+        @Data
+        @NoArgsConstructor
+        @AllArgsConstructor
+        @Builder
+        public static class UserId {
+
+            private String wechat_app_id;
+
+            private String wechat_openid;
+
+        }
+
+        @Data
+        @NoArgsConstructor
+        @AllArgsConstructor
+        @Builder
+        public static class Trace {
+            private String click_id;
+        }
     }
 }