From 7cdb314cd293912723ae27d5eb8080d8518bf2df Mon Sep 17 00:00:00 2001 From: chengkun <2500338766@qq.com> Date: Tue, 7 Jun 2022 18:29:14 +0800 Subject: [PATCH] =?UTF-8?q?feature1.0.0-img:=E5=AE=8C=E5=96=84=E6=8F=90?= =?UTF-8?q?=E7=8E=B0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bnyer/img/constants/TiktokConstant.java | 10 ++ .../img/controller/BannerController.java | 12 +- .../controller/CreatorAccountController.java | 12 +- .../img/controller/CreatorController.java | 18 ++- .../img/controller/CreatorMiniController.java | 47 +++++- .../img/controller/FeedBackController.java | 10 +- .../img/controller/InviteLogController.java | 4 +- .../img/controller/NoticeController.java | 12 +- .../img/controller/TiktokImgController.java | 16 +- .../img/controller/TiktokMiniController.java | 2 +- .../img/controller/TiktokUserController.java | 8 +- .../bnyer/img/controller/TypeController.java | 12 +- .../img/controller/VerifyLogController.java | 4 +- .../img/controller/WithdrawLogController.java | 74 +++++++++ .../java/com/bnyer/img/domain/Creator.java | 9 +- .../com/bnyer/img/domain/CreatorAccount.java | 7 +- .../com/bnyer/img/domain/WithdrawLog.java | 30 +++- .../java/com/bnyer/img/dto/CreatorDto.java | 8 - .../com/bnyer/img/dto/CreatorPageDto.java | 5 +- .../com/bnyer/img/dto/CreatorUpdateDto.java | 2 +- .../com/bnyer/img/dto/DownloadLogPageDto.java | 19 +++ .../java/com/bnyer/img/dto/WithdrawDto.java | 43 +++++ .../com/bnyer/img/dto/WithdrawPageDto.java | 25 +++ .../com/bnyer/img/dto/checkWithdrawDto.java | 26 +++ .../com/bnyer/img/mapper/CreatorMapper.java | 2 +- .../bnyer/img/mapper/WithdrawLogMapper.java | 17 ++ .../com/bnyer/img/service/CreatorService.java | 4 +- .../bnyer/img/service/DownloadLogService.java | 44 +++++ .../bnyer/img/service/WithdrawLogService.java | 79 +++++++++ .../impl/CreatorAccountServiceImpl.java | 26 +-- .../img/service/impl/CreatorServiceImpl.java | 8 +- .../service/impl/WithdrawLogServiceImpl.java | 153 ++++++++++++++++++ .../com/bnyer/img/vo/CreatorAccountVo.java | 4 +- .../java/com/bnyer/img/vo/WithdrawLogVo.java | 53 ++++++ .../com/bnyer/img/mapper/CreatorMapper.xml | 24 +-- .../bnyer/img/mapper/WithdrawLogMapper.xml | 22 ++- 36 files changed, 745 insertions(+), 106 deletions(-) create mode 100644 bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/WithdrawLogController.java create mode 100644 bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/DownloadLogPageDto.java create mode 100644 bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/WithdrawDto.java create mode 100644 bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/WithdrawPageDto.java create mode 100644 bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/checkWithdrawDto.java create mode 100644 bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/DownloadLogService.java create mode 100644 bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/WithdrawLogService.java create mode 100644 bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/WithdrawLogServiceImpl.java create mode 100644 bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/WithdrawLogVo.java diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/constants/TiktokConstant.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/constants/TiktokConstant.java index e400489..b69909e 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/constants/TiktokConstant.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/constants/TiktokConstant.java @@ -35,4 +35,14 @@ public class TiktokConstant { * 艺术家不存在 */ public static final Integer TIKTOK_CREATOR_NOT_EXIST = 105005; + + /** + * 提现申请记录不存在 + */ + public static final Integer WITHDRAW_LOG_NOT_EXIST = 105006; + + /** + * 艺术家可提现余额不足 + */ + public static final Integer CREATOR_AMT_NOT_ENOUGH = 105007; } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/BannerController.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/BannerController.java index 9fc6966..2e2c0b7 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/BannerController.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/BannerController.java @@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; -@Api(value = "img-banner-【后端】接口",tags = "img-banner-【后端】接口") +@Api(value = "【图文平台】banner接口",tags = "【图文平台】banner接口") @RestController @RequestMapping("/img/banner") @Slf4j @@ -43,7 +43,7 @@ public class BannerController extends BaseController { @ApiOperation(value="新增banner") @PostMapping(value = "/insert") public AjaxResult insertBanner(@Validated @RequestBody @ApiParam("banner对象")BannerDto dto){ - log.debug("新增banner参数为:{}", JSON.toJSONString(dto)); + log.debug("【图文平台后台】新增banner参数为:{}", JSON.toJSONString(dto)); return AjaxResult.success(bannerService.insert(dto.extractParam())); } @@ -51,7 +51,7 @@ public class BannerController extends BaseController { @ApiOperation(value="修改banner") @PostMapping(value = "/update") public AjaxResult updateBanner(@Validated @RequestBody @ApiParam("banner对象")BannerDto dto){ - log.debug("修改banner参数为:{}", JSON.toJSONString(dto)); + log.debug("【图文平台后台】修改banner参数为:{}", JSON.toJSONString(dto)); return AjaxResult.success(bannerService.update(dto.extractParam())); } @@ -59,7 +59,7 @@ public class BannerController extends BaseController { @ApiOperation(value="删除banner") @DeleteMapping(value = "/delete/{ids}") public AjaxResult deleteBanner(@PathVariable @ApiParam("主键ids") List ids){ - log.debug("删除banner参数为:{}", JSON.toJSONString(ids)); + log.debug("【图文平台后台】删除banner参数为:{}", JSON.toJSONString(ids)); return AjaxResult.success(bannerService.delete(ids)); } @@ -67,7 +67,7 @@ public class BannerController extends BaseController { @ApiOperation(value="查询banner详情") @GetMapping(value = "/details/{id}") public AjaxResult detailsBanner(@PathVariable @ApiParam("主键id") Long id){ - log.debug("查询banner详情参数为:{}", id); + log.debug("【图文平台后台】查询banner详情参数为:{}", id); return AjaxResult.success(bannerService.queryDetails(id)); } @@ -75,7 +75,7 @@ public class BannerController extends BaseController { @ApiOperation(value="变更type显示状态") @PostMapping(value = "/changeStatus") public AjaxResult changeStatus(@Validated @RequestBody @ApiParam("type状态对象") StatusDto dto){ - log.debug("变更type参数为:{}", JSON.toJSONString(dto)); + log.debug("【图文平台后台】变更type参数为:{}", JSON.toJSONString(dto)); return AjaxResult.success(bannerService.changeStatus(dto.getId(),dto.getStatus())); } } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CreatorAccountController.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CreatorAccountController.java index ef0d963..0ca1871 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CreatorAccountController.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CreatorAccountController.java @@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; -@Api(value = "img-creatorAccount-【后端】艺术家账户接口",tags = "img-creatorAccount-【后端】艺术家账户接口") +@Api(value = "【图文平台】艺术家账户接口",tags = "【图文平台】艺术家账户接口") @RestController @RequestMapping("/img/creatorAccount") @Slf4j @@ -43,7 +43,7 @@ public class CreatorAccountController extends BaseController { @ApiOperation(value="新增creatorAccount") @PostMapping(value = "/insert") public AjaxResult insertCreatorAccount(@Validated @RequestBody @ApiParam("creatorAccount对象")CreatorAccountDto dto){ - log.debug("新增creatorAccount参数为:{}", DesensitizedUtils.getJson(dto)); + log.debug("【图文平台后台】新增creatorAccount参数为:{}", DesensitizedUtils.getJson(dto)); return AjaxResult.success(creatorAccountService.insert(dto.extractParam())); } @@ -51,7 +51,7 @@ public class CreatorAccountController extends BaseController { @ApiOperation(value="修改creatorAccount") @PostMapping(value = "/update") public AjaxResult updateCreatorAccount(@Validated @RequestBody @ApiParam("creatorAccount对象")CreatorAccountDto dto){ - log.debug("修改creatorAccount参数为:{}", JSON.toJSONString(dto)); + log.debug("【图文平台后台】修改creatorAccount参数为:{}", JSON.toJSONString(dto)); return AjaxResult.success(creatorAccountService.update(dto.extractParam())); } @@ -59,7 +59,7 @@ public class CreatorAccountController extends BaseController { @ApiOperation(value="删除creatorAccount") @DeleteMapping(value = "/delete/{ids}") public AjaxResult deleteCreatorAccount(@PathVariable @ApiParam("主键ids") List ids){ - log.debug("删除creatorAccount参数为:{}", JSON.toJSONString(ids)); + log.debug("【图文平台后台】删除creatorAccount参数为:{}", JSON.toJSONString(ids)); return AjaxResult.success(creatorAccountService.delete(ids)); } @@ -67,7 +67,7 @@ public class CreatorAccountController extends BaseController { @ApiOperation(value="查询creatorAccount详情") @GetMapping(value = "/details/{id}") public AjaxResult detailsCreatorAccount(@PathVariable @ApiParam("主键id") Long id){ - log.debug("查询creatorAccount详情参数为:{}", id); + log.debug("【图文平台后台】查询creatorAccount详情参数为:{}", id); return AjaxResult.success(creatorAccountService.queryDetails(id)); } @@ -75,7 +75,7 @@ public class CreatorAccountController extends BaseController { @ApiOperation(value="变更type显示状态") @PostMapping(value = "/changeStatus") public AjaxResult changeStatus(@Validated @RequestBody @ApiParam("type状态对象") StatusDto dto){ - log.debug("变更type参数为:{}", JSON.toJSONString(dto)); + log.debug("【图文平台后台】变更type参数为:{}", JSON.toJSONString(dto)); return AjaxResult.success(creatorAccountService.changeStatus(dto.getId(),dto.getStatus())); } } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CreatorController.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CreatorController.java index 5ba6342..c48bc4c 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CreatorController.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CreatorController.java @@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; -@Api(value = "img-creator-【后端】艺术家接口",tags = "img-creator-【后端】艺术家接口") +@Api(value = "【图文平台】艺术家接口",tags = "【图文平台】艺术家接口") @RestController @RequestMapping("/img/creator") @Slf4j @@ -38,6 +38,9 @@ public class CreatorController extends BaseController { if(StringUtils.isNotBlank(dto.getPhone())){ dto.setPhone(Sm4Util.sm4Encryption(dto.getPhone())); } + if(StringUtils.isNotBlank(dto.getOpenId())){ + dto.setOpenId(Sm4Util.sm4Encryption(dto.getOpenId())); + } PageHelper.startPage(dto.getPageNum(), dto.getPageSize()); List creators = creatorService.queryPage(dto); for (Creator creator : creators) { @@ -45,6 +48,7 @@ public class CreatorController extends BaseController { if(StringUtils.isNotBlank(creator.getPhone())){ creator.setPhone(Sm4Util.sm4Decrypt(creator.getPhone())); } + creator.setOpenId(Sm4Util.sm4Decrypt(creator.getOpenId())); } } return getDataTable(creators); @@ -54,7 +58,7 @@ public class CreatorController extends BaseController { @ApiOperation(value="成为艺术家") @PostMapping(value = "/insert") public AjaxResult insert(@Validated @RequestBody @ApiParam("艺术家对象") CreatorDto dto){ - log.debug("【艺术家小程序】成为艺术家参数为:{}", JSON.toJSONString(dto)); + log.debug("【图文平台后台】成为艺术家参数为:{}", JSON.toJSONString(dto)); return AjaxResult.success(creatorService.insertCreator(dto)); } @@ -62,7 +66,7 @@ public class CreatorController extends BaseController { @ApiOperation(value="修改艺术家") @PostMapping(value = "/update") public AjaxResult update(@RequestBody @ApiParam("艺术家对象") CreatorUpdateDto dto){ - log.debug("修改艺术家参数为:{}", JSON.toJSONString(dto)); + log.debug("【图文平台后台】修改艺术家参数为:{}", JSON.toJSONString(dto)); return AjaxResult.success(creatorService.updateCreator(dto.extractParam())); } @@ -70,7 +74,7 @@ public class CreatorController extends BaseController { @ApiOperation(value="删除艺术家") @DeleteMapping(value = "/delete/{ids}") public AjaxResult deleteTiktokUser(@PathVariable @ApiParam("主键ids") List ids){ - log.debug("删除艺术家参数为:{}", ids); + log.debug("【图文平台后台】删除艺术家参数为:{}", ids); return AjaxResult.success(creatorService.delete(ids)); } @@ -85,7 +89,7 @@ public class CreatorController extends BaseController { @ApiOperation(value="变更type显示状态") @PostMapping(value = "/changeStatus") public AjaxResult changeStatus(@Validated @RequestBody @ApiParam("type状态对象") StatusDto dto){ - log.debug("变更type参数为:{}", JSON.toJSONString(dto)); + log.debug("【图文平台后台】变更type参数为:{}", JSON.toJSONString(dto)); return AjaxResult.success(creatorService.changeStatus(dto.getId(),dto.getStatus())); } @@ -93,7 +97,7 @@ public class CreatorController extends BaseController { @ApiOperation(value="审核通过") @PostMapping(value = "/verifyPass") public AjaxResult verifyPass(@Validated @RequestBody @ApiParam("审核对象") VerifyDto dto){ - log.debug("审核通过参数为:{}", JSON.toJSONString(dto)); + log.debug("【图文平台后台】审核通过参数为:{}", JSON.toJSONString(dto)); return AjaxResult.success(creatorService.verifyPass(dto)); } @@ -101,7 +105,7 @@ public class CreatorController extends BaseController { @ApiOperation(value="审核拒绝") @PostMapping(value = "/verifyUnPass") public AjaxResult verifyUnPass(@Validated @RequestBody @ApiParam("审核对象") VerifyDto dto){ - log.debug("审核不通过参数为:{}", JSON.toJSONString(dto)); + log.debug("【图文平台后台】审核不通过参数为:{}", JSON.toJSONString(dto)); return AjaxResult.success(creatorService.verifyUnPass(dto)); } } 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 5d63e07..9b9f19b 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 @@ -4,9 +4,7 @@ import com.alibaba.fastjson.JSON; import com.bnyer.common.core.web.controller.BaseController; import com.bnyer.common.core.web.domain.AjaxResult; import com.bnyer.img.domain.TiktokImg; -import com.bnyer.img.dto.CreatorDto; -import com.bnyer.img.dto.TiktokImgListMiniDto; -import com.bnyer.img.dto.TiktokImgMiniDto; +import com.bnyer.img.dto.*; import com.bnyer.img.service.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -18,7 +16,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; -@Api(value = "img-creator-【小程序】艺术家接口",tags = "img-creator-【小程序】艺术家接口") +@Api(value = "【微信小程序】艺术家接口",tags = "【微信小程序】艺术家接口") @RestController @RequestMapping("/img/mini/creator") @Slf4j @@ -49,6 +47,9 @@ public class CreatorMiniController extends BaseController { @Autowired private CreatorAccountService creatorAccountService; + @Autowired + private WithdrawLogService withdrawLogService; + //@TokenCheck @ApiOperation(value="成为艺术家") @PostMapping(value = "/insertCreator") @@ -58,10 +59,10 @@ public class CreatorMiniController extends BaseController { } //@TokenCheck - @ApiOperation(value="查看审核结果") + @ApiOperation(value="查看艺术家审核结果") @GetMapping(value = "/queryVerifyStatus/{creatorId}") public AjaxResult queryVerifyStatus(@PathVariable @ApiParam("审核结果id") Long creatorId){ - log.info("【艺术家小程序】查看审核结果参数为:{}", JSON.toJSONString(creatorId)); + log.info("【艺术家小程序】查看艺术家审核结果参数为:{}", JSON.toJSONString(creatorId)); return AjaxResult.success(verifyLogService.queryVerifyStatus(creatorId)); } @@ -150,7 +151,39 @@ public class CreatorMiniController extends BaseController { @ApiOperation(value="查询指定艺术家账户") @GetMapping(value = "/getAccount/{creatorId}") public AjaxResult getAccount(@PathVariable @ApiParam("艺术家id") Long creatorId){ - log.info("【艺术家小程序】查询艺术家id:【{}】账户:",creatorId); + log.info("【艺术家小程序】查询艺术家id:【{}】账户",creatorId); return AjaxResult.success(creatorAccountService.queryList(creatorId)); } + + //@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)); + } + + //@TokenCheck + @ApiOperation(value="查询指定艺术家提现记录明细") + @GetMapping(value = "/getWithdrawDetails/{orderId}") + public AjaxResult getWithdrawDetails(@PathVariable @ApiParam("订单id") String orderId){ + log.info("【艺术家小程序】查询订单id【{}】提现记录明细",orderId); + return AjaxResult.success(withdrawLogService.queryFrontDetails(orderId)); + } + + //@TokenCheck + @ApiOperation(value="检查艺术家是否可提现") + @PostMapping(value = "/checkWithdraw") + public AjaxResult checkWithdraw(@Validated @RequestBody @ApiParam("检查提现对象") checkWithdrawDto dto){ + log.info("【艺术家小程序】检查艺术家【{}】是否可提现", dto.getCreatorId()); + return AjaxResult.success(withdrawLogService.checkWithdraw(dto.getCreatorId(),dto.getAmt())); + } + + //@TokenCheck + @ApiOperation(value="发起提现申请") + @PostMapping(value = "/withdraw") + public AjaxResult withdraw(@Validated @RequestBody @ApiParam("提现对象") WithdrawDto dto){ + log.info("【艺术家小程序】艺术家【{}】申请提现", dto.getCreatorId()); + return AjaxResult.success(withdrawLogService.insert(dto.extractParam())); + } } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/FeedBackController.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/FeedBackController.java index a4aa493..6a5a689 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/FeedBackController.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/FeedBackController.java @@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; -@Api(value = "img-feedback-【后端】反馈接口",tags = "img-feedback-【后端】反馈接口") +@Api(value = "【图文平台】反馈接口",tags = "【图文平台】反馈接口") @RestController @RequestMapping("/img/feedback") @Slf4j @@ -41,7 +41,7 @@ public class FeedBackController extends BaseController { @ApiOperation(value="修改feedback") @PostMapping(value = "/update") public AjaxResult updateFeedBack(@Validated @RequestBody @ApiParam("feedback对象") FeedBackDto dto){ - log.debug("修改feedback参数为:{}", JSON.toJSONString(dto)); + log.debug("【图文平台后台】修改feedback参数为:{}", JSON.toJSONString(dto)); return AjaxResult.success(feedBackService.update(dto.extractParam())); } @@ -49,7 +49,7 @@ public class FeedBackController extends BaseController { @ApiOperation(value="变更feedback显示状态") @PostMapping(value = "/changeStatus") public AjaxResult changeStatus(@Validated @RequestBody @ApiParam("feedback状态对象") StatusDto dto){ - log.debug("变更feedback参数为:{}", JSON.toJSONString(dto)); + log.debug("【图文平台后台】变更feedback参数为:{}", JSON.toJSONString(dto)); return AjaxResult.success(feedBackService.changeStatus(dto.getId(),dto.getStatus())); } @@ -57,7 +57,7 @@ public class FeedBackController extends BaseController { @ApiOperation(value="删除feedback") @DeleteMapping(value = "/delete/{ids}") public AjaxResult deleteFeedBack(@PathVariable @ApiParam("主键ids") List ids){ - log.debug("删除feedback参数为:{}", JSON.toJSONString(ids)); + log.debug("【图文平台后台】删除feedback参数为:{}", JSON.toJSONString(ids)); return AjaxResult.success(feedBackService.delete(ids)); } @@ -65,7 +65,7 @@ public class FeedBackController extends BaseController { @ApiOperation(value="查询feedback详情") @GetMapping(value = "/details/{id}") public AjaxResult detailsFeedBack(@PathVariable @ApiParam("主键ids") Long id){ - log.debug("查询feedback详情参数为:{}", id); + log.debug("【图文平台后台】查询feedback详情参数为:{}", id); return AjaxResult.success(feedBackService.queryDetails(id)); } } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/InviteLogController.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/InviteLogController.java index 45fe442..6a579c0 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/InviteLogController.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/InviteLogController.java @@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; -@Api(value = "img-inviteLog-【后端】邀请记录接口",tags = "img-inviteLog-【后端】邀请记录接口") +@Api(value = "【图文平台】邀请记录接口",tags = "【图文平台】邀请记录接口") @RestController @RequestMapping("/img/inviteLog") @Slf4j @@ -40,7 +40,7 @@ public class InviteLogController extends BaseController { @ApiOperation(value="删除邀请记录") @DeleteMapping(value = "/delete/{ids}") public AjaxResult deleteVerifyLog(@PathVariable @ApiParam("主键ids") List ids){ - log.debug("删除邀请记录参数为:{}", ids); + log.debug("【图文平台后台】删除邀请记录参数为:{}", ids); return AjaxResult.success(inviteLogService.delete(ids)); } } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/NoticeController.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/NoticeController.java index 680c5df..314515c 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/NoticeController.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/NoticeController.java @@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; -@Api(value = "img-notice-【后端】公告接口",tags = "img-notice-【后端】公告接口") +@Api(value = "【图文平台】公告接口",tags = "【图文平台】公告接口") @RestController @RequestMapping("/img/notice") @Slf4j @@ -42,7 +42,7 @@ public class NoticeController extends BaseController { @ApiOperation(value="新增notice") @PostMapping(value = "/insert") public AjaxResult insertNotice(@Validated @RequestBody @ApiParam("notice对象")NoticeDto dto){ - log.debug("新增notice参数为:{}", JSON.toJSONString(dto)); + log.debug("【图文平台后台】新增notice参数为:{}", JSON.toJSONString(dto)); return AjaxResult.success(noticeService.insert(dto.extractParam())); } @@ -50,7 +50,7 @@ public class NoticeController extends BaseController { @ApiOperation(value="修改notice") @PostMapping(value = "/update") public AjaxResult updateNotice(@Validated @RequestBody @ApiParam("notice对象")NoticeDto dto){ - log.debug("修改notice参数为:{}", JSON.toJSONString(dto)); + log.debug("【图文平台后台】修改notice参数为:{}", JSON.toJSONString(dto)); return AjaxResult.success(noticeService.update(dto.extractParam())); } @@ -58,7 +58,7 @@ public class NoticeController extends BaseController { @ApiOperation(value="删除notice") @DeleteMapping(value = "/delete/{ids}") public AjaxResult deleteNotice(@PathVariable @ApiParam("主键ids") List ids){ - log.debug("删除notice参数为:{}", JSON.toJSONString(ids)); + log.debug("【图文平台后台】删除notice参数为:{}", JSON.toJSONString(ids)); return AjaxResult.success(noticeService.delete(ids)); } @@ -66,7 +66,7 @@ public class NoticeController extends BaseController { @ApiOperation(value="查询notice详情") @GetMapping(value = "/details/{id}") public AjaxResult detailsNotice(@PathVariable @ApiParam("主键id") Long id){ - log.debug("查询notice详情参数为:{}", id); + log.debug("【图文平台后台】查询notice详情参数为:{}", id); return AjaxResult.success(noticeService.queryDetails(id)); } @@ -74,7 +74,7 @@ public class NoticeController extends BaseController { @ApiOperation(value="变更type显示状态") @PostMapping(value = "/changeStatus") public AjaxResult changeStatus(@Validated @RequestBody @ApiParam("type状态对象") StatusDto dto){ - log.debug("变更type参数为:{}", JSON.toJSONString(dto)); + log.debug("【图文平台后台】变更type参数为:{}", JSON.toJSONString(dto)); return AjaxResult.success(noticeService.changeStatus(dto.getId(),dto.getStatus())); } } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokImgController.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokImgController.java index 44af8f7..adc43c1 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokImgController.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokImgController.java @@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; -@Api(value = "img-tiktokImg-【后端】抖音图片接口",tags = "img-tiktokImg-【后端】抖音图片接口") +@Api(value = "【图文平台】图片接口",tags = "【图文平台】图片接口") @RestController @RequestMapping("/img/tiktokImg") @Slf4j @@ -42,7 +42,7 @@ public class TiktokImgController extends BaseController { @ApiOperation(value="新增TiktokImg") @PostMapping(value = "/insert") public AjaxResult addTiktokImg(@Validated @RequestBody @ApiParam("TiktokImg对象") TiktokImgDto dto){ - log.debug("后台管理系统新增TiktokImg参数为:{}", JSON.toJSONString(dto)); + log.debug("【图文平台后台】新增TiktokImg参数为:{}", JSON.toJSONString(dto)); return AjaxResult.success(tiktokImgService.insert(dto.extractParam())); } @@ -50,7 +50,7 @@ public class TiktokImgController extends BaseController { @ApiOperation(value="修改TiktokImg") @PostMapping(value = "/update") public AjaxResult editTiktokImg(@Validated @RequestBody @ApiParam("TiktokImg对象") TiktokImgDto dto){ - log.debug("后台管理系统修改TiktokImg参数为:{}", JSON.toJSONString(dto)); + log.debug("【图文平台后台】修改TiktokImg参数为:{}", JSON.toJSONString(dto)); return AjaxResult.success(tiktokImgService.update(dto.extractParam())); } @@ -58,7 +58,7 @@ public class TiktokImgController extends BaseController { @ApiOperation(value="删除TiktokImg") @DeleteMapping(value = "/delete/{ids}") public AjaxResult delTiktokImg(@PathVariable @ApiParam("主键ids") List ids){ - log.debug("后台管理系统删除TiktokImg参数为:{}", ids); + log.debug("【图文平台后台】删除TiktokImg参数为:{}", ids); return AjaxResult.success(tiktokImgService.delete(ids)); } @@ -66,7 +66,7 @@ public class TiktokImgController extends BaseController { @ApiOperation(value="查询TiktokImg详情") @GetMapping(value = "/details/{id}") public AjaxResult detailTiktokImg(@PathVariable @ApiParam("主键id") Long id){ - log.debug("查询TiktokImg详情参数为:{}", id); + log.debug("【图文平台后台】查询TiktokImg详情参数为:{}", id); return AjaxResult.success(tiktokImgService.queryDetails(id)); } @@ -74,7 +74,7 @@ public class TiktokImgController extends BaseController { @ApiOperation(value="变更图片显示状态") @PostMapping(value = "/changeStatus") public AjaxResult changeStatus(@Validated @RequestBody @ApiParam("img状态对象") StatusDto dto){ - log.debug("变更img显示状态参数为:{}", JSON.toJSONString(dto)); + log.debug("【图文平台后台】变更img显示状态参数为:{}", JSON.toJSONString(dto)); return AjaxResult.success(tiktokImgService.changeStatus(dto.getId(),dto.getStatus())); } @@ -82,7 +82,7 @@ public class TiktokImgController extends BaseController { @ApiOperation(value="变更图片审核状态") @PostMapping(value = "/changeJudge") public AjaxResult changeJudge(@Validated @RequestBody @ApiParam("img状态对象") StatusDto dto){ - log.debug("变更图片审核状态参数为:{}", JSON.toJSONString(dto)); + log.debug("【图文平台后台】变更图片审核状态参数为:{}", JSON.toJSONString(dto)); return AjaxResult.success(tiktokImgService.changeJudge(dto.getId(),dto.getStatus())); } @@ -90,7 +90,7 @@ public class TiktokImgController extends BaseController { @ApiOperation(value="变更图片热门状态") @PostMapping(value = "/changeHot") public AjaxResult changeHot(@Validated @RequestBody @ApiParam("img状态对象") StatusDto dto){ - log.debug("变更图片热门状态参数为:{}", JSON.toJSONString(dto)); + log.debug("【图文平台后台】变更图片热门状态参数为:{}", JSON.toJSONString(dto)); return AjaxResult.success(tiktokImgService.changeHot(dto.getId(),dto.getStatus())); } } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokMiniController.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokMiniController.java index 8ef9f74..f839177 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokMiniController.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokMiniController.java @@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; -@Api(value = "img-抖音平台-【小程序】接口",tags = "img-抖音平台-【小程序】接口") +@Api(value = "【抖音小程序】接口",tags = "【抖音小程序】接口") @RestController @RequestMapping("/img/mini/tiktok") @Slf4j diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokUserController.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokUserController.java index 449023d..e930e3d 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokUserController.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokUserController.java @@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; -@Api(value = "img-tiktokUser-【后端】抖音平台用户接口",tags = "img-tiktokUser-【后端】抖音平台用户接口") +@Api(value = "【图文平台】抖音用户接口",tags = "【图文平台】抖音用户接口") @RestController @RequestMapping("/img/tiktokUser") @Slf4j @@ -51,7 +51,7 @@ public class TiktokUserController extends BaseController { @ApiOperation(value="修改user") @PostMapping(value = "/update") public AjaxResult update(@RequestBody @ApiParam("user对象") TiktokUserDto dto){ - log.debug("修改user参数为:{}", JSON.toJSONString(dto)); + log.debug("【图文平台后台】修改user参数为:{}", JSON.toJSONString(dto)); return AjaxResult.success(tiktokUserService.update(dto.extractParam())); } @@ -59,7 +59,7 @@ public class TiktokUserController extends BaseController { @ApiOperation(value="删除user") @DeleteMapping(value = "/delete/{ids}") public AjaxResult deleteTiktokUser(@PathVariable @ApiParam("主键ids") List ids){ - log.debug("删除user参数为:{}", ids); + log.debug("【图文平台后台】删除user参数为:{}", ids); return AjaxResult.success(tiktokUserService.delete(ids)); } @@ -74,7 +74,7 @@ public class TiktokUserController extends BaseController { @ApiOperation(value="变更type显示状态") @PostMapping(value = "/changeStatus") public AjaxResult changeStatus(@Validated @RequestBody @ApiParam("type状态对象") StatusDto dto){ - log.debug("变更type参数为:{}", JSON.toJSONString(dto)); + log.debug("【图文平台后台】变更type参数为:{}", JSON.toJSONString(dto)); return AjaxResult.success(tiktokUserService.changeStatus(dto.getId(),dto.getStatus())); } } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TypeController.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TypeController.java index feec6ca..a5181f0 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TypeController.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TypeController.java @@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; -@Api(value = "img-type-【后端】图片类型接口",tags = "img-type-【后端】图片类型接口") +@Api(value = "【图文平台】图片类型接口",tags = "【图文平台】图片类型接口") @RestController @RequestMapping("/img/type") @Slf4j @@ -42,7 +42,7 @@ public class TypeController extends BaseController { @ApiOperation(value="新增type") @PostMapping(value = "/insert") public AjaxResult insertType(@Validated @RequestBody @ApiParam("type对象") TypeDto dto){ - log.debug("新增type参数为:{}", JSON.toJSONString(dto)); + log.debug("【图文平台后台】新增type参数为:{}", JSON.toJSONString(dto)); return AjaxResult.success(typeService.insert(dto.extractParam())); } @@ -50,7 +50,7 @@ public class TypeController extends BaseController { @ApiOperation(value="修改type") @PostMapping(value = "/update") public AjaxResult updateType(@Validated @RequestBody @ApiParam("type对象") TypeDto dto){ - log.debug("修改type参数为:{}", JSON.toJSONString(dto)); + log.debug("【图文平台后台】修改type参数为:{}", JSON.toJSONString(dto)); return AjaxResult.success(typeService.update(dto.extractParam())); } @@ -58,7 +58,7 @@ public class TypeController extends BaseController { @ApiOperation(value="删除type") @DeleteMapping(value = "/delete/{ids}") public AjaxResult deleteType(@PathVariable @ApiParam("主键ids") List ids){ - log.debug("删除type参数为:{}", ids); + log.debug("【图文平台后台】删除type参数为:{}", ids); return AjaxResult.success(typeService.delete(ids)); } @@ -66,7 +66,7 @@ public class TypeController extends BaseController { @ApiOperation(value="查询type详情") @GetMapping(value = "/details/{id}") public AjaxResult detailsType(@PathVariable @ApiParam("主键id") Long id){ - log.debug("查询type详情参数为:{}", id); + log.debug("【图文平台后台】查询type详情参数为:{}", id); return AjaxResult.success(typeService.queryDetails(id)); } @@ -74,7 +74,7 @@ public class TypeController extends BaseController { @ApiOperation(value="变更type显示状态") @PostMapping(value = "/changeStatus") public AjaxResult changeStatus(@Validated @RequestBody @ApiParam("type状态对象") StatusDto dto){ - log.debug("变更type参数为:{}", JSON.toJSONString(dto)); + log.debug("【图文平台后台】变更type参数为:{}", JSON.toJSONString(dto)); return AjaxResult.success(typeService.changeStatus(dto.getId(),dto.getStatus())); } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/VerifyLogController.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/VerifyLogController.java index 294c0a0..9db25f5 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/VerifyLogController.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/VerifyLogController.java @@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; -@Api(value = "img-verifyLog-【后端】审核记录接口",tags = "img-verifyLog-【后端】审核记录接口") +@Api(value = "【图文平台】审核记录接口",tags = "【图文平台】审核记录接口") @RestController @RequestMapping("/img/verifyLog") @Slf4j @@ -38,7 +38,7 @@ public class VerifyLogController extends BaseController { @ApiOperation(value="删除审核记录") @DeleteMapping(value = "/delete/{ids}") public AjaxResult deleteVerifyLog(@PathVariable @ApiParam("主键ids") List ids){ - log.debug("删除审核记录参数为:{}", ids); + log.debug("【图文平台后台】删除审核记录参数为:{}", ids); return AjaxResult.success(verifyLogService.delete(ids)); } } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/WithdrawLogController.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/WithdrawLogController.java new file mode 100644 index 0000000..ff91c92 --- /dev/null +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/WithdrawLogController.java @@ -0,0 +1,74 @@ +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.domain.WithdrawLog; +import com.bnyer.img.dto.VerifyDto; +import com.bnyer.img.dto.VerifyPageDto; +import com.bnyer.img.dto.WithdrawPageDto; +import com.bnyer.img.dto.checkWithdrawDto; +import com.bnyer.img.service.WithdrawLogService; +import com.github.pagehelper.PageHelper; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@Api(value = "【图文平台】提现记录接口",tags = "【图文平台】提现记录接口") +@RestController +@RequestMapping("/img/withdrawLog") +@Slf4j +public class WithdrawLogController extends BaseController { + + @Autowired + private WithdrawLogService withdrawLogService; + + //@RequiresPermissions("system:config:list") + @ApiOperation(value="查询提现记录分页") + @PostMapping("/page") + public TableDataInfo pageWithdrawLog(@RequestBody @ApiParam("分页对象") WithdrawPageDto dto){ + PageHelper.startPage(dto.getPageNum(), dto.getPageSize()); + List withdrawLogs = withdrawLogService.queryPage(dto); + return getDataTable(withdrawLogs); + } + + //@RequiresPermissions("system:config:list") + @ApiOperation(value="删除提现记录") + @DeleteMapping(value = "/delete/{ids}") + public AjaxResult deleteWithdrawLog(@PathVariable @ApiParam("主键ids") List ids){ + log.debug("【图文平台后台】删除提现记录参数为:{}", ids); + return AjaxResult.success(withdrawLogService.delete(ids)); + } + + @ApiOperation(value="查询提现记录详情") + @GetMapping(value = "/details/{id}") + public AjaxResult details(@PathVariable @ApiParam("主键id") Long id){ + log.debug("【图文平台后台】查询提现记录参数为:{}", id); + return AjaxResult.success(withdrawLogService.queryDetails(id)); + } + + //@RequiresPermissions("system:config:list") + @ApiOperation(value="审核提现通过") + @PostMapping(value = "/verifyPass") + public AjaxResult verifyPass(@Validated @RequestBody @ApiParam("审核对象") VerifyDto dto){ + log.debug("【图文平台后台】审核提现通过参数为:{}", JSON.toJSONString(dto)); + return AjaxResult.success(withdrawLogService.verifyPass(dto)); + } + + //@RequiresPermissions("system:config:list") + @ApiOperation(value="审核提现拒绝") + @PostMapping(value = "/verifyUnPass") + public AjaxResult verifyUnPass(@Validated @RequestBody @ApiParam("审核对象") VerifyDto dto){ + log.debug("【图文平台后台】审核提现不通过参数为:{}", JSON.toJSONString(dto)); + return AjaxResult.success(withdrawLogService.verifyUnPass(dto)); + } + + +} diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/Creator.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/Creator.java index 21bef01..4051f82 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/Creator.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/Creator.java @@ -34,9 +34,16 @@ public class Creator extends BaseDomain { * 姓名 */ @TableField(value = "`name`") - @ApiModelProperty(value="姓名") + @ApiModelProperty(value="昵称") private String name; + /** + * 姓名 + */ + @TableField(value = "open_id") + @ApiModelProperty(value="微信id") + private String openId; + /** * 搜索码 */ diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/CreatorAccount.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/CreatorAccount.java index 1c32164..5fe8abe 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/CreatorAccount.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/CreatorAccount.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.bnyer.common.core.annotation.Desensitized; +import com.bnyer.common.core.enums.SensitiveTypeEnum; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.*; @@ -42,6 +44,7 @@ public class CreatorAccount extends BaseDomain { */ @TableField(value = "id_no") @ApiModelProperty(value="身份证(加密)") + @Desensitized(type = SensitiveTypeEnum.ID_CARD) private String idNo; /** @@ -49,6 +52,7 @@ public class CreatorAccount extends BaseDomain { */ @TableField(value = "bank_no") @ApiModelProperty(value="银行卡(加密)") + @Desensitized(type = SensitiveTypeEnum.BANK_CARD) private String bankNo; /** @@ -56,7 +60,8 @@ public class CreatorAccount extends BaseDomain { */ @TableField(value = "phone") @ApiModelProperty(value="联系电话") + @Desensitized(type = SensitiveTypeEnum.MOBILE_PHONE) private String phone; private static final long serialVersionUID = 1L; -} \ No newline at end of file +} diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/WithdrawLog.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/WithdrawLog.java index 25ec46a..b438bed 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/WithdrawLog.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/WithdrawLog.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.bnyer.common.core.annotation.Desensitized; +import com.bnyer.common.core.enums.SensitiveTypeEnum; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.*; @@ -23,6 +25,13 @@ public class WithdrawLog extends BaseDomain { @ApiModelProperty(value="主键id") private Integer id; + /** + * 流水号 + */ + @TableField(value = "order_id") + @ApiModelProperty(value="流水号") + private String orderId; + /** * 艺术家id */ @@ -42,14 +51,29 @@ public class WithdrawLog extends BaseDomain { */ @TableField(value = "bank_no") @ApiModelProperty(value="银行卡(加密)") + @Desensitized(type = SensitiveTypeEnum.BANK_CARD) private String bankNo; /** - * 状态(0->提现失败;1->提现中;2->提现成功) + * 渠道(0->微信;1->银行卡) + */ + @TableField(value = "channel") + @ApiModelProperty(value="渠道(0->微信;1->银行卡)") + private String channel; + + /** + * 理由 + */ + @TableField(value = "reason") + @ApiModelProperty(value="理由") + private String reason; + + /** + * 状态(0->待审核;1->提现中;2->提现成功;3->提现失败) */ @TableField(value = "status") - @ApiModelProperty(value="状态(0->提现失败;1->提现中;2->提现成功)") + @ApiModelProperty(value="状态(0->待审核;1->提现中;2->提现成功;3->提现失败;4->审核拒绝)") private String status; private static final long serialVersionUID = 1L; -} \ No newline at end of file +} diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorDto.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorDto.java index 217315c..df5db0c 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorDto.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorDto.java @@ -17,10 +17,6 @@ public class CreatorDto implements Serializable { @ApiModelProperty(value="主键Id") private Long id; - @NotBlank(message = "姓名不能为空!") - @ApiModelProperty(value="姓名") - private String name; - @NotBlank(message = "搜索码不能为空!") @ApiModelProperty(value="搜索码") private String scanCode; @@ -29,10 +25,6 @@ public class CreatorDto implements Serializable { @ApiModelProperty(value="手机号") private String phone; - @NotBlank(message = "头像不能为空!") - @ApiModelProperty(value="头像img地址") - private String img; - @ApiModelProperty(value="简介") private String intro; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorPageDto.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorPageDto.java index e92a71a..6f54590 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorPageDto.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorPageDto.java @@ -13,9 +13,12 @@ import java.io.Serializable; @ApiModel("艺术家分页接收类") public class CreatorPageDto extends BasePageDto { - @ApiModelProperty(value="姓名") + @ApiModelProperty(value="昵称") private String name; + @ApiModelProperty(value="微信id") + private String openId; + @ApiModelProperty(value="搜索码") private String scanCode; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorUpdateDto.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorUpdateDto.java index 8642c24..31f3219 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorUpdateDto.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorUpdateDto.java @@ -18,7 +18,7 @@ public class CreatorUpdateDto implements Serializable { @ApiModelProperty(value="主键id") private Long id; - @ApiModelProperty(value="姓名") + @ApiModelProperty(value="昵称") private String name; @ApiModelProperty(value="搜索码") diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/DownloadLogPageDto.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/DownloadLogPageDto.java new file mode 100644 index 0000000..889899c --- /dev/null +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/DownloadLogPageDto.java @@ -0,0 +1,19 @@ +package com.bnyer.img.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; + + +@Getter +@Setter +@ApiModel("下载记录分页接收类") +public class DownloadLogPageDto extends BasePageDto { + + @ApiModelProperty(value="渠道(0->抖音;1->快手;2->微信)") + private String channel; + + @ApiModelProperty(value="搜索码") + private String scanCode; +} diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/WithdrawDto.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/WithdrawDto.java new file mode 100644 index 0000000..8e0b9dd --- /dev/null +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/WithdrawDto.java @@ -0,0 +1,43 @@ +package com.bnyer.img.dto; + +import com.bnyer.common.core.annotation.Desensitized; +import com.bnyer.common.core.enums.SensitiveTypeEnum; +import com.bnyer.common.core.utils.bean.BeanUtils; +import com.bnyer.img.domain.WithdrawLog; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + + +@Getter +@Setter +@ApiModel("提现接收类") +public class WithdrawDto implements Serializable { + + @NotNull(message = "艺术家id不能为空!") + @ApiModelProperty(value="艺术家id") + private Long creatorId; + + @NotNull(message = "提现金额不能为空!") + @ApiModelProperty(value="提现金额") + private Integer amt; + + @ApiModelProperty(value="银行卡(加密)") + @Desensitized(type = SensitiveTypeEnum.BANK_CARD) + private String bankNo; + + @NotBlank(message = "渠道不能为空!") + @ApiModelProperty(value="渠道(0->微信;1->银行卡)") + private String channel; + + public WithdrawLog extractParam(){ + WithdrawLog withdrawLog = new WithdrawLog(); + BeanUtils.copyProperties(this,withdrawLog); + return withdrawLog; + } +} diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/WithdrawPageDto.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/WithdrawPageDto.java new file mode 100644 index 0000000..4d77bde --- /dev/null +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/WithdrawPageDto.java @@ -0,0 +1,25 @@ +package com.bnyer.img.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; + + +@Getter +@Setter +@ApiModel("提现记录分页接收类") +public class WithdrawPageDto extends BasePageDto { + + @ApiModelProperty(value="流水号") + private String orderId; + + @ApiModelProperty(value="渠道(0->微信;1->银行卡)") + private String channel; + + @ApiModelProperty(value="状态(0->待审核;1->提现中;2->提现成功;3->提现失败)") + private String status; + + @ApiModelProperty(value="银行卡(加密)") + private String bankNo; +} diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/checkWithdrawDto.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/checkWithdrawDto.java new file mode 100644 index 0000000..8fffaac --- /dev/null +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/checkWithdrawDto.java @@ -0,0 +1,26 @@ +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.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + + +@Getter +@Setter +@ApiModel("检查提现接收类") +public class checkWithdrawDto implements Serializable { + + @NotNull(message = "艺术家id不能为空!") + @ApiModelProperty(value="艺术家id") + private Long creatorId; + + @NotNull(message = "额度不能为空!") + @ApiModelProperty(value="额度") + private Integer amt; +} diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/CreatorMapper.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/CreatorMapper.java index 046834e..52b2b57 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/CreatorMapper.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/CreatorMapper.java @@ -42,5 +42,5 @@ public interface CreatorMapper extends BaseMapper { * @param creator 艺术家实体 * @return - */ - int insertCreator(@Param("creator") Creator creator); +// int insertCreator(@Param("creator") Creator creator); } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/WithdrawLogMapper.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/WithdrawLogMapper.java index 0a061b3..def09c8 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/WithdrawLogMapper.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/WithdrawLogMapper.java @@ -2,8 +2,25 @@ package com.bnyer.img.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.bnyer.img.domain.WithdrawLog; +import com.bnyer.img.vo.WithdrawLogVo; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; @Mapper public interface WithdrawLogMapper extends BaseMapper { + /** + * 小程序查询艺术家提现记录列表 + * @param creatorId 艺术家Id + * @return - + */ + List queryFrontList(@Param("creatorId") Long creatorId); + + /** + * 小程序根据流水号查询提现记录详情 + * @param orderId 订单id + * @return - + */ + WithdrawLogVo queryFrontDetails(@Param("orderId") String orderId); } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/CreatorService.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/CreatorService.java index f3f8f94..85bff1f 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/CreatorService.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/CreatorService.java @@ -16,7 +16,7 @@ import java.util.List; public interface CreatorService { /** - * 新增艺术家 + * 成为艺术家 * @param dto 艺术家参数 * @return - */ @@ -91,4 +91,6 @@ public interface CreatorService { * @return - */ int reVerify(Long id); + + //TODO 微信登录 } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/DownloadLogService.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/DownloadLogService.java new file mode 100644 index 0000000..a4387d7 --- /dev/null +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/DownloadLogService.java @@ -0,0 +1,44 @@ +package com.bnyer.img.service; + +import com.bnyer.img.domain.DownloadLog; +import com.bnyer.img.domain.VerifyLog; +import com.bnyer.img.dto.DownloadLogPageDto; +import com.bnyer.img.dto.VerifyPageDto; +import com.bnyer.img.vo.VerifyLogVo; + +import java.util.List; + +/** + * @author chengkun + * @date 2022/5/31 10:37 + */ +public interface DownloadLogService { + + /** + * 新增下载记录 + * @param downloadLog 记录参数 + * @return - + */ + int insertDownloadLog(DownloadLog downloadLog); + + /** + * 查询下载记录分页 + * @param params 分页参数 + * @return - + */ + List queryPage(DownloadLogPageDto params); + + /** + * 删除记录 + * @param ids 主键ids + * @return - + */ + int delete(List ids); + + /** + * 根据艺术家id查询下载状态记录 + * @param creatorId 艺术家id + * @return - + */ + VerifyLogVo queryVerifyStatus(Long creatorId); +} diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/WithdrawLogService.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/WithdrawLogService.java new file mode 100644 index 0000000..6763772 --- /dev/null +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/WithdrawLogService.java @@ -0,0 +1,79 @@ +package com.bnyer.img.service; + +import com.bnyer.img.domain.WithdrawLog; +import com.bnyer.img.dto.VerifyDto; +import com.bnyer.img.dto.WithdrawPageDto; +import com.bnyer.img.vo.WithdrawLogVo; + +import java.util.List; + +/** + * @author chengkun + * @date 2022/5/31 10:37 + */ +public interface WithdrawLogService { + + /** + * 新增提现记录 + * @param withdrawLog 提现记录对象 + * @return - + */ + int insert(WithdrawLog withdrawLog); + + /** + * 查询提现记录分页 + * @param params 分页参数 + * @return - + */ + List queryPage(WithdrawPageDto params); + + /** + * 查询提现详情 + * @param id 主键id + * @return - + */ + WithdrawLog queryDetails(Long id); + + /** + * 删除记录 + * @param ids 主键ids + * @return - + */ + int delete(List ids); + + /** + * 小程序查询艺术家提现记录列表 + * @param creatorId 艺术家id + * @return - + */ + List queryFrontList(Long creatorId); + + /** + * 小程序根据流水号查询提现记录详情 + * @param orderId 流水号 + * @return - + */ + WithdrawLogVo queryFrontDetails(String orderId); + + /** + * 审核提现通过 + * @param params 审核参数 + * @return - + */ + int verifyPass(VerifyDto params); + + /** + * 审核提现拒绝 + * @param params 审核参数 + * @return - + */ + int verifyUnPass(VerifyDto params); + + /** + * 检查该艺术家是否可提现 + * @param creatorId 艺术家id + * @param amt 额度 + * @return - + */ + boolean checkWithdraw(Long creatorId,Integer amt); +} diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/CreatorAccountServiceImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/CreatorAccountServiceImpl.java index 9e4f062..13a2b18 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/CreatorAccountServiceImpl.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/CreatorAccountServiceImpl.java @@ -1,5 +1,6 @@ package com.bnyer.img.service.impl; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.bnyer.common.core.utils.DesensitizedUtils; @@ -67,10 +68,11 @@ public class CreatorAccountServiceImpl implements CreatorAccountService { wrapper.orderByDesc(CreatorAccount::getSort); List creatorAccounts = creatorAccountMapper.selectList(wrapper); for (CreatorAccount creatorAccount : creatorAccounts) { - creatorAccount.setIdNo(DesensitizedUtils.getJsonNoCopy(Sm4Util.sm4Decrypt(creatorAccount.getIdNo()))); - creatorAccount.setPhone(DesensitizedUtils.getJsonNoCopy(Sm4Util.sm4Decrypt(creatorAccount.getPhone()))); - creatorAccount.setName(DesensitizedUtils.getJsonNoCopy(creatorAccount.getName())); - creatorAccount.setBankNo(DesensitizedUtils.getJsonNoCopy(Sm4Util.sm4Decrypt(creatorAccount.getBankNo()))); + creatorAccount.setIdNo(Sm4Util.sm4Decrypt(creatorAccount.getIdNo())); + creatorAccount.setPhone(Sm4Util.sm4Decrypt(creatorAccount.getPhone())); + creatorAccount.setName(creatorAccount.getName()); + creatorAccount.setBankNo(Sm4Util.sm4Decrypt(creatorAccount.getBankNo())); + JSONObject.parseObject(DesensitizedUtils.getJsonNoCopy(creatorAccount), CreatorAccount.class); } return creatorAccounts; } @@ -78,10 +80,13 @@ public class CreatorAccountServiceImpl implements CreatorAccountService { @Override public CreatorAccount queryDetails(Long id) { CreatorAccount creatorAccount = creatorAccountMapper.selectById(id); - creatorAccount.setIdNo(DesensitizedUtils.getJson(Sm4Util.sm4Decrypt(creatorAccount.getIdNo()))); - creatorAccount.setPhone(DesensitizedUtils.getJson(Sm4Util.sm4Decrypt(creatorAccount.getPhone()))); - creatorAccount.setName(DesensitizedUtils.getJson(Sm4Util.sm4Decrypt(creatorAccount.getName()))); - creatorAccount.setBankNo(DesensitizedUtils.getJson(Sm4Util.sm4Decrypt(creatorAccount.getBankNo()))); + if(creatorAccount != null){ + creatorAccount.setIdNo(Sm4Util.sm4Decrypt(creatorAccount.getIdNo())); + creatorAccount.setPhone(Sm4Util.sm4Decrypt(creatorAccount.getPhone())); + creatorAccount.setName(creatorAccount.getName()); + creatorAccount.setBankNo(Sm4Util.sm4Decrypt(creatorAccount.getBankNo())); + JSONObject.parseObject(DesensitizedUtils.getJsonNoCopy(creatorAccount), CreatorAccount.class); + } return creatorAccount; } @@ -89,8 +94,9 @@ public class CreatorAccountServiceImpl implements CreatorAccountService { public List queryList(Long creatorId) { List creatorAccountVos = creatorAccountMapper.queryFrontList(creatorId); for (CreatorAccountVo creatorAccountVo : creatorAccountVos) { - creatorAccountVo.setName(DesensitizedUtils.getJsonNoCopy(creatorAccountVo.getName())); - creatorAccountVo.setBankNo(DesensitizedUtils.getJsonNoCopy(Sm4Util.sm4Decrypt(creatorAccountVo.getBankNo()))); + creatorAccountVo.setName(creatorAccountVo.getName()); + creatorAccountVo.setBankNo(Sm4Util.sm4Decrypt(creatorAccountVo.getBankNo())); + JSONObject.parseObject(DesensitizedUtils.getJsonNoCopy(creatorAccountVo), CreatorAccountVo.class); } return creatorAccountVos; } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/CreatorServiceImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/CreatorServiceImpl.java index d9ce622..f2871d2 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/CreatorServiceImpl.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/CreatorServiceImpl.java @@ -117,9 +117,8 @@ public class CreatorServiceImpl implements CreatorService { throw new ServiceException("邀请码不存在,请重新编辑！",TiktokConstant.INVITE_CODE_NOT_EXIST); } Creator creator = new Creator(); - creator.setName(dto.getName()); + creator.setId(dto.getId()); creator.setIntro(dto.getIntro()); - creator.setImg(dto.getImg()); creator.setScanCode(dto.getScanCode()); creator.setInviteCode(IdUtils.inviteCodeGen()); creator.setUrl(dto.getUrl()); @@ -129,9 +128,8 @@ public class CreatorServiceImpl implements CreatorService { creator.setIsShow("1"); creator.setAmt(0); creator.setSort(0); - creator.setCreateTime(new Date()); creator.setUpdateTime(new Date()); - int insert = creatorMapper.insertCreator(creator); + int update = creatorMapper.updateById(creator); log.info("手机号【{}】成为艺术家成功!待审核",dto.getPhone()); //保存邀请记录 InviteLog inviteLog = new InviteLog(); @@ -144,7 +142,7 @@ public class CreatorServiceImpl implements CreatorService { inviteLog.setSort(0); inviteLogMapper.insert(inviteLog); log.info("艺术家id【{}】被邀请码【{}】邀请成功!记录写入数据库完成!",creator.getId(),dto.getInviteCode()); - return insert; + return update; } @Override 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 new file mode 100644 index 0000000..f281e7e --- /dev/null +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/WithdrawLogServiceImpl.java @@ -0,0 +1,153 @@ +package com.bnyer.img.service.impl; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.bnyer.common.core.exception.ServiceException; +import com.bnyer.common.core.utils.DesensitizedUtils; +import com.bnyer.common.core.utils.Sm4Util; +import com.bnyer.common.core.utils.StringUtils; +import com.bnyer.img.constants.TiktokConstant; +import com.bnyer.img.domain.Creator; +import com.bnyer.img.domain.WithdrawLog; +import com.bnyer.img.dto.VerifyDto; +import com.bnyer.img.dto.WithdrawPageDto; +import com.bnyer.img.mapper.CreatorMapper; +import com.bnyer.img.mapper.WithdrawLogMapper; +import com.bnyer.img.service.WithdrawLogService; +import com.bnyer.img.vo.WithdrawLogVo; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Date; +import java.util.List; + +/** + * @author chengkun + * @date 2022/5/30 16:46 + */ +@Service +@Slf4j +public class WithdrawLogServiceImpl implements WithdrawLogService { + + @Autowired + private WithdrawLogMapper withdrawLogMapper; + + @Autowired + private CreatorMapper creatorMapper; + + + @Override + @Transactional(rollbackFor = Exception.class) + public int insert(WithdrawLog withdrawLog) { + Creator creator = creatorMapper.selectById(withdrawLog.getCreatorId()); + if(creator == null){ + throw new ServiceException("该艺术家不存在!", TiktokConstant.TIKTOK_CREATOR_NOT_EXIST); + } + //此处以分为单位 + if(creator.getAmt() < withdrawLog.getAmt() * 100){ + throw new ServiceException("该艺术家当前可提现余额不足,提现失败!", TiktokConstant.CREATOR_AMT_NOT_ENOUGH); + } + withdrawLog.setCreateTime(new Date()); + withdrawLog.setUpdateTime(new Date()); + withdrawLog.setStatus("0"); + if(StringUtils.isNotBlank(withdrawLog.getBankNo())){ + withdrawLog.setBankNo(Sm4Util.sm4Encryption(withdrawLog.getBankNo())); + } + //TODO 订单id待核实了广告平台给予的奖励来确定是否有专属订单 + return withdrawLogMapper.insert(withdrawLog); + } + + @Override + public List queryPage(WithdrawPageDto params) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + if(StringUtils.isNotBlank(params.getStatus())){ + wrapper.eq(WithdrawLog::getStatus,params.getStatus()); + } + if(StringUtils.isNotBlank(params.getChannel())){ + wrapper.eq(WithdrawLog::getChannel,params.getChannel()); + } + if(StringUtils.isNotBlank(params.getOrderId())){ + wrapper.eq(WithdrawLog::getOrderId,params.getOrderId()); + } + if(StringUtils.isNotBlank(params.getBankNo())){ + wrapper.eq(WithdrawLog::getBankNo, Sm4Util.sm4Encryption(params.getBankNo())); + } + wrapper.orderByDesc(WithdrawLog::getCreateTime); + List withdrawLogs = withdrawLogMapper.selectList(wrapper); + for (WithdrawLog withdrawLog : withdrawLogs) { + if(StringUtils.isNotBlank(withdrawLog.getBankNo())){ + withdrawLog.setBankNo(Sm4Util.sm4Decrypt(withdrawLog.getBankNo())); + JSONObject.parseObject(DesensitizedUtils.getJsonNoCopy(withdrawLog), WithdrawLog.class); + } + } + return withdrawLogs; + } + + @Override + public WithdrawLog queryDetails(Long id) { + WithdrawLog withdrawLog = withdrawLogMapper.selectById(id); + if(StringUtils.isNotBlank(withdrawLog.getBankNo())){ + withdrawLog.setBankNo(Sm4Util.sm4Decrypt(withdrawLog.getBankNo())); + JSONObject.parseObject(DesensitizedUtils.getJsonNoCopy(withdrawLog), WithdrawLog.class); + } + return withdrawLog; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public int delete(List ids) { + return withdrawLogMapper.deleteBatchIds(ids); + } + + @Override + public List queryFrontList(Long creatorId) { + return withdrawLogMapper.queryFrontList(creatorId); + } + + @Override + public WithdrawLogVo queryFrontDetails(String orderId) { + return withdrawLogMapper.queryFrontDetails(orderId); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public int verifyPass(VerifyDto params) { + WithdrawLog withdrawLog = withdrawLogMapper.selectById(params.getId()); + if(withdrawLog == null){ + throw new ServiceException("该笔提现申请不存在!", TiktokConstant.WITHDRAW_LOG_NOT_EXIST); + } + withdrawLog.setStatus("1"); + withdrawLog.setReason(params.getReason()); + int update = withdrawLogMapper.updateById(withdrawLog); + //TODO 此处审核通过，调用微信企业付款到零钱方法 + return update; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public int verifyUnPass(VerifyDto params) { + WithdrawLog withdrawLog = withdrawLogMapper.selectById(params.getId()); + if(withdrawLog == null){ + throw new ServiceException("该笔提现申请不存在!", TiktokConstant.WITHDRAW_LOG_NOT_EXIST); + } + withdrawLog.setStatus("4"); + withdrawLog.setReason(params.getReason()); + return withdrawLogMapper.updateById(withdrawLog); + } + + @Override + public boolean checkWithdraw(Long creatorId,Integer amt) { + Creator creator = creatorMapper.selectById(creatorId); + if(creator == null){ + throw new ServiceException("该艺术家不存在!", TiktokConstant.TIKTOK_CREATOR_NOT_EXIST); + } + //此处以分为单位 + if(creator.getAmt() >= amt * 100){ + return true; + }else{ + return false; + } + } +} diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorAccountVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorAccountVo.java index fcbb3cf..7b5f9c7 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorAccountVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorAccountVo.java @@ -20,12 +20,12 @@ public class CreatorAccountVo implements Serializable { @ApiModelProperty(value="艺术家id") private Long creatorId; - @Desensitized(type = SensitiveTypeEnum.CHINESE_NAME) @ApiModelProperty(value="姓名(加密)") + @Desensitized(type = SensitiveTypeEnum.CHINESE_NAME) private String name; - @Desensitized(type = SensitiveTypeEnum.BANK_CARD) @ApiModelProperty(value="银行卡(加密)") + @Desensitized(type = SensitiveTypeEnum.BANK_CARD) private String bankNo; private static final long serialVersionUID = 1L; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/WithdrawLogVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/WithdrawLogVo.java new file mode 100644 index 0000000..5e8dc71 --- /dev/null +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/WithdrawLogVo.java @@ -0,0 +1,53 @@ +package com.bnyer.img.vo; + +import com.bnyer.common.core.annotation.Desensitized; +import com.bnyer.common.core.enums.SensitiveTypeEnum; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; + +import java.io.Serializable; + + +@Getter +@Setter +@ApiModel("提现记录响应体") +public class WithdrawLogVo implements Serializable { + + @ApiModelProperty(value="主键id") + private Integer id; + + @ApiModelProperty(value="流水号") + private String orderId; + + @ApiModelProperty(value="艺术家id") + private Long creatorId; + + @ApiModelProperty(value="提现金额") + private Integer amt; + + @ApiModelProperty(value="银行卡(加密)") + @Desensitized(type = SensitiveTypeEnum.BANK_CARD) + private String bankNo; + + @ApiModelProperty(value="渠道(0->微信;1->银行卡)") + private String channel; + + @ApiModelProperty(value="状态(0->待审核;1->提现中;2->提现成功;3->提现失败;4->审核拒绝)") + private String status; + + @ApiModelProperty(value="理由") + private String reason; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value="提现时间") + private String createTime; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value="到账时间") + private String achieveTime; + + private static final long serialVersionUID = 1L; +} diff --git a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/CreatorMapper.xml b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/CreatorMapper.xml index 20f53f1..64df693 100644 --- a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/CreatorMapper.xml +++ b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/CreatorMapper.xml @@ -6,6 +6,7 @@ + @@ -33,7 +34,7 @@ - id, `name`, scan_code, phone, img, intro, invite_code, url, status, is_hot, is_show, create_time, + id, `name`,open_id, scan_code, phone, img, intro, invite_code, url, status, is_hot, is_show, create_time, update_time, sort, amt @@ -63,6 +64,9 @@ and scan_code = #{params.scanCode} + + and open_id = #{params.openId} + and phone = #{params.phone} @@ -82,13 +86,13 @@ order by create_time desc - - insert into img_creator - (name, scan_code, phone, img, intro, invite_code, url, status, is_hot, - is_show, create_time,update_time, sort, amt) - values(#{creator.name},#{creator.scanCode},#{creator.phone},#{creator.img}, - #{creator.intro},#{creator.inviteCode},#{creator.url},#{creator.status}, - #{creator.isHot},#{creator.isShow},#{creator.createTime},#{creator.updateTime}, - #{creator.sort},#{creator.amt}) - + + + + + + + + + diff --git a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/WithdrawLogMapper.xml b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/WithdrawLogMapper.xml index 7e3b045..9f5aa19 100644 --- a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/WithdrawLogMapper.xml +++ b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/WithdrawLogMapper.xml @@ -6,9 +6,12 @@ + + + @@ -16,6 +19,21 @@ - id, creator_id, amt, bank_no, `status`, create_time, update_time, sort,is_show + id, creator_id, amt, bank_no, `status`, create_time, update_time, sort,is_show,order_id,channel,reason - \ No newline at end of file + + + + +