Merge remote-tracking branch 'remotes/origin/feature-1.0-img' into feature-1.0-img-quan

.workflow/BranchPipeline.yml

@@ -1,53 +0,0 @@
-version: '1.0'
-name: branch-pipeline
-displayName: BranchPipeline
-stages:
-  - stage: 
-    name: compile
-    displayName: 编译
-    steps:
-      - step: build@maven
-        name: build_maven
-        displayName: Maven 构建
-        # 支持6、7、8、9、10、11六个版本
-        jdkVersion: 8
-        # 支持2.2.1、3.2.5、3.3.9、3.5.2、3.5.3、3.5.4、3.6.1、3.6.3八个版本
-        mavenVersion: 3.3.9
-        # 构建命令
-        commands:
-          - mvn -B clean package -Dmaven.test.skip=true
-        # 非必填字段，开启后表示将构建产物暂存，但不会上传到制品库中，7天后自动清除
-        artifacts:
-            # 构建产物名字，作为产物的唯一标识可向下传递，支持自定义，默认为BUILD_ARTIFACT。在下游可以通过${BUILD_ARTIFACT}方式引用来获取构建物地址
-          - name: BUILD_ARTIFACT
-            # 构建产物获取路径，是指代码编译完毕之后构建物的所在路径，如通常jar包在target目录下。当前目录为代码库根目录
-            path:
-              - ./target
-      - step: publish@general_artifacts
-        name: publish_general_artifacts
-        displayName: 上传制品
-        # 上游构建任务定义的产物名，默认BUILD_ARTIFACT
-        dependArtifact: BUILD_ARTIFACT
-        # 上传到制品库时的制品命名，默认output
-        artifactName: output
-        dependsOn: build_maven
-  - stage: 
-    name: release
-    displayName: 发布
-    steps:
-      - step: publish@release_artifacts
-        name: publish_release_artifacts
-        displayName: '发布'
-        # 上游上传制品任务的产出
-        dependArtifact: output
-        # 发布制品版本号
-        version: '1.0.0.0'
-        # 是否开启版本号自增，默认开启
-        autoIncrement: true
-triggers:
-  push:
-    branches:
-      exclude:
-        - master
-      include:
-        - .*

.workflow/MasterPipeline.yml

@@ -1,51 +0,0 @@
-version: '1.0'
-name: master-pipeline
-displayName: MasterPipeline
-stages:
-  - stage: 
-    name: compile
-    displayName: 编译
-    steps:
-      - step: build@maven
-        name: build_maven
-        displayName: Maven 构建
-        # 支持6、7、8、9、10、11六个版本
-        jdkVersion: 8
-        # 支持2.2.1、3.2.5、3.3.9、3.5.2、3.5.3、3.5.4、3.6.1、3.6.3八个版本
-        mavenVersion: 3.3.9
-        # 构建命令
-        commands:
-          - mvn -B clean package -Dmaven.test.skip=true
-        # 非必填字段，开启后表示将构建产物暂存，但不会上传到制品库中，7天后自动清除
-        artifacts:
-            # 构建产物名字，作为产物的唯一标识可向下传递，支持自定义，默认为BUILD_ARTIFACT。在下游可以通过${BUILD_ARTIFACT}方式引用来获取构建物地址
-          - name: BUILD_ARTIFACT
-            # 构建产物获取路径，是指代码编译完毕之后构建物的所在路径，如通常jar包在target目录下。当前目录为代码库根目录
-            path:
-              - ./target
-      - step: publish@general_artifacts
-        name: publish_general_artifacts
-        displayName: 上传制品
-        # 上游构建任务定义的产物名，默认BUILD_ARTIFACT
-        dependArtifact: BUILD_ARTIFACT
-        # 上传到制品库时的制品命名，默认output
-        artifactName: output
-        dependsOn: build_maven
-  - stage: 
-    name: release
-    displayName: 发布
-    steps:
-      - step: publish@release_artifacts
-        name: publish_release_artifacts
-        displayName: '发布'
-        # 上游上传制品任务的产出
-        dependArtifact: output
-        # 发布制品版本号
-        version: '1.0.0.0'
-        # 是否开启版本号自增，默认开启
-        autoIncrement: true
-triggers:
-  push:
-    branches:
-      include:
-        - master

.workflow/PRPipeline.yml

@@ -1,40 +0,0 @@
-version: '1.0'
-name: pr-pipeline
-displayName: PRPipeline
-stages:
-  - stage: 
-    name: compile
-    displayName: 编译
-    steps:
-      - step: build@maven
-        name: build_maven
-        displayName: Maven 构建
-        # 支持6、7、8、9、10、11六个版本
-        jdkVersion: 8
-        # 支持2.2.1、3.2.5、3.3.9、3.5.2、3.5.3、3.5.4、3.6.1、3.6.3八个版本
-        mavenVersion: 3.3.9
-        # 构建命令
-        commands:
-          - mvn -B clean package -Dmaven.test.skip=true
-        # 非必填字段，开启后表示将构建产物暂存，但不会上传到制品库中，7天后自动清除
-        artifacts:
-            # 构建产物名字，作为产物的唯一标识可向下传递，支持自定义，默认为BUILD_ARTIFACT。在下游可以通过${BUILD_ARTIFACT}方式引用来获取构建物地址
-          - name: BUILD_ARTIFACT
-            # 构建产物获取路径，是指代码编译完毕之后构建物的所在路径，如通常jar包在target目录下。当前目录为代码库根目录
-            path:
-              - ./target
-      - step: publish@general_artifacts
-        name: publish_general_artifacts
-        displayName: 上传制品
-        # 上游构建任务定义的产物名，默认BUILD_ARTIFACT
-        dependArtifact: BUILD_ARTIFACT
-        # 构建产物制品库，默认default，系统默认创建
-        artifactRepository: default
-        # 上传到制品库时的制品命名，默认output
-        artifactName: output
-        dependsOn: build_maven
-triggers:
-  pr:
-    branches:
-      include:
-        - master

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/CreatorProfit.java

@@ -0,0 +1,149 @@
+package com.bnyer.img.domain;
+
+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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+import java.util.Date;
+
+/**
+ * @author  chengkun
+ * @date  2022/6/8 10:51
+ */
+/**
+    * 图文平台-艺术家收益表
+    */
+@ApiModel(value="com-bnyer-img-domain-CreatorProfit")
+@Getter
+@Setter
+@ToString
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName(value = "img_creator_profit")
+public class CreatorProfit extends BaseDomain {
+    /**
+     * 主键id
+     */
+    @TableId(value = "id", type = IdType.INPUT)
+    @ApiModelProperty(value="主键id")
+    private Long id;
+
+    /**
+     * 结算流水号
+     */
+    @TableField(value = "order_no")
+    @ApiModelProperty(value="结算流水号")
+    private String orderNo;
+
+    /**
+     * 艺术家id
+     */
+    @TableField(value = "creator_id")
+    @ApiModelProperty(value="艺术家id")
+    private Long creatorId;
+
+    /**
+     * 收益人/邀请人搜索码
+     */
+    @TableField(value = "scan_code")
+    @ApiModelProperty(value="收益人/邀请人搜索码")
+    private String scanCode;
+
+    /**
+     * 图片id
+     */
+    @TableField(value = "img_id")
+    @ApiModelProperty(value="图片id")
+    private Long imgId;
+
+    /**
+     * 结算收益(单位毫分)
+     */
+    @TableField(value = "profit")
+    @ApiModelProperty(value="结算收益(单位毫分)")
+    private Integer profit;
+
+    /**
+     * 结算平台(0->抖音;1->快手;2->微信;3->uniapp)
+     */
+    @TableField(value = "platform")
+    @ApiModelProperty(value="结算平台(0->抖音;1->快手;2->微信;3->uniapp)")
+    private String platform;
+
+    /**
+     * 应用类型(0->bnyer壁纸)
+     */
+    @TableField(value = "app_type")
+    @ApiModelProperty(value="应用类型(0->bnyer壁纸)")
+    private String appType;
+
+    /**
+     * 收益类型(0->广告浏览;1->邀请;2->会员)
+     */
+    @TableField(value = "`type`")
+    @ApiModelProperty(value="收益类型(0->广告浏览;1->邀请;2->会员)")
+    private String type;
+
+    /**
+     * 收益状态(0->即将到账;1->已到账;2->转入钱包)
+     */
+    @TableField(value = "`status`")
+    @ApiModelProperty(value="收益状态(0->即将到账;1->已到账;2->转入钱包)")
+    private String status;
+
+    /**
+     * 确认收益方式(0->系统自动;1->艺术家手动)
+     */
+    @TableField(value = "confirm_type")
+    @ApiModelProperty(value="确认收益方式(0->系统自动;1->艺术家手动)")
+    private String confirmType;
+
+    /**
+     * 艺术家确认收益状态(0->待确认;1->已确认)
+     */
+    @TableField(value = "confirm_status")
+    @ApiModelProperty(value="艺术家确认收益状态(0->待确认;1->已确认)")
+    private String confirmStatus;
+
+    /**
+     * 下载次数
+     */
+    @TableField(value = "download_num")
+    @ApiModelProperty(value="下载次数")
+    private Integer downloadNum;
+
+    /**
+     * 浏览次数
+     */
+    @TableField(value = "view_num")
+    @ApiModelProperty(value="浏览次数")
+    private Integer viewNum;
+
+    /**
+     * 平台结算收益时间
+     */
+    @TableField(value = "income_time")
+    @ApiModelProperty(value="平台结算收益时间")
+    private Date incomeTime;
+
+    /**
+     * 确认收益时间
+     */
+    @TableField(value = "confirm_time")
+    @ApiModelProperty(value="确认收益时间")
+    private Date confirmTime;
+
+    /**
+     * 转入钱包时间
+     */
+    @TableField(value = "wallet_time")
+    @ApiModelProperty(value="转入钱包时间")
+    private Date walletTime;
+
+
+    private static final long serialVersionUID = 1L;
+}

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorProfitPageDto.java

@@ -0,0 +1,39 @@
+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 CreatorProfitPageDto extends BasePageDto {
+
+    @ApiModelProperty(value="结算流水号")
+    private String orderNo;
+
+    @ApiModelProperty(value="收益人/邀请人搜索码")
+    private String scanCode;
+
+    @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 String isShow;
+}

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

@@ -0,0 +1,13 @@
+package com.bnyer.img.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.bnyer.img.domain.CreatorProfit;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author  chengkun
+ * @date  2022/6/8 10:51
+ */
+@Mapper
+public interface CreatorProfitMapper extends BaseMapper<CreatorProfit> {
+}

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

@@ -0,0 +1,97 @@
+package com.bnyer.img.service;
+
+import com.bnyer.img.domain.CreatorProfit;
+import com.bnyer.img.dto.CreatorProfitPageDto;
+import com.bnyer.img.vo.CreatorIncomeProfitVo;
+import com.bnyer.img.vo.CreatorPreProfitVo;
+import com.bnyer.img.vo.CreatorTransIntoProfitVo;
+import com.bnyer.img.vo.ProfitVo;
+
+import java.util.List;
+
+/**
+ * @author chengkun
+ * @date 2022/6/8 10:57
+ */
+public interface CreatorProfitService {
+
+    /**
+     * 新增收益结算
+     * @param creatorProfit 收益对象
+     * @return -
+     */
+    int insert(CreatorProfit creatorProfit);
+
+    /**
+     * 修改结算收益
+     * @param creatorProfit 收益对象
+     * @return -
+     */
+    int update(CreatorProfit creatorProfit);
+
+    /**
+     * 删除结算收益
+     * @param ids 主键ids
+     * @return -
+     */
+    int delete(List<Long> ids);
+
+    /**
+     * 查询结算收益分页
+     * @param params 分页参数
+     * @return -
+     */
+    List<CreatorProfit> queryPage(CreatorProfitPageDto params);
+
+    /**
+     * 查询结算收益详情
+     * @param id 主键id
+     * @return -
+     */
+    CreatorProfit queryDetails(Long id);
+
+    /**
+     * 变更显示状态
+     * @param id 主键id
+     * @param status 状态
+     * @return -
+     */
+    int changeIsShow(Long id,String status);
+
+    /**
+     * 小程序艺术家手动确认收益
+     * @param id 主键id
+     * @param creatorId 艺术家id
+     * @return -
+     */
+    int handleUpdateConfirmType(Long id,Long creatorId);
+
+    /**
+     * 小程序查询当天即将入账收益
+     * @param creatorId 艺术家id
+     * @return -
+     */
+    CreatorPreProfitVo queryFrontPreProfit(Long creatorId);
+
+    /**
+     * 小程序查询昨日已入账收益
+     * @param creatorId 艺术家id
+     * @return -
+     */
+    CreatorIncomeProfitVo queryFrontIncomeProfit(Long creatorId);
+
+    /**
+     * 小程序查询已转入钱包收益
+     * @param creatorId 艺术家id
+     * @return -
+     */
+    CreatorTransIntoProfitVo queryFrontTransIntoProfit(Long creatorId);
+
+    /**
+     * 小程序查询收益信息
+     * @param creatorId 艺术家id
+     * @return -
+     */
+    ProfitVo queryFrontProfitInfo(Long creatorId);
+
+}

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

@@ -48,9 +48,15 @@ public class BannerServiceImpl implements BannerService {
     @Override
     public List<Banner> queryPage(BannerPageDto dto) {
         LambdaQueryWrapper<Banner> wrapper = new LambdaQueryWrapper<>();
-        wrapper.like(StringUtils.isNotBlank(dto.getBannerName()), Banner::getBannerName,dto.getBannerName());
+        if(StringUtils.isNotBlank(dto.getBannerName())){
-        wrapper.eq(StringUtils.isNotBlank(dto.getSource()), Banner::getSource, dto.getSource());
+            wrapper.like(Banner::getBannerName,dto.getBannerName());
-        wrapper.eq(StringUtils.isNotBlank(dto.getIsShow()), Banner::getIsShow, dto.getIsShow());
+        }
+        if(StringUtils.isNotBlank(dto.getSource())){
+            wrapper.eq(Banner::getSource, dto.getSource());
+        }
+        if(StringUtils.isNotBlank(dto.getIsShow())){
+            wrapper.eq(Banner::getIsShow, dto.getIsShow());
+        }
         wrapper.orderByDesc(Banner::getSort);
         return bannerMapper.selectList(wrapper);
     }

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

@@ -0,0 +1,130 @@
+package com.bnyer.img.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.bnyer.common.core.utils.StringUtils;
+import com.bnyer.img.domain.CreatorProfit;
+import com.bnyer.img.dto.CreatorProfitPageDto;
+import com.bnyer.img.mapper.CreatorProfitMapper;
+import com.bnyer.img.service.CreatorProfitService;
+import com.bnyer.img.vo.CreatorIncomeProfitVo;
+import com.bnyer.img.vo.CreatorPreProfitVo;
+import com.bnyer.img.vo.CreatorTransIntoProfitVo;
+import com.bnyer.img.vo.ProfitVo;
+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;
+
+@Service
+@Slf4j
+public class CreatorProfitServiceImpl implements CreatorProfitService {
+
+    @Autowired
+    private CreatorProfitMapper creatorProfitMapper;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int insert(CreatorProfit creatorProfit) {
+        creatorProfit.setCreateTime(new Date());
+        creatorProfit.setUpdateTime(new Date());
+        creatorProfit.setStatus("0");
+        creatorProfit.setConfirmStatus("0");
+        creatorProfit.setIsShow("1");
+        creatorProfit.setSort(0);
+        return creatorProfitMapper.insert(creatorProfit);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int update(CreatorProfit creatorProfit) {
+        creatorProfit.setUpdateTime(new Date());
+        return creatorProfitMapper.updateById(creatorProfit);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int delete(List<Long> ids) {
+        return creatorProfitMapper.deleteBatchIds(ids);
+    }
+
+    @Override
+    public List<CreatorProfit> queryPage(CreatorProfitPageDto dto) {
+        LambdaQueryWrapper<CreatorProfit> 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);
+    }
+
+    @Override
+    public CreatorProfit queryDetails(Long id) {
+        return creatorProfitMapper.selectById(id);
+    }
+
+
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int changeIsShow(Long id, String status) {
+        LambdaUpdateWrapper<CreatorProfit> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.eq(CreatorProfit::getId, id);
+        CreatorProfit creatorProfit = new CreatorProfit();
+        creatorProfit.setIsShow(status);
+        return creatorProfitMapper.update(creatorProfit,wrapper);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int handleUpdateConfirmType(Long id, Long creatorId) {
+        return 0;
+    }
+
+    @Override
+    public CreatorPreProfitVo queryFrontPreProfit(Long creatorId) {
+        return null;
+    }
+
+    @Override
+    public CreatorIncomeProfitVo queryFrontIncomeProfit(Long creatorId) {
+        return null;
+    }
+
+    @Override
+    public CreatorTransIntoProfitVo queryFrontTransIntoProfit(Long creatorId) {
+        return null;
+    }
+
+    @Override
+    public ProfitVo queryFrontProfitInfo(Long creatorId) {
+        return null;
+    }
+}

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

@@ -48,8 +48,13 @@ public class FeedBackServiceImpl implements FeedBackService {
     @Override
     public List<Feedback> queryPage(String source,String isShow) {
         LambdaQueryWrapper<Feedback> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(source),Feedback::getSource,source);
+        if(StringUtils.isNotBlank(source)){
-        wrapper.eq(StringUtils.isNotBlank(isShow),Feedback::getIsShow,isShow);
+            wrapper.eq(Feedback::getSource,source);
+        }
+        if(StringUtils.isNotBlank(isShow)){
+            wrapper.eq(Feedback::getIsShow,isShow);
+        }
+        wrapper.orderByDesc(Feedback::getCreateTime);
         return feedbackMapper.selectList(wrapper);
     }
 

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

@@ -32,8 +32,13 @@ public class InviteLogServiceImpl implements InviteLogService {
     @Override
     public List<InviteLog> queryPage(InviteLogPageDto params) {
         LambdaQueryWrapper<InviteLog> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(params.getIsShow()),InviteLog::getIsShow,params.getIsShow());
+        if(StringUtils.isNotBlank(params.getIsShow())){
-        wrapper.eq(StringUtils.isNotBlank(params.getInviteCode()),InviteLog::getInviteCode,params.getInviteCode());
+            wrapper.eq(InviteLog::getIsShow,params.getIsShow());
+        }
+        if(StringUtils.isNotBlank(params.getInviteCode())){
+            wrapper.eq(InviteLog::getInviteCode,params.getInviteCode());
+        }
+        wrapper.orderByDesc(InviteLog::getCreateTime);
         return inviteLogMapper.selectList(wrapper);
     }
 

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

@@ -47,9 +47,15 @@ public class NoticeServiceImpl implements NoticeService {
     @Override
     public List<Notice> queryPage(NoticePageDto dto) {
         LambdaQueryWrapper<Notice> wrapper = new LambdaQueryWrapper<>();
-        wrapper.like(StringUtils.isNotBlank(dto.getTitle()), Notice::getTitle,dto.getTitle());
+        if(StringUtils.isNotBlank(dto.getTitle())){
-        wrapper.eq(StringUtils.isNotBlank(dto.getChannel()), Notice::getChannel, dto.getChannel());
+            wrapper.like(Notice::getTitle,dto.getTitle());
-        wrapper.eq(StringUtils.isNotBlank(dto.getIsShow()), Notice::getIsShow, dto.getIsShow());
+        }
+        if(StringUtils.isNotBlank(dto.getChannel())){
+            wrapper.eq(Notice::getChannel, dto.getChannel());
+        }
+        if(StringUtils.isNotBlank(dto.getIsShow())){
+            wrapper.eq(Notice::getIsShow, dto.getIsShow());
+        }
         wrapper.orderByDesc(Notice::getSort);
         return noticeMapper.selectList(wrapper);
     }

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

@@ -76,11 +76,21 @@ public class TiktokImgServiceImpl implements TiktokImgService {
     @Override
     public List<TiktokImg> queryPage(TiktokImgPageDto dto) {
         LambdaQueryWrapper<TiktokImg> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(dto.getCreatorId() != null, TiktokImg::getCreatorId, dto.getCreatorId());
+        if(dto.getCreatorId() != null){
-        wrapper.eq(dto.getTypeId() != null, TiktokImg::getTypeId, dto.getTypeId());
+            wrapper.eq(TiktokImg::getCreatorId, dto.getCreatorId());
-        wrapper.eq(StringUtils.isNotBlank(dto.getStatus()), TiktokImg::getStatus, dto.getStatus());
+        }
-        wrapper.eq(StringUtils.isNotBlank(dto.getIsHot()), TiktokImg::getIsHot, dto.getIsHot());
+        if(dto.getTypeId() != null){
-        wrapper.eq(StringUtils.isNotBlank(dto.getIsShow()), TiktokImg::getIsShow, dto.getIsShow());
+            wrapper.eq(TiktokImg::getTypeId, dto.getTypeId());
+        }
+        if(StringUtils.isNotBlank(dto.getStatus())){
+            wrapper.eq(TiktokImg::getStatus, dto.getStatus());
+        }
+        if(StringUtils.isNotBlank(dto.getIsHot())){
+            wrapper.eq(TiktokImg::getIsHot, dto.getIsHot());
+        }
+        if(StringUtils.isNotBlank(dto.getIsShow())){
+            wrapper.eq(TiktokImg::getIsShow, dto.getIsShow());
+        }
         wrapper.orderByDesc(TiktokImg::getCreateTime);
         return tiktokImgMapper.selectList(wrapper);
     }

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

@@ -47,8 +47,12 @@ public class TypeServiceImpl implements TypeService {
     @Override
     public List<Type> queryPage(String typeName,String isShow) {
         LambdaQueryWrapper<Type> wrapper = new LambdaQueryWrapper<>();
-        wrapper.like(StringUtils.isNotBlank(typeName), Type::getTypeName, typeName);
+        if(StringUtils.isNotBlank(typeName)){
-        wrapper.eq(StringUtils.isNotBlank(isShow),Type::getIsShow, isShow);
+            wrapper.like(Type::getTypeName, typeName);
+        }
+        if(StringUtils.isNotBlank(isShow)){
+            wrapper.eq(Type::getIsShow, isShow);
+        }
         wrapper.orderByDesc(Type::getSort);
         return typeMapper.selectList(wrapper);
     }

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

@@ -47,7 +47,10 @@ public class VerifyLogServiceImpl implements VerifyLogService {
     @Override
     public List<VerifyLog> queryPage(VerifyPageDto params) {
         LambdaQueryWrapper<VerifyLog> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(params.getStatus()),VerifyLog::getStatus,params.getStatus());
+        if(StringUtils.isNotBlank(params.getStatus())){
+            wrapper.eq(VerifyLog::getStatus,params.getStatus());
+        }
+        wrapper.orderByDesc(VerifyLog::getCreateTime);
         return verifyLogMapper.selectList(wrapper);
     }
 

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

@@ -0,0 +1,68 @@
+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 CreatorIncomeProfitVo 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="图片id")
+    private Long imgId;
+
+    @ApiModelProperty(value="结算收益(单位毫分)")
+    private Integer 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 Integer viewNum;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value="平台结算收益时间")
+    private Date incomeTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value="确认收益时间")
+    private Date confirmTime;
+
+    private static final long serialVersionUID = 1L;
+}

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

@@ -0,0 +1,49 @@
+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 CreatorPreProfitVo 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="结算平台(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 HH:mm:ss")
+    @ApiModelProperty(value="创建时间")
+    private Date createTime;
+
+    private static final long serialVersionUID = 1L;
+}

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

@@ -0,0 +1,58 @@
+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 CreatorTransIntoProfitVo 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="图片id")
+    private Long imgId;
+
+    @ApiModelProperty(value="结算收益(单位毫分)")
+    private Integer 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="下载次数")
+    private Integer downloadNum;
+
+    @ApiModelProperty(value="浏览次数")
+    private Integer viewNum;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value="转入钱包时间")
+    private Date walletTime;
+
+    private static final long serialVersionUID = 1L;
+}

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

@@ -0,0 +1,32 @@
+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;
+
+
+@Getter
+@Setter
+@ApiModel("收益响应体")
+public class ProfitVo implements Serializable {
+
+    @ApiModelProperty(value="昨日广告收益(单位毫分)")
+    private Integer yesterdayProfit;
+
+    @ApiModelProperty(value="昨日邀请收益(单位毫分)")
+    private Integer yesterdayInviteProfit;
+
+    @ApiModelProperty(value="累计收益(单位毫分)")
+    private Integer totalProfit;
+
+    @ApiModelProperty(value="上月收益(单位毫分)")
+    private Integer lastMonthProfit;
+
+    @ApiModelProperty(value="当月收益(单位毫分)")
+    private Integer thisMonthProfit;
+
+    private static final long serialVersionUID = 1L;
+}

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

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.bnyer.img.mapper.CreatorProfitMapper">
+  <resultMap id="BaseResultMap" type="com.bnyer.img.domain.CreatorProfit">
+    <!--@mbg.generated-->
+    <!--@Table img_creator_profit-->
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
+    <result column="creator_id" jdbcType="BIGINT" property="creatorId" />
+    <result column="scan_code" jdbcType="VARCHAR" property="scanCode" />
+    <result column="img_id" jdbcType="BIGINT" property="imgId" />
+    <result column="profit" jdbcType="INTEGER" property="profit" />
+    <result column="platform" jdbcType="CHAR" property="platform" />
+    <result column="app_type" jdbcType="CHAR" property="appType" />
+    <result column="type" jdbcType="CHAR" property="type" />
+    <result column="status" jdbcType="CHAR" property="status" />
+    <result column="confirm_type" jdbcType="CHAR" property="confirmType" />
+    <result column="confirm_status" jdbcType="CHAR" property="confirmStatus" />
+    <result column="download_num" jdbcType="INTEGER" property="downloadNum" />
+    <result column="view_num" jdbcType="INTEGER" property="viewNum" />
+    <result column="is_show" jdbcType="CHAR" property="isShow" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="income_time" jdbcType="TIMESTAMP" property="incomeTime" />
+    <result column="confirm_time" jdbcType="TIMESTAMP" property="confirmTime" />
+    <result column="wallet_time" jdbcType="TIMESTAMP" property="walletTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="sort" jdbcType="INTEGER" property="sort" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, order_no, creator_id,scan_code, img_id, profit, platform, app_type, `type`, `status`, confirm_type,
+    confirm_status, download_num, view_num, is_show, create_time, income_time, confirm_time,
+    wallet_time, update_time, sort
+  </sql>
+</mapper>