BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 7a8a440eb6aeac2d543a51626b85c4f1f14d3429

Authored by owen
1 parent eddc897c

分佣: 佣金记录

Inline Side-by-side
Showing 2 changed files with 15 additions and 10 deletions
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/AppBrokerageRecordController.java
  View file @7a8a440
... ... @@ -6,6 +6,9 @@ import cn.iocoder.yudao.framework.security.core.annotations.PreAuthenticated;
6 6 import cn.iocoder.yudao.module.trade.controller.app.brokerage.vo.record.AppBrokerageProductPriceRespVO;
7 7 import cn.iocoder.yudao.module.trade.controller.app.brokerage.vo.record.AppBrokerageRecordPageReqVO;
8 8 import cn.iocoder.yudao.module.trade.controller.app.brokerage.vo.record.AppBrokerageRecordRespVO;
  9 +import cn.iocoder.yudao.module.trade.convert.brokerage.BrokerageRecordConvert;
  10 +import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.BrokerageRecordDO;
  11 +import cn.iocoder.yudao.module.trade.service.brokerage.BrokerageRecordService;
9 12 import cn.iocoder.yudao.module.trade.service.brokerage.BrokerageUserService;
10 13 import io.swagger.v3.oas.annotations.Operation;
11 14 import io.swagger.v3.oas.annotations.tags.Tag;
... ... @@ -18,11 +21,9 @@ import org.springframework.web.bind.annotation.RestController;
18 21  
19 22 import javax.annotation.Resource;
20 23 import javax.validation.Valid;
21   -import java.time.LocalDateTime;
22 24  
23 25 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
24 26 import static cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils.getLoginUserId;
25   -import static java.util.Arrays.asList;
26 27  
27 28 @Tag(name = "用户 APP - 分销用户")
28 29 @RestController
... ... @@ -32,19 +33,16 @@ import static java.util.Arrays.asList;
32 33 public class AppBrokerageRecordController {
33 34 @Resource
34 35 private BrokerageUserService brokerageUserService;
  36 + @Resource
  37 + private BrokerageRecordService brokerageRecordService;
35 38  
36   - // TODO 芋艿：临时 mock =>
37 39 @GetMapping("/page")
38 40 @Operation(summary = "获得分销记录分页")
39 41 @PreAuthenticated
40 42 public CommonResult<PageResult<AppBrokerageRecordRespVO>> getBrokerageRecordPage(@Valid AppBrokerageRecordPageReqVO pageReqVO) {
41   - AppBrokerageRecordRespVO vo1 = new AppBrokerageRecordRespVO()
42   - .setId(1L).setPrice(10).setTitle("收到钱").setCreateTime(LocalDateTime.now())
43   - .setFinishTime(LocalDateTime.now());
44   - AppBrokerageRecordRespVO vo2 = new AppBrokerageRecordRespVO()
45   - .setId(2L).setPrice(-20).setTitle("提现钱").setCreateTime(LocalDateTime.now())
46   - .setFinishTime(LocalDateTime.now());
47   - return success(new PageResult<>(asList(vo1, vo2), 10L));
  43 + PageResult<BrokerageRecordDO> pageResult = brokerageRecordService.getBrokerageRecordPage(
  44 + BrokerageRecordConvert.INSTANCE.convert(pageReqVO, getLoginUserId()));
  45 + return success(BrokerageRecordConvert.INSTANCE.convertPage02(pageResult));
48 46 }
49 47  
50 48 @GetMapping("/get-product-brokerage-price")
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/brokerage/BrokerageRecordConvert.java
  View file @7a8a440
... ... @@ -5,7 +5,10 @@ import cn.hutool.core.util.ObjectUtil;
5 5 import cn.hutool.core.util.StrUtil;
6 6 import cn.iocoder.yudao.framework.common.pojo.PageResult;
7 7 import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
  8 +import cn.iocoder.yudao.module.trade.controller.admin.brokerage.vo.record.BrokerageRecordPageReqVO;
8 9 import cn.iocoder.yudao.module.trade.controller.admin.brokerage.vo.record.BrokerageRecordRespVO;
  10 +import cn.iocoder.yudao.module.trade.controller.app.brokerage.vo.record.AppBrokerageRecordPageReqVO;
  11 +import cn.iocoder.yudao.module.trade.controller.app.brokerage.vo.record.AppBrokerageRecordRespVO;
9 12 import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.BrokerageRecordDO;
10 13 import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.BrokerageUserDO;
11 14 import cn.iocoder.yudao.module.trade.enums.brokerage.BrokerageRecordBizTypeEnum;
... ... @@ -61,4 +64,8 @@ public interface BrokerageRecordConvert {
61 64 }
62 65 return result;
63 66 }
  67 +
  68 + BrokerageRecordPageReqVO convert(AppBrokerageRecordPageReqVO pageReqVO, Long userId);
  69 +
  70 + PageResult<AppBrokerageRecordRespVO> convertPage02(PageResult<BrokerageRecordDO> pageResult);
64 71 }
... ...