gongfuzhu пре 10 месеци
родитељ
комит
196a7fe9b5

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

@@ -166,6 +166,7 @@ public class PaymentController {
     public ResultContent withdrawalsPlatformList(@RequestBody @Valid WithdrawRequestModel withdrawRequestModel) {
         return paymentServer.withdrawalsPlatformList(withdrawRequestModel);
     }
+
     @ApiOperation("已提现订单列表")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform)
     @ResourceAuth(value = "admin", type = AuthType.Enterprise)
@@ -174,6 +175,14 @@ public class PaymentController {
         return paymentServer.withdrawalsList(withdrawRequestModel);
     }
 
+    @ApiOperation("提现明细列表")
+    @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform)
+    @ResourceAuth(value = "admin", type = AuthType.Enterprise)
+    @RequestMapping(value = "account/withdrawalsDetailList", method = RequestMethod.POST)
+    public ResultContent withdrawalsDetail(@RequestBody @Valid WithdrawDetailRequestModel withdrawDetailRequestModel) {
+        return paymentServer.withdrawalsDetail(withdrawDetailRequestModel);
+    }
+
     @ApiOperation("审核提现")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform)
     @RequestMapping(value = "account/withdrawals/apply", method = RequestMethod.POST)

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

@@ -4,10 +4,7 @@ import com.github.microservice.auth.client.content.ResultContent;
 import com.github.microservice.auth.security.helper.AuthHelper;
 import com.github.microservice.auth.security.model.AuthDetails;
 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.GoodsResultModel;
-import com.zhongshu.payment.client.model.order.v2.RefundParam2Model;
-import com.zhongshu.payment.client.model.order.v2.WithdrawRequestModel;
+import com.zhongshu.payment.client.model.order.v2.*;
 import com.zhongshu.payment.client.model.payment.QueryResponseModel;
 import com.zhongshu.payment.client.model.payment.zswl.*;
 import com.zhongshu.payment.client.service.v2.OrderService2;
@@ -91,7 +88,7 @@ public class PaymentService {
 
     public ResultContent refundIntervene(String goodsId) {
         String userId = authHelper.getCurrentUser().getUserId();
-        return paymentService2.refundIntervene(userId,goodsId);
+        return paymentService2.refundIntervene(userId, goodsId);
     }
 
 
@@ -153,10 +150,15 @@ public class PaymentService {
 
         return paymentService2.withdrawalsOrderList(withdrawRequestModel);
     }
+
     public ResultContent withdrawalsList(WithdrawRequestModel withdrawRequestModel) {
         return paymentService2.withdrawalsList(withdrawRequestModel);
     }
 
+    public ResultContent withdrawalsDetail(WithdrawDetailRequestModel withdrawDetailRequestModel) {
+        return paymentService2.withdrawalsDetail(withdrawDetailRequestModel);
+    }
+
     public ResultContent withdrawalsDetailList(WithdrawRequestModel withdrawRequestModel) {
         String enterPriseId = authHelper.getEnterPriseId();
         withdrawRequestModel.setShopId(enterPriseId);
@@ -175,8 +177,6 @@ public class PaymentService {
     }
 
 
-
-
     public ResultContent subOrdersConfirm(String goodsId, String useShopId) {
         return paymentService2.subOrdersConfirm(goodsId, useShopId);
     }