gongfuzhu 1 yıl önce
ebeveyn
işleme
0551895a3b

+ 4 - 3
SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/controller/PaymentController.java

@@ -11,6 +11,7 @@ import com.zhongshu.payment.client.model.order.v2.*;
 import com.zhongshu.payment.client.model.payment.CloseResponsetModel;
 import com.zhongshu.payment.client.model.payment.CreateResponseModel;
 import com.zhongshu.payment.client.model.payment.QueryRequestModel;
+import com.zhongshu.payment.client.model.payment.zswl.ApplyWithdrawalsModel;
 import com.zhongshu.payment.client.model.payment.zswl.CreatePaymentModel;
 import com.zhongshu.payment.client.model.payment.zswl.SyncInformModel;
 import com.zswl.cloud.springBtach.server.core.model.SubOrderModel;
@@ -127,9 +128,9 @@ public class PaymentController {
     @ApiOperation("店铺_提现按钮")
     @ResourceAuth(value = "admin", type = AuthType.Enterprise)
     @ResourceAuth(value = "admin", type = AuthType.Project)
-    @RequestMapping(value = "account/withdrawals", method = RequestMethod.GET)
-    public ResultContent withdrawals() {
-        return paymentServer.withdrawals();
+    @RequestMapping(value = "account/withdrawals", method = RequestMethod.POST)
+    public ResultContent withdrawals(@RequestBody ApplyWithdrawalsModel applyWithdrawalsModel) {
+        return paymentServer.withdrawals(applyWithdrawalsModel);
     }
 
     @ApiOperation("平台_提现按钮")

+ 9 - 4
SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/service/PaymentService.java

@@ -1,13 +1,13 @@
 package com.zswl.cloud.springBtach.server.core.service;
 
 import com.github.microservice.auth.client.content.ResultContent;
-import com.github.microservice.auth.client.content.ResultState;
 import com.github.microservice.auth.security.helper.AuthHelper;
 import com.zhongshu.payment.client.model.order.AdminSeachOrderModel;
 import com.zhongshu.payment.client.model.order.v2.ApplicantRefundParam2Model;
 import com.zhongshu.payment.client.model.order.v2.RefundParam2Model;
 import com.zhongshu.payment.client.model.order.v2.WithdrawRequestModel;
 import com.zhongshu.payment.client.model.payment.QueryResponseModel;
+import com.zhongshu.payment.client.model.payment.zswl.ApplyWithdrawalsModel;
 import com.zhongshu.payment.client.model.payment.zswl.CreatePayment2Model;
 import com.zhongshu.payment.client.model.payment.zswl.CreatePaymentModel;
 import com.zhongshu.payment.client.model.payment.zswl.SyncInformModel;
@@ -87,12 +87,17 @@ public class PaymentService {
         return paymentService2.getDetail(channel.name());
     }
 
-    public ResultContent withdrawals() {
-        return paymentService2.applicationWithdrawals(authHelper.getEnterPriseId());
+    public ResultContent withdrawals(ApplyWithdrawalsModel applyWithdrawalsModel) {
+        applyWithdrawalsModel.setShopId(authHelper.getEnterPriseId());
+        applyWithdrawalsModel.setPlatform(false);
+        return paymentService2.applicationWithdrawals(applyWithdrawalsModel);
     }
 
     public ResultContent withdrawalsPlatform(Channel channel) {
-        return paymentService2.applicationWithdrawals(channel.name());
+        ApplyWithdrawalsModel applyWithdrawalsModel = new ApplyWithdrawalsModel();
+        applyWithdrawalsModel.setShopId(channel.name());
+        applyWithdrawalsModel.setPlatform(true);
+        return paymentService2.applicationWithdrawals(applyWithdrawalsModel);
     }
 
     public ResultContent withdrawalsList(WithdrawRequestModel withdrawRequestModel) {