收入明细

SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/controller/PaymentController.java

@@ -6,6 +6,8 @@ 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.AccountCountRequestModel;
+import com.zhongshu.payment.client.model.TransferDetailRequestModel;
 import com.zhongshu.payment.client.model.WithdrawListModel;
 import com.zhongshu.payment.client.model.order.AdminSeachOrderModel;
 import com.zhongshu.payment.client.model.order.ApplicantRefundParamModel;
@@ -201,7 +203,7 @@ public class PaymentController {
     }
 
 
-    @ApiOperation("店铺_分账明细列表")
+    @ApiOperation("店铺-时间段-分账明细-求和")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform)
     @ResourceAuth(value = "admin", type = AuthType.Enterprise)
     @ResourceAuth(value = "admin", type = AuthType.Project)
@@ -210,6 +212,22 @@ public class PaymentController {
         return paymentServer.withdrawalsDetailList(withdrawRequestModel);
     }
 
+    @ApiOperation("店铺-时间段-收入统计")
+    @ResourceAuth(value = "admin", type = AuthType.Enterprise)
+    @ResourceAuth(value = "admin", type = AuthType.Project)
+    @RequestMapping(value = "account/shop/count", method = RequestMethod.POST)
+    public ResultContent withdrawalsDetailList(@RequestBody AccountCountRequestModel accountCountRequestModel) {
+        return paymentServer.accountCount(accountCountRequestModel);
+    }
+
+    @ApiOperation("店铺-时间段-分账明细列表-不求和")
+    @ResourceAuth(value = "admin", type = AuthType.Enterprise)
+    @ResourceAuth(value = "admin", type = AuthType.Project)
+    @RequestMapping(value = "account/shop/transferDetail", method = RequestMethod.POST)
+    public ResultContent withdrawalsDetailList(@RequestBody TransferDetailRequestModel transferDetailRequestModel) {
+        return paymentServer.transferDetail(transferDetailRequestModel);
+    }
+
     @ApiOperation("后台_确认分账")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform)
     @RequestMapping(value = "subOrdersConfirm", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)

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

@@ -3,7 +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.*;
 import com.zhongshu.payment.client.model.order.AdminSeachOrderModel;
 import com.zhongshu.payment.client.model.order.v2.*;
 import com.zhongshu.payment.client.model.payment.QueryResponseModel;
@@ -168,6 +168,16 @@ public class PaymentService {
         withdrawRequestModel.setShopId(enterPriseId);
         return paymentService2.shopTransferDetail(withdrawRequestModel);
     }
+    public ResultContent<AccountCountResponseModel> accountCount(AccountCountRequestModel accountCountRequestModel) {
+        String enterPriseId = authHelper.getEnterPriseId();
+        accountCountRequestModel.setShopId(enterPriseId);
+        return paymentService2.accountCount(accountCountRequestModel);
+    }
+    public ResultContent<Page<TransferDetailModel>> transferDetail(TransferDetailRequestModel transferDetailRequestModel) {
+        String enterPriseId = authHelper.getEnterPriseId();
+        transferDetailRequestModel.setShopId(enterPriseId);
+        return paymentService2.transferDetail(transferDetailRequestModel);
+    }
 
     public ResultContent applyWithdrawals(AuditWithdrawalsModel auditWithdrawalsModel) {
         AuthDetails currentUser = authHelper.getCurrentUser();