|
@@ -368,9 +368,8 @@ public class WxPayService extends PayBaseService {
|
|
|
PayMerchantDTO payMerchantDTO;
|
|
|
//支付应用信息
|
|
|
PayApplicationDTO payApplicationDTO;
|
|
|
- //小程序支付和客服支付, 关联了盒子
|
|
|
- if (Objects.equals(PayDeviceEnum.APPLET_PAY.getPayDeviceId(), gamePayWayDTO.getPayDeviceId())
|
|
|
- || Objects.equals(PayDeviceEnum.CUSTOM_PAY.getPayDeviceId(), gamePayWayDTO.getPayDeviceId())) {
|
|
|
+ //小程序支付, 客服支付, 公众号支付, 关联了盒子
|
|
|
+ if (PayDeviceEnum.getByPayWayIdList().contains(gamePayWayDTO.getPayDeviceId())) {
|
|
|
payMerchantDTO = payBoxService.getMerchantByBoxId(gamePayWayDTO.getPayBoxId());
|
|
|
payApplicationDTO = payApplicationService.getPayApplicationByPayBoxId(gamePayWayDTO.getPayBoxId());
|
|
|
} else {
|