fix

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionRebateAddBo.java

@@ -0,0 +1,64 @@
+package com.zhongzheng.modules.distribution.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+import java.math.BigDecimal;
+
+/**
+ * 分销返利添加对象 distribution_rebate
+ *
+ * @author ruoyi
+ * @date 2023-03-29
+ */
+@Data
+@ApiModel("分销返利添加对象")
+public class DistributionRebateAddBo {
+
+    /** 分销码 */
+    @ApiModelProperty("分销码")
+    private String distributionCode;
+    /** 业务员ID */
+    @ApiModelProperty("业务员ID")
+    private Long sellerId;
+    /** 业务员等级 */
+    @ApiModelProperty("业务员等级")
+    private Integer sellerLevel;
+    /** 佣金 */
+    @ApiModelProperty("佣金")
+    private BigDecimal cash;
+    /** 订单商品ID */
+    @ApiModelProperty("订单商品ID")
+    private Long orderGoodsId;
+    /** 订单编号 */
+    @ApiModelProperty("订单编号")
+    private String orderSn;
+    /** 佣金类型：1百分比，2固定金额 */
+    @ApiModelProperty("佣金类型：1百分比，2固定金额")
+    private Integer profitType;
+    /** 佣金比例 */
+    @ApiModelProperty("佣金比例")
+    private BigDecimal profit;
+    /** 佣金状态：1冻结，2正常，3退款 */
+    @ApiModelProperty("佣金状态：1冻结，2正常，3退款")
+    private Integer cashStatus;
+    /** 解冻时间 */
+    @ApiModelProperty("解冻时间")
+    private Long openTime;
+    /** 状态：1有效, -1无效 */
+    @ApiModelProperty("状态：1有效, -1无效")
+    private Integer status;
+    /** 添加时间 */
+    @ApiModelProperty("添加时间")
+    private Long createTime;
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+    /** 备注 */
+    @ApiModelProperty("备注")
+    private String remark;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionRebateEditBo.java

@@ -0,0 +1,78 @@
+package com.zhongzheng.modules.distribution.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+import java.math.BigDecimal;
+
+/**
+ * 分销返利编辑对象 distribution_rebate
+ *
+ * @author ruoyi
+ * @date 2023-03-29
+ */
+@Data
+@ApiModel("分销返利编辑对象")
+public class DistributionRebateEditBo {
+
+    /** 主键 */
+    @ApiModelProperty("主键")
+    private Long id;
+
+    /** 分销码 */
+    @ApiModelProperty("分销码")
+    private String distributionCode;
+
+    /** 业务员ID */
+    @ApiModelProperty("业务员ID")
+    private Long sellerId;
+
+    /** 业务员等级 */
+    @ApiModelProperty("业务员等级")
+    private Integer sellerLevel;
+
+    /** 佣金 */
+    @ApiModelProperty("佣金")
+    private BigDecimal cash;
+
+    /** 订单商品ID */
+    @ApiModelProperty("订单商品ID")
+    private Long orderGoodsId;
+
+    /** 订单编号 */
+    @ApiModelProperty("订单编号")
+    private String orderSn;
+
+    /** 佣金类型：1百分比，2固定金额 */
+    @ApiModelProperty("佣金类型：1百分比，2固定金额")
+    private Integer profitType;
+
+    /** 佣金比例 */
+    @ApiModelProperty("佣金比例")
+    private BigDecimal profit;
+
+    /** 佣金状态：1冻结，2正常，3退款 */
+    @ApiModelProperty("佣金状态：1冻结，2正常，3退款")
+    private Integer cashStatus;
+
+    /** 解冻时间 */
+    @ApiModelProperty("解冻时间")
+    private Long openTime;
+
+    /** 状态：1有效, -1无效 */
+    @ApiModelProperty("状态：1有效, -1无效")
+    private Integer status;
+
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+
+
+    /** 备注 */
+    @ApiModelProperty("备注")
+    private String remark;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionRebateQueryBo.java

@@ -0,0 +1,73 @@
+package com.zhongzheng.modules.distribution.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.HashMap;
+
+import java.math.BigDecimal;
+import com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 分销返利分页查询对象 distribution_rebate
+ *
+ * @author ruoyi
+ * @date 2023-03-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("分销返利分页查询对象")
+public class DistributionRebateQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 分销码 */
+	@ApiModelProperty("分销码")
+	private String distributionCode;
+	/** 业务员ID */
+	@ApiModelProperty("业务员ID")
+	private Long sellerId;
+	/** 业务员等级 */
+	@ApiModelProperty("业务员等级")
+	private Integer sellerLevel;
+	/** 佣金 */
+	@ApiModelProperty("佣金")
+	private BigDecimal cash;
+	/** 订单商品ID */
+	@ApiModelProperty("订单商品ID")
+	private Long orderGoodsId;
+	/** 订单编号 */
+	@ApiModelProperty("订单编号")
+	private String orderSn;
+	/** 佣金类型：1百分比，2固定金额 */
+	@ApiModelProperty("佣金类型：1百分比，2固定金额")
+	private Integer profitType;
+	/** 佣金比例 */
+	@ApiModelProperty("佣金比例")
+	private BigDecimal profit;
+	/** 佣金状态：1冻结，2正常，3退款 */
+	@ApiModelProperty("佣金状态：1冻结，2正常，3退款")
+	private Integer cashStatus;
+	/** 解冻时间 */
+	@ApiModelProperty("解冻时间")
+	private Long openTime;
+	/** 状态：1有效, -1无效 */
+	@ApiModelProperty("状态：1有效, -1无效")
+	private Integer status;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/IDistributionRebateService.java

@@ -1,7 +1,14 @@
 package com.zhongzheng.modules.distribution.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.distribution.bo.DistributionRebateAddBo;
+import com.zhongzheng.modules.distribution.bo.DistributionRebateEditBo;
+import com.zhongzheng.modules.distribution.bo.DistributionRebateQueryBo;
 import com.zhongzheng.modules.distribution.domain.DistributionRebate;
+import com.zhongzheng.modules.distribution.vo.DistributionRebateVo;
+
+import java.util.Collection;
+import java.util.List;
 
 /**
  * 【请填写功能名称】Service接口
@@ -10,5 +17,36 @@ import com.zhongzheng.modules.distribution.domain.DistributionRebate;
  * @date 2023-03-06
  */
 public interface IDistributionRebateService extends IService<DistributionRebate> {
+    /**
+     * 查询单个
+     * @return
+     */
+    DistributionRebateVo queryById(Long id);
+
+    /**
+     * 查询列表
+     */
+    List<DistributionRebateVo> queryList(DistributionRebateQueryBo bo);
+
+    /**
+     * 根据新增业务对象插入分销返利
+     * @param bo 分销返利新增业务对象
+     * @return
+     */
+    Boolean insertByAddBo(DistributionRebateAddBo bo);
+
+    /**
+     * 根据编辑业务对象修改分销返利
+     * @param bo 分销返利编辑业务对象
+     * @return
+     */
+    Boolean updateByEditBo(DistributionRebateEditBo bo);
 
+    /**
+     * 校验并删除数据
+     * @param ids 主键集合
+     * @param isValid 是否校验,true-删除前校验,false-不校验
+     * @return
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/impl/DistributionRebateServiceImpl.java

@@ -1,11 +1,27 @@
 package com.zhongzheng.modules.distribution.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.dynamic.datasource.annotation.DS;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.distribution.bo.DistributionRebateAddBo;
+import com.zhongzheng.modules.distribution.bo.DistributionRebateEditBo;
+import com.zhongzheng.modules.distribution.bo.DistributionRebateQueryBo;
 import com.zhongzheng.modules.distribution.domain.DistributionRebate;
 import com.zhongzheng.modules.distribution.mapper.DistributionRebateMapper;
 import com.zhongzheng.modules.distribution.service.IDistributionRebateService;
+import com.zhongzheng.modules.distribution.vo.DistributionRebateVo;
 import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.Page;
+
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 【请填写功能名称】Service业务层处理
@@ -16,5 +32,80 @@ import org.springframework.stereotype.Service;
 @Service
 @DS("slave")
 public class DistributionRebateServiceImpl extends ServiceImpl<DistributionRebateMapper, DistributionRebate> implements IDistributionRebateService {
+    @Override
+    public DistributionRebateVo queryById(Long id){
+        DistributionRebate db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, DistributionRebateVo.class);
+    }
+
+    @Override
+    public List<DistributionRebateVo> queryList(DistributionRebateQueryBo bo) {
+        LambdaQueryWrapper<DistributionRebate> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StrUtil.isNotBlank(bo.getDistributionCode()), DistributionRebate::getDistributionCode, bo.getDistributionCode());
+        lqw.eq(bo.getSellerId() != null, DistributionRebate::getSellerId, bo.getSellerId());
+        lqw.eq(bo.getSellerLevel() != null, DistributionRebate::getSellerLevel, bo.getSellerLevel());
+        lqw.eq(bo.getCash() != null, DistributionRebate::getCash, bo.getCash());
+        lqw.eq(bo.getOrderGoodsId() != null, DistributionRebate::getOrderGoodsId, bo.getOrderGoodsId());
+        lqw.eq(StrUtil.isNotBlank(bo.getOrderSn()), DistributionRebate::getOrderSn, bo.getOrderSn());
+        lqw.eq(bo.getProfitType() != null, DistributionRebate::getProfitType, bo.getProfitType());
+        lqw.eq(bo.getProfit() != null, DistributionRebate::getProfit, bo.getProfit());
+        lqw.eq(bo.getCashStatus() != null, DistributionRebate::getCashStatus, bo.getCashStatus());
+        lqw.eq(bo.getOpenTime() != null, DistributionRebate::getOpenTime, bo.getOpenTime());
+        lqw.eq(bo.getStatus() != null, DistributionRebate::getStatus, bo.getStatus());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+     * 实体类转化成视图对象
+     *
+     * @param collection 实体类集合
+     * @return
+     */
+    private List<DistributionRebateVo> entity2Vo(Collection<DistributionRebate> collection) {
+        List<DistributionRebateVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, DistributionRebateVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<DistributionRebate> page = (Page<DistributionRebate>)collection;
+            Page<DistributionRebateVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(DistributionRebateAddBo bo) {
+        DistributionRebate add = BeanUtil.toBean(bo, DistributionRebate.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(DistributionRebateEditBo bo) {
+        DistributionRebate update = BeanUtil.toBean(bo, DistributionRebate.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(DistributionRebate entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
 
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/vo/DistributionRebateVo.java

@@ -0,0 +1,76 @@
+package com.zhongzheng.modules.distribution.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.math.BigDecimal;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 分销返利视图对象 mall_package
+ *
+ * @author ruoyi
+ * @date 2023-03-29
+ */
+@Data
+@ApiModel("分销返利视图对象")
+public class DistributionRebateVo {
+	private static final long serialVersionUID = 1L;
+
+	/** 主键 */
+	@ApiModelProperty("主键")
+	private Long id;
+
+	/** 分销码 */
+	@Excel(name = "分销码")
+	@ApiModelProperty("分销码")
+	private String distributionCode;
+	/** 业务员ID */
+	@Excel(name = "业务员ID")
+	@ApiModelProperty("业务员ID")
+	private Long sellerId;
+	/** 业务员等级 */
+	@Excel(name = "业务员等级")
+	@ApiModelProperty("业务员等级")
+	private Integer sellerLevel;
+	/** 佣金 */
+	@Excel(name = "佣金")
+	@ApiModelProperty("佣金")
+	private BigDecimal cash;
+	/** 订单商品ID */
+	@Excel(name = "订单商品ID")
+	@ApiModelProperty("订单商品ID")
+	private Long orderGoodsId;
+	/** 订单编号 */
+	@Excel(name = "订单编号")
+	@ApiModelProperty("订单编号")
+	private String orderSn;
+	/** 佣金类型：1百分比，2固定金额 */
+	@Excel(name = "佣金类型：1百分比，2固定金额")
+	@ApiModelProperty("佣金类型：1百分比，2固定金额")
+	private Integer profitType;
+	/** 佣金比例 */
+	@Excel(name = "佣金比例")
+	@ApiModelProperty("佣金比例")
+	private BigDecimal profit;
+	/** 佣金状态：1冻结，2正常，3退款 */
+	@Excel(name = "佣金状态：1冻结，2正常，3退款")
+	@ApiModelProperty("佣金状态：1冻结，2正常，3退款")
+	private Integer cashStatus;
+	/** 解冻时间 */
+	@Excel(name = "解冻时间")
+	@ApiModelProperty("解冻时间")
+	private Long openTime;
+	/** 状态：1有效, -1无效 */
+	@Excel(name = "状态：1有效, -1无效")
+	@ApiModelProperty("状态：1有效, -1无效")
+	private Integer status;
+	/** 备注 */
+	@Excel(name = "备注")
+	@ApiModelProperty("备注")
+	private String remark;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/schedule/service/IScheduleService.java

@@ -102,4 +102,5 @@ public interface IScheduleService extends IService<PolyvVideo> {
 
     void goodsCopyOne();
 
+    void distributionRebate();
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/schedule/service/impl/ScheduleServiceImpl.java

@@ -1082,6 +1082,11 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
         iGoodsService.goodsCopyOne(bo);
     }
 
+    @Override
+    public void distributionRebate() {
+
+    }
+
     @Override
     public void closeTimeOutOrder() {
         OrderQueryBo bo = new OrderQueryBo();