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

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

@@ -51,12 +51,15 @@ public class GameTencentMiniGameOrderServiceImpl extends ServiceImpl<GameTencent
         if (mustBack) {
             doBack = true;
         } else {
-            if (!Objects.equals(orderLog.getOrderStatus(), OrderStatusEnum.SUCCESS_PAY.getValue()) &&
-                    !Objects.equals(orderLog.getOrderStatus(), OrderStatusEnum.SUCCESS_PAY.getValue())) {
-                // 只要回传 下单、支付行为
+            if (!Objects.equals(orderLog.getOrderStatus(), OrderStatusEnum.SUCCESS_PAY.getValue())) {
+                // 只要回传 支付行为
                 return false;
             }
         }
+        if (StringUtils.isBlank(orderLog.getClickId())) {
+            // 没有点击 id（之后做监测链接，从监测链接里面找）
+            return false;
+        }
         if (orderLog.getBackPolicyId() == null) {
             // 没有回传策略，则直接全量回传
             doBack = true;
@@ -110,12 +113,12 @@ public class GameTencentMiniGameOrderServiceImpl extends ServiceImpl<GameTencent
     @Override
     public boolean doReport(List<Long> orderLogIds) {
         listByIds(orderLogIds).forEach(orderLog -> {
-                    BackStatusEnum backStatus = gameTencentMiniGameBackLogService.orderBack(orderLog);
-                    update(new LambdaUpdateWrapper<GameTencentMiniGameOrder>()
-                            .set(GameTencentMiniGameOrder::getBackStatus, backStatus.getBackStatus())
-                            .eq(GameTencentMiniGameOrder::getId, orderLog.getId())
-                    );
-                });
+            BackStatusEnum backStatus = gameTencentMiniGameBackLogService.orderBack(orderLog);
+            update(new LambdaUpdateWrapper<GameTencentMiniGameOrder>()
+                    .set(GameTencentMiniGameOrder::getBackStatus, backStatus.getBackStatus())
+                    .eq(GameTencentMiniGameOrder::getId, orderLog.getId())
+            );
+        });
         return true;
     }
 

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

@@ -41,6 +41,10 @@ public class GameTencentMiniGameUserServiceImpl extends ServiceImpl<GameTencentM
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean userBack(GameTencentMiniGameUser userLog, boolean mustBack) {
+        if (StringUtils.isBlank(userLog.getClickId())) {
+            // 没有点击 id（之后做监测链接，从监测链接里面找）
+            return false;
+        }
         BackStatusEnum backStatus = doCallback(userLog, mustBack);
         return update(new LambdaUpdateWrapper<GameTencentMiniGameUser>()
                 .set(GameTencentMiniGameUser::getBackStatus, backStatus.getBackStatus())

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/SDKApplication.java

@@ -23,7 +23,7 @@ public class SDKApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(SDKApplication.class, args);
-        System.out.println("赞象SDK服务启动成功 <dubbo升级3.0, 小游戏回传修改> ( ´･･)ﾉ(._.`) \n" +
+        System.out.println("赞象SDK服务启动成功 <dubbo升级3.0, 小游戏回传修改11> ( ´･･)ﾉ(._.`) \n" +
                 " ___________ _   __\n" +
                 "/  ___|  _  \\ | / /\n" +
                 "\\ `--.| | | | |/ / \n" +

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/service/impl/OrderServiceImpl.java

@@ -2,6 +2,7 @@ package com.zanxiang.game.module.sdk.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zanxiang.game.back.base.pojo.enums.OrderStatusEnum;
 import com.zanxiang.game.module.mybatis.entity.*;
 import com.zanxiang.game.module.mybatis.mapper.OrderMapper;
 import com.zanxiang.game.module.sdk.pojo.dto.GamePayWayDTO;
@@ -106,6 +107,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                 .payDeviceId(gamePayWayDTO.getPayDeviceId())
                 .gamePayWayId(gamePayWayDTO.getId())
                 .ext(payParam.getExtension())
+                .status(OrderStatusEnum.READY_PAY.getValue())
                 .createTime(LocalDateTime.now())
                 .updateTime(LocalDateTime.now())
                 .build();