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

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();