فهرست منبع

feat : 上线部署修改118

bilingfeng 2 سال پیش
والد
کامیت
b0442dd642

+ 0 - 36
game-module/game-manage/src/main/java/com/zanxiang/manage/domain/vo/OrderCompleteListVO.java

@@ -1,36 +0,0 @@
-package com.zanxiang.manage.domain.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author xufeng
- * @date 2022/7/4 16:25
- */
-@Data
-public class OrderCompleteListVO implements Serializable {
-    @ApiModelProperty(notes = "订单列表数据")
-    private List<OrderCompleteVO> data;
-
-    @ApiModelProperty(notes = "订单统计数据")
-    private Map<String, BigDecimal> totalData;
-
-    @ApiModelProperty(notes = "总数据")
-    private Long total;
-
-    @ApiModelProperty(notes = "每页显示条数")
-    private Long size;
-
-    @ApiModelProperty(notes = "当前页")
-    private Long current;
-
-    @ApiModelProperty(notes = "分页总页数")
-    private Long pages;
-
-
-}

+ 0 - 156
game-module/game-manage/src/main/java/com/zanxiang/manage/domain/vo/OrderCompleteVO.java

@@ -1,156 +0,0 @@
-package com.zanxiang.manage.domain.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 注释游戏订单全量宽表
- *
- * @author xufeng
- * @date 2022-07-04 11:45
- */
-@Data
-public class OrderCompleteVO implements Serializable {
-
-    @ApiModelProperty(notes = "订单ID:订单号")
-    private Long id;
-
-    @ApiModelProperty(notes = "订单ID:订单号")
-    private Long orderId;
-
-    @ApiModelProperty(notes = "充值游戏id")
-    private Long gameId;
-
-    @ApiModelProperty(notes = "充值游戏名称")
-    private String gameName;
-
-    @ApiModelProperty(notes = "充值游戏类型")
-    private String gameCategory;
-
-    @ApiModelProperty(notes = "是否删除:0正常 1删除")
-    private Integer isDelete;
-
-    @ApiModelProperty(notes = "订单下单日期(不含时分秒)")
-    private Date orderDate;
-
-    @ApiModelProperty(notes = "cp订单号")
-    private String cpOrderId;
-
-    @ApiModelProperty(notes = "第三方支付订单号")
-    private String merchantOrderNo;
-
-    @ApiModelProperty(notes = "玩家id")
-    private Long userId;
-
-    @ApiModelProperty(notes = "玩家账号")
-    private String userAccount;
-
-    @ApiModelProperty(notes = "玩家注册时间")
-    private Date userRegisterTime;
-
-    @ApiModelProperty(notes = "注册游戏")
-    private String userRegisterGame;
-
-    @ApiModelProperty(notes = "注册游戏分类")
-    private String userRegisterGameCategory;
-
-    @ApiModelProperty(notes = "玩家注册渠道")
-    private String userRegisterChannel;
-
-    @ApiModelProperty(notes = "cp id")
-    private Long cpId;
-
-    @ApiModelProperty(notes = "cp名称")
-    private String cpName;
-
-    @ApiModelProperty(notes = "投放人")
-    private String agentId;
-
-    @ApiModelProperty(notes = "推广账号")
-    private String agentAccount;
-
-    @ApiModelProperty(notes = "推广媒体")
-    private String agentMedia;
-
-    @ApiModelProperty(notes = "推广广告")
-    private String agentAdvert;
-
-    @ApiModelProperty(notes = "产品id")
-    private String productId;
-
-    @ApiModelProperty(notes = "产品名称")
-    private String productName;
-
-    @ApiModelProperty(notes = "订单金额")
-    private BigDecimal orderAmount;
-
-    @ApiModelProperty(notes = "订单实付金额")
-    private BigDecimal realAmount;
-
-    @ApiModelProperty(notes = "支付方式")
-    private String payWay;
-
-    @ApiModelProperty(notes = "支付场景")
-    private String payDevice;
-
-    @ApiModelProperty(notes = "收款商户号")
-    private String merchantNo;
-
-    @ApiModelProperty(notes = "收款商户名称")
-    private String merchantName;
-
-    @ApiModelProperty(notes = "游戏区服")
-    private String gameRegional;
-
-    @ApiModelProperty(notes = "游戏角色")
-    private String gameRole;
-
-    @ApiModelProperty(notes = "游戏等级")
-    private String gameLevel;
-
-    @ApiModelProperty(notes = "游戏角色vip")
-    private String gameVip;
-
-    @ApiModelProperty(notes = "操作系统")
-    private String fromDevice;
-
-    @ApiModelProperty(notes = "是否切量  0 否 1 是")
-    private Integer isSwitch;
-
-    @ApiModelProperty(notes = "支付时间")
-    private Date payTime;
-
-    @ApiModelProperty(notes = "结束时间")
-    private String endTime;
-
-    @ApiModelProperty(notes = "cp最后通知时间")
-    private Date lastCpNotifyTime;
-
-    @ApiModelProperty(notes = "支付状态,1待支付,2 支付成功,-1 已取消")
-    private Integer status;
-
-    @ApiModelProperty(notes = "CP通知状态,1为待处理,2为成功,-1为失败")
-    private Integer cpStatus;
-
-    @ApiModelProperty(notes = "是否首充 0 否 1 是")
-    private Integer isFirstRecharge;
-
-    @ApiModelProperty(notes = "广告上报状态")
-    private Integer advertNotifyStatus;
-
-    @ApiModelProperty(notes = "广告上报方式 0 系统 1 人工")
-    private Integer advertNotifyType;
-
-    @ApiModelProperty(notes = "渠道")
-    private String channel;
-
-    @ApiModelProperty(notes = "创建时间")
-    private Date createTime;
-
-    @ApiModelProperty(notes = "更新时间")
-    private Date updateTime;
-}

+ 2 - 0
game-module/game-sdk/src/main/java/com/zanxiang/sdk/adapter/WebHandlerAdapter.java

@@ -4,6 +4,7 @@ import com.zanxiang.common.enums.DeviceTypeEnum;
 import com.zanxiang.common.enums.HttpStatusEnum;
 import com.zanxiang.common.exception.CustomException;
 import com.zanxiang.common.utils.StringUtils;
+import com.zanxiang.module.util.JsonUtil;
 import com.zanxiang.mybatis.entity.GameExt;
 import com.zanxiang.sdk.annotation.UnSignCheck;
 import com.zanxiang.sdk.service.GameExtService;
@@ -64,6 +65,7 @@ public class WebHandlerAdapter implements HandlerInterceptor {
         }
         //签名验证
         GameExt gameExt = gameExtService.getByGameAppId(gameId);
+        log.error("gameId : {}, sign : {}, timestamp : {}, gameExt : {}", gameId, sign, timestamp, JsonUtil.toString(gameExt));
         if (gameExt == null || Strings.isBlank(gameExt.getAppKey())) {
             log.error("非法参数, 游戏id对应的前端密钥appKey不存在");
             throw new CustomException(HttpStatusEnum.INVALID_PARAMS);