fix: 积分页支出明细不显示 + integral/list 支持 type 参数
- 前端 points.vue: 支出明细 type 过滤改为 Number(item.type)===2;onLoad 先 await loadUserInfo 再 loadPointsList;请求 getIntegralList 时传 type=2 - 后端 integral/list: 增加可选参数 type(1=收入,2=支出),UserIntegralRecordServiceImpl 支持按 type 筛选 - 新增 backend/shell/test-integral-list.sh 测试 integral/list 支出明细 - 新增 backend/shell/start-front-miao33.sh 使用 nohup 启动 crmeb-front(miao33) Made-with: Cursor
This commit is contained in:
@@ -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)));
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -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登录
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user