2
0

7 Commits 0fbcf77ffc ... 7fc5e0bd9b

Autor SHA1 Nachricht Datum
  july 7fc5e0bd9b 添加商户产品变更进度查询接口 vor 4 Jahren
  july a79fc413bb Merge branch 'master' of http://192.168.1.218:3000/lianghanqiang/ldt into dev vor 4 Jahren
  july e616a6f4c8 修改配置参数 vor 4 Jahren
  july 0f76f6e6b5 Merge branch 'dev' of http://192.168.1.218:3000/lianghanqiang/ldt vor 4 Jahren
  july d35a596995 修改配置参数 vor 4 Jahren
  july e260af2b2f Merge remote-tracking branch 'origin/master' vor 4 Jahren
  July a2ce121aca Merge branch 'dev' of lianghanqiang/ldt into master vor 4 Jahren

+ 5 - 0
ldt-core/src/main/java/org/springblade/yeePay/api/YeepaySaas.java

@@ -368,6 +368,11 @@ public enum YeepaySaas {
 	 */
 	PRODUCT_FEE_MODIFY("/rest/v2.0/mer/product/fee/modify", "POST"),
 
+	/**
+	 * 商户产品变更进度查询接口
+	 */
+	PRODUCT_FEE_MODIFY_QUERY("/rest/v2.0/mer/product/modify/query", "POST"),
+
 	/**
 	 * 商户产品费率查询
 	 */

+ 15 - 9
ldt-core/src/main/java/org/springblade/yeePay/controller/YeepayController.java

@@ -75,7 +75,7 @@ public class YeepayController {
 
 	@PostMapping("cancelWechatApply")
 	@ApiOperation("撤销微信实名认证")
-	public R cancelWechatApply(WechatAuthDto wechatAuthDtow) {
+	public R cancelWechatApply(@RequestBody WechatAuthDto wechatAuthDtow) {
 		return R.data(yeepaySaasService.wechatAuthCancel(wechatAuthDtow));
 	}
 
@@ -148,7 +148,7 @@ public class YeepayController {
 
 	@PostMapping("/withdraw")
 	@ApiOperation("提现")
-	public R withdraw(WithdrawOrderDto withdrawOrderDto) {
+	public R withdraw(@RequestBody WithdrawOrderDto withdrawOrderDto) {
 		return R.data(yeepaySaasService.withdrawOrder(withdrawOrderDto));
 	}
 
@@ -160,7 +160,7 @@ public class YeepayController {
 
 	@PostMapping("/settle")
 	@ApiOperation("结算")
-	public R settle(SettleSelfSettleApplyDto settleSelfSettleApplyDto) {
+	public R settle(@RequestBody SettleSelfSettleApplyDto settleSelfSettleApplyDto) {
 		return R.data(yeepaySaasService.settleSelfSettleApply(settleSelfSettleApplyDto));
 	}
 
@@ -170,21 +170,27 @@ public class YeepayController {
 		return JSON.parseObject(yeepaySaasService.productFeeQuery(productFeeQueryDto).getStringResult());
 	}
 
-	@GetMapping("/feeUpdate")
+	@GetMapping("/feeUpdate/query")
+	@ApiOperation("商户产品变更进度查询接口")
+	public JSONObject productFeeModifyQuery(String requestNo) {
+		return JSON.parseObject(yeepaySaasService.productFeeModifyQuery(requestNo).getStringResult());
+	}
+
+	@PostMapping("/feeUpdate")
 	@ApiOperation("产品费率修改")
-	public JSONObject feeUpdate(ProductFeeModifyDto productFeeModifyDto) {
+	public JSONObject feeUpdate(@RequestBody ProductFeeModifyDto productFeeModifyDto) {
 		return JSON.parseObject(yeepaySaasService.productFeeModify(productFeeModifyDto).getStringResult());
 	}
 
 	@PostMapping("/transfer")
 	@ApiOperation("商户转账")
-	public JSONObject transfer(TransferOrderDto transferOrderDto) {
+	public JSONObject transfer(@RequestBody TransferOrderDto transferOrderDto) {
 		return JSON.parseObject(yeepaySaasService.transferOrder(transferOrderDto).getStringResult());
 	}
 
 	@PostMapping("/reCharge")
 	@ApiOperation("充值")
-	public JSONObject reCharge(OnlineBankRechargeOrderDto onlineBankRechargeOrderDto) {
+	public JSONObject reCharge(@RequestBody OnlineBankRechargeOrderDto onlineBankRechargeOrderDto) {
 		return JSON.parseObject(yeepaySaasService.onlineBankRechargeOrder(onlineBankRechargeOrderDto).getStringResult());
 	}
 
@@ -209,13 +215,13 @@ public class YeepayController {
 
 	@PostMapping("/divide/apply")
 	@ApiOperation("申请分账")
-	public YopResponse divideApply(DivideApplyDto divideApplyDto) {
+	public YopResponse divideApply(@RequestBody DivideApplyDto divideApplyDto) {
 		return yeepaySaasService.divideApply(divideApplyDto);
 	}
 
 	@PostMapping("/divide/complete")
 	@ApiOperation("完结分账")
-	public YopResponse divideComplete(DivideCompleteDto divideCompleteDto) {
+	public YopResponse divideComplete(@RequestBody DivideCompleteDto divideCompleteDto) {
 		return yeepaySaasService.divideComplete(divideCompleteDto);
 	}
 

+ 9 - 0
ldt-core/src/main/java/org/springblade/yeePay/service/YeepaySaasService.java

@@ -638,6 +638,15 @@ public class YeepaySaasService {
 		return yopClient.request(yopRequest);
 	}
 
+	/**
+	 * 商户产品变更进度查询接口
+	 */
+	public YopResponse productFeeModifyQuery(String requestNo) {
+		YopRequest yopRequest = YeepaySaas.PRODUCT_FEE_MODIFY_QUERY.buildRequest();
+		yopRequest.addParameter("requestNo", requestNo);
+		return yopClient.request(yopRequest);
+	}
+
 	/**
 	 * 商户产品费率查询
 	 */