Merge branch 'master' of https://gitee.com/wjl2008_admin/nuttyreading-java into zcc
This commit is contained in:
@@ -64,10 +64,12 @@ public class WeChatPayController {
|
|||||||
String nonceStr = UUID.randomUUID().toString().replace("-", "");
|
String nonceStr = UUID.randomUUID().toString().replace("-", "");
|
||||||
Map<String, Object> paramMap = new HashMap<>();
|
Map<String, Object> paramMap = new HashMap<>();
|
||||||
String appid = "";
|
String appid = "";
|
||||||
if (paymentInfo.getAppName()==null||"".equals(paymentInfo.getAppName())){
|
if (paymentInfo.getAppName()==null||"".equals(paymentInfo.getAppName())||"nuttyreading".equals(paymentInfo.getAppName())){
|
||||||
appid = wechatPayConfig.getAppId();
|
appid = wechatPayConfig.getAppId();
|
||||||
}else if ("zmzm".equals(paymentInfo.getAppName())){
|
}else if ("zmzm".equals(paymentInfo.getAppName())){
|
||||||
appid = wechatPayConfig.getZmzmappId();
|
appid = wechatPayConfig.getZmzmappId();
|
||||||
|
} else if ("wumen".equals(paymentInfo.getAppName())) {
|
||||||
|
appid = wechatPayConfig.getWumenappId();
|
||||||
}
|
}
|
||||||
Map<String, Object> map = new HashMap<>();
|
Map<String, Object> map = new HashMap<>();
|
||||||
paramMap.put("appid", appid);
|
paramMap.put("appid", appid);
|
||||||
|
|||||||
Reference in New Issue
Block a user