diff --git a/hai-order/src/main/java/com/web/controller/OrderPayController.java b/hai-order/src/main/java/com/web/controller/OrderPayController.java index 2e2b7e5d..16c06353 100644 --- a/hai-order/src/main/java/com/web/controller/OrderPayController.java +++ b/hai-order/src/main/java/com/web/controller/OrderPayController.java @@ -228,7 +228,7 @@ public class OrderPayController { if (store.getSourceType().equals(MerchantStoreSourceType.type1.getNumber())) { // 查询支付配置 - HighGasChannelConfig gasChannelConfig = gasChannelConfigService.getConfig(GasChannel.type1, GasChannelPayPlatformType.type1); + HighGasChannelConfig gasChannelConfig = gasChannelConfigService.getConfig(GasChannel.type1); if (gasChannelConfig == null) { throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未配置支付参数,请稍后重试!"); } @@ -582,7 +582,7 @@ public class OrderPayController { payParam.put("outTradeNo" , order.getOrderNo()); payParam.put("transType" , "JSAPI"); payParam.put("payMode" , "ALIPAY"); - payParam.put("totalAmount" , order.getPayRealPrice()); + payParam.put("totalAmount" , order.getPayablePrice()); payParam.put("profitSharing" , profitSharing.equals("Y")?1:0); payParam.put("notifyUrl" , SysConst.getSysConfig().getHuiPayNotify()); payParam.put("subject" , orderTitle); diff --git a/hai-service/src/main/java/com/hai/service/impl/BsConfigServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/BsConfigServiceImpl.java index 45ed3f50..261fc79e 100644 --- a/hai-service/src/main/java/com/hai/service/impl/BsConfigServiceImpl.java +++ b/hai-service/src/main/java/com/hai/service/impl/BsConfigServiceImpl.java @@ -108,6 +108,11 @@ public class BsConfigServiceImpl implements BsConfigService { stringName.append(productPayType.getPayTypeName()).append(","); string.append(productPayType.getPayTypeId()).append(","); } + } else if (platformId == 4) { + if (productPayType.getPayTypeId() == 1 || productPayType.getPayTypeId() == 3 || productPayType.getPayTypeId() == 6 || productPayType.getPayTypeId() == 7) { + stringName.append(productPayType.getPayTypeName()).append(","); + string.append(productPayType.getPayTypeId()).append(","); + } } } else { stringName.append(productPayType.getPayTypeName()).append(",");