gongfuzhu il y a 10 mois
Parent
commit
4a33aa8a73

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

@@ -6,6 +6,7 @@ import com.github.microservice.auth.client.content.ResultContent;
 import com.github.microservice.auth.client.content.ResultState;
 import com.github.microservice.auth.security.annotations.ResourceAuth;
 import com.github.microservice.auth.security.type.AuthType;
+import com.zhongshu.payment.client.model.WithdrawListModel;
 import com.zhongshu.payment.client.model.order.AdminSeachOrderModel;
 import com.zhongshu.payment.client.model.order.ApplicantRefundParamModel;
 import com.zhongshu.payment.client.model.order.v2.*;
@@ -23,6 +24,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 
@@ -170,8 +172,8 @@ public class PaymentController {
     @ApiOperation("已提现订单列表")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform)
     @ResourceAuth(value = "admin", type = AuthType.Enterprise)
-    @RequestMapping(value = "account/withdrawedList", method = RequestMethod.POST)
-    public ResultContent withdrawedList(@RequestBody @Valid WithdrawedRequestModel withdrawRequestModel) {
+    @RequestMapping(value = "account/shop/withdrawedList", method = RequestMethod.POST)
+    public ResultContent<Page<WithdrawListModel>> withdrawedList(@RequestBody @Valid WithdrawedRequestModel withdrawRequestModel) {
         return paymentServer.withdrawedList(withdrawRequestModel);
     }
 

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

@@ -3,6 +3,7 @@ package com.zswl.cloud.springBtach.server.core.service;
 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.WithdrawListModel;
 import com.zhongshu.payment.client.model.order.AdminSeachOrderModel;
 import com.zhongshu.payment.client.model.order.v2.*;
 import com.zhongshu.payment.client.model.payment.QueryResponseModel;
@@ -22,6 +23,7 @@ import org.springframework.batch.core.launch.JobLauncher;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
+import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -151,7 +153,9 @@ public class PaymentService {
         return paymentService2.withdrawalsOrderList(withdrawRequestModel);
     }
 
-    public ResultContent withdrawedList(WithdrawedRequestModel withdrawRequestModel) {
+    public ResultContent<Page<WithdrawListModel>> withdrawedList(WithdrawedRequestModel withdrawRequestModel) {
+        String enterPriseId = authHelper.getEnterPriseId();
+        withdrawRequestModel.setShopId(enterPriseId);
         return paymentService2.withdrawalsList(withdrawRequestModel);
     }