mrege Develop #10
Merged
mrege Develop #10
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
update from base
update from upstream
Update WxMpServiceImpl.java
增加NATIVE扫码支付类型， 1.将原来的getJSSDKPayInfo(String openId, String outTradeNo, double amt, String body, String tradeType, String ip, String notifyUrl)方法拆分为两个方法：1）拼装NATIVE发起支付请求需要的参数的方法 Map<String, String> getNativePayInfo(String productId, String outTradeNo, double amt, String body, String ip, String notifyUrl); 2） 拼装JSAPI发起支付请求需要的参数方法 Map<String, String> getJsapiPayInfo(String openId, String outTradeNo, double amt, String body, String ip, String notifyUrl); 2.修改getJSSDKPayInfo(Map<String, String> parameters)方式为getPayInfo(Map<String, String> parameters)，适用上面两个方法调用。
1.对应WxMpService类修改getJSSDKPayInfo(Map<String, String> parameters)方法为getPayInfo(Map<String, String> parameters)方法 2.增加，1）扫码支付参数拼装方法：getNativePayInfo(String productId,String outTradeNo, double amt, String body,String ip, String callbackUrl) 2）原来的公众号支付参数拼装方法：getJsapiPayInfo(String openId,String outTradeNo, double amt, String body,String ip, String callbackUrl) 3.在getPayInfo(Map<String, String> parameters)方法中增加codeUrl参数判断，只有在NATIVE方式才返回codeUrl参数。
1.对应WxMpService类修改getJSSDKPayInfo(Map<String, String> parameters)方法为getPayInfo(Map<String, String> parameters)方法 2.增加，1）扫码支付参数拼装方法：getNativePayInfo(String productId,String outTradeNo, double amt, String body,String ip, String callbackUrl) 2）原来的公众号支付参数拼装方法：getJsapiPayInfo(String openId,String outTradeNo, double amt, String body,String ip, String callbackUrl) 3.在getPayInfo(Map<String, String> parameters)方法中增加codeUrl参数判断，只有在NATIVE方式才返回codeUrl参数。
群发接口响应 增加msgDataId字段 用于图文分析
消息群发的预览接口
上传图文消息内的图片获取URL
# Conflicts: # weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java
binarywang
pushed a commit
that referenced
this pull request
Dec 19, 2016
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.