diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/tp/service/WxCpTpMediaService.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/tp/service/WxCpTpMediaService.java index e8a8750d8..f3a611e84 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/tp/service/WxCpTpMediaService.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/tp/service/WxCpTpMediaService.java @@ -40,10 +40,13 @@ public interface WxCpTpMediaService { * * @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; + /** *
* 上传图片.
@@ -52,9 +55,10 @@ public interface WxCpTpMediaService {
* 每个企业每天最多可上传100张图片
* 接口url格式:https://qyapi.weixin.qq.com/cgi-bin/media/uploadimg?access_token=ACCESS_TOKEN
*
- *
* @param file 上传的文件对象
+ * @param corpId 授权企业的corpid
* @return 返回图片url
+ * @throws WxErrorException 异常信息
*/
String uploadImg(File file, String corpId) throws WxErrorException;
}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/tp/service/impl/WxCpTpMediaServiceImpl.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/tp/service/impl/WxCpTpMediaServiceImpl.java
index ef914b940..2f8afe092 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/tp/service/impl/WxCpTpMediaServiceImpl.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/tp/service/impl/WxCpTpMediaServiceImpl.java
@@ -43,7 +43,7 @@ public class WxCpTpMediaServiceImpl implements WxCpTpMediaService {
@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();
}
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/PartnerTransactionsResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/PartnerTransactionsResult.java
index 9524627d7..a79dae78e 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/PartnerTransactionsResult.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/PartnerTransactionsResult.java
@@ -195,11 +195,22 @@ public class PartnerTransactionsResult implements Serializable {
/**
* - * 字段名:+支付者 + * 字段名:支付者信息 + * 变量名:payer + * 是否必填:是 + * 类型:object + * 描述:基础支付支付者信息 + *+ */ + private CombinePayerInfo payer; + + /** + *
+ * 字段名:支付者
* 变量名:combine_payer_info
* 是否必填:否
* 类型:object
- * 描述:示例值:见请求示例
+ * 描述:合单支付支付者信息,示例值:见请求示例
*
*/
@SerializedName(value = "combine_payer_info")