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

game-module/game-common/src/main/java/com/zanxiang/common/domain/MiPayConfig.java

@@ -1,47 +0,0 @@
-package com.zanxiang.common.domain;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * @author xufeng
- * @date 2022/7/15 12:00
- */
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@Builder
-public class MiPayConfig {
-
-    /**
-     * 微信小程序appId
-     */
-    private String wxAppId;
-
-    /**
-     * 米大师支付应用id
-     */
-    private String appId;
-
-    /**
-     * 米大师现网AppKey
-     */
-    private String appKey;
-
-    /**
-     * 米大师沙箱AppKey
-     */
-    private String appKeyDev;
-
-    /**
-     * 人民币元宝比例
-     */
-    private String exchangeRate;
-
-    /**
-     * IOS充值提示
-     */
-    private String iosTips;
-}

game-module/game-common/src/main/java/com/zanxiang/common/domain/gameStrategy/Order.java

@@ -1,31 +0,0 @@
-package com.zanxiang.common.domain.gameStrategy;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-
-/**
- * 游戏支付策略-订单切量配置
- *
- * @author xufeng
- * @date 2022/7/1 11:47
- */
-@Data
-public class Order implements Serializable {
-
-    @ApiModelProperty(notes = "日总金额")
-    private BigDecimal dayAmount;
-
-    @ApiModelProperty(notes = "周总金额")
-    private BigDecimal weekAmount;
-
-    @ApiModelProperty(notes = "月总金额")
-    private BigDecimal monthAmount;
-
-    @ApiModelProperty(notes = "总金额")
-    private BigDecimal totalAmount;
-
-
-}

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

@@ -104,7 +104,7 @@ public class GameAppletServiceImpl extends ServiceImpl<GameAppletMapper, GameApp
         //查询用户最新订单
         Order order = orderService.getOne(new LambdaQueryWrapper<Order>()
                 .eq(Order::getUserId, userDTO.getId())
-                .eq(Order::getStatus, OrderStateEnum.WAIT_PAY.getCode())
+                .eq(Order::getStatus, OrderStateEnum.READY_PAY.getCode())
                 .orderByDesc(Order::getCreateTime)
                 .last("limit 1"));
         if (order == null) {