feat : 游戏平台数据同步服务完成, 正式上线

game-platform/game-platform-serve/pom.xml

@@ -75,6 +75,10 @@
             <groupId>com.zanxiang.module</groupId>
             <artifactId>zx-web</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.zanxiang.erp</groupId>
+            <artifactId>erp-security</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.zanxiang.module</groupId>
             <artifactId>zx-redis</artifactId>

game-platform/game-platform-serve/src/main/java/com/zanxiang/game/platform/serve/GamePlatformApplication.java

@@ -23,7 +23,7 @@ public class GamePlatformApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(GamePlatformApplication.class, args);
-        System.out.println("游戏第三方平台数据服务启动成功 ( ´･･)ﾉ(._.`) \n" +
+        System.out.println("游戏第三方平台数据服务启动成功--pro ( ´･･)ﾉ(._.`) \n" +
                 " ______  __     __     \n" +
                 "/_____/\\/__/\\ /__/\\    \n" +
                 "\\:::__\\/\\ \\::\\\\:.\\ \\   \n" +

game-platform/game-platform-serve/src/main/java/com/zanxiang/game/platform/serve/controller/GamePlatformSyncController.java

@@ -0,0 +1,49 @@
+package com.zanxiang.game.platform.serve.controller;
+
+import com.zanxiang.erp.security.annotation.PreAuthorize;
+import com.zanxiang.game.platform.serve.pojo.req.PlatformSyncRequest;
+import com.zanxiang.game.platform.serve.service.platform.PlatformBaseService;
+import com.zanxiang.game.platform.serve.utils.SpringUtils;
+import com.zanxiang.module.util.pojo.ResultVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author : lingfeng
+ * @time : 2023-05-22
+ * @description : 德扬接口
+ */
+@Api(tags = {"德扬手动同步"})
+@Slf4j
+@RestController
+@RequestMapping("/game/platform/sync")
+public class GamePlatformSyncController {
+
+    @ApiOperation(value = "用户信息同步接口")
+    @PostMapping("/user")
+    @PreAuthorize(permissionKey = "gamePlatformServe:gamePlatformSync:syncUser")
+    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Boolean.class)})
+    public ResultVO<Boolean> syncUserInfo(@RequestBody @Validated PlatformSyncRequest request) {
+        PlatformBaseService service = SpringUtils.getBean(request.getGamePlatformEnum().getClazz());
+        service.syncPlatformUser(request.getAccountIdList(), request.getStartDate(), request.getEndDate());
+        return ResultVO.ok(Boolean.TRUE);
+    }
+
+    @ApiOperation(value = "订单信息同步接口")
+    @PostMapping("/order")
+    @PreAuthorize(permissionKey = "gamePlatformServe:gamePlatformSync:syncOrder")
+    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Boolean.class)})
+    public ResultVO<Boolean> syncOrderInfo(@RequestBody @Validated PlatformSyncRequest request) {
+        PlatformBaseService service = SpringUtils.getBean(request.getGamePlatformEnum().getClazz());
+        service.syncPlatformOrder(request.getAccountIdList(), request.getStartDate(), request.getEndDate());
+        return ResultVO.ok(Boolean.TRUE);
+    }
+}

game-platform/game-platform-serve/src/main/java/com/zanxiang/game/platform/serve/controller/PlatformDeYangController.java

@@ -1,69 +0,0 @@
-package com.zanxiang.game.platform.serve.controller;
-
-import com.zanxiang.game.platform.serve.pojo.entity.GamePlatform;
-import com.zanxiang.game.platform.serve.pojo.entity.GamePlatformAccount;
-import com.zanxiang.game.platform.serve.service.IGamePlatformAccountService;
-import com.zanxiang.game.platform.serve.service.IGamePlatformService;
-import com.zanxiang.game.platform.serve.service.platform.PlatformDeYangService;
-import com.zanxiang.module.util.pojo.ResultVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * @author : lingfeng
- * @time : 2023-05-22
- * @description : 德扬接口
- */
-@Api(tags = {"德扬手动同步"})
-@Slf4j
-@RestController
-@RequestMapping("/deYang/game")
-public class PlatformDeYangController {
-
-    @Autowired
-    private IGamePlatformService gamePlatformService;
-
-    @Autowired
-    private IGamePlatformAccountService gamePlatformAccountService;
-
-    @Autowired
-    private PlatformDeYangService platformDeYangService;
-
-    @ApiOperation(value = "用户信息同步接口")
-    @GetMapping("/user")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Boolean.class)})
-    public ResultVO<Boolean> syncUserInfo() {
-        System.out.println("德扬用户信息手动同步");
-        return ResultVO.ok(Boolean.FALSE);
-    }
-
-    @ApiOperation(value = "订单信息同步接口")
-    @GetMapping("/order")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Boolean.class)})
-    public ResultVO<Boolean> syncOrderInfo() {
-        System.out.println("德扬订单信息手动同步");
-        return ResultVO.ok(Boolean.FALSE);
-    }
-
-    @ApiOperation(value = "测试")
-    @GetMapping("/test")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Boolean.class)})
-    public ResultVO<Boolean> test() {
-        GamePlatform gamePlatform = gamePlatformService.getById(1L);
-        List<GamePlatformAccount> list = gamePlatformAccountService.list();
-        list.forEach(l -> {
-            platformDeYangService.syncUserByAccount(gamePlatform, l, null, null);
-        });
-        return ResultVO.ok(Boolean.FALSE);
-    }
-
-}

game-platform/game-platform-serve/src/main/java/com/zanxiang/game/platform/serve/pojo/dto/PlatformDeYangOrderDTO.java

@@ -87,4 +87,9 @@ public class PlatformDeYangOrderDTO {
      * 分销号id
      */
     private String agent_id2;
+
+    /**
+     * 充值回执
+     */
+    private String bankOrderNo;
 }

game-platform/game-platform-serve/src/main/java/com/zanxiang/game/platform/serve/pojo/entity/PlatformDeYangOrder.java

@@ -105,4 +105,9 @@ public class PlatformDeYangOrder implements Serializable {
      * 分销号id
      */
     private String agentId;
+
+    /**
+     * 充值回执
+     */
+    private String bankOrderNo;
 }

game-platform/game-platform-serve/src/main/java/com/zanxiang/game/platform/serve/pojo/req/PlatformSyncRequest.java

@@ -0,0 +1,43 @@
+package com.zanxiang.game.platform.serve.pojo.req;
+
+import com.zanxiang.game.platform.serve.enums.GamePlatformEnum;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * @author : lingfeng
+ * @time : 2023-05-25
+ * @description : 手动同步参数
+ */
+@Data
+public class PlatformSyncRequest {
+
+    /**
+     * 平台的 key
+     */
+    @NotNull
+    private GamePlatformEnum gamePlatformEnum;
+
+    /**
+     * 账号id列表
+     */
+    @NotEmpty
+    private List<Long> accountIdList;
+
+    /**
+     * 开始时间
+     */
+    @NotNull
+    private LocalDateTime startDate;
+
+    /**
+     * 结束时间
+     */
+    @NotNull
+    private LocalDateTime endDate;
+}

game-platform/game-platform-serve/src/main/java/com/zanxiang/game/platform/serve/pojo/res/PlatformDeYangBaseRes.java

@@ -23,6 +23,5 @@ public class PlatformDeYangBaseRes {
     /**
      * 分页总数
      */
-    //todo : 字段需要与德扬定义德接口一致
-    private Integer totalPage;
+    private Integer allpage;
 }

game-platform/game-platform-serve/src/main/java/com/zanxiang/game/platform/serve/service/impl/PlatformDeYangOrderServiceImpl.java

@@ -50,6 +50,7 @@ public class PlatformDeYangOrderServiceImpl extends ServiceImpl<PlatformDeYangOr
                 .productName(orderDTO.getProduct_name())
                 .touFangBack(orderDTO.getToufang_back())
                 .agentId(orderDTO.getAgent_id2())
+                .bankOrderNo(orderDTO.getBankOrderNo())
                 .build());
     }
 

game-platform/game-platform-serve/src/main/java/com/zanxiang/game/platform/serve/service/platform/PlatformBaseService.java

@@ -1,6 +1,7 @@
 package com.zanxiang.game.platform.serve.service.platform;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.zanxiang.game.platform.serve.enums.GamePlatformEnum;
 import com.zanxiang.game.platform.serve.pojo.entity.GamePlatform;
 import com.zanxiang.game.platform.serve.pojo.entity.GamePlatformAccount;
@@ -29,18 +30,18 @@ public abstract class PlatformBaseService {
     @Autowired
     private IGamePlatformAccountService gamePlatformAccountService;
 
-    /**
-     * 同步指定时间段的订单
-     *
-     * @param startDate 开始日期
-     * @param endDate   结束日期
-     * @return boolean
-     */
-    public boolean syncPlatformOrder(LocalDateTime startDate, LocalDateTime endDate) {
+    public void syncPlatformOrder(List<Long> accountIds, LocalDateTime startDate, LocalDateTime endDate) {
         GamePlatform gamePlatform = getByPlatformKey.getByPlatformKey(getGamePlatformEnum().getPlatformKey());
-        List<GamePlatformAccount> gamePlatformAccountList = gamePlatformAccountService.list(new LambdaQueryWrapper<GamePlatformAccount>()
-                .eq(GamePlatformAccount::getPlatformKey, gamePlatform.getPlatformKey())
-                .eq(GamePlatformAccount::getStatus, GamePlatformAccount.USE_STATUS));
+        List<GamePlatformAccount> gamePlatformAccountList;
+        //未指定账号id
+        if (CollectionUtils.isEmpty(accountIds)) {
+            gamePlatformAccountList = gamePlatformAccountService.list(new LambdaQueryWrapper<GamePlatformAccount>()
+                    .eq(GamePlatformAccount::getPlatformKey, gamePlatform.getPlatformKey())
+                    .eq(GamePlatformAccount::getStatus, GamePlatformAccount.USE_STATUS));
+        } else {
+            //指定账号id
+            gamePlatformAccountList = gamePlatformAccountService.listByIds(accountIds);
+        }
         for (GamePlatformAccount account : gamePlatformAccountList) {
             try {
                 syncOrderByAccount(gamePlatform, account, startDate, endDate);
@@ -48,14 +49,20 @@ public abstract class PlatformBaseService {
                 log.error("同步游戏平台订单失败！accountId: {}, error : {}", account.getId(), e.getMessage());
             }
         }
-        return true;
     }
 
-    public boolean syncPlatformUser(LocalDateTime startDate, LocalDateTime endDate) {
+    public void syncPlatformUser(List<Long> accountIds, LocalDateTime startDate, LocalDateTime endDate) {
         GamePlatform gamePlatform = getByPlatformKey.getByPlatformKey(getGamePlatformEnum().getPlatformKey());
-        List<GamePlatformAccount> gamePlatformAccountList = gamePlatformAccountService.list(new LambdaQueryWrapper<GamePlatformAccount>()
-                .eq(GamePlatformAccount::getPlatformKey, gamePlatform.getPlatformKey())
-                .eq(GamePlatformAccount::getStatus, GamePlatformAccount.USE_STATUS));
+        List<GamePlatformAccount> gamePlatformAccountList;
+        //指定账号id
+        if (CollectionUtils.isNotEmpty(accountIds)) {
+            gamePlatformAccountList = gamePlatformAccountService.listByIds(accountIds);
+        } else {
+            //未指定账号id
+            gamePlatformAccountList = gamePlatformAccountService.list(new LambdaQueryWrapper<GamePlatformAccount>()
+                    .eq(GamePlatformAccount::getPlatformKey, gamePlatform.getPlatformKey())
+                    .eq(GamePlatformAccount::getStatus, GamePlatformAccount.USE_STATUS));
+        }
         for (GamePlatformAccount account : gamePlatformAccountList) {
             try {
                 syncUserByAccount(gamePlatform, account, startDate, endDate);
@@ -63,7 +70,6 @@ public abstract class PlatformBaseService {
                 log.error("同步游戏平台用户失败！accountId: {}, error : {}", account.getId(), e.getMessage());
             }
         }
-        return true;
     }
 
     /**
@@ -80,9 +86,8 @@ public abstract class PlatformBaseService {
      * @param startDate    开始日期
      * @param endDate      结束日期
      * @param gamePlatform 游戏平台
-     * @return boolean
      */
-    public abstract boolean syncUserByAccount(GamePlatform gamePlatform, GamePlatformAccount account, LocalDateTime startDate, LocalDateTime endDate);
+    public abstract void syncUserByAccount(GamePlatform gamePlatform, GamePlatformAccount account, LocalDateTime startDate, LocalDateTime endDate);
 
     /**
      * 游戏平台同步用户
@@ -91,7 +96,6 @@ public abstract class PlatformBaseService {
      * @param startDate    开始日期
      * @param endDate      结束日期
      * @param gamePlatform 游戏平台
-     * @return boolean
      */
-    public abstract boolean syncOrderByAccount(GamePlatform gamePlatform, GamePlatformAccount account, LocalDateTime startDate, LocalDateTime endDate);
+    public abstract void syncOrderByAccount(GamePlatform gamePlatform, GamePlatformAccount account, LocalDateTime startDate, LocalDateTime endDate);
 }

game-platform/game-platform-serve/src/main/java/com/zanxiang/game/platform/serve/service/platform/PlatformDeYangService.java

@@ -54,7 +54,7 @@ public class PlatformDeYangService extends PlatformBaseService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public boolean syncOrderByAccount(GamePlatform gamePlatform, GamePlatformAccount account, LocalDateTime startDate, LocalDateTime endDate) {
+    public void syncOrderByAccount(GamePlatform gamePlatform, GamePlatformAccount account, LocalDateTime startDate, LocalDateTime endDate) {
         Map<String, String> platformParam = JsonUtil.toMap(gamePlatform.getConfigParam(), Map.class, String.class);
         Map<String, String> accountParam = JsonUtil.toMap(account.getConfigParam(), Map.class, String.class);
         startDate = startDate == null ? LocalDateTime.of(gamePlatform.getBeginTime(), LocalTime.MIDNIGHT) : startDate;
@@ -80,33 +80,34 @@ public class PlatformDeYangService extends PlatformBaseService {
                 url = URIUtil.fillUrlParams(url, params, true);
                 PlatformDeYangOrderRes res;
                 try {
-                    res = restTemplate.getForObject(url, PlatformDeYangOrderRes.class);
+                    String result = restTemplate.getForObject(url, String.class);
+                    res = JsonUtil.toObj(result, PlatformDeYangOrderRes.class);
                 } catch (Exception e) {
                     log.error("同步德扬订单信息异常, accountId: {}, message: {}", account.getId(), e.getMessage());
                     break;
                 }
                 if (res == null || CollectionUtils.isEmpty(res.getList())) {
-                    log.error("同步德扬订单信息,返回结果为空, accountId: {}, res : {}", account.getId(), JsonUtil.toString(res));
+                    log.error("同步德扬订单信息,返回结果为空, accountId: {}, searchDate : {}, res : {}", account.getId(),
+                            searchDate, JsonUtil.toString(res));
                     break;
                 }
                 //总页数赋值
-                if (res.getTotalPage() != null) {
-                    totalPage = res.getTotalPage();
+                if (res.getAllpage() != null) {
+                    totalPage = res.getAllpage();
                 }
                 //数据处理
-                platformDeYangOrderService.saveOrUpdate(this.transformOrder(gamePlatform.getPlatformKey(), agentId, res.getList()));
+                if (CollectionUtils.isNotEmpty(res.getList())) {
+                    platformDeYangOrderService.saveOrUpdate(this.transformOrder(gamePlatform.getPlatformKey(), res.getList()));
+                }
             } while (page++ <= totalPage);
             //日期递增
             searchDate = searchDate.plusDays(1);
         } while (!searchDate.isAfter(endDate.toLocalDate()));
-
-
-        return true;
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public boolean syncUserByAccount(GamePlatform gamePlatform, GamePlatformAccount account, LocalDateTime startDate, LocalDateTime endDate) {
+    public void syncUserByAccount(GamePlatform gamePlatform, GamePlatformAccount account, LocalDateTime startDate, LocalDateTime endDate) {
         startDate = startDate == null ? LocalDateTime.of(gamePlatform.getBeginTime(), LocalTime.MIDNIGHT) : startDate;
         endDate = endDate == null ? LocalDateTime.now() : endDate;
         Map<String, String> accountParam = JsonUtil.toMap(account.getConfigParam(), Map.class, String.class);
@@ -132,26 +133,28 @@ public class PlatformDeYangService extends PlatformBaseService {
                 url = URIUtil.fillUrlParams(url, params, true);
                 PlatformDeYangUserRes res;
                 try {
-                    res = restTemplate.getForObject(url, PlatformDeYangUserRes.class);
+                    String result = restTemplate.getForObject(url, String.class);
+                    res = JsonUtil.toObj(result, PlatformDeYangUserRes.class);
                 } catch (Exception e) {
                     log.error("同步德扬订单信息异常, accountId: {}, message: {}", account.getId(), e.getMessage());
                     break;
                 }
-                if (res == null) {
+                if (res == null || CollectionUtils.isEmpty(res.getList())) {
                     log.error("同步德扬用户信息,返回结果为空, accountId: {}, res : {}", account.getId(), JsonUtil.toString(res));
                     break;
                 }
                 //总页数赋值
-                if (res.getTotalPage() != null) {
-                    totalPage = res.getTotalPage();
+                if (res.getAllpage() != null) {
+                    totalPage = res.getAllpage();
                 }
                 //数据处理
-                platformDeYangUserService.saveOrUpdate(this.transformUser(gamePlatform.getPlatformKey(), agentId, res.getList()));
+                if (CollectionUtils.isNotEmpty(res.getList())) {
+                    platformDeYangUserService.saveOrUpdate(this.transformUser(gamePlatform.getPlatformKey(), res.getList()));
+                }
             } while (page++ <= totalPage);
             //日期递增
             searchDate = searchDate.plusDays(1);
         } while (!searchDate.isAfter(endDate.toLocalDate()));
-        return true;
     }
 
     private String sign(String secret, Map<String, String> params) {
@@ -164,11 +167,10 @@ public class PlatformDeYangService extends PlatformBaseService {
             }
             temp.append(paramKey).append("=").append(params.get(paramKey)).append("&");
         }
-        String res = temp.substring(0, temp.length() - 1) + secret;
-        return Md5Util.encrypt32(res);
+        return Md5Util.encrypt32(temp.substring(0, temp.length() - 1) + secret);
     }
 
-    private List<PlatformDeYangOrder> transformOrder(String platformKey, String agentId, List<PlatformDeYangOrderDTO> orderList) {
+    private List<PlatformDeYangOrder> transformOrder(String platformKey, List<PlatformDeYangOrderDTO> orderList) {
         if (CollectionUtils.isEmpty(orderList)) {
             return Collections.emptyList();
         }
@@ -188,11 +190,12 @@ public class PlatformDeYangService extends PlatformBaseService {
                 .tunnelId(order.getTunnel_id())
                 .productName(order.getProduct_name())
                 .touFangBack(order.getToufang_back())
-                .agentId(agentId)
+                .agentId(order.getAgent_id2())
+                .bankOrderNo(order.getBankOrderNo())
                 .build()).collect(Collectors.toList());
     }
 
-    private List<PlatformDeYangUser> transformUser(String platformKey, String agentId, List<PlatformDeYangUserDTO> userList) {
+    private List<PlatformDeYangUser> transformUser(String platformKey, List<PlatformDeYangUserDTO> userList) {
         if (CollectionUtils.isEmpty(userList)) {
             return Collections.emptyList();
         }
@@ -216,7 +219,7 @@ public class PlatformDeYangService extends PlatformBaseService {
                 .appId(user.getAppid())
                 .appName(user.getAppname())
                 .userAgent(user.getUser_agent())
-                .agentId(agentId)
+                .agentId(user.getAgent_id2())
                 .build()).collect(Collectors.toList());
     }
 }

game-platform/game-platform-serve/src/main/java/com/zanxiang/game/platform/serve/task/SyncPlatformOrderTask.java

@@ -90,7 +90,7 @@ public class SyncPlatformOrderTask {
     private void execute(GamePlatformEnum gamePlatformEnum, LocalDateTime startTime, LocalDateTime endTime) {
         try {
             PlatformBaseService service = SpringUtils.getBean(gamePlatformEnum.getClazz());
-            service.syncPlatformOrder(startTime, endTime);
+            service.syncPlatformOrder(null, startTime, endTime);
         } catch (UnsupportedException ignored) {
         } catch (Exception e) {
             log.error("同步游戏平台【{}】的订单异常, 异常原因: {}", gamePlatformEnum.getPlatformName(), e.getMessage(), e);

game-platform/game-platform-serve/src/main/java/com/zanxiang/game/platform/serve/task/SyncPlatformUserTask.java

@@ -90,7 +90,7 @@ public class SyncPlatformUserTask {
     private void execute(GamePlatformEnum gamePlatformEnum, LocalDateTime startTime, LocalDateTime endTime) {
         try {
             PlatformBaseService service = SpringUtils.getBean(gamePlatformEnum.getClazz());
-            service.syncPlatformUser(startTime, endTime);
+            service.syncPlatformUser(null, startTime, endTime);
         } catch (UnsupportedException ignored) {
         } catch (Exception e) {
             log.error("同步游戏平台【{}】的用户异常, 异常原因: {}", gamePlatformEnum.getPlatformName(), e.getMessage(), e);