Browse Source

回传策略更新,支持拆单回传

wcc 1 year ago
parent
commit
ce43e5eb90

+ 1 - 1
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/IGameTencentMiniGameBackLogService.java

@@ -14,5 +14,5 @@ public interface IGameTencentMiniGameBackLogService extends IService<GameTencent
 
     Tuple2<BackStatusEnum, String> orderBack(GameTencentMiniGameOrder orderLog, Long backMoney);
 
-    BackStatusEnum roleRegisterBack(GameTencentMiniGameRoleRegister roleRegisterLog);
+    Tuple2<BackStatusEnum, String> roleRegisterBack(GameTencentMiniGameRoleRegister roleRegisterLog);
 }

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

@@ -85,7 +85,7 @@ public class GameTencentMiniGameBackLogServiceImpl extends ServiceImpl<GameTence
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public BackStatusEnum roleRegisterBack(GameTencentMiniGameRoleRegister roleRegisterLog) {
+    public Tuple2<BackStatusEnum, String> roleRegisterBack(GameTencentMiniGameRoleRegister roleRegisterLog) {
         GameTencentMiniGameBackLog backLog = GameTencentMiniGameBackLog.builder()
                 .gameId(roleRegisterLog.getGameId())
                 .adAccountId(roleRegisterLog.getAdAccountId())
@@ -96,9 +96,11 @@ public class GameTencentMiniGameBackLogServiceImpl extends ServiceImpl<GameTence
                 .actionType(ActionTypeEnum.CREATE_ROLE.getActionType())
                 .createTime(LocalDateTime.now())
                 .build();
-        callback(backLog);
+        Tuple2<BackStatusEnum, String> backResult = callback(backLog);
+        backLog.setBackStatus(backResult.first.getBackStatus());
+        backLog.setErrMsg(backResult.second);
         save(backLog);
-        return BackStatusEnum.getByValue(backLog.getBackStatus());
+        return backResult;
     }
 
     private Tuple2<BackStatusEnum, String> callback(GameTencentMiniGameBackLog backLog) {

+ 7 - 6
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/impl/GameTencentMiniGameRoleRegisterServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.sd4324530.jtuple.Tuple2;
 import com.zanxiang.advertising.tencent.base.AdvertisingTencentServer;
 import com.zanxiang.advertising.tencent.base.rpc.IUserActionSetRpc;
 import com.zanxiang.game.back.serve.dao.mapper.GameTencentMiniGameRoleRegisterMapper;
@@ -62,9 +63,9 @@ public class GameTencentMiniGameRoleRegisterServiceImpl extends ServiceImpl<Game
         if (StringUtils.isBlank(roleRegisterLog.getClickId())) {
             return false;
         }
-        BackStatusEnum backStatus = doCallback(roleRegisterLog);
+        Tuple2<BackStatusEnum, String> backResult = doCallback(roleRegisterLog);
         return update(new LambdaUpdateWrapper<GameTencentMiniGameRoleRegister>()
-                .set(GameTencentMiniGameRoleRegister::getBackStatus, backStatus.getBackStatus())
+                .set(GameTencentMiniGameRoleRegister::getBackStatus, backResult.first.getBackStatus())
                 .eq(GameTencentMiniGameRoleRegister::getId, roleRegisterLog.getId())
         );
     }
@@ -94,9 +95,9 @@ public class GameTencentMiniGameRoleRegisterServiceImpl extends ServiceImpl<Game
     @Override
     public boolean doReport(List<Long> userLogIds) {
         listByIds(userLogIds).forEach(userLog -> {
-            BackStatusEnum backStatus = doCallback(userLog);
+            Tuple2<BackStatusEnum, String> backResult = doCallback(userLog);
             update(new LambdaUpdateWrapper<GameTencentMiniGameRoleRegister>()
-                    .set(GameTencentMiniGameRoleRegister::getBackStatus, backStatus.getBackStatus())
+                    .set(GameTencentMiniGameRoleRegister::getBackStatus, backResult.first.getBackStatus())
                     .eq(GameTencentMiniGameRoleRegister::getId, userLog.getId())
             );
         });
@@ -123,7 +124,7 @@ public class GameTencentMiniGameRoleRegisterServiceImpl extends ServiceImpl<Game
 
     }
 
-    private BackStatusEnum doCallback(GameTencentMiniGameRoleRegister roleRegisterLog) {
+    private Tuple2<BackStatusEnum, String> doCallback(GameTencentMiniGameRoleRegister roleRegisterLog) {
         GameTencentMiniGameUser user = gameTencentMiniGameUserService.getOne(new LambdaQueryWrapper<GameTencentMiniGameUser>()
                 .eq(GameTencentMiniGameUser::getGameId, roleRegisterLog.getGameId())
                 .eq(GameTencentMiniGameUser::getWechatAppId, roleRegisterLog.getWechatAppId())
@@ -137,7 +138,7 @@ public class GameTencentMiniGameRoleRegisterServiceImpl extends ServiceImpl<Game
                 gameTencentMiniGameUserService.userBack(user);
             } else {
                 // 注册已回传,则默认认为创角也回传了
-                return BackStatusEnum.NO;
+                return Tuple2.with(BackStatusEnum.SUCCESS, "注册已回传,则默认认为创角也回传了");
             }
         }
         return gameTencentMiniGameBackLogService.roleRegisterBack(roleRegisterLog);