Skip to content

Commit 6ccbf90

Browse files
binarywangbinarywang
committed
🎨 优化部分代码
1 parent 64e29af commit 6ccbf90

File tree

1 file changed

+35
-26
lines changed

1 file changed

+35
-26
lines changed

‎weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/MerchantTransferServiceImpl.java‎

Lines changed: 35 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import com.google.gson.GsonBuilder;
1010
import lombok.RequiredArgsConstructor;
1111
import lombok.extern.slf4j.Slf4j;
12+
import org.apache.commons.lang3.StringUtils;
1213

1314
/**
1415
* @author glz
@@ -24,26 +25,30 @@ public class MerchantTransferServiceImpl implements MerchantTransferService {
2425

2526
@Override
2627
public TransferCreateResult createTransfer(TransferCreateRequest request) throws WxPayException {
27-
request.setAppid(this.wxPayService.getConfig().getAppId());
28+
if (StringUtils.isEmpty(request.getAppid())) {
29+
request.setAppid(this.wxPayService.getConfig().getAppId());
30+
}
31+
2832
String url = String.format("%s/v3/transfer/batches", this.wxPayService.getPayBaseUrl());
2933
RsaCryptoUtil.encryptFields(request, this.wxPayService.getConfig().getVerifier().getValidCertificate());
3034

31-
String response = wxPayService.postV3WithWechatpaySerial(url,GSON.toJson(request));
35+
String response = wxPayService.postV3WithWechatpaySerial(url, GSON.toJson(request));
3236
return GSON.fromJson(response, TransferCreateResult.class);
3337
}
3438

3539
@Override
3640
public BatchesQueryResult queryWxBatches(WxBatchesQueryRequest request) throws WxPayException {
37-
String url = String.format("%s/v3/transfer/batches/batch-id/%s?need_query_detail=%b", this.wxPayService.getPayBaseUrl(), request.getBatchId(), request.getNeedQueryDetail());
41+
String url = String.format("%s/v3/transfer/batches/batch-id/%s?need_query_detail=%b",
42+
this.wxPayService.getPayBaseUrl(), request.getBatchId(), request.getNeedQueryDetail());
3843

39-
if(request.getOffset()!=null){
40-
url = String.format("%s&offset=%d",url,request.getOffset());
44+
if (request.getOffset() != null) {
45+
url = String.format("%s&offset=%d", url, request.getOffset());
4146
}
42-
if(request.getLimit()!=null){
43-
url = String.format("%s&limit=%d",url,request.getLimit());
47+
if (request.getLimit() != null) {
48+
url = String.format("%s&limit=%d", url, request.getLimit());
4449
}
45-
if(request.getDetailStatus()!=null && request.getDetailStatus().length()!=0){
46-
url = String.format("%s&detail_status=%s",url,request.getDetailStatus());
50+
if (request.getDetailStatus() != null && request.getDetailStatus().length() != 0) {
51+
url = String.format("%s&detail_status=%s", url, request.getDetailStatus());
4752
}
4853

4954
String response = wxPayService.getV3(url);
@@ -52,23 +57,25 @@ public BatchesQueryResult queryWxBatches(WxBatchesQueryRequest request) throws W
5257

5358
@Override
5459
public DetailsQueryResult queryWxDetails(WxDetailsQueryRequest request) throws WxPayException {
55-
String url = String.format("%s/v3/transfer/batches/batch-id/%s/details/detail-id/%s",this.wxPayService.getPayBaseUrl(),request.getBatchId(),request.getDetailId());
60+
String url = String.format("%s/v3/transfer/batches/batch-id/%s/details/detail-id/%s",
61+
this.wxPayService.getPayBaseUrl(), request.getBatchId(), request.getDetailId());
5662
String response = wxPayService.getV3(url);
5763
return GSON.fromJson(response, DetailsQueryResult.class);
5864
}
5965

6066
@Override
6167
public BatchesQueryResult queryMerchantBatches(MerchantBatchesQueryRequest request) throws WxPayException {
62-
String url = String.format("%s/v3/transfer/batches/out-batch-no/%s?need_query_detail=%b", this.wxPayService.getPayBaseUrl(), request.getOutBatchNo(),request.getNeedQueryDetail());
68+
String url = String.format("%s/v3/transfer/batches/out-batch-no/%s?need_query_detail=%b",
69+
this.wxPayService.getPayBaseUrl(), request.getOutBatchNo(), request.getNeedQueryDetail());
6370

64-
if(request.getOffset()!=null){
65-
url = String.format("%s&offset=%d",url,request.getOffset());
71+
if (request.getOffset() != null) {
72+
url = String.format("%s&offset=%d", url, request.getOffset());
6673
}
67-
if(request.getLimit()!=null){
68-
url = String.format("%s&limit=%d",url,request.getLimit());
74+
if (request.getLimit() != null) {
75+
url = String.format("%s&limit=%d", url, request.getLimit());
6976
}
70-
if(request.getDetailStatus()!=null && request.getDetailStatus().length()!=0){
71-
url = String.format("%s&detail_status=%s",url,request.getDetailStatus());
77+
if (request.getDetailStatus() != null && request.getDetailStatus().length() != 0) {
78+
url = String.format("%s&detail_status=%s", url, request.getDetailStatus());
7279
}
7380

7481
String response = wxPayService.getV3(url);
@@ -77,38 +84,40 @@ public BatchesQueryResult queryMerchantBatches(MerchantBatchesQueryRequest reque
7784

7885
@Override
7986
public DetailsQueryResult queryMerchantDetails(MerchantDetailsQueryRequest request) throws WxPayException {
80-
String url = String.format("%s/v3/transfer/batches/out-batch-no/%s/details/out-detail-no/%s",this.wxPayService.getPayBaseUrl(),request.getOutBatchNo(),request.getOutDetailNo());
87+
String url = String.format("%s/v3/transfer/batches/out-batch-no/%s/details/out-detail-no/%s",
88+
this.wxPayService.getPayBaseUrl(), request.getOutBatchNo(), request.getOutDetailNo());
8189
String response = wxPayService.getV3(url);
8290
return GSON.fromJson(response, DetailsQueryResult.class);
8391
}
8492

8593
@Override
8694
public ElectronicBillResult applyElectronicBill(ElectronicBillApplyRequest request) throws WxPayException {
87-
String url = String.format("%s/v3/transfer/bill-receipt",this.wxPayService.getPayBaseUrl());
88-
String response = wxPayService.postV3(url,GSON.toJson(request));
95+
String url = String.format("%s/v3/transfer/bill-receipt", this.wxPayService.getPayBaseUrl());
96+
String response = wxPayService.postV3(url, GSON.toJson(request));
8997
return GSON.fromJson(response, ElectronicBillResult.class);
9098
}
9199

92100
@Override
93101
public ElectronicBillResult queryElectronicBill(String outBatchNo) throws WxPayException {
94-
String url = String.format("%s/v3/transfer/bill-receipt/%s",this.wxPayService.getPayBaseUrl(),outBatchNo);
102+
String url = String.format("%s/v3/transfer/bill-receipt/%s", this.wxPayService.getPayBaseUrl(), outBatchNo);
95103
String response = wxPayService.getV3(url);
96104
return GSON.fromJson(response, ElectronicBillResult.class);
97105
}
98106

99107
@Override
100108
public DetailElectronicBillResult applyDetailElectronicBill(DetailElectronicBillRequest request) throws WxPayException {
101-
String url = String.format("%s/v3/transfer-detail/electronic-receipts",this.wxPayService.getPayBaseUrl());
102-
String response = wxPayService.postV3(url,GSON.toJson(request));
109+
String url = String.format("%s/v3/transfer-detail/electronic-receipts", this.wxPayService.getPayBaseUrl());
110+
String response = wxPayService.postV3(url, GSON.toJson(request));
103111
return GSON.fromJson(response, DetailElectronicBillResult.class);
104112
}
105113

106114
@Override
107115
public DetailElectronicBillResult queryDetailElectronicBill(DetailElectronicBillRequest request) throws WxPayException {
108-
String url = String.format("%s/v3/transfer-detail/electronic-receipts?accept_type=%s&out_detail_no=%s", this.wxPayService.getPayBaseUrl(), request.getAcceptType(),request.getOutDetailNo());
116+
String url = String.format("%s/v3/transfer-detail/electronic-receipts?accept_type=%s&out_detail_no=%s",
117+
this.wxPayService.getPayBaseUrl(), request.getAcceptType(), request.getOutDetailNo());
109118

110-
if(request.getOutBatchNo()!=null && request.getOutBatchNo().length()!=0){
111-
url = String.format("%s&out_batch_no=%s",url,request.getOutBatchNo());
119+
if (StringUtils.isNotEmpty(request.getOutBatchNo())) {
120+
url = String.format("%s&out_batch_no=%s", url, request.getOutBatchNo());
112121
}
113122

114123
String response = wxPayService.getV3(url);

0 commit comments

Comments
 (0)