Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

支付通知解密数据对象增加字段 #2106

Merged
merged 2 commits into from
May 14, 2021
Merged

支付通知解密数据对象增加字段 #2106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c00bce
支付通知解密数据对象增加字段
mr-xiaoyu May 12, 2021
7393047
URL组装的Bug #2105
mr-xiaoyu May 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion weixin-java-cp/src/main/java/me/chanjar/weixin/cp/tp/service/WxCpTpMediaService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,13 @@ WxMediaUploadResult upload(String mediaType, String fileType, InputStream inputS
*
* @param mediaType 媒体类型
* @param file 文件对象
* @param corpId 授权企业的corpid
* @see #upload(String, String, InputStream, String)
* @throws WxErrorException 异常信息
*/
WxMediaUploadResult upload(String mediaType, File file, String corpId) throws WxErrorException;


/**
* <pre>
* 上传图片.
Expand All @@ -52,9 +55,10 @@ WxMediaUploadResult upload(String mediaType, String fileType, InputStream inputS
* 每个企业每天最多可上传100张图片
* 接口url格式：https://qyapi.weixin.qq.com/cgi-bin/media/uploadimg?access_token=ACCESS_TOKEN
* </pre>
*
* @param file 上传的文件对象
* @param corpId 授权企业的corpid
* @return 返回图片url
* @throws WxErrorException 异常信息
*/
String uploadImg(File file, String corpId) throws WxErrorException;
}
2 changes: 1 addition & 1 deletion ...in-java-cp/src/main/java/me/chanjar/weixin/cp/tp/service/impl/WxCpTpMediaServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public WxMediaUploadResult upload(String mediaType, File file, String corpId) th
@Override
public String uploadImg(File file, String corpId) throws WxErrorException {
String url = mainService.getWxCpTpConfigStorage().getApiUrl(IMG_UPLOAD);
url += "&access_token=" + mainService.getWxCpTpConfigStorage().getAccessToken(corpId);
url += "?access_token=" + mainService.getWxCpTpConfigStorage().getAccessToken(corpId);
return this.mainService.execute(MediaUploadRequestExecutor.create(this.mainService.getRequestHttp()), url, file)
.getUrl();
}
Expand Down
15 changes: 13 additions & 2 deletions ...y/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/PartnerTransactionsResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,11 +195,22 @@ public class PartnerTransactionsResult implements Serializable {

/**
* <pre>
* 字段名：+支付者
* 字段名：支付者信息
* 变量名：payer
* 是否必填：是
* 类型：object
* 描述：基础支付支付者信息
* </pre>
*/
private CombinePayerInfo payer;

/**
* <pre>
* 字段名：支付者
* 变量名：combine_payer_info
* 是否必填：否
* 类型：object
* 描述：示例值：见请求示例
* 描述：合单支付支付者信息，示例值：见请求示例
* </pre>
*/
@SerializedName(value = "combine_payer_info")
Expand Down