lsm/weixin-java-tools
1
0
Fork 0
mirror of https://gitee.com/binary/weixin-java-tools.git synced 2025-05-03 20:27:46 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

🎨 优化部分代码

Browse Source
This commit is contained in:
Binary Wang 2023-01-10 14:37:59 +08:00
parent 64e29af498
commit 6ccbf900db
1 changed files with 35 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/MerchantTransferServiceImpl.java
View File

@ -9,6 +9,7 @@ import com.google.gson.Gson;
import com.google.gson.GsonBuilder; import com.google.gson.GsonBuilder;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
/** /**
* @author glz * @author glz
@ -24,7 +25,10 @@ public class MerchantTransferServiceImpl implements MerchantTransferService {
@Override @Override
public TransferCreateResult createTransfer(TransferCreateRequest request) throws WxPayException { public TransferCreateResult createTransfer(TransferCreateRequest request) throws WxPayException {
if (StringUtils.isEmpty(request.getAppid())) {
request.setAppid(this.wxPayService.getConfig().getAppId()); request.setAppid(this.wxPayService.getConfig().getAppId());
}
String url = String.format("%s/v3/transfer/batches", this.wxPayService.getPayBaseUrl()); String url = String.format("%s/v3/transfer/batches", this.wxPayService.getPayBaseUrl());
RsaCryptoUtil.encryptFields(request, this.wxPayService.getConfig().getVerifier().getValidCertificate()); RsaCryptoUtil.encryptFields(request, this.wxPayService.getConfig().getVerifier().getValidCertificate());
@ -34,7 +38,8 @@ public class MerchantTransferServiceImpl implements MerchantTransferService {
@Override @Override
public BatchesQueryResult queryWxBatches(WxBatchesQueryRequest request) throws WxPayException { public BatchesQueryResult queryWxBatches(WxBatchesQueryRequest request) throws WxPayException {
String url = String.format("%s/v3/transfer/batches/batch-id/%s?need_query_detail=%b", this.wxPayService.getPayBaseUrl(), request.getBatchId(), request.getNeedQueryDetail()); String url = String.format("%s/v3/transfer/batches/batch-id/%s?need_query_detail=%b",
this.wxPayService.getPayBaseUrl(), request.getBatchId(), request.getNeedQueryDetail());
if (request.getOffset() != null) { if (request.getOffset() != null) {
url = String.format("%s&offset=%d", url, request.getOffset()); url = String.format("%s&offset=%d", url, request.getOffset());
@ -52,14 +57,16 @@ public class MerchantTransferServiceImpl implements MerchantTransferService {
@Override @Override
public DetailsQueryResult queryWxDetails(WxDetailsQueryRequest request) throws WxPayException { public DetailsQueryResult queryWxDetails(WxDetailsQueryRequest request) throws WxPayException {
String url = String.format("%s/v3/transfer/batches/batch-id/%s/details/detail-id/%s",this.wxPayService.getPayBaseUrl(),request.getBatchId(),request.getDetailId()); String url = String.format("%s/v3/transfer/batches/batch-id/%s/details/detail-id/%s",
this.wxPayService.getPayBaseUrl(), request.getBatchId(), request.getDetailId());
String response = wxPayService.getV3(url); String response = wxPayService.getV3(url);
return GSON.fromJson(response, DetailsQueryResult.class); return GSON.fromJson(response, DetailsQueryResult.class);
} }
@Override @Override
public BatchesQueryResult queryMerchantBatches(MerchantBatchesQueryRequest request) throws WxPayException { public BatchesQueryResult queryMerchantBatches(MerchantBatchesQueryRequest request) throws WxPayException {
String url = String.format("%s/v3/transfer/batches/out-batch-no/%s?need_query_detail=%b", this.wxPayService.getPayBaseUrl(), request.getOutBatchNo(),request.getNeedQueryDetail()); String url = String.format("%s/v3/transfer/batches/out-batch-no/%s?need_query_detail=%b",
this.wxPayService.getPayBaseUrl(), request.getOutBatchNo(), request.getNeedQueryDetail());
if (request.getOffset() != null) { if (request.getOffset() != null) {
url = String.format("%s&offset=%d", url, request.getOffset()); url = String.format("%s&offset=%d", url, request.getOffset());
@ -77,7 +84,8 @@ public class MerchantTransferServiceImpl implements MerchantTransferService {
@Override @Override
public DetailsQueryResult queryMerchantDetails(MerchantDetailsQueryRequest request) throws WxPayException { public DetailsQueryResult queryMerchantDetails(MerchantDetailsQueryRequest request) throws WxPayException {
String url = String.format("%s/v3/transfer/batches/out-batch-no/%s/details/out-detail-no/%s",this.wxPayService.getPayBaseUrl(),request.getOutBatchNo(),request.getOutDetailNo()); String url = String.format("%s/v3/transfer/batches/out-batch-no/%s/details/out-detail-no/%s",
this.wxPayService.getPayBaseUrl(), request.getOutBatchNo(), request.getOutDetailNo());
String response = wxPayService.getV3(url); String response = wxPayService.getV3(url);
return GSON.fromJson(response, DetailsQueryResult.class); return GSON.fromJson(response, DetailsQueryResult.class);
} }
@ -105,9 +113,10 @@ public class MerchantTransferServiceImpl implements MerchantTransferService {
@Override @Override
public DetailElectronicBillResult queryDetailElectronicBill(DetailElectronicBillRequest request) throws WxPayException { public DetailElectronicBillResult queryDetailElectronicBill(DetailElectronicBillRequest request) throws WxPayException {
String url = String.format("%s/v3/transfer-detail/electronic-receipts?accept_type=%s&out_detail_no=%s", this.wxPayService.getPayBaseUrl(), request.getAcceptType(),request.getOutDetailNo()); String url = String.format("%s/v3/transfer-detail/electronic-receipts?accept_type=%s&out_detail_no=%s",
this.wxPayService.getPayBaseUrl(), request.getAcceptType(), request.getOutDetailNo());
if(request.getOutBatchNo()!=null && request.getOutBatchNo().length()!=0){ if (StringUtils.isNotEmpty(request.getOutBatchNo())) {
url = String.format("%s&out_batch_no=%s", url, request.getOutBatchNo()); url = String.format("%s&out_batch_no=%s", url, request.getOutBatchNo());
} }