diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CreatorProfitController.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CreatorProfitController.java index dd60700..56c8491 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CreatorProfitController.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CreatorProfitController.java @@ -9,6 +9,7 @@ import com.bnyer.img.dto.CreatorProfitPageDto; import com.bnyer.img.dto.CreatorProfitUpdateDto; import com.bnyer.img.dto.StatusDto; import com.bnyer.img.service.CreatorProfitService; +import com.bnyer.img.vo.CreatorProfitVo; import com.github.pagehelper.PageHelper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -34,7 +35,7 @@ public class CreatorProfitController extends BaseController { @PostMapping("/page") public TableDataInfo pageCreatorProfit(@RequestBody @ApiParam("分页对象") CreatorProfitPageDto dto){ PageHelper.startPage(dto.getPageNum(), dto.getPageSize()); - List creatorProfits = creatorProfitService.queryPage(dto); + List creatorProfits = creatorProfitService.queryPage(dto); return getDataTable(creatorProfits); } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/ProfitVerifyOrder.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/ProfitVerifyOrder.java index 39fab34..5c03a89 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/ProfitVerifyOrder.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/ProfitVerifyOrder.java @@ -56,7 +56,7 @@ public class ProfitVerifyOrder implements Serializable { * 平台(0->抖音;1->快手) */ @TableField(value = "platform") - @ApiModelProperty(value="平台(0->抖音;1->快手)") + @ApiModelProperty(value="平台(0->抖音;1->快手;2->微信)") private String platform; /** diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/ProfitVerifyOrderPageDto.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/ProfitVerifyOrderPageDto.java index 8b14797..742883e 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/ProfitVerifyOrderPageDto.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/ProfitVerifyOrderPageDto.java @@ -13,7 +13,7 @@ public class ProfitVerifyOrderPageDto extends BasePageDto { @ApiModelProperty(value="审核状态(0->待审核;1->通过;2->拒绝)") private String verifyStatus; - @ApiModelProperty(value="平台(0->抖音;1->快手)") + @ApiModelProperty(value="平台(0->抖音;1->快手;2->微信)") private String platform; @ApiModelProperty(value="开始时间") diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/CreatorProfitMapper.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/CreatorProfitMapper.java index c18dff6..5f0c514 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/CreatorProfitMapper.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/CreatorProfitMapper.java @@ -1,8 +1,10 @@ package com.bnyer.img.mapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.bnyer.img.domain.CreatorProfit; import com.bnyer.img.dto.BatchUpdateInviteDto; +import com.bnyer.img.dto.CreatorProfitPageDto; import com.bnyer.img.dto.ProfitInOrEndDto; import com.bnyer.img.vo.*; import org.apache.ibatis.annotations.Mapper; @@ -127,4 +129,11 @@ public interface CreatorProfitMapper extends BaseMapper { * @return - */ List queryPreProfit(@Param("platform") String platform,@Param("appType") String appType,@Param("type") String type,@Param("date") String date); + + /** + * 查询艺术家收益分页 + * @param params 参数 + * @return - + */ + List queryPage(@Param("params") CreatorProfitPageDto params); } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/CreatorProfitService.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/CreatorProfitService.java index 2ef31be..882f2fd 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/CreatorProfitService.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/CreatorProfitService.java @@ -70,7 +70,7 @@ public interface CreatorProfitService { * @param params 分页参数 * @return - */ - List queryPage(CreatorProfitPageDto params); + List queryPage(CreatorProfitPageDto params); /** * 查询结算收益详情 diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/CreatorProfitServiceImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/CreatorProfitServiceImpl.java index 675e005..3fd019a 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/CreatorProfitServiceImpl.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/CreatorProfitServiceImpl.java @@ -181,37 +181,8 @@ public class CreatorProfitServiceImpl implements CreatorProfitService { } @Override - public List queryPage(CreatorProfitPageDto dto) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - if(StringUtils.isNotBlank(dto.getScanCode())){ - wrapper.eq(CreatorProfit::getScanCode, dto.getScanCode()); - } - if(StringUtils.isNotBlank(dto.getOrderNo())){ - wrapper.eq(CreatorProfit::getOrderNo, dto.getOrderNo()); - } - if(StringUtils.isNotBlank(dto.getPlatform())){ - wrapper.eq(CreatorProfit::getPlatform, dto.getPlatform()); - } - if(StringUtils.isNotBlank(dto.getAppType())){ - wrapper.eq(CreatorProfit::getAppType, dto.getAppType()); - } - if(StringUtils.isNotBlank(dto.getType())){ - wrapper.eq(CreatorProfit::getType, dto.getType()); - } - if(StringUtils.isNotBlank(dto.getStatus())){ - wrapper.eq(CreatorProfit::getStatus, dto.getStatus()); - } - if(StringUtils.isNotBlank(dto.getConfirmType())){ - wrapper.eq(CreatorProfit::getConfirmType, dto.getConfirmType()); - } - if(StringUtils.isNotBlank(dto.getConfirmStatus())){ - wrapper.eq(CreatorProfit::getConfirmStatus, dto.getConfirmStatus()); - } - if(StringUtils.isNotBlank(dto.getIsShow())){ - wrapper.eq(CreatorProfit::getIsShow, dto.getIsShow()); - } - wrapper.orderByDesc(CreatorProfit::getCreateTime); - return creatorProfitMapper.selectList(wrapper); + public List queryPage(CreatorProfitPageDto dto) { + return creatorProfitMapper.queryPage(dto); } @Override diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorProfitVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorProfitVo.java new file mode 100644 index 0000000..b6ee5af --- /dev/null +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorProfitVo.java @@ -0,0 +1,79 @@ +package com.bnyer.img.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + + +@Getter +@Setter +@ApiModel("艺术家收益结果响应体") +public class CreatorProfitVo implements Serializable { + + @ApiModelProperty(value="主键id") + private Long id; + + @ApiModelProperty(value="结算流水号") + private String orderNo; + + @ApiModelProperty(value="艺术家id") + private Long creatorId; + + @ApiModelProperty(value="收益人/邀请人搜索码") + private String scanCode; + + @ApiModelProperty(value="图片url") + private String img; + + @ApiModelProperty(value="结算收益(单位毫分)") + private BigDecimal profit; + + @ApiModelProperty(value="结算平台(0->抖音;1->快手;2->微信;3->uniapp)") + private String platform; + + @ApiModelProperty(value="应用类型(0->bnyer壁纸)") + private String appType; + + @ApiModelProperty(value="收益类型(0->广告浏览;1->邀请;2->会员)") + private String type; + + @ApiModelProperty(value="收益状态(0->即将到账;1->已到账;2->转入钱包)") + private String status; + + @ApiModelProperty(value="确认收益方式(0->系统自动;1->艺术家手动)") + private String confirmType; + + @ApiModelProperty(value="艺术家确认收益状态(0->待确认;1->已确认)") + private String confirmStatus; + + @ApiModelProperty(value="下载次数") + private Integer downloadNum; + + @ApiModelProperty(value="平台结算收益时间") + private Date incomeTime; + + @ApiModelProperty(value="确认收益时间") + private Date confirmTime; + + @ApiModelProperty(value="转入钱包时间") + private Date walletTime; + + @ApiModelProperty(value="是否显示 (0->隐藏;1->显示)") + private String isShow; + + @ApiModelProperty(value="创建时间") + private Date createTime; + + @ApiModelProperty(value="更新时间") + private Date updateTime; + + @ApiModelProperty(value="排序") + private Integer sort; + + private static final long serialVersionUID = 1L; +} diff --git a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/CreatorProfitMapper.xml b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/CreatorProfitMapper.xml index f922093..38ca6fe 100644 --- a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/CreatorProfitMapper.xml +++ b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/CreatorProfitMapper.xml @@ -160,4 +160,47 @@ where platform = #{platform} and app_type = #{appType} and type = #{type} and status = '0' and DATE_FORMAT(create_time,'%Y-%m-%d') = #{date} + +