fix

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/financial/TopDivideLogController.java

@@ -0,0 +1,67 @@
+package com.zhongzheng.controller.financial;
+
+import java.util.List;
+import java.util.Arrays;
+
+import com.zhongzheng.modules.top.financial.bo.TopDivideLogEditBo;
+import com.zhongzheng.modules.top.financial.bo.TopDivideLogQueryBo;
+import com.zhongzheng.modules.top.financial.service.ITopDivideLogService;
+import com.zhongzheng.modules.top.financial.vo.TopDivideLogVo;
+import com.zhongzheng.modules.top.goods.bo.TopOldOrderEditBo;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.common.utils.poi.ExcelUtil;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 分成记录Controller
+ *
+ * @author ruoyi
+ * @date 2023-05-09
+ */
+@Api(value = "分成记录控制器", tags = {"分成记录管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/divide/log")
+public class TopDivideLogController extends BaseController {
+
+    private final ITopDivideLogService iTopDivideLogService;
+
+    /**
+     * 查询分成记录列表
+     */
+    @ApiOperation("查询机构分成记录列表")
+    @PreAuthorize("@ss.hasPermi('system:log:list')")
+    @GetMapping("/companyList")
+    public TableDataInfo<TopDivideLogVo> getCompanyList(TopDivideLogQueryBo bo) {
+        startPage();
+        List<TopDivideLogVo> list = iTopDivideLogService.getCompanyList(bo);
+        return getDataTable(list);
+    }
+
+
+    /**
+     * 分成记录修改备注
+     */
+    @ApiOperation("分成记录修改备注")
+    @PostMapping("/updateRemark")
+    public AjaxResult<Void> updateRemark(@RequestBody TopDivideLogEditBo bo) {
+        return toAjax(iTopDivideLogService.updateRemark(bo) ? 1 : 0);
+    }
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/bo/TopDivideLogAddBo.java

@@ -0,0 +1,57 @@
+package com.zhongzheng.modules.top.financial.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;
+
+/**
+ * 分成记录添加对象 top_divide_log
+ *
+ * @author ruoyi
+ * @date 2023-05-09
+ */
+@Data
+@ApiModel("分成记录添加对象")
+public class TopDivideLogAddBo {
+
+    /** 年份 */
+    @ApiModelProperty("年份")
+    private Integer year;
+    /** 月份 */
+    @ApiModelProperty("月份")
+    private Integer month;
+    /** 待付分成(元),待审提成(元),待付佣金(元) */
+    @ApiModelProperty("待付分成(元),待审提成(元),待付佣金(元)")
+    private BigDecimal payMoney;
+    /** 业务ID */
+    @ApiModelProperty("业务ID")
+    private Long sellerId;
+    /** 状态 1正常 0关闭 */
+    @ApiModelProperty("状态 1正常 0关闭")
+    private Integer status;
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    private Long createTime;
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+    /** 类型 1机构分成 2业务员提成  3佣金结算 */
+    @ApiModelProperty("类型 1机构分成 2业务员提成  3佣金结算")
+    private Integer divideType;
+    /** 1已打款 0未打款 */
+    @ApiModelProperty("1已打款 0未打款")
+    private Integer payStatus;
+    /** 备注 */
+    @ApiModelProperty("备注")
+    private String remark;
+    /** 待扣分成(元),待扣提成(元) */
+    @ApiModelProperty("待扣分成(元),待扣提成(元)")
+    private BigDecimal deductMoney;
+    @ApiModelProperty("机构ID")
+    private String tenantId;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/bo/TopDivideLogEditBo.java

@@ -0,0 +1,67 @@
+package com.zhongzheng.modules.top.financial.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;
+
+/**
+ * 分成记录编辑对象 top_divide_log
+ *
+ * @author ruoyi
+ * @date 2023-05-09
+ */
+@Data
+@ApiModel("分成记录编辑对象")
+public class TopDivideLogEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long id;
+
+    /** 年份 */
+    @ApiModelProperty("年份")
+    private Integer year;
+
+    /** 月份 */
+    @ApiModelProperty("月份")
+    private Integer month;
+
+    /** 待付分成(元),待审提成(元),待付佣金(元) */
+    @ApiModelProperty("待付分成(元),待审提成(元),待付佣金(元)")
+    private BigDecimal payMoney;
+
+    /** 业务ID */
+    @ApiModelProperty("业务ID")
+    private Long sellerId;
+
+
+    /** 状态 1正常 0关闭 */
+    @ApiModelProperty("状态 1正常 0关闭")
+    private Integer status;
+
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+
+    /** 类型 1机构分成 2业务员提成  3佣金结算 */
+    @ApiModelProperty("类型 1机构分成 2业务员提成  3佣金结算")
+    private Integer divideType;
+
+    /** 1已打款 0未打款 */
+    @ApiModelProperty("1已打款 0未打款")
+    private Integer payStatus;
+
+    /** 备注 */
+    @ApiModelProperty("备注")
+    private String remark;
+
+    /** 待扣分成(元),待扣提成(元) */
+    @ApiModelProperty("待扣分成(元),待扣提成(元)")
+    private BigDecimal deductMoney;
+    @ApiModelProperty("机构ID")
+    private String tenantId;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/bo/TopDivideLogQueryBo.java

@@ -0,0 +1,73 @@
+package com.zhongzheng.modules.top.financial.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
+
+import java.math.BigDecimal;
+import com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 分成记录分页查询对象 top_divide_log
+ *
+ * @author ruoyi
+ * @date 2023-05-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("分成记录分页查询对象")
+public class TopDivideLogQueryBo 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 Integer year;
+	/** 月份 */
+	@ApiModelProperty("月份")
+	private Integer month;
+	/** 待付分成(元),待审提成(元),待付佣金(元) */
+	@ApiModelProperty("待付分成(元),待审提成(元),待付佣金(元)")
+	private BigDecimal payMoney;
+	/** 业务ID */
+	@ApiModelProperty("业务ID")
+	private Long sellerId;
+	/** 状态 1正常 0关闭 */
+	@ApiModelProperty("状态 1正常 0关闭")
+	private Integer status;
+	/** 类型 1机构分成 2业务员提成  3佣金结算 */
+	@ApiModelProperty("类型 1机构分成 2业务员提成  3佣金结算")
+	private Integer divideType;
+	/** 1已打款 0未打款 */
+	@ApiModelProperty("1已打款 0未打款")
+	private Integer payStatus;
+	/** 待扣分成(元),待扣提成(元) */
+	@ApiModelProperty("待扣分成(元),待扣提成(元)")
+	private BigDecimal deductMoney;
+	@ApiModelProperty("机构ID")
+	private String tenantId;
+	@ApiModelProperty("审核状态：0待审核，1已通过，-1未通过，（2待支付，3已支付）")
+	private List<Integer> checkStatus;
+	@ApiModelProperty("角色ID")
+	private Long roleId;
+	@ApiModelProperty("月份时间（时间戳）")
+	private List<Long> monthTime;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/domain/TopDivideLog.java

@@ -0,0 +1,56 @@
+package com.zhongzheng.modules.top.financial.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.zhongzheng.common.annotation.Excel;
+
+/**
+ * 分成记录对象 top_divide_log
+ *
+ * @author ruoyi
+ * @date 2023-05-09
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("top_divide_log")
+public class TopDivideLog implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "id")
+    private Long id;
+    /** 年份 */
+    private Integer year;
+    /** 月份 */
+    private Integer month;
+    /** 待付分成(元),待审提成(元),待付佣金(元) */
+    private BigDecimal payMoney;
+    /** 业务ID */
+    private Long sellerId;
+    /** 状态 1正常 0关闭 */
+    private Integer status;
+    /** 创建时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 更新时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+    /** 类型 1机构分成 2业务员提成  3佣金结算 */
+    private Integer divideType;
+    /** 1已打款 0未打款 */
+    private Integer payStatus;
+    /** 备注 */
+    private String remark;
+    /** 待扣分成(元),待扣提成(元) */
+    private BigDecimal deductMoney;
+
+    private String tenantId;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/mapper/TopDivideLogMapper.java

@@ -0,0 +1,24 @@
+package com.zhongzheng.modules.top.financial.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.top.financial.bo.TopCostTpQueryBo;
+import com.zhongzheng.modules.top.financial.bo.TopDivideLogQueryBo;
+import com.zhongzheng.modules.top.financial.domain.TopDivideLog;
+import com.zhongzheng.modules.top.financial.vo.TopCostTpVo;
+import com.zhongzheng.modules.top.financial.vo.TopDivideLogVo;
+
+import java.util.List;
+
+/**
+ * 分成记录Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-05-09
+ */
+public interface TopDivideLogMapper extends BaseMapper<TopDivideLog> {
+    List<TopDivideLogVo> getCompanyList(TopDivideLogQueryBo bo);
+
+    List<TopDivideLogVo> getCheckList(TopDivideLogQueryBo bo);
+
+    TopDivideLogVo getSumMoney(TopDivideLogQueryBo bo);
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/service/ITopDivideLogService.java

@@ -0,0 +1,60 @@
+package com.zhongzheng.modules.top.financial.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.top.financial.bo.TopDivideLogAddBo;
+import com.zhongzheng.modules.top.financial.bo.TopDivideLogEditBo;
+import com.zhongzheng.modules.top.financial.bo.TopDivideLogQueryBo;
+import com.zhongzheng.modules.top.financial.domain.TopDivideLog;
+import com.zhongzheng.modules.top.financial.vo.TopDivideLogVo;
+import com.zhongzheng.modules.top.goods.bo.TopOldOrderEditBo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 分成记录Service接口
+ *
+ * @author ruoyi
+ * @date 2023-05-09
+ */
+public interface ITopDivideLogService extends IService<TopDivideLog> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	TopDivideLogVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+	List<TopDivideLogVo> queryList(TopDivideLogQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入分成记录
+	 * @param bo 分成记录新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(TopDivideLogAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改分成记录
+	 * @param bo 分成记录编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(TopDivideLogEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+	List<TopDivideLogVo> getCompanyList(TopDivideLogQueryBo bo);
+
+	boolean updateRemark(TopDivideLogEditBo bo);
+
+	TopDivideLogVo getSumMoney(TopDivideLogQueryBo bo);
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/service/impl/TopDivideLogServiceImpl.java

@@ -0,0 +1,145 @@
+package com.zhongzheng.modules.top.financial.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.lang.Validator;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.zhongzheng.common.exception.CustomException;
+import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.top.financial.bo.TopDivideLogAddBo;
+import com.zhongzheng.modules.top.financial.bo.TopDivideLogEditBo;
+import com.zhongzheng.modules.top.financial.bo.TopDivideLogQueryBo;
+import com.zhongzheng.modules.top.financial.domain.TopDivideLog;
+import com.zhongzheng.modules.top.financial.mapper.TopDivideLogMapper;
+import com.zhongzheng.modules.top.financial.service.ITopDivideLogService;
+import com.zhongzheng.modules.top.financial.vo.TopDivideLogVo;
+import com.zhongzheng.modules.top.goods.domain.TopOldOrder;
+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业务层处理
+ *
+ * @author ruoyi
+ * @date 2023-05-09
+ */
+@Service
+public class TopDivideLogServiceImpl extends ServiceImpl<TopDivideLogMapper, TopDivideLog> implements ITopDivideLogService {
+
+    @Override
+    public TopDivideLogVo queryById(Long id){
+        TopDivideLog db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, TopDivideLogVo.class);
+    }
+
+    @Override
+    public List<TopDivideLogVo> queryList(TopDivideLogQueryBo bo) {
+        LambdaQueryWrapper<TopDivideLog> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getYear() != null, TopDivideLog::getYear, bo.getYear());
+        lqw.eq(bo.getMonth() != null, TopDivideLog::getMonth, bo.getMonth());
+        lqw.eq(bo.getPayMoney() != null, TopDivideLog::getPayMoney, bo.getPayMoney());
+        lqw.eq(bo.getSellerId() != null, TopDivideLog::getSellerId, bo.getSellerId());
+        lqw.eq(bo.getStatus() != null, TopDivideLog::getStatus, bo.getStatus());
+        lqw.eq(bo.getDivideType() != null, TopDivideLog::getDivideType, bo.getDivideType());
+        lqw.eq(bo.getPayStatus() != null, TopDivideLog::getPayStatus, bo.getPayStatus());
+        lqw.eq(bo.getDeductMoney() != null, TopDivideLog::getDeductMoney, bo.getDeductMoney());
+        lqw.eq(bo.getTenantId() != null, TopDivideLog::getTenantId, bo.getTenantId());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<TopDivideLogVo> entity2Vo(Collection<TopDivideLog> collection) {
+        List<TopDivideLogVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, TopDivideLogVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<TopDivideLog> page = (Page<TopDivideLog>)collection;
+            Page<TopDivideLogVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(TopDivideLogAddBo bo) {
+        TopDivideLog add = BeanUtil.toBean(bo, TopDivideLog.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(TopDivideLogEditBo bo) {
+        TopDivideLog update = BeanUtil.toBean(bo, TopDivideLog.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(TopDivideLog entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+
+    @Override
+    public List<TopDivideLogVo> getCompanyList(TopDivideLogQueryBo bo) {
+        List<TopDivideLogVo> list = baseMapper.getCompanyList(bo);
+        for(TopDivideLogVo vo :list){
+            TopDivideLogQueryBo queryBo = new TopDivideLogQueryBo();
+            queryBo.setTenantId(vo.getTenantId());
+            queryBo.setDivideType(1);
+            queryBo.setRoleId(bo.getRoleId());
+            queryBo.setCheckStatus(bo.getCheckStatus());
+            queryBo.setMonthTime(bo.getMonthTime());
+            List<TopDivideLogVo> monthList = baseMapper.getCheckList(queryBo);
+            vo.setMonthList(monthList);
+        }
+        return list;
+    }
+
+    @Override
+    public boolean updateRemark(TopDivideLogEditBo bo) {
+        if (Validator.isEmpty(bo.getRemark()) || Validator.isEmpty(bo.getId())) {
+            throw new CustomException("参数缺失");
+        }
+        LambdaUpdateWrapper<TopDivideLog> objectLambdaUpdateWrapper = Wrappers.lambdaUpdate();
+        objectLambdaUpdateWrapper.eq(TopDivideLog::getId, bo.getId());
+
+        objectLambdaUpdateWrapper.set(TopDivideLog::getRemark, bo.getRemark());
+        objectLambdaUpdateWrapper.set(TopDivideLog::getUpdateTime, DateUtils.getNowTime());
+        return update(null, objectLambdaUpdateWrapper);
+    }
+
+    @Override
+    public TopDivideLogVo getSumMoney(TopDivideLogQueryBo bo) {
+        return baseMapper.getSumMoney(bo);
+    }
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/vo/TopDivideLogVo.java

@@ -0,0 +1,94 @@
+package com.zhongzheng.modules.top.financial.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;
+import java.util.List;
+
+
+/**
+ * 分成记录视图对象 mall_package
+ *
+ * @author ruoyi
+ * @date 2023-05-09
+ */
+@Data
+@ApiModel("分成记录视图对象")
+public class TopDivideLogVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long id;
+
+	/** 年份 */
+	@Excel(name = "年份")
+	@ApiModelProperty("年份")
+	private Integer year;
+	/** 月份 */
+	@Excel(name = "月份")
+	@ApiModelProperty("月份")
+	private Integer month;
+	/** 待付分成(元),待审提成(元),待付佣金(元) */
+	@Excel(name = "待付分成(元),待审提成(元),待付佣金(元)")
+	@ApiModelProperty("待付分成(元),待审提成(元),待付佣金(元)")
+	private BigDecimal payMoney;
+	/** 业务ID */
+	@Excel(name = "业务ID")
+	@ApiModelProperty("业务ID")
+	private Long sellerId;
+	/** 状态 1正常 0关闭 */
+	@Excel(name = "状态 1正常 0关闭")
+	@ApiModelProperty("状态 1正常 0关闭")
+	private Integer status;
+	/** 类型 1机构分成 2业务员提成  3佣金结算 */
+	@Excel(name = "类型 1机构分成 2业务员提成  3佣金结算")
+	@ApiModelProperty("类型 1机构分成 2业务员提成  3佣金结算")
+	private Integer divideType;
+	/** 1已打款 0未打款 */
+	@Excel(name = "1已打款 0未打款")
+	@ApiModelProperty("1已打款 0未打款")
+	private Integer payStatus;
+	/** 备注 */
+	@Excel(name = "备注")
+	@ApiModelProperty("备注")
+	private String remark;
+	/** 待扣分成(元),待扣提成(元) */
+	@Excel(name = "待扣分成(元),待扣提成(元)")
+	@ApiModelProperty("待扣分成(元),待扣提成(元)")
+	private BigDecimal deductMoney;
+
+	@ApiModelProperty("总已扣分成(元)")
+	private BigDecimal deductMoneyTotal;
+
+	@ApiModelProperty("总已付分成")
+	private BigDecimal payMoneyTotal;
+
+	@ApiModelProperty("月份详细列表")
+	private List<TopDivideLogVo> monthList;
+
+	private String tenantId;
+
+	private String tenantName;
+
+	@ApiModelProperty("角色名称")
+	private String roleName;
+	/** 审核状态：0待审核，1已通过，-1未通过，（2待支付，3已支付） */
+	@Excel(name = "审核状态：0待审核，1已通过，-1未通过，" , readConverterExp = "2=待支付，3已支付")
+	@ApiModelProperty("审核状态：0待审核，1已通过，-1未通过，（2待支付，3已支付）")
+	private Integer checkStatus;
+	/** 是否当前审核标记：0否，1是 */
+	@Excel(name = "是否当前审核标记：0否，1是")
+	@ApiModelProperty("是否当前审核标记：0否，1是")
+	private Integer checkSign;
+
+	@ApiModelProperty("总未扣分成(元)")
+	private BigDecimal unDeductMoneyTotal;
+
+	@ApiModelProperty("总未付分成")
+	private BigDecimal unPayMoneyTotal;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/bo/TopOldOrderQueryBo.java

@@ -93,6 +93,6 @@ public class TopOldOrderQueryBo extends BaseEntity {
 	private String tenantId;
 	@ApiModelProperty("角色ID")
 	private Long roleId;
-	@ApiModelProperty("统计类型 1应收账款 2机构分成 3业务员提成")
+	@ApiModelProperty("统计类型 1应收账款 2机构分成 3业务员提成 4佣金结算")
 	private Integer totalType;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopOldOrderServiceImpl.java

@@ -41,16 +41,16 @@ import com.zhongzheng.modules.order.service.IOrderGoodsService;
 import com.zhongzheng.modules.system.domain.SysOldOrg;
 import com.zhongzheng.modules.system.service.ISysOldOrgService;
 import com.zhongzheng.modules.system.service.ISysUserService;
+import com.zhongzheng.modules.top.financial.bo.TopDivideLogQueryBo;
 import com.zhongzheng.modules.top.financial.bo.TopOrderRemindBo;
 import com.zhongzheng.modules.top.financial.bo.TopOrderRevocationBo;
 import com.zhongzheng.modules.top.financial.bo.TopSellerDiscountBo;
-import com.zhongzheng.modules.top.financial.domain.TopCostTp;
+import com.zhongzheng.modules.top.financial.domain.*;
 import com.zhongzheng.modules.order.service.IOrderService;
 import com.zhongzheng.modules.top.financial.domain.TopCostTp;
-import com.zhongzheng.modules.top.financial.domain.TopCostTpItem;
-import com.zhongzheng.modules.top.financial.domain.TopOldSellerDiscount;
 import com.zhongzheng.modules.top.financial.service.ITopCostTpItemService;
 import com.zhongzheng.modules.top.financial.service.ITopCostTpService;
+import com.zhongzheng.modules.top.financial.service.ITopDivideLogService;
 import com.zhongzheng.modules.top.financial.service.ITopOldSellerDiscountService;
 import com.zhongzheng.modules.top.financial.vo.*;
 import com.zhongzheng.modules.top.goods.bo.*;
@@ -176,7 +176,8 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
     @Autowired
     private ITopOrderBankPayService iTopOrderBankPayService;
 
-
+    @Autowired
+    private ITopDivideLogService iTopDivideLogService;
 
     @Value("${oldOrder.studyRecord}")
     private String ORDER_STUDY;
@@ -2162,26 +2163,45 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
     @Override
     public Map<String, Object> countOrderNum(TopOldOrderQueryBo bo) {
         Map<String, Object> map = new HashMap<>();
-        /*if(bo.getTotalType()==1){
-
+        if(bo.getTotalType()==1){
+            List<TopOldOrderVo> vos = baseMapper.queryListAll();
+//        BigDecimal price = vos.stream().filter(x -> ObjectUtils.isNotNull(x.getOrderPrice())).map(TopOldOrderVo::getOrderPrice).reduce(BigDecimal.ZERO, BigDecimal::add);
+//        BigDecimal received = vos.stream().filter(x -> ObjectUtils.isNotNull(x.getOrderReceived())).map(TopOldOrderVo::getOrderReceived).reduce(BigDecimal.ZERO, BigDecimal::add);
+            BigDecimal uncollected = vos.stream().filter(x -> ObjectUtils.isNotNull(x.getOrderUncollected())).map(TopOldOrderVo::getOrderUncollected).reduce(BigDecimal.ZERO, BigDecimal::add);
+/*        map.put("orderPriceTotal", price);
+        map.put("orderReceivedTotal", received);*/
+            map.put("orderUncollectedTotal", uncollected); //未收账款
 
         }
         if(bo.getTotalType()==2){
-            map.put("tenantPay",baseMapper.tenantMoneyTotal(bo));
+            //机构分成
+            TopDivideLogQueryBo queryBo1 =new TopDivideLogQueryBo();
+            queryBo1.setDivideType(1);
+            TopDivideLogVo vo1 = iTopDivideLogService.getSumMoney(queryBo1);
+            map.put("unDeductMoneyTotal",vo1.getUnDeductMoneyTotal());
+            map.put("unPayMoneyTotal",vo1.getUnPayMoneyTotal());
+            map.put("payMoneyTotal",vo1.getPayMoneyTotal());
+            map.put("deductMoneyTotal",vo1.getDeductMoneyTotal());
         }
         if(bo.getTotalType()==3){
-            map.put("sellerPay",baseMapper.tenantSellerTotal(bo));
-        }*/
-        List<TopOldOrderVo> vos = baseMapper.queryListAll();
-        BigDecimal price = vos.stream().filter(x -> ObjectUtils.isNotNull(x.getOrderPrice())).map(TopOldOrderVo::getOrderPrice).reduce(BigDecimal.ZERO, BigDecimal::add);
-        BigDecimal received = vos.stream().filter(x -> ObjectUtils.isNotNull(x.getOrderReceived())).map(TopOldOrderVo::getOrderReceived).reduce(BigDecimal.ZERO, BigDecimal::add);
-        BigDecimal uncollected = vos.stream().filter(x -> ObjectUtils.isNotNull(x.getOrderUncollected())).map(TopOldOrderVo::getOrderUncollected).reduce(BigDecimal.ZERO, BigDecimal::add);
-        map.put("orderPriceTotal", price);
-        map.put("orderReceivedTotal", received);
-        map.put("orderUncollectedTotal", uncollected);
+            //3业务员提成
+            TopDivideLogQueryBo queryBo1 =new TopDivideLogQueryBo();
+            queryBo1.setDivideType(2);
+            TopDivideLogVo vo1 = iTopDivideLogService.getSumMoney(queryBo1);
+            map.put("unDeductMoneyTotal",vo1.getUnDeductMoneyTotal());
+            map.put("unPayMoneyTotal",vo1.getUnPayMoneyTotal());
+            map.put("payMoneyTotal",vo1.getPayMoneyTotal());
+            map.put("deductMoneyTotal",vo1.getDeductMoneyTotal());
+        }
+        if(bo.getTotalType()==4){
+            //4佣金结算
+            TopDivideLogQueryBo queryBo1 =new TopDivideLogQueryBo();
+            queryBo1.setDivideType(3);
+            TopDivideLogVo vo1 = iTopDivideLogService.getSumMoney(queryBo1);
+            map.put("unPayMoneyTotal",vo1.getUnPayMoneyTotal());
+            map.put("payMoneyTotal",vo1.getPayMoneyTotal());
+        }
 
-        map.put("tenantPay", baseMapper.tenantMoneyTotal(bo));
-        map.put("sellerPay", baseMapper.tenantSellerTotal(bo));
         return map;
     }
 }

zhongzheng-system/src/main/resources/mapper/modules/top/TopDivideLogMapper.xml

@@ -0,0 +1,123 @@
+<?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.zhongzheng.modules.top.financial.mapper.TopDivideLogMapper">
+
+    <resultMap type="com.zhongzheng.modules.top.financial.domain.TopDivideLog" id="TopDivideLogResult">
+        <result property="id" column="id"/>
+        <result property="year" column="year"/>
+        <result property="month" column="month"/>
+        <result property="payMoney" column="pay_money"/>
+        <result property="sellerId" column="seller_id"/>
+        <result property="status" column="status"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="divideType" column="divide_type"/>
+        <result property="payStatus" column="pay_status"/>
+        <result property="remark" column="remark"/>
+        <result property="deductMoney" column="deduct_money"/>
+    </resultMap>
+
+    <select id="getCompanyList" parameterType="com.zhongzheng.modules.top.financial.bo.TopDivideLogQueryBo"  resultType="com.zhongzheng.modules.top.financial.vo.TopDivideLogVo">
+        SELECT
+            dl.tenant_id,
+            sum(
+                    IF
+                        ( pay_status = 1, dl.pay_money, 0 )) AS pay_money_total,
+            sum(
+                    IF
+                        ( pay_status = 1, dl.deduct_money, 0 )) AS deduct_money_total,
+            st.tenant_name
+        FROM
+            top_divide_log dl
+                LEFT JOIN sys_tenant st ON dl.tenant_id = st.tenant_id
+            LEFT JOIN
+            top_old_order_check_log cl ON dl.id = cl.month_divide_id AND  cl.check_sign = 1
+        WHERE
+            dl.divide_type = 1
+        <if test="tenantId != null and tenantId != ''">
+            AND dl.tenant_id = #{tenantId}
+        </if>
+        <if test="roleId != null and roleId != ''">
+            AND cl.role_id = #{roleId}
+        </if>
+        <if test="checkStatus != null and checkStatus != ''">
+            AND cl.check_status in
+            <foreach collection="checkStatus" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="monthTime != null and monthTime != ''">
+            AND dl.month_time in
+            <foreach collection="monthTime" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        GROUP BY
+            dl.tenant_id
+    </select>
+
+    <select id="getCheckList" parameterType="com.zhongzheng.modules.top.financial.bo.TopDivideLogQueryBo" resultType="com.zhongzheng.modules.top.financial.vo.TopDivideLogVo">
+        SELECT
+        dl.*,
+        cl.check_status,
+        cl.check_sign,
+        r.role_name
+        FROM
+        top_divide_log dl LEFT JOIN
+        top_old_order_check_log cl ON dl.id = cl.month_divide_id AND  cl.check_sign = 1
+        LEFT JOIN top_sys_role r ON cl.role_id = r.role_id
+        WHERE
+        1 = 1
+        <if test="tenantId != null and tenantId != ''">
+            AND dl.tenant_id = #{tenantId}
+        </if>
+        <if test="divideType != null">
+            AND dl.divide_type = #{divideType}
+        </if>
+        <if test="payStatus != null">
+            AND dl.pay_status = #{payStatus}
+        </if>
+        <if test="roleId != null and roleId != ''">
+            AND cl.role_id = #{roleId}
+        </if>
+        <if test="checkStatus != null and checkStatus != ''">
+            AND cl.check_status in
+            <foreach collection="checkStatus" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="monthTime != null and monthTime != ''">
+            AND dl.month_time in
+            <foreach collection="monthTime" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        order by dl.id
+    </select>
+
+    <select id="getSumMoney" parameterType="com.zhongzheng.modules.top.financial.bo.TopDivideLogQueryBo" resultType="com.zhongzheng.modules.top.financial.vo.TopDivideLogVo">
+        SELECT
+            sum(
+                    IF
+                        ( pay_status = 1, dl.pay_money, 0 )) AS pay_money_total,
+            sum(
+                    IF
+                        ( pay_status = 1, dl.deduct_money, 0 )) AS deduct_money_total,
+            sum(
+                    IF
+                        ( pay_status = 0, dl.pay_money, 0 )) AS un_pay_money_total,
+            sum(
+                    IF
+                        ( pay_status = 0, dl.deduct_money, 0 )) AS un_deduct_money_total
+        FROM
+            top_divide_log dl
+        WHERE
+              1=1
+        <if test="divideType != null">
+            AND dl.divide_type = #{divideType}
+        </if>
+    </select>
+
+</mapper>