open-source/payment-spring-boot
1
0
Fork 0
mirror of https://github.com/dromara/payment-spring-boot.git synced 2026-03-13 21:33:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
felord.cn
2020-12-01 23:44:37 +08:00
parent 30d04ec4da
commit d587ab9fd4
3 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/AbstractApi.java
View File

@@ -31,15 +31,15 @@ public abstract class AbstractApi {
return mapper; return mapper;
} }
public WechatPayClient getWechatPayClient() { public WechatPayClient client() {
return wechatPayClient; return wechatPayClient;
} }
public WechatMetaBean getWechatMetaBean() { public WechatMetaBean meta() {
return wechatMetaBean; return wechatMetaBean;
} }
protected RequestEntity<?> postRequestEntity(URI uri, Object params) { protected RequestEntity<?> post(URI uri, Object params) {
try { try {
return RequestEntity.post(uri) return RequestEntity.post(uri)
.body(mapper.writeValueAsString(params)); .body(mapper.writeValueAsString(params));

38
payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatMarketingApi.java
View File

@@ -54,7 +54,7 @@ public class WechatMarketingApi extends AbstractApi {
*/ */
public WechatResponseEntity<ObjectNode> createStock(StocksCreateParams params) { public WechatResponseEntity<ObjectNode> createStock(StocksCreateParams params) {
WechatResponseEntity<ObjectNode> wechatResponseEntity = new WechatResponseEntity<>(); WechatResponseEntity<ObjectNode> wechatResponseEntity = new WechatResponseEntity<>();
this.getWechatPayClient().withType(WechatPayV3Type.MARKETING_FAVOR_STOCKS_COUPON_STOCKS, params) this.client().withType(WechatPayV3Type.MARKETING_FAVOR_STOCKS_COUPON_STOCKS, params)
.function(this::createStocksFunction) .function(this::createStocksFunction)
.consumer(wechatResponseEntity::convert) .consumer(wechatResponseEntity::convert)
.request(); .request();
@@ -62,12 +62,12 @@ public class WechatMarketingApi extends AbstractApi {
} }
private RequestEntity<?> createStocksFunction(WechatPayV3Type type, StocksCreateParams params) { private RequestEntity<?> createStocksFunction(WechatPayV3Type type, StocksCreateParams params) {
WechatPayProperties.V3 v3 = this.getWechatMetaBean().getWechatPayProperties().getV3(); WechatPayProperties.V3 v3 = this.meta().getWechatPayProperties().getV3();
String mchId = v3.getMchId(); String mchId = v3.getMchId();
String httpUrl = type.uri(WeChatServer.CHINA); String httpUrl = type.uri(WeChatServer.CHINA);
URI uri = UriComponentsBuilder.fromHttpUrl(httpUrl).build().toUri(); URI uri = UriComponentsBuilder.fromHttpUrl(httpUrl).build().toUri();
params.setBelongMerchant(mchId); params.setBelongMerchant(mchId);
return postRequestEntity(uri, params); return post(uri, params);
} }
/** /**
@@ -78,7 +78,7 @@ public class WechatMarketingApi extends AbstractApi {
*/ */
public WechatResponseEntity<ObjectNode> startStock(String stockId) { public WechatResponseEntity<ObjectNode> startStock(String stockId) {
WechatResponseEntity<ObjectNode> wechatResponseEntity = new WechatResponseEntity<>(); WechatResponseEntity<ObjectNode> wechatResponseEntity = new WechatResponseEntity<>();
this.getWechatPayClient().withType(WechatPayV3Type.MARKETING_FAVOR_STOCKS_START, stockId) this.client().withType(WechatPayV3Type.MARKETING_FAVOR_STOCKS_START, stockId)
.function(this::startAndRestartStockFunction) .function(this::startAndRestartStockFunction)
.consumer(wechatResponseEntity::convert) .consumer(wechatResponseEntity::convert)
.request(); .request();
@@ -93,7 +93,7 @@ public class WechatMarketingApi extends AbstractApi {
*/ */
public WechatResponseEntity<ObjectNode> restartStock(String stockId) { public WechatResponseEntity<ObjectNode> restartStock(String stockId) {
WechatResponseEntity<ObjectNode> wechatResponseEntity = new WechatResponseEntity<>(); WechatResponseEntity<ObjectNode> wechatResponseEntity = new WechatResponseEntity<>();
this.getWechatPayClient().withType(WechatPayV3Type.MARKETING_FAVOR_STOCKS_RESTART, stockId) this.client().withType(WechatPayV3Type.MARKETING_FAVOR_STOCKS_RESTART, stockId)
.function(this::startAndRestartStockFunction) .function(this::startAndRestartStockFunction)
.consumer(wechatResponseEntity::convert) .consumer(wechatResponseEntity::convert)
.request(); .request();
@@ -101,13 +101,13 @@ public class WechatMarketingApi extends AbstractApi {
} }
private RequestEntity<?> startAndRestartStockFunction(WechatPayV3Type type, String stockId) { private RequestEntity<?> startAndRestartStockFunction(WechatPayV3Type type, String stockId) {
WechatPayProperties.V3 v3 = this.getWechatMetaBean().getWechatPayProperties().getV3(); WechatPayProperties.V3 v3 = this.meta().getWechatPayProperties().getV3();
String mchId = v3.getMchId(); String mchId = v3.getMchId();
Map<String, String> body = new HashMap<>(); Map<String, String> body = new HashMap<>();
body.put("stock_creator_mchid", mchId); body.put("stock_creator_mchid", mchId);
String httpUrl = type.uri(WeChatServer.CHINA); String httpUrl = type.uri(WeChatServer.CHINA);
URI uri = UriComponentsBuilder.fromHttpUrl(httpUrl).build().expand(stockId).toUri(); URI uri = UriComponentsBuilder.fromHttpUrl(httpUrl).build().expand(stockId).toUri();
return postRequestEntity(uri, body); return post(uri, body);
} }
/** /**
@@ -118,7 +118,7 @@ public class WechatMarketingApi extends AbstractApi {
*/ */
public WechatResponseEntity<ObjectNode> queryStockDetail(String stockId) { public WechatResponseEntity<ObjectNode> queryStockDetail(String stockId) {
WechatResponseEntity<ObjectNode> wechatResponseEntity = new WechatResponseEntity<>(); WechatResponseEntity<ObjectNode> wechatResponseEntity = new WechatResponseEntity<>();
this.getWechatPayClient().withType(WechatPayV3Type.MARKETING_FAVOR_STOCKS_DETAIL, stockId) this.client().withType(WechatPayV3Type.MARKETING_FAVOR_STOCKS_DETAIL, stockId)
.function(this::stockDetailFunction) .function(this::stockDetailFunction)
.consumer(wechatResponseEntity::convert) .consumer(wechatResponseEntity::convert)
.request(); .request();
@@ -127,7 +127,7 @@ public class WechatMarketingApi extends AbstractApi {
private RequestEntity<?> stockDetailFunction(WechatPayV3Type type, String stockId) { private RequestEntity<?> stockDetailFunction(WechatPayV3Type type, String stockId) {
WechatPayProperties.V3 v3 = this.getWechatMetaBean().getWechatPayProperties().getV3(); WechatPayProperties.V3 v3 = this.meta().getWechatPayProperties().getV3();
String httpUrl = type.uri(WeChatServer.CHINA); String httpUrl = type.uri(WeChatServer.CHINA);
@@ -147,7 +147,7 @@ public class WechatMarketingApi extends AbstractApi {
*/ */
public WechatResponseEntity<ObjectNode> queryMerchantsByStockId(StocksQueryParams params) { public WechatResponseEntity<ObjectNode> queryMerchantsByStockId(StocksQueryParams params) {
WechatResponseEntity<ObjectNode> wechatResponseEntity = new WechatResponseEntity<>(); WechatResponseEntity<ObjectNode> wechatResponseEntity = new WechatResponseEntity<>();
this.getWechatPayClient().withType(WechatPayV3Type.MARKETING_FAVOR_STOCKS_MERCHANTS, params) this.client().withType(WechatPayV3Type.MARKETING_FAVOR_STOCKS_MERCHANTS, params)
.function(this::queryStocksFunction) .function(this::queryStocksFunction)
.consumer(wechatResponseEntity::convert) .consumer(wechatResponseEntity::convert)
.request(); .request();
@@ -164,7 +164,7 @@ public class WechatMarketingApi extends AbstractApi {
*/ */
public WechatResponseEntity<ObjectNode> queryStocksByMch(StocksQueryParams params) { public WechatResponseEntity<ObjectNode> queryStocksByMch(StocksQueryParams params) {
WechatResponseEntity<ObjectNode> wechatResponseEntity = new WechatResponseEntity<>(); WechatResponseEntity<ObjectNode> wechatResponseEntity = new WechatResponseEntity<>();
this.getWechatPayClient().withType(WechatPayV3Type.MARKETING_FAVOR_STOCKS, params) this.client().withType(WechatPayV3Type.MARKETING_FAVOR_STOCKS, params)
.function(this::queryStocksFunction) .function(this::queryStocksFunction)
.consumer(wechatResponseEntity::convert) .consumer(wechatResponseEntity::convert)
.request(); .request();
@@ -178,7 +178,7 @@ public class WechatMarketingApi extends AbstractApi {
MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<>(); MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<>();
queryParams.add("offset", String.valueOf(params.getOffset())); queryParams.add("offset", String.valueOf(params.getOffset()));
queryParams.add("limit", String.valueOf(params.getLimit())); queryParams.add("limit", String.valueOf(params.getLimit()));
WechatPayProperties.V3 v3 = this.getWechatMetaBean().getWechatPayProperties().getV3(); WechatPayProperties.V3 v3 = this.meta().getWechatPayProperties().getV3();
queryParams.add("stock_creator_mchid", v3.getMchId()); queryParams.add("stock_creator_mchid", v3.getMchId());
LocalDateTime createStartTime = params.getCreateStartTime(); LocalDateTime createStartTime = params.getCreateStartTime();
if (Objects.nonNull(createStartTime)) { if (Objects.nonNull(createStartTime)) {
@@ -220,7 +220,7 @@ public class WechatMarketingApi extends AbstractApi {
*/ */
public WechatResponseEntity<ObjectNode> sendStock(StocksSendParams params) { public WechatResponseEntity<ObjectNode> sendStock(StocksSendParams params) {
WechatResponseEntity<ObjectNode> wechatResponseEntity = new WechatResponseEntity<>(); WechatResponseEntity<ObjectNode> wechatResponseEntity = new WechatResponseEntity<>();
this.getWechatPayClient().withType(WechatPayV3Type.MARKETING_FAVOR_USERS_COUPONS, params) this.client().withType(WechatPayV3Type.MARKETING_FAVOR_USERS_COUPONS, params)
.function(this::sendStocksFunction) .function(this::sendStocksFunction)
.consumer(wechatResponseEntity::convert) .consumer(wechatResponseEntity::convert)
.request(); .request();
@@ -229,14 +229,14 @@ public class WechatMarketingApi extends AbstractApi {
private RequestEntity<?> sendStocksFunction(WechatPayV3Type type, StocksSendParams params) { private RequestEntity<?> sendStocksFunction(WechatPayV3Type type, StocksSendParams params) {
WechatPayProperties.V3 v3 = this.getWechatMetaBean().getWechatPayProperties().getV3(); WechatPayProperties.V3 v3 = this.meta().getWechatPayProperties().getV3();
// 服务号 // 服务号
params.setAppid(v3.getMp().getAppId()); params.setAppid(v3.getMp().getAppId());
params.setStockCreatorMchid(v3.getMchId()); params.setStockCreatorMchid(v3.getMchId());
String httpUrl = type.uri(WeChatServer.CHINA); String httpUrl = type.uri(WeChatServer.CHINA);
URI uri = UriComponentsBuilder.fromHttpUrl(httpUrl).build().expand(params.getOpenid()).toUri(); URI uri = UriComponentsBuilder.fromHttpUrl(httpUrl).build().expand(params.getOpenid()).toUri();
params.setOpenid(null); params.setOpenid(null);
return postRequestEntity(uri, params); return post(uri, params);
} }
/** /**
@@ -247,7 +247,7 @@ public class WechatMarketingApi extends AbstractApi {
*/ */
public WechatResponseEntity<ObjectNode> marketingImageUpload(MultipartFile file) { public WechatResponseEntity<ObjectNode> marketingImageUpload(MultipartFile file) {
WechatResponseEntity<ObjectNode> wechatResponseEntity = new WechatResponseEntity<>(); WechatResponseEntity<ObjectNode> wechatResponseEntity = new WechatResponseEntity<>();
this.getWechatPayClient().withType(WechatPayV3Type.MARKETING_IMAGE_UPLOAD, file) this.client().withType(WechatPayV3Type.MARKETING_IMAGE_UPLOAD, file)
.function(this::marketingImageUploadFunction) .function(this::marketingImageUploadFunction)
.consumer(wechatResponseEntity::convert) .consumer(wechatResponseEntity::convert)
.request(); .request();
@@ -284,7 +284,7 @@ public class WechatMarketingApi extends AbstractApi {
*/ */
public WechatResponseEntity<ObjectNode> marketingFavorCallback(String notifyUrl) { public WechatResponseEntity<ObjectNode> marketingFavorCallback(String notifyUrl) {
WechatResponseEntity<ObjectNode> wechatResponseEntity = new WechatResponseEntity<>(); WechatResponseEntity<ObjectNode> wechatResponseEntity = new WechatResponseEntity<>();
this.getWechatPayClient().withType(WechatPayV3Type.MARKETING_FAVOR_CALLBACKS, notifyUrl) this.client().withType(WechatPayV3Type.MARKETING_FAVOR_CALLBACKS, notifyUrl)
.function(this::marketingFavorCallbackFunction) .function(this::marketingFavorCallbackFunction)
.consumer(wechatResponseEntity::convert) .consumer(wechatResponseEntity::convert)
.request(); .request();
@@ -292,14 +292,14 @@ public class WechatMarketingApi extends AbstractApi {
} }
private RequestEntity<?> marketingFavorCallbackFunction(WechatPayV3Type type, String notifyUrl) { private RequestEntity<?> marketingFavorCallbackFunction(WechatPayV3Type type, String notifyUrl) {
WechatPayProperties.V3 v3 = this.getWechatMetaBean().getWechatPayProperties().getV3(); WechatPayProperties.V3 v3 = this.meta().getWechatPayProperties().getV3();
Map<String, Object> body = new HashMap<>(3); Map<String, Object> body = new HashMap<>(3);
body.put("mchid", v3.getMchId()); body.put("mchid", v3.getMchId());
body.put("notify_url", notifyUrl); body.put("notify_url", notifyUrl);
body.put("switch", true); body.put("switch", true);
String httpUrl = type.uri(WeChatServer.CHINA); String httpUrl = type.uri(WeChatServer.CHINA);
URI uri = UriComponentsBuilder.fromHttpUrl(httpUrl).build().toUri(); URI uri = UriComponentsBuilder.fromHttpUrl(httpUrl).build().toUri();
return postRequestEntity(uri, body); return post(uri, body);
} }
} }

6
payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatPayApi.java
View File

@@ -31,7 +31,7 @@ public class WechatPayApi extends AbstractApi {
*/ */
public WechatResponseEntity<ObjectNode> appPay(AppPayParams payParams) { public WechatResponseEntity<ObjectNode> appPay(AppPayParams payParams) {
WechatResponseEntity<ObjectNode> wechatResponseEntity = new WechatResponseEntity<>(); WechatResponseEntity<ObjectNode> wechatResponseEntity = new WechatResponseEntity<>();
this.getWechatPayClient().withType(WechatPayV3Type.APP, payParams) this.client().withType(WechatPayV3Type.APP, payParams)
.function(this::appPayFunction) .function(this::appPayFunction)
.consumer(wechatResponseEntity::convert) .consumer(wechatResponseEntity::convert)
.request(); .request();
@@ -39,11 +39,11 @@ public class WechatPayApi extends AbstractApi {
} }
private RequestEntity<?> appPayFunction(WechatPayV3Type type, AppPayParams payParams) { private RequestEntity<?> appPayFunction(WechatPayV3Type type, AppPayParams payParams) {
WechatPayProperties.V3 v3 = this.getWechatMetaBean().getWechatPayProperties().getV3(); WechatPayProperties.V3 v3 = this.meta().getWechatPayProperties().getV3();
payParams.setAppid(v3.getAppId()); payParams.setAppid(v3.getAppId());
payParams.setMchid(v3.getMchId()); payParams.setMchid(v3.getMchId());
String httpUrl = type.uri(WeChatServer.CHINA); String httpUrl = type.uri(WeChatServer.CHINA);
URI uri = UriComponentsBuilder.fromHttpUrl(httpUrl).build().toUri(); URI uri = UriComponentsBuilder.fromHttpUrl(httpUrl).build().toUri();
return postRequestEntity(uri, payParams); return post(uri, payParams);
} }
} }