diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/WechatPlugin.java b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/WechatPlugin.java index 94ce4589..a7c2dd46 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/WechatPlugin.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/WechatPlugin.java @@ -140,7 +140,7 @@ public class WechatPlugin implements Payment { WechatPaymentSetting setting = wechatPaymentSetting(); - String appid = setting.getServiceAppId(); + String appid = setting.getH5AppId(); if (appid == null) { throw new ServiceException(ResultCode.WECHAT_PAYMENT_NOT_SETTING); } @@ -199,7 +199,7 @@ public class WechatPlugin implements Payment { String attach = URLEncoder.createDefault().encode(JSONUtil.toJsonStr(payParam), StandardCharsets.UTF_8); WechatPaymentSetting setting = wechatPaymentSetting(); - String appid = setting.getServiceAppId(); + String appid = setting.getJsapiAppId(); if (appid == null) { throw new ServiceException(ResultCode.WECHAT_PAYMENT_NOT_SETTING); } @@ -264,7 +264,7 @@ public class WechatPlugin implements Payment { String attach = URLEncoder.createDefault().encode(JSONUtil.toJsonStr(payParam), StandardCharsets.UTF_8); WechatPaymentSetting setting = wechatPaymentSetting(); - String appid = setting.getAppId(); + String appid = setting.getJsapiAppId(); if (appid == null) { throw new ServiceException(ResultCode.WECHAT_PAYMENT_NOT_SETTING); } @@ -332,7 +332,7 @@ public class WechatPlugin implements Payment { WechatPaymentSetting setting = wechatPaymentSetting(); - String appid = setting.getServiceAppId(); + String appid = setting.getNativeAppId(); if (appid == null) { throw new ServiceException(ResultCode.WECHAT_PAYMENT_NOT_SETTING); } diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dto/payment/WechatPaymentSetting.java b/framework/src/main/java/cn/lili/modules/system/entity/dto/payment/WechatPaymentSetting.java index 4a027dc2..9cda1f97 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/dto/payment/WechatPaymentSetting.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/dto/payment/WechatPaymentSetting.java @@ -14,17 +14,25 @@ import lombok.experimental.Accessors; public class WechatPaymentSetting { /** - * APP应用id + * JSAPI支付应用ID */ - private String appId; + private String jsapiAppId; /** - * 小程序应用id + * native支付应用ID + */ + private String nativeAppId; + /** + * 小程序支付应用id */ private String mpAppId; /** - * 服务号应用id + * H5支付应用ID */ - private String serviceAppId; + private String h5AppId; + /** + * APP支付应用ID + */ + private String appAppId; /** * 商户号 */