From 26e2592813b9263124d518d238262910e817d323 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 14 八月 2023 10:13:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-account/src/main/java/com/dsh/account/controller/UserIntegralChangesController.java |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/UserIntegralChangesController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/UserIntegralChangesController.java
index 41f6691..1cdcf70 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/UserIntegralChangesController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/UserIntegralChangesController.java
@@ -1,9 +1,16 @@
 package com.dsh.account.controller;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.dsh.account.entity.UserIntegral;
+import com.dsh.account.entity.UserIntegralChanges;
+import com.dsh.account.model.IntegralListQuery;
 import com.dsh.account.model.SaveUserIntegralChangesVo;
 import com.dsh.account.service.UserIntegralChangesService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @author zhibing.pu
@@ -30,4 +37,17 @@
             e.printStackTrace();
         }
     }
+
+    @PostMapping("/userIntegralChanges/list")
+    public Page<UserIntegral> list(@RequestBody IntegralListQuery integralListQuery){
+        try {
+            Page<UserIntegral> userIntegralPage = new Page<>(integralListQuery.getOffset(), integralListQuery.getLimit());
+
+            Page<UserIntegral> list = userIntegralChangesService.listAll(userIntegralPage,integralListQuery);
+            return list;
+        }catch (Exception e){
+            e.printStackTrace();
+            return new Page<>();
+        }
+    }
 }

--
Gitblit v1.7.1