feature1.0.0-img: 优化艺术家收益方法

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CreatorMiniController.java

@@ -208,13 +208,29 @@ public class CreatorMiniController extends BaseController {
         return AjaxResult.success(creatorProfitService.handleUpdateConfirmType(dto.getId(), dto.getCreatorId()));
     }
 
-//    //@TokenCheck
+    //@TokenCheck
-//    @ApiOperation(value="查询指定艺术家当天即将入账广告收益列表")
+    @ApiOperation(value="查询指定艺术家即将入账广告次数列表")
-//    @GetMapping(value = "/getPreAdProfitList/{creatorId}")
+    @GetMapping(value = "/queryFrontPreCreatorProfitCount/{creatorId}")
-//    public AjaxResult getPreAdProfitList(@PathVariable @ApiParam("艺术家id") Long creatorId){
+    public AjaxResult queryFrontPreCreatorProfitCount(@PathVariable @ApiParam("艺术家id") Long creatorId){
-//        log.info("【艺术家小程序】查询指定艺术家id【{}】当天即将入账广告收益列表",creatorId);
+        log.info("【艺术家小程序】查询指定艺术家id【{}】即将入账广告次数列表",creatorId);
-//        return AjaxResult.success(creatorProfitService.queryFrontPreAdProfitList(creatorId));
+        return AjaxResult.success(creatorProfitService.queryFrontPreCreatorProfitCount(creatorId));
-//    }
+    }
+
+    //@TokenCheck
+    @ApiOperation(value="查询指定艺术家即将入账广告收益列表")
+    @GetMapping(value = "/queryFrontPreCreatorProfit/{creatorId}")
+    public AjaxResult queryFrontPreCreatorProfit(@PathVariable @ApiParam("艺术家id") Long creatorId){
+        log.info("【艺术家小程序】查询指定艺术家id【{}】即将入账广告收益列表",creatorId);
+        return AjaxResult.success(creatorProfitService.queryFrontPreAdCreatorProfit(creatorId));
+    }
+
+    //@TokenCheck
+    @ApiOperation(value="查询指定艺术家已入账广告收益累计")
+    @GetMapping(value = "/queryFrontInCreatorProfitAmt/{creatorId}")
+    public AjaxResult queryFrontInCreatorProfitAmt(@PathVariable @ApiParam("艺术家id") Long creatorId){
+        log.info("【艺术家小程序】查询指定艺术家id【{}】已入账广告收益累计",creatorId);
+        return AjaxResult.success(creatorProfitService.queryFrontInProfitAmt(creatorId));
+    }
 //
 //    //@TokenCheck
 //    @ApiOperation(value="查询指定艺术家当天即将入账邀请收益列表")

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/CreatorProfitMapper.java

@@ -2,6 +2,9 @@ package com.bnyer.img.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.bnyer.img.domain.CreatorProfit;
+import com.bnyer.img.vo.CreatorProfitCountVo;
+import com.bnyer.img.vo.CreatorProfitInAmtVo;
+import com.bnyer.img.vo.CreatorProfitPreAdVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -31,4 +34,26 @@ public interface CreatorProfitMapper extends BaseMapper<CreatorProfit> {
      * @return -
      */
     int updateDownloadNum(@Param("creatorId") Long creatorId,@Param("imgId") Long imgId,@Param("appType") String appType,@Param("platform") String platform,@Param("date") String date);
+
+    /**
+     * 小程序查询即将入账日期内下载次数
+     * @param creatorId 艺术家id
+     * @return -
+     */
+    List<CreatorProfitCountVo> queryFrontPreCreatorProfitCount(@Param("creatorId") Long creatorId);
+
+    /**
+     * 小程序查询即将入账广告收益列表
+     * @param creatorId 艺术家id
+     * @return -
+     */
+    List<CreatorProfitPreAdVo> queryFrontPreAdCreatorProfit(@Param("creatorId") Long creatorId);
+
+    /**
+     * 小程序查询已入账广告收益累计
+     * @param creatorId 艺术家id
+     * @return -
+     */
+    List<CreatorProfitInAmtVo> queryFrontInProfitAmt(@Param("creatorId") Long creatorId);
+
 }

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/CreatorProfitService.java

@@ -2,6 +2,9 @@ package com.bnyer.img.service;
 
 import com.bnyer.img.domain.CreatorProfit;
 import com.bnyer.img.dto.CreatorProfitPageDto;
+import com.bnyer.img.vo.CreatorProfitCountVo;
+import com.bnyer.img.vo.CreatorProfitInAmtVo;
+import com.bnyer.img.vo.CreatorProfitPreAdVo;
 import com.bnyer.img.vo.ProfitVo;
 
 import java.util.List;
@@ -98,4 +101,25 @@ public interface CreatorProfitService {
      * @return -
      */
     ProfitVo queryFrontProfitInfo(Long creatorId);
+
+    /**
+     * 小程序查询即将入账日期内下载次数
+     * @param creatorId 艺术家id
+     * @return -
+     */
+    List<CreatorProfitCountVo> queryFrontPreCreatorProfitCount(Long creatorId);
+
+    /**
+     * 小程序查询即将入账广告收益列表
+     * @param creatorId 艺术家id
+     * @return -
+     */
+    List<CreatorProfitPreAdVo> queryFrontPreAdCreatorProfit(Long creatorId);
+
+    /**
+     * 小程序查询已入账广告收益累计
+     * @param creatorId 艺术家id
+     * @return -
+     */
+    List<CreatorProfitInAmtVo> queryFrontInProfitAmt(Long creatorId);
 }

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/CreatorProfitServiceImpl.java

@@ -9,6 +9,9 @@ import com.bnyer.img.dto.CreatorProfitPageDto;
 import com.bnyer.img.mapper.CreatorProfitMapper;
 import com.bnyer.img.service.CreatorProfitService;
 import com.bnyer.img.service.TiktokImgService;
+import com.bnyer.img.vo.CreatorProfitCountVo;
+import com.bnyer.img.vo.CreatorProfitInAmtVo;
+import com.bnyer.img.vo.CreatorProfitPreAdVo;
 import com.bnyer.img.vo.ProfitVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -165,4 +168,19 @@ public class CreatorProfitServiceImpl implements CreatorProfitService {
         //TODO 计算收益
         return null;
     }
+
+    @Override
+    public List<CreatorProfitCountVo> queryFrontPreCreatorProfitCount(Long creatorId) {
+        return creatorProfitMapper.queryFrontPreCreatorProfitCount(creatorId);
+    }
+
+    @Override
+    public List<CreatorProfitPreAdVo> queryFrontPreAdCreatorProfit(Long creatorId) {
+        return creatorProfitMapper.queryFrontPreAdCreatorProfit(creatorId);
+    }
+
+    @Override
+    public List<CreatorProfitInAmtVo> queryFrontInProfitAmt(Long creatorId) {
+        return creatorProfitMapper.queryFrontInProfitAmt(creatorId);
+    }
 }

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorProfitCountVo.java

@@ -0,0 +1,27 @@
+package com.bnyer.img.vo;
+
+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;
+import java.util.Date;
+import java.util.List;
+
+
+@Getter
+@Setter
+@ApiModel("艺术家收益次数响应类")
+public class CreatorProfitCountVo implements Serializable {
+
+    @ApiModelProperty(value="下载次数")
+    private Integer downloadNum;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty(value="创建时间")
+    private Date createTime;
+
+    private static final long serialVersionUID = 1L;
+}

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorProfitInAmtVo.java

@@ -0,0 +1,23 @@
+package com.bnyer.img.vo;
+
+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;
+import java.math.BigDecimal;
+import java.util.Date;
+
+
+@Getter
+@Setter
+@ApiModel("艺术家已入账广告收益累计响应类")
+public class CreatorProfitInAmtVo implements Serializable {
+
+    @ApiModelProperty(value="结算收益(单位毫分)")
+    private BigDecimal profit;
+
+    private static final long serialVersionUID = 1L;
+}

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorProfitPreAdVo.java

@@ -0,0 +1,53 @@
+package com.bnyer.img.vo;
+
+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;
+import java.util.Date;
+
+
+@Getter
+@Setter
+@ApiModel("艺术家即将入账广告收益响应类")
+public class CreatorProfitPreAdVo implements Serializable {
+
+    @ApiModelProperty(value="主键id")
+    private Long id;
+
+    @ApiModelProperty(value="艺术家id")
+    private Long creatorId;
+
+    @ApiModelProperty(value="收益人/邀请人搜索码")
+    private String scanCode;
+
+    @ApiModelProperty(value="图片id")
+    private Long imgId;
+
+    @ApiModelProperty(value="图片url")
+    private String url;
+
+    @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="下载次数")
+    private Integer downloadNum;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty(value="创建时间")
+    private Date createTime;
+
+    private static final long serialVersionUID = 1L;
+}

bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/CreatorProfitMapper.xml

@@ -46,5 +46,28 @@
     where creator_id = #{creatorId} and img_id = #{imgId} and app_type = #{appType}
     and platform = #{platform} and DATE_FORMAT(create_time,'%Y-%m-%d') = #{date}
   </update>
+    <select id="queryFrontPreCreatorProfitCount" resultType="com.bnyer.img.vo.CreatorProfitCountVo">
+      select
+        sum(download_num) as downloadNum,create_time as createTime
+      from img_creator_profit
+      where creator_id = #{creatorId} and status = '0' and is_show = '1'
+      group by create_time
+    </select>
+  <select id="queryFrontPreAdCreatorProfit" resultType="com.bnyer.img.vo.CreatorProfitPreAdVo">
+    select
+        icp.id as id,icp.creator_id as creatorId,icp.scan_code as scanCode,icp.img_id as imgId,
+        iti.img_url as url,
+        icp.platform as platform,icp.app_type as appType,icp.type as type,icp.status as status,
+        icp.download_num as downloadNum,icp.create_time as createTime
+    from img_creator_profit icp
+    left join img_tiktok_img iti on iti.id = icp.img_id
+    where icp.is_show = '1' and icp.creator_id = #{creatorId} and icp.status = '0' and icp.type = '0'
+  </select>
+    <select id="queryFrontInProfitAmt" resultType="com.bnyer.img.vo.CreatorProfitInAmtVo">
+      select
+        sum(profit) as profit
+      from img_creator_profit
+      where is_show = '1' and creator_id = #{creatorId} and status = '1' and type = '0'
+    </select>
 
 </mapper>