Skip to content

Commit a596228

Browse files
authored
🆕 #2106 支付通知解密数据对象增加“基础支付支付者信息”字段
1 parent dae6b15 commit a596228

File tree

3 files changed

+19
-4
lines changed

3 files changed

+19
-4
lines changed

weixin-java-cp/src/main/java/me/chanjar/weixin/cp/tp/service/WxCpTpMediaService.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,13 @@ WxMediaUploadResult upload(String mediaType, String fileType, InputStream inputS
4040
*
4141
* @param mediaType 媒体类型
4242
* @param file 文件对象
43+
* @param corpId 授权企业的corpid
4344
* @see #upload(String, String, InputStream, String)
45+
* @throws WxErrorException 异常信息
4446
*/
4547
WxMediaUploadResult upload(String mediaType, File file, String corpId) throws WxErrorException;
4648

49+
4750
/**
4851
* <pre>
4952
* 上传图片.
@@ -52,9 +55,10 @@ WxMediaUploadResult upload(String mediaType, String fileType, InputStream inputS
5255
* 每个企业每天最多可上传100张图片
5356
* 接口url格式:https://qyapi.weixin.qq.com/cgi-bin/media/uploadimg?access_token=ACCESS_TOKEN
5457
* </pre>
55-
*
5658
* @param file 上传的文件对象
59+
* @param corpId 授权企业的corpid
5760
* @return 返回图片url
61+
* @throws WxErrorException 异常信息
5862
*/
5963
String uploadImg(File file, String corpId) throws WxErrorException;
6064
}

weixin-java-cp/src/main/java/me/chanjar/weixin/cp/tp/service/impl/WxCpTpMediaServiceImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public WxMediaUploadResult upload(String mediaType, File file, String corpId) th
4343
@Override
4444
public String uploadImg(File file, String corpId) throws WxErrorException {
4545
String url = mainService.getWxCpTpConfigStorage().getApiUrl(IMG_UPLOAD);
46-
url += "&access_token=" + mainService.getWxCpTpConfigStorage().getAccessToken(corpId);
46+
url += "?access_token=" + mainService.getWxCpTpConfigStorage().getAccessToken(corpId);
4747
return this.mainService.execute(MediaUploadRequestExecutor.create(this.mainService.getRequestHttp()), url, file)
4848
.getUrl();
4949
}

weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/PartnerTransactionsResult.java

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,11 +195,22 @@ public class PartnerTransactionsResult implements Serializable {
195195

196196
/**
197197
* <pre>
198-
* 字段名:+支付者
198+
* 字段名:支付者信息
199+
* 变量名:payer
200+
* 是否必填:是
201+
* 类型:object
202+
* 描述:基础支付支付者信息
203+
* </pre>
204+
*/
205+
private CombinePayerInfo payer;
206+
207+
/**
208+
* <pre>
209+
* 字段名:支付者
199210
* 变量名:combine_payer_info
200211
* 是否必填:否
201212
* 类型:object
202-
* 描述:示例值:见请求示例
213+
* 描述:合单支付支付者信息,示例值:见请求示例
203214
* </pre>
204215
*/
205216
@SerializedName(value = "combine_payer_info")

0 commit comments

Comments
 (0)