fix log

zhongzheng-api/src/main/java/com/zhongzheng/controller/distribution/DistributionCashLogController.java

@@ -0,0 +1,56 @@
+package com.zhongzheng.controller.distribution;
+
+import java.util.List;
+import java.util.Arrays;
+
+import com.zhongzheng.common.utils.ServletUtils;
+import com.zhongzheng.framework.web.service.SellerTokenService;
+import com.zhongzheng.modules.distribution.bo.DistributionCashLogQueryBo;
+import com.zhongzheng.modules.distribution.service.IDistributionCashLogService;
+import com.zhongzheng.modules.distribution.vo.DistributionCashLogVo;
+import com.zhongzheng.modules.user.entity.ClientLoginSeller;
+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.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.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 业务员金额操作日志Controller
+ *
+ * @author ruoyi
+ * @date 2023-03-25
+ */
+@Api(value = "业务员金额操作日志控制器", tags = {"业务员金额操作日志管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/distribution/cash/log")
+public class DistributionCashLogController extends BaseController {
+
+    private final IDistributionCashLogService iDistributionCashLogService;
+
+    private final SellerTokenService sellerTokenService;
+
+    /**
+     * 查询业务员金额操作日志列表
+     */
+    @ApiOperation("查询业务员佣金列表")
+    @PreAuthorize("@ss.hasPermi('system:log:list')")
+    @GetMapping("/fromOrderCashList")
+    public TableDataInfo<DistributionCashLogVo> fromOrderCashList(DistributionCashLogQueryBo bo) {
+        ClientLoginSeller loginUser = sellerTokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setSellerId(loginUser.getSeller().getSellerId());
+        startPage();
+        List<DistributionCashLogVo> list = iDistributionCashLogService.fromOrderCashList(bo);
+        return getDataTable(list);
+    }
+
+
+
+}

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

@@ -0,0 +1,55 @@
+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_cash_log
+ *
+ * @author ruoyi
+ * @date 2023-03-25
+ */
+@Data
+@ApiModel("业务员金额操作日志添加对象")
+public class DistributionCashLogAddBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long sellerId;
+    /** 老金额 */
+    @ApiModelProperty("老金额")
+    private BigDecimal oldNum;
+    /** 现金额 */
+    @ApiModelProperty("现金额")
+    private BigDecimal newNum;
+    /** 1冻结金额  2可提现金额 3已提现金额 */
+    @ApiModelProperty("1冻结金额  2可提现金额 3已提现金额")
+    private Long type;
+    /** 变化金额 */
+    @ApiModelProperty("变化金额")
+    private BigDecimal diffNum;
+    /** 关联订单编号，提现编号 */
+    @ApiModelProperty("关联订单编号，提现编号")
+    private String relatedSn;
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    private Long createTime;
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Integer status;
+    /** 备注 */
+    @ApiModelProperty("备注")
+    private String remark;
+    /** 操作人员 */
+    @ApiModelProperty("操作人员")
+    private String operName;
+}

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

@@ -0,0 +1,66 @@
+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_cash_log
+ *
+ * @author ruoyi
+ * @date 2023-03-25
+ */
+@Data
+@ApiModel("业务员金额操作日志编辑对象")
+public class DistributionCashLogEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long id;
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long sellerId;
+
+    /** 老金额 */
+    @ApiModelProperty("老金额")
+    private BigDecimal oldNum;
+
+    /** 现金额 */
+    @ApiModelProperty("现金额")
+    private BigDecimal newNum;
+
+    /** 1冻结金额  2可提现金额 3已提现金额 */
+    @ApiModelProperty("1冻结金额  2可提现金额 3已提现金额")
+    private Long type;
+
+    /** 变化金额 */
+    @ApiModelProperty("变化金额")
+    private BigDecimal diffNum;
+
+    /** 关联订单编号，提现编号 */
+    @ApiModelProperty("关联订单编号，提现编号")
+    private String relatedSn;
+
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Integer status;
+
+    /** 备注 */
+    @ApiModelProperty("备注")
+    private String remark;
+
+    /** 操作人员 */
+    @ApiModelProperty("操作人员")
+    private String operName;
+
+
+}

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

@@ -0,0 +1,64 @@
+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_cash_log
+ *
+ * @author ruoyi
+ * @date 2023-03-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("业务员金额操作日志分页查询对象")
+public class DistributionCashLogQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** $column.columnComment */
+	@ApiModelProperty("$column.columnComment")
+	private Long sellerId;
+	/** 老金额 */
+	@ApiModelProperty("老金额")
+	private BigDecimal oldNum;
+	/** 现金额 */
+	@ApiModelProperty("现金额")
+	private BigDecimal newNum;
+	/** 1冻结金额  2可提现金额 3已提现金额 */
+	@ApiModelProperty("1冻结金额  2可提现金额 3已提现金额")
+	private Long type;
+	/** 变化金额 */
+	@ApiModelProperty("变化金额")
+	private BigDecimal diffNum;
+	/** 关联订单编号，提现编号 */
+	@ApiModelProperty("关联订单编号，提现编号")
+	private String relatedSn;
+	/** $column.columnComment */
+	@ApiModelProperty("$column.columnComment")
+	private Integer status;
+	/** 操作人员 */
+	@ApiModelProperty("操作人员")
+	private String operName;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/domain/DistributionCashLog.java

@@ -0,0 +1,53 @@
+package com.zhongzheng.modules.distribution.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+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;
+
+/**
+ * 业务员金额操作日志对象 distribution_cash_log
+ *
+ * @author ruoyi
+ * @date 2023-03-25
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("distribution_cash_log")
+public class DistributionCashLog implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "id")
+    private Long id;
+    /** $column.columnComment */
+    private Long sellerId;
+    /** 老金额 */
+    private BigDecimal oldNum;
+    /** 现金额 */
+    private BigDecimal newNum;
+    /** 1冻结金额  2可提现金额 3已提现金额 */
+    private Long type;
+    /** 变化金额 */
+    private BigDecimal diffNum;
+    /** 关联订单编号，提现编号 */
+    private String relatedSn;
+    /** 创建时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 更新时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+    /** $column.columnComment */
+    private Integer status;
+    /** 备注 */
+    private String remark;
+    /** 操作人员 */
+    private String operName;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/mapper/DistributionCashLogMapper.java

@@ -0,0 +1,20 @@
+package com.zhongzheng.modules.distribution.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.distribution.bo.DistributionCashLogQueryBo;
+import com.zhongzheng.modules.distribution.domain.DistributionCashLog;
+import com.zhongzheng.modules.distribution.vo.DistributionCashLogVo;
+
+import java.util.List;
+
+/**
+ * 业务员金额操作日志Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-03-25
+ */
+public interface DistributionCashLogMapper extends BaseMapper<DistributionCashLog> {
+    List<DistributionCashLogVo> fromOrderCashList(DistributionCashLogQueryBo bo);
+
+}

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

@@ -0,0 +1,54 @@
+package com.zhongzheng.modules.distribution.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.distribution.bo.DistributionCashLogAddBo;
+import com.zhongzheng.modules.distribution.bo.DistributionCashLogEditBo;
+import com.zhongzheng.modules.distribution.bo.DistributionCashLogQueryBo;
+import com.zhongzheng.modules.distribution.domain.DistributionCashLog;
+import com.zhongzheng.modules.distribution.vo.DistributionCashLogVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 业务员金额操作日志Service接口
+ *
+ * @author ruoyi
+ * @date 2023-03-25
+ */
+public interface IDistributionCashLogService extends IService<DistributionCashLog> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	DistributionCashLogVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+	List<DistributionCashLogVo> queryList(DistributionCashLogQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入业务员金额操作日志
+	 * @param bo 业务员金额操作日志新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(DistributionCashLogAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改业务员金额操作日志
+	 * @param bo 业务员金额操作日志编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(DistributionCashLogEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+	List<DistributionCashLogVo> fromOrderCashList(DistributionCashLogQueryBo bo);
+}

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

@@ -0,0 +1,111 @@
+package com.zhongzheng.modules.distribution.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.distribution.bo.DistributionCashLogAddBo;
+import com.zhongzheng.modules.distribution.bo.DistributionCashLogEditBo;
+import com.zhongzheng.modules.distribution.bo.DistributionCashLogQueryBo;
+import com.zhongzheng.modules.distribution.domain.DistributionCashLog;
+import com.zhongzheng.modules.distribution.mapper.DistributionCashLogMapper;
+import com.zhongzheng.modules.distribution.service.IDistributionCashLogService;
+import com.zhongzheng.modules.distribution.vo.DistributionCashLogVo;
+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-03-25
+ */
+@Service
+public class DistributionCashLogServiceImpl extends ServiceImpl<DistributionCashLogMapper, DistributionCashLog> implements IDistributionCashLogService {
+
+    @Override
+    public DistributionCashLogVo queryById(Long id){
+        DistributionCashLog db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, DistributionCashLogVo.class);
+    }
+
+    @Override
+    public List<DistributionCashLogVo> queryList(DistributionCashLogQueryBo bo) {
+        LambdaQueryWrapper<DistributionCashLog> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getSellerId() != null, DistributionCashLog::getSellerId, bo.getSellerId());
+        lqw.eq(bo.getOldNum() != null, DistributionCashLog::getOldNum, bo.getOldNum());
+        lqw.eq(bo.getNewNum() != null, DistributionCashLog::getNewNum, bo.getNewNum());
+        lqw.eq(bo.getType() != null, DistributionCashLog::getType, bo.getType());
+        lqw.eq(bo.getDiffNum() != null, DistributionCashLog::getDiffNum, bo.getDiffNum());
+        lqw.eq(StrUtil.isNotBlank(bo.getRelatedSn()), DistributionCashLog::getRelatedSn, bo.getRelatedSn());
+        lqw.eq(bo.getStatus() != null, DistributionCashLog::getStatus, bo.getStatus());
+        lqw.like(StrUtil.isNotBlank(bo.getOperName()), DistributionCashLog::getOperName, bo.getOperName());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<DistributionCashLogVo> entity2Vo(Collection<DistributionCashLog> collection) {
+        List<DistributionCashLogVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, DistributionCashLogVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<DistributionCashLog> page = (Page<DistributionCashLog>)collection;
+            Page<DistributionCashLogVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(DistributionCashLogAddBo bo) {
+        DistributionCashLog add = BeanUtil.toBean(bo, DistributionCashLog.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(DistributionCashLogEditBo bo) {
+        DistributionCashLog update = BeanUtil.toBean(bo, DistributionCashLog.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(DistributionCashLog entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+
+    @Override
+    public List<DistributionCashLogVo> fromOrderCashList(DistributionCashLogQueryBo bo) {
+        return baseMapper.fromOrderCashList(bo);
+    }
+}

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

@@ -0,0 +1,66 @@
+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-25
+ */
+@Data
+@ApiModel("业务员金额操作日志视图对象")
+public class DistributionCashLogVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long id;
+
+	/** $column.columnComment */
+	@Excel(name = "${comment}" , readConverterExp = "$column.readConverterExp()")
+	@ApiModelProperty("$column.columnComment")
+	private Long sellerId;
+	/** 老金额 */
+	@Excel(name = "老金额")
+	@ApiModelProperty("老金额")
+	private BigDecimal oldNum;
+	/** 现金额 */
+	@Excel(name = "现金额")
+	@ApiModelProperty("现金额")
+	private BigDecimal newNum;
+	/** 1冻结金额  2可提现金额 3已提现金额 */
+	@Excel(name = "1冻结金额  2可提现金额 3已提现金额")
+	@ApiModelProperty("1冻结金额  2可提现金额 3已提现金额")
+	private Long type;
+	/** 变化金额 */
+	@Excel(name = "变化金额")
+	@ApiModelProperty("变化金额")
+	private BigDecimal diffNum;
+	/** 关联订单编号，提现编号 */
+	@Excel(name = "关联订单编号，提现编号")
+	@ApiModelProperty("关联订单编号，提现编号")
+	private String relatedSn;
+	/** $column.columnComment */
+	@Excel(name = "关联订单编号，提现编号")
+	@ApiModelProperty("$column.columnComment")
+	private Integer status;
+	/** 备注 */
+	@Excel(name = "备注")
+	@ApiModelProperty("备注")
+	private String remark;
+	/** 操作人员 */
+	@Excel(name = "操作人员")
+	@ApiModelProperty("操作人员")
+	private String operName;
+	@ApiModelProperty("创建时间")
+	private Long create_time;
+}

zhongzheng-system/src/main/resources/mapper/modules/distribution/DistributionCashLogMapper.xml

@@ -0,0 +1,34 @@
+<?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.distribution.mapper.DistributionCashLogMapper">
+
+    <resultMap type="com.zhongzheng.modules.distribution.domain.DistributionCashLog" id="DistributionCashLogResult">
+        <result property="id" column="id"/>
+        <result property="sellerId" column="seller_id"/>
+        <result property="oldNum" column="old_num"/>
+        <result property="newNum" column="new_num"/>
+        <result property="type" column="type"/>
+        <result property="diffNum" column="diff_num"/>
+        <result property="relatedSn" column="related_sn"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="status" column="status"/>
+        <result property="remark" column="remark"/>
+        <result property="operName" column="oper_name"/>
+    </resultMap>
+
+    <select id="fromOrderCashList" parameterType="com.zhongzheng.modules.distribution.bo.DistributionCashLogQueryBo" resultType="com.zhongzheng.modules.distribution.vo.DistributionCashLogVo">
+        SELECT
+            create_time,
+            diff_num
+        FROM
+            distribution_cash_log
+        WHERE
+            type = 1
+          AND seller_id = #{sellerId}
+        ORDER BY id DESC
+    </select>
+
+</mapper>