|
@@ -1,11 +1,11 @@
|
|
|
package com.zanxiang.game.module.sdk.service.impl;
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
+import com.zanxiang.game.module.base.pojo.enums.OsEnum;
|
|
|
import com.zanxiang.game.module.base.pojo.enums.PayDeviceEnum;
|
|
|
import com.zanxiang.game.module.mybatis.entity.Order;
|
|
|
import com.zanxiang.game.module.mybatis.entity.OrderPayParam;
|
|
|
import com.zanxiang.game.module.mybatis.entity.User;
|
|
|
-import com.zanxiang.game.module.sdk.enums.DeviceTypeEnum;
|
|
|
import com.zanxiang.game.module.sdk.enums.OrderStateEnum;
|
|
|
import com.zanxiang.game.module.sdk.enums.PayTypeEnum;
|
|
|
import com.zanxiang.game.module.sdk.pojo.dto.GamePayWayDTO;
|
|
@@ -129,13 +129,8 @@ public class OrderPayServiceImpl implements IOrderPayService {
|
|
|
//支付方式
|
|
|
GamePayWayDTO gamePayWayDTO = null;
|
|
|
//android用户, 游戏适配米大师支付
|
|
|
- if (Objects.equals(userData.getDeviceSystem(), DeviceTypeEnum.DEVICE_TYPE_ANDROID.getDescribe())) {
|
|
|
- gamePayWayDTO = gamePayWayList.stream().filter(gamePayWay ->
|
|
|
- Objects.equals(gamePayWay.getPayDeviceId(), PayDeviceEnum.MI_PAY.getPayDeviceId()))
|
|
|
- .findFirst().orElse(null);
|
|
|
- }
|
|
|
- //两个账号做测试
|
|
|
- if (userData.getUserId() == 6L || userData.getUserId() == 306L) {
|
|
|
+ if (Objects.equals(userData.getDeviceSystem(), OsEnum.SYSTEM_ANDROID.getOs())
|
|
|
+ || Objects.equals(userData.getDeviceSystem(), OsEnum.SYSTEM_WINDOW.getOs())) {
|
|
|
gamePayWayDTO = gamePayWayList.stream().filter(gamePayWay ->
|
|
|
Objects.equals(gamePayWay.getPayDeviceId(), PayDeviceEnum.MI_PAY.getPayDeviceId()))
|
|
|
.findFirst().orElse(null);
|