From 04180c2c2c8bfa97861db34eba19f277b4119d75 Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Tue, 04 Apr 2023 14:33:56 +0800 Subject: [PATCH] 关于积分凭证 --- src/main/resources/mapper/modules/MallScoreVoucherMapper.xml | 5 +++++ src/main/java/cc/mrbird/febs/mall/controller/ApiScoreController.java | 9 +++++++++ src/main/java/cc/mrbird/febs/mall/dto/ApiScoreVoucherRecordDto.java | 3 +++ src/main/java/cc/mrbird/febs/mall/service/IScoreService.java | 2 ++ src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java | 9 +++++++++ 5 files changed, 28 insertions(+), 0 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ApiScoreController.java b/src/main/java/cc/mrbird/febs/mall/controller/ApiScoreController.java index 515bf43..c4041d2 100644 --- a/src/main/java/cc/mrbird/febs/mall/controller/ApiScoreController.java +++ b/src/main/java/cc/mrbird/febs/mall/controller/ApiScoreController.java @@ -94,4 +94,13 @@ return new FebsResponse().success().message("提交成功"); } + @ApiOperation(value = "绿色积分个人信息-个人买卖信息", notes = "绿色积分个人信息-个人买卖信息") + @ApiResponses({ + @ApiResponse(code = 200, message = "success", response = ApiScoreVoucherRecordVo.class) + }) + @PostMapping(value = "/scoreVoucherList") + public FebsResponse scoreVoucherList(@RequestBody ApiScoreVoucherRecordDto apiScoreVoucherRecordDto) { + return scoreService.findMallScoreVoucherListInPage(apiScoreVoucherRecordDto); + } + } diff --git a/src/main/java/cc/mrbird/febs/mall/dto/ApiScoreVoucherRecordDto.java b/src/main/java/cc/mrbird/febs/mall/dto/ApiScoreVoucherRecordDto.java index 83c6151..2448eb9 100644 --- a/src/main/java/cc/mrbird/febs/mall/dto/ApiScoreVoucherRecordDto.java +++ b/src/main/java/cc/mrbird/febs/mall/dto/ApiScoreVoucherRecordDto.java @@ -14,4 +14,7 @@ @ApiModelProperty(value = "第几页", example = "1") private Integer pageNum; + @ApiModelProperty(hidden = true) + private Long memberId; + } diff --git a/src/main/java/cc/mrbird/febs/mall/service/IScoreService.java b/src/main/java/cc/mrbird/febs/mall/service/IScoreService.java index 1ceea8d..ec048b8 100644 --- a/src/main/java/cc/mrbird/febs/mall/service/IScoreService.java +++ b/src/main/java/cc/mrbird/febs/mall/service/IScoreService.java @@ -32,4 +32,6 @@ FebsResponse voucherBusinessSale(ApiVoucherBusinessDto apiVoucherBusinessDto); void withdrawal(WithdrawalDto withdrawalDto); + + FebsResponse findMallScoreVoucherListInPage(ApiScoreVoucherRecordDto apiScoreVoucherRecordDto); } diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java index c5ef99c..0f0581c 100644 --- a/src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java +++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java @@ -315,6 +315,15 @@ } @Override + public FebsResponse findMallScoreVoucherListInPage(ApiScoreVoucherRecordDto apiScoreVoucherRecordDto) { + IPage<ApiScoreVoucherRecordVo> page = new Page<>(apiScoreVoucherRecordDto.getPageNum(), apiScoreVoucherRecordDto.getPageSize()); + Long id = LoginUserUtil.getLoginUser().getId(); + apiScoreVoucherRecordDto.setMemberId(id); + IPage<ApiScoreVoucherRecordVo> pages = mallScoreVoucherMapper.findMallScoreVoucherListInPage(page, apiScoreVoucherRecordDto); + return new FebsResponse().success().data(pages); + } + + @Override @Transactional(rollbackFor = Exception.class) public void sign() { MallMember member = LoginUserUtil.getLoginUser(); diff --git a/src/main/resources/mapper/modules/MallScoreVoucherMapper.xml b/src/main/resources/mapper/modules/MallScoreVoucherMapper.xml index e357925..5814ff5 100644 --- a/src/main/resources/mapper/modules/MallScoreVoucherMapper.xml +++ b/src/main/resources/mapper/modules/MallScoreVoucherMapper.xml @@ -13,6 +13,11 @@ FROM mall_score_voucher a LEFT JOIN mall_member b ON a.member_id = b.id + <where> + <if test="record.memberId!=null and record.memberId!=''"> + and a.member_id = #{record.memberId} + </if> + </where> ORDER BY a.CREATED_TIME DESC </select> -- Gitblit v1.9.1