scottpan/integral-shop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge main into shccd159，保留 shccd159 配置（jjy/ccd 域名）

Browse Source 
Made-with: Cursor
This commit is contained in:
apple
2026-03-18 10:35:08 +08:00
parent e87b823d31 e8563e4fda
commit a14566122b
35 changed files with 355 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
backend/crmeb-front/src/main/java/com/zbkj/front/controller/UserController.java
View File

@@ -220,11 +220,13 @@ public class UserController {
/**
* 积分记录
* @param type 可选，记录类型：1=收入，2=支出，不传返回全部
*/
@ApiOperation(value = "积分记录")
@RequestMapping(value = "/integral/list", method = RequestMethod.GET)
public CommonResult<CommonPage<UserIntegralRecord>> getIntegralList(@Validated PageParamRequest pageParamRequest) {
return CommonResult.success(CommonPage.restPage(userCenterService.getUserIntegralRecordList(pageParamRequest)));
public CommonResult<CommonPage<UserIntegralRecord>> getIntegralList(@Validated PageParamRequest pageParamRequest,
@RequestParam(required = false) Integer type) {
return CommonResult.success(CommonPage.restPage(userCenterService.getUserIntegralRecordList(pageParamRequest, type)));
}
/**

3
backend/crmeb-front/src/main/java/com/zbkj/front/service/UserCenterService.java
View File

@@ -176,9 +176,10 @@ public interface UserCenterService extends IService<User> {
/**
* 用户积分记录列表
* @param pageParamRequest 分页参数
* @param type 可选，记录类型：1=收入，2=支出，null=全部
* @return List<UserIntegralRecord>
*/
List<UserIntegralRecord> getUserIntegralRecordList(PageParamRequest pageParamRequest);
List<UserIntegralRecord> getUserIntegralRecordList(PageParamRequest pageParamRequest, Integer type);
/**
* 微信app登录

5
backend/crmeb-front/src/main/java/com/zbkj/front/service/impl/UserCenterServiceImpl.java
View File

@@ -912,12 +912,13 @@ public class UserCenterServiceImpl extends ServiceImpl<UserDao, User> implements
* 用户积分记录列表
*
* @param pageParamRequest 分页参数
* @param type 可选，记录类型：1=收入，2=支出，null=全部
* @return List<UserIntegralRecord>
*/
@Override
public List<UserIntegralRecord> getUserIntegralRecordList(PageParamRequest pageParamRequest) {
public List<UserIntegralRecord> getUserIntegralRecordList(PageParamRequest pageParamRequest, Integer type) {
Integer uid = userService.getUserIdException();
return userIntegralRecordService.findUserIntegralRecordList(uid, pageParamRequest);
return userIntegralRecordService.findUserIntegralRecordList(uid, pageParamRequest, type);
}
/**