|
@@ -160,7 +160,9 @@ public class OrderPayServiceImpl implements IOrderPayService {
|
|
|
GamePayWayDTO gamePayWayDTO = null;
|
|
|
//android用户, 游戏适配米大师支付
|
|
|
if (Objects.equals(userData.getDeviceSystem(), OsEnum.SYSTEM_ANDROID.getOs())
|
|
|
- || Objects.equals(userData.getDeviceSystem(), OsEnum.SYSTEM_WINDOW.getOs())) {
|
|
|
+ || Objects.equals(userData.getDeviceSystem(), OsEnum.SYSTEM_WINDOW.getOs())
|
|
|
+ || Objects.equals(userData.getDeviceSystem(), OsEnum.SYSTEM_OHOS.getOs())
|
|
|
+ ) {
|
|
|
gamePayWayDTO = gamePayWayList.stream().filter(gamePayWay ->
|
|
|
Objects.equals(gamePayWay.getPayDeviceId(), PayDeviceEnum.MI_PAY.getPayDeviceId()))
|
|
|
.findFirst().orElse(null);
|
|
@@ -269,6 +271,7 @@ public class OrderPayServiceImpl implements IOrderPayService {
|
|
|
if (Objects.equals(userData.getDeviceSystem(), OsEnum.SYSTEM_ANDROID.getOs())
|
|
|
|| Objects.equals(userData.getDeviceSystem(), OsEnum.SYSTEM_WINDOW.getOs())
|
|
|
|| Objects.equals(userData.getDeviceSystem(), OsEnum.SYSTEM_DEVTOOLS.getOs())
|
|
|
+ || Objects.equals(userData.getDeviceSystem(), OsEnum.SYSTEM_OHOS.getOs())
|
|
|
) {
|
|
|
result = wxApiService.checkSessionKey(userData.getGameId(), user.getOpenId(), user.getSessionKey());
|
|
|
}
|