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

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/entity/GameTencentBackLog.java

@@ -64,6 +64,11 @@ public class GameTencentBackLog implements Serializable {
      */
     private String actionType;
 
+    /**
+     * 行为参数
+     */
+    private String actionParam;
+
     /**
      * 订单ID
      */

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

@@ -75,6 +75,8 @@ public class GameBackPolicyServiceImpl extends ServiceImpl<GameBackPolicyMapper,
     public boolean tencentOrderBack(TencentOrderDTO dto) {
         //订单保存
         GameTencentOrder gameTencentOrder = GameTencentOrder.builder()
+                .adAccountId(dto.getAdAccountId())
+                .gameId(dto.getGameId())
                 .orderId(dto.getOrderId())
                 .channel(dto.getChannel())
                 .rechargeMoney(dto.getRechargeMoney())
@@ -99,6 +101,7 @@ public class GameBackPolicyServiceImpl extends ServiceImpl<GameBackPolicyMapper,
                 ActionTypeEnum.PURCHASE.getActionType() : ActionTypeEnum.COMPLETE_ORDER.getActionType();
         Map<String, Object> actionParam = new HashMap<>(2);
         actionParam.put("claim_type", 0);
+        actionParam.put("value", dto.getRechargeMoney());
         DataReportOfAppIdRpcDTO dataReportOfAppIdRpcDTO = DataReportOfAppIdRpcDTO.builder()
                 .appId(dto.getWechatAppId())
                 .userActionSetId(dto.getUserActionSetId())
@@ -123,6 +126,7 @@ public class GameBackPolicyServiceImpl extends ServiceImpl<GameBackPolicyMapper,
                 .wechatAppId(dto.getWechatAppId())
                 .wechatOpenid(dto.getWechatOpenid())
                 .userActionSetId(dto.getUserActionSetId())
+                .actionParam(actionParam.toString())
                 .build();
 
         boolean doBack;
@@ -217,6 +221,7 @@ public class GameBackPolicyServiceImpl extends ServiceImpl<GameBackPolicyMapper,
                 .wechatAppId(dto.getWechatAppId())
                 .wechatOpenid(dto.getWechatOpenid())
                 .userActionSetId(dto.getUserActionSetId())
+                .actionParam(actionParam.toString())
                 .build();
             ResultVO<Boolean> result = userActionSetRpc.reportByAppId(dataReportOfAppIdRpcDTO);
             if (result.getCode() == HttpStatus.HTTP_OK) {

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

@@ -90,6 +90,7 @@ public class GameTencentOrderServiceImpl extends ServiceImpl<GameTencentOrderMap
                             ActionTypeEnum.PURCHASE.getActionType() : ActionTypeEnum.COMPLETE_ORDER.getActionType();
                     Map<String, Object> actionParam = new HashMap<>(2);
                     actionParam.put("claim_type", 0);
+                    actionParam.put("value", gameTencentOrder.getRechargeMoney());
                     DataReportOfAppIdRpcDTO dataReportOfAppIdRpcDTO = DataReportOfAppIdRpcDTO.builder()
                             .appId(gameTencentOrder.getWechatAppId())
                             .userActionSetId(gameTencentOrder.getUserActionSetId())
@@ -114,6 +115,7 @@ public class GameTencentOrderServiceImpl extends ServiceImpl<GameTencentOrderMap
                             .wechatAppId(gameTencentOrder.getWechatAppId())
                             .wechatOpenid(gameTencentOrder.getWechatOpenid())
                             .userActionSetId(gameTencentOrder.getUserActionSetId())
+                            .actionParam(actionParam.toString())
                             .build();
                     gameTencentOrder.setUpdateTime(LocalDateTime.now());
                     gameTencentOrder.setUpdateBy(SecurityUtil.getUserId());

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

@@ -98,6 +98,7 @@ public class GameTencentUserServiceImpl extends ServiceImpl<GameTencentUserMappe
                             .wechatAppId(gameTencentUser.getWechatAppId())
                             .wechatOpenid(gameTencentUser.getWechatOpenid())
                             .userActionSetId(gameTencentUser.getUserActionSetId())
+                            .actionParam(actionParam.toString())
                             .build();
                     gameTencentUser.setUpdateTime(LocalDateTime.now());
                     gameTencentUser.setUpdateBy(SecurityUtil.getUserId());