diff --git a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/WeixinPayProxy.java b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/WeixinPayProxy.java index bab00c83..a02d03b3 100644 --- a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/WeixinPayProxy.java +++ b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/WeixinPayProxy.java @@ -1008,9 +1008,10 @@ public class WeixinPayProxy { */ public ProfitSharingReturnResult profitSharingReturn(ProfitId id, String outReturnNo, ReturnAccountType returnAccountType, String returnAccount, - String description) + int returnAmount, String description) throws WeixinException{ - return profitSharingApi.profitSharingReturn(id, outReturnNo, returnAccountType, returnAccount, description); + return profitSharingApi.profitSharingReturn(id, outReturnNo, returnAccountType, returnAccount, returnAmount, + description); } /** diff --git a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/api/ProfitSharingApi.java b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/api/ProfitSharingApi.java index af20c112..78b08108 100644 --- a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/api/ProfitSharingApi.java +++ b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/api/ProfitSharingApi.java @@ -156,6 +156,8 @@ public class ProfitSharingApi extends MchApi { * 回退方类型 * @param returnAccount * 回退方账号 + * @param returnAmount + * 回退金额 * @param description * 回退描述 * @return @@ -165,14 +167,14 @@ public class ProfitSharingApi extends MchApi { */ public ProfitSharingReturnResult profitSharingReturn(ProfitId id, String outReturnNo, ReturnAccountType returnAccountType, String returnAccount, - String description) throws WeixinException{ + int returnAmount, String description) throws WeixinException{ ProfitSharingReturnRequest request; if(id.getIdType()== ProfitIdType.ORDER_ID){ request = new ProfitSharingReturnRequest(id.getId(), null, outReturnNo, returnAccountType, - returnAccount, description); + returnAccount, returnAmount, description); }else{ request = new ProfitSharingReturnRequest(null, id.getId(), outReturnNo, returnAccountType, - returnAccount, description); + returnAccount, returnAmount, description); } super.declareMerchant(request); String url = getRequestUri("profit_sharing_return_uri"); diff --git a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/profitsharing/ProfitSharingReturnRequest.java b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/profitsharing/ProfitSharingReturnRequest.java index 73b4b4ae..9fab9edc 100644 --- a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/profitsharing/ProfitSharingReturnRequest.java +++ b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/profitsharing/ProfitSharingReturnRequest.java @@ -51,6 +51,12 @@ public class ProfitSharingReturnRequest extends MerchantResult { @XmlElement(name = "return_account") @JSONField(name = "return_account") private String returnAccount; + /** + * 回退金额 + */ + @XmlElement(name = "return_amount") + @JSONField(name = "return_amount") + private int returnAmount; /** * 回退描述 */ @@ -89,12 +95,14 @@ public class ProfitSharingReturnRequest extends MerchantResult { * 回退描述 */ public ProfitSharingReturnRequest(String orderId, String outOrderNo, String outReturnNo, - ReturnAccountType returnAccountType, String returnAccount, String description) { + ReturnAccountType returnAccountType, String returnAccount, + int returnAmount, String description) { this.orderId = orderId; this.outOrderNo = outOrderNo; this.outReturnNo = outReturnNo; this.returnAccountType = returnAccountType; this.returnAccount = returnAccount; + this.returnAmount = returnAmount; this.description = description; } @@ -143,6 +151,14 @@ public class ProfitSharingReturnRequest extends MerchantResult { this.returnAccount = returnAccount; } + public int getReturnAmount() { + return returnAmount; + } + + public void setReturnAmount(int returnAmount) { + this.returnAmount = returnAmount; + } + public String getDescription() { return description; } diff --git a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/profitsharing/Receiver.java b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/profitsharing/Receiver.java index ee654a11..64086769 100644 --- a/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/profitsharing/Receiver.java +++ b/weixin4j-pay/src/main/java/com/foxinmy/weixin4j/pay/profitsharing/Receiver.java @@ -14,6 +14,8 @@ import com.foxinmy.weixin4j.pay.type.profitsharing.RelationType; */ public class Receiver { + public Receiver(){} + public Receiver(ReceiverType type, String account, RelationType relationType) { this.type = type; this.account = account;