🐛 #1455 修复微信支付分账结果查询接口的分账接收人解析错误的问题,并补充相关单元测试代码

This commit is contained in:
Binary Wang
2020-03-22 14:37:32 +08:00
parent 8d6978d757
commit 38959f821a
3 changed files with 75 additions and 5 deletions

View File

@@ -4,12 +4,15 @@ import com.github.binarywang.wxpay.bean.result.BaseWxPayResult;
import com.google.gson.FieldNamingPolicy;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import org.w3c.dom.Document;
import java.util.List;
/**
* @author Wang GuangXin 2019/10/22 15:51
* @version 1.0
@@ -49,7 +52,11 @@ public class ProfitSharingQueryResult extends BaseWxPayResult {
* 分账接收方列表
*/
@XStreamAlias("receivers")
private String receivers;
private String receiversJson;
/**
* 分账接收方列表json转换后的对象
*/
private List<Receiver> receivers;
/**
* 分账金额
*/
@@ -61,11 +68,14 @@ public class ProfitSharingQueryResult extends BaseWxPayResult {
@XStreamAlias("description")
private String description;
public ProfitSharingQueryResult.Receivers formatReceivers() {
public List<Receiver> formatReceivers() {
GsonBuilder gsonBuilder = new GsonBuilder();
gsonBuilder.setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES);
Gson gson = gsonBuilder.create();
return gson.fromJson(receivers, Receivers.class);
final List<Receiver> receivers = gson.fromJson(receiversJson, new TypeToken<List<Receiver>>() {
}.getType());
this.receivers = receivers;
return receivers;
}
@Override
@@ -75,13 +85,13 @@ public class ProfitSharingQueryResult extends BaseWxPayResult {
orderId = readXMLString(d, "orderId");
status = readXMLString(d, "status");
closeReason = readXMLString(d, "close_reason");
receivers = readXMLString(d, "receivers");
receiversJson = readXMLString(d, "receivers");
amount = readXMLInteger(d, "amount");
description = readXMLString(d, "description");
}
@Data
public class Receivers {
public class Receiver {
/**
* 分账接收方类型
*/

View File

@@ -81,6 +81,7 @@ public class ProfitSharingServiceImpl implements ProfitSharingService {
String responseContent = this.payService.post(url, request.toXML(), true);
ProfitSharingQueryResult result = BaseWxPayResult.fromXML(responseContent, ProfitSharingQueryResult.class);
result.formatReceivers();
result.checkResult(this.payService, request.getSignType(), true);
return result;
}