TRX 1 gadu atpakaļ
vecāks
revīzija
61ce9ab162

+ 67 - 0
FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/payment/ExpenseFlowController.java

@@ -0,0 +1,67 @@
+package com.zhongshu.card.server.core.controller.payment;
+
+import com.github.microservice.auth.security.annotations.ResourceAuth;
+import com.github.microservice.auth.security.type.AuthType;
+import com.zhongshu.card.client.model.base.IDParam;
+import com.zhongshu.card.client.model.payment.ExpenseFlowCount;
+import com.zhongshu.card.client.model.payment.ExpenseFlowModel;
+import com.zhongshu.card.client.model.payment.ExpenseFlowSearch;
+import com.zhongshu.card.client.model.school.BookInfoAddParam;
+import com.zhongshu.card.client.model.school.BookInfoModel;
+import com.zhongshu.card.client.model.school.BookInfoSearch;
+import com.zhongshu.card.client.ret.ResultContent;
+import com.zhongshu.card.client.service.payment.ExpenseFlowService;
+import com.zhongshu.card.client.service.school.BookInfoService;
+import com.zhongshu.card.client.service.school.NoticeInfoService;
+import com.zhongshu.card.client.utils.type.OrganizationUserType;
+import com.zhongshu.card.server.core.service.org.RoleServiceImpl;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.web.PageableDefault;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 学校 通讯录管理
+ *
+ * @author TRX
+ * @date 2024/6/5
+ */
+@RestController
+@RequestMapping("/order/expenseFlow")
+@Tag(name = "订单--消费流水")
+public class ExpenseFlowController {
+
+    @Autowired
+    ExpenseFlowService expenseFlowService;
+
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @Operation(summary = "消费详情", description = "消费详情")
+    @RequestMapping(value = "getDetail", method = {RequestMethod.POST})
+    public ResultContent<ExpenseFlowModel> getDetail(@RequestBody IDParam param) {
+        return this.expenseFlowService.getDetail(param.getId());
+    }
+
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @Operation(summary = "消费列表-分页查询", description = "消费列表-分页查询")
+    @RequestMapping(value = {"page"}, method = {RequestMethod.POST})
+    public ResultContent<Page<ExpenseFlowModel>> page(
+            @Parameter(hidden = true) @PageableDefault(page = 0, size = 10) Pageable pageable,
+            @Parameter(required = false) ExpenseFlowSearch param) {
+        return expenseFlowService.page(param, pageable);
+    }
+
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @Operation(summary = "统计消费总数", description = "统计消费总数")
+    @RequestMapping(value = {"countPayment"}, method = {RequestMethod.POST})
+    public ResultContent<ExpenseFlowCount> countPayment(ExpenseFlowSearch param) {
+        return expenseFlowService.countPayment(param);
+    }
+
+}

+ 3 - 0
FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/payment/ExpenseFlow.java

@@ -28,6 +28,9 @@ public class ExpenseFlow extends SuperMain {
     @Schema(description = "用户userId")
     private String userId;
 
+    @Schema(description = "消费机设备ID")
+    private String deviceId;
+
     @Schema(description = "消费类型,如:餐饮消费")
     private String payType;