From 7120720e44fa7981d9c443a8622d9c18a4b59577 Mon Sep 17 00:00:00 2001 From: penny <2500338766@qq.com> Date: Tue, 12 Jul 2022 23:03:03 +0800 Subject: [PATCH] =?UTF-8?q?feature-img-1.0.0:=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=8F=90=E7=8E=B0=E8=AE=B0=E5=BD=95bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../img/controller/CreatorMiniController.java | 29 +++++++++++-------- .../img/dto/CreatorInviteLogPageDto.java | 21 ++++++++++++++ .../bnyer/img/dto/CreatorWithdrawPageDto.java | 21 ++++++++++++++ .../com/bnyer/img/dto/WithdrawOrderDto.java | 2 +- .../service/impl/WithdrawLogServiceImpl.java | 25 ++++++++++++++-- .../java/com/bnyer/img/vo/InviteLogVo.java | 3 ++ .../com/bnyer/img/mapper/InviteLogMapper.xml | 2 +- 7 files changed, 87 insertions(+), 16 deletions(-) create mode 100644 bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorInviteLogPageDto.java create mode 100644 bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorWithdrawPageDto.java diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CreatorMiniController.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CreatorMiniController.java index 84055a2..4a192bf 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CreatorMiniController.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CreatorMiniController.java @@ -3,10 +3,12 @@ package com.bnyer.img.controller; import com.alibaba.fastjson.JSON; import com.bnyer.common.core.web.controller.BaseController; import com.bnyer.common.core.web.domain.AjaxResult; +import com.bnyer.common.core.web.page.TableDataInfo; import com.bnyer.img.constants.TiktokConstant; import com.bnyer.img.domain.TiktokImg; import com.bnyer.img.dto.*; import com.bnyer.img.service.*; +import com.github.pagehelper.PageHelper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -175,17 +177,19 @@ public class CreatorMiniController extends BaseController { //@TokenCheck @ApiOperation(value="查询公告列表") - @GetMapping(value = "/getNoticeList") - public AjaxResult getNoticeList(){ - return AjaxResult.success(noticeService.queryList()); + @PostMapping(value = "/getNoticeList") + public TableDataInfo getNoticeList(@RequestBody @ApiParam("分页参数") BasePageDto dto){ + PageHelper.startPage(dto.getPageNum(), dto.getPageSize()); + return getDataTable(noticeService.queryList()); } //@TokenCheck @ApiOperation(value="查询邀请记录") - @GetMapping(value = "/getInviteLog/{creatorId}") - public AjaxResult getInviteLog(@PathVariable @ApiParam("艺术家id") Long creatorId){ - log.info("【艺术家小程序】查询艺术家id:【{}】邀请记录:",creatorId); - return AjaxResult.success(inviteLogService.queryFrontList(creatorId)); + @PostMapping(value = "/getInviteLog") + public TableDataInfo getInviteLog(@RequestBody @ApiParam("艺术家分页对象") CreatorInviteLogPageDto dto){ + PageHelper.startPage(dto.getPageNum(), dto.getPageSize()); + log.info("【艺术家小程序】查询艺术家id:【{}】邀请记录:",dto.getCreatorId()); + return getDataTable(inviteLogService.queryFrontList(dto.getCreatorId())); } //@TokenCheck @@ -197,11 +201,12 @@ public class CreatorMiniController extends BaseController { } //@TokenCheck - @ApiOperation(value="查询指定艺术家提现记录列表") - @GetMapping(value = "/getWithdrawList/{creatorId}") - public AjaxResult getWithdrawList(@PathVariable @ApiParam("艺术家id") Long creatorId){ - log.info("【艺术家小程序】查询指定艺术家id【{}】提现记录列表",creatorId); - return AjaxResult.success(withdrawLogService.queryFrontList(creatorId)); + @ApiOperation(value="查询指定艺术家提现记录分页") + @PostMapping(value = "/getWithdrawList") + public TableDataInfo getWithdrawList(@RequestBody @ApiParam("艺术家对象") CreatorWithdrawPageDto dto){ + PageHelper.startPage(dto.getPageNum(), dto.getPageSize()); + log.info("【艺术家小程序】查询指定艺术家id【{}】提现记录列表",dto.getCreatorId()); + return getDataTable(withdrawLogService.queryFrontList(dto.getCreatorId())); } //@TokenCheck diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorInviteLogPageDto.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorInviteLogPageDto.java new file mode 100644 index 0000000..826a62e --- /dev/null +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorInviteLogPageDto.java @@ -0,0 +1,21 @@ +package com.bnyer.img.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; + +import javax.validation.constraints.NotNull; + + +@Getter +@Setter +@ApiModel("艺术家邀请记录分页接收类") +public class CreatorInviteLogPageDto extends BasePageDto { + + @NotNull(message = "艺术家id不能为空!") + @ApiModelProperty(value="艺术家id") + private Long creatorId; + + +} diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorWithdrawPageDto.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorWithdrawPageDto.java new file mode 100644 index 0000000..e30ef7a --- /dev/null +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorWithdrawPageDto.java @@ -0,0 +1,21 @@ +package com.bnyer.img.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; + +import javax.validation.constraints.NotNull; + + +@Getter +@Setter +@ApiModel("艺术家提现记录分页接收类") +public class CreatorWithdrawPageDto extends BasePageDto { + + @NotNull(message = "艺术家id不能为空!") + @ApiModelProperty(value="艺术家id") + private Long creatorId; + + +} diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/WithdrawOrderDto.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/WithdrawOrderDto.java index b08eedb..e7e5b0f 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/WithdrawOrderDto.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/WithdrawOrderDto.java @@ -10,7 +10,7 @@ import java.io.Serializable; @Getter @Setter -@ApiModel("notice分页接收类") +@ApiModel("提现记录明细接收类") public class WithdrawOrderDto implements Serializable { @NotBlank(message = "订单id不能为空!") diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/WithdrawLogServiceImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/WithdrawLogServiceImpl.java index d83322c..e3e1e96 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/WithdrawLogServiceImpl.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/WithdrawLogServiceImpl.java @@ -139,12 +139,33 @@ public class WithdrawLogServiceImpl implements WithdrawLogService { @Override public List queryFrontList(Long creatorId) { - return withdrawLogMapper.queryFrontList(creatorId); + List withdrawLogVos = withdrawLogMapper.queryFrontList(creatorId); + if(withdrawLogVos.size() > 0){ + for (WithdrawLogVo withdrawLogVo : withdrawLogVos) { + if(StringUtils.isNotBlank(withdrawLogVo.getPhone())){ + withdrawLogVo.setPhone(Sm4Util.sm4Decrypt(withdrawLogVo.getPhone())); + } + if(StringUtils.isNotBlank(withdrawLogVo.getBankNo())){ + withdrawLogVo.setBankNo(Sm4Util.sm4Decrypt(withdrawLogVo.getBankNo())); + } + JSONObject.parseObject(DesensitizedUtils.getJsonNoCopy(withdrawLogVo), WithdrawLogVo.class); + } + } + + return withdrawLogVos; } @Override public WithdrawLogVo queryFrontDetails(String orderId) { - return withdrawLogMapper.queryFrontDetails(orderId); + WithdrawLogVo withdrawLogVo = withdrawLogMapper.queryFrontDetails(orderId); + if(StringUtils.isNotBlank(withdrawLogVo.getPhone())){ + withdrawLogVo.setPhone(Sm4Util.sm4Decrypt(withdrawLogVo.getPhone())); + } + if(StringUtils.isNotBlank(withdrawLogVo.getBankNo())){ + withdrawLogVo.setBankNo(Sm4Util.sm4Decrypt(withdrawLogVo.getBankNo())); + } + JSONObject.parseObject(DesensitizedUtils.getJsonNoCopy(withdrawLogVo), WithdrawLogVo.class); + return withdrawLogVo; } /** diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/InviteLogVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/InviteLogVo.java index d1d18f4..b7331df 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/InviteLogVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/InviteLogVo.java @@ -28,6 +28,9 @@ public class InviteLogVo implements Serializable { @ApiModelProperty(value="被邀请者搜索码") private String invitedScanCode; + @ApiModelProperty(value="被邀请者头像") + private String img; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value="邀请时间") private String createTime; diff --git a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/InviteLogMapper.xml b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/InviteLogMapper.xml index 416610c..7de3e60 100644 --- a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/InviteLogMapper.xml +++ b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/InviteLogMapper.xml @@ -22,7 +22,7 @@ select iil.id as id,iil.creator_id as creatorId,iil.invite_code as inviteCode, iil.invited_creator_id as invitedCreatorId,ic.scan_code as invitedScanCode, - iil.create_time as createTime + ic.img as img,iil.create_time as createTime from img_invite_log iil join img_creator ic on iil.invited_creator_id = ic.id where iil.is_show = '1' and iil.creator_id = #{creatorId}