|
@@ -600,6 +600,10 @@ public class ProjectPaySettingServiceImpl extends SuperService {
|
|
|
public ResultContent<PayConfigFieldModel> getField(PaymentType paymentType) {
|
|
public ResultContent<PayConfigFieldModel> getField(PaymentType paymentType) {
|
|
|
PayConfigFieldModel model = new PayConfigFieldModel();
|
|
PayConfigFieldModel model = new PayConfigFieldModel();
|
|
|
if (paymentType == PaymentType.WeChat) {
|
|
if (paymentType == PaymentType.WeChat) {
|
|
|
|
|
+ // 微信小程序支付 (充值)
|
|
|
|
|
+ model.setApiName("saveWxPayConfig");
|
|
|
|
|
+ model.setFields(getWxConfig());
|
|
|
|
|
+ } else if (paymentType == PaymentType.WeChatPay) {
|
|
|
// 微信小程序支付
|
|
// 微信小程序支付
|
|
|
model.setApiName("saveWxPayConfig");
|
|
model.setApiName("saveWxPayConfig");
|
|
|
model.setFields(getWxConfig());
|
|
model.setFields(getWxConfig());
|
|
@@ -866,6 +870,19 @@ public class ProjectPaySettingServiceImpl extends SuperService {
|
|
|
Boolean disable = Boolean.FALSE;
|
|
Boolean disable = Boolean.FALSE;
|
|
|
if (ObjectUtils.isNotEmpty(entity)) {
|
|
if (ObjectUtils.isNotEmpty(entity)) {
|
|
|
if (paymentType == PaymentType.WeChat) {
|
|
if (paymentType == PaymentType.WeChat) {
|
|
|
|
|
+ // 微信支付 (充值)
|
|
|
|
|
+ accountModel.setProductChannelType(PayProductChannelType.WeChatMiniAppPay);
|
|
|
|
|
+
|
|
|
|
|
+ WeChatMiniAppConf appConf = new WeChatMiniAppConf();
|
|
|
|
|
+ WxPayConfigModel model = (WxPayConfigModel) entity.getPayConfig();
|
|
|
|
|
+ appConf.setAppId(model.getAppId());
|
|
|
|
|
+ appConf.setMchId(model.getMchId());
|
|
|
|
|
+ appConf.setMchSerialNo(model.getMchSerialNo());
|
|
|
|
|
+ appConf.setPriKeyPath(model.getPrivateKeyStr());
|
|
|
|
|
+ appConf.setApiV3KeyPath(model.getApiV3Key());
|
|
|
|
|
+ appConf.setNotifyUrl(model.getNotifyUrl());
|
|
|
|
|
+ accountModel.setConf(appConf);
|
|
|
|
|
+ } else if (paymentType == PaymentType.WeChatPay) {
|
|
|
// 微信支付
|
|
// 微信支付
|
|
|
accountModel.setProductChannelType(PayProductChannelType.WeChatMiniAppPay);
|
|
accountModel.setProductChannelType(PayProductChannelType.WeChatMiniAppPay);
|
|
|
|
|
|