fix

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

@@ -0,0 +1,91 @@
+package com.zhongzheng.controller.distribution;
+
+import java.util.List;
+import java.util.Arrays;
+
+import com.zhongzheng.modules.distribution.bo.DistributionSellerAddBo;
+import com.zhongzheng.modules.distribution.bo.DistributionSellerEditBo;
+import com.zhongzheng.modules.distribution.bo.DistributionSellerQueryBo;
+import com.zhongzheng.modules.distribution.service.IDistributionSellerService;
+import com.zhongzheng.modules.distribution.vo.DistributionSellerVo;
+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 hjl
+ * @date 2023-03-13
+ */
+@Api(value = "分销业务员控制器", tags = {"分销业务员管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/distribution/seller")
+public class DistributionSellerController extends BaseController {
+
+    private final IDistributionSellerService iDistributionSellerService;
+
+    /**
+     * 查询分销业务员列表
+     */
+    @ApiOperation("查询分销业务员列表")
+    @PreAuthorize("@ss.hasPermi('system:seller:list')")
+    @GetMapping("/list")
+    public TableDataInfo<DistributionSellerVo> list(DistributionSellerQueryBo bo) {
+        startPage();
+        List<DistributionSellerVo> list = iDistributionSellerService.queryList(bo);
+        return getDataTable(list);
+    }
+
+
+    /**
+     * 获取分销业务员详细信息
+     */
+    @ApiOperation("获取分销业务员详细信息")
+    @PreAuthorize("@ss.hasPermi('system:seller:query')")
+    @GetMapping("/{salerId}")
+    public AjaxResult<DistributionSellerVo> getInfo(@PathVariable("salerId" ) Long salerId) {
+        return AjaxResult.success(iDistributionSellerService.queryById(salerId));
+    }
+
+    /**
+     * 新增分销业务员
+     */
+   /* @ApiOperation("新增分销业务员")
+    @PreAuthorize("@ss.hasPermi('system:seller:add')")
+    @Log(title = "分销业务员", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody DistributionSellerAddBo bo) {
+        return toAjax(iDistributionSellerService.insertByAddBo(bo) ? 1 : 0);
+    }*/
+
+    /**
+     * 修改分销业务员
+     */
+    @ApiOperation("修改分销业务员")
+    @PreAuthorize("@ss.hasPermi('system:seller:edit')")
+    @Log(title = "分销业务员", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public AjaxResult<Void> edit(@RequestBody DistributionSellerEditBo bo) {
+        return toAjax(iDistributionSellerService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+
+}

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

@@ -0,0 +1,41 @@
+package com.zhongzheng.controller.distribution;
+
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.modules.user.bo.*;
+import com.zhongzheng.modules.user.service.IUserService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+ * 客户端用户Controller
+ *
+ * @author hjl
+ * @date 2021-06-08
+ */
+@Api(value = "短信控制器", tags = {"登录控制器"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/app/common/seller")
+public class SellerLoginController extends BaseController {
+
+    private final IUserService iUserService;
+
+    /**
+     * 用户注册
+     */
+    @ApiOperation("用户注册")
+    @PostMapping("/register")
+    public AjaxResult<Void> register(@RequestBody UserAppRegisterBo bo) {
+        return toAjax(iUserService.registerUser(bo) ? 1 : 0);
+    }
+
+}

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

@@ -0,0 +1,57 @@
+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;
+
+
+
+/**
+ * 分销业务员添加对象 distribution_seller
+ *
+ * @author hjl
+ * @date 2023-03-13
+ */
+@Data
+@ApiModel("分销业务员添加对象")
+public class DistributionSellerAddBo {
+
+    /** 真实姓名 */
+    @ApiModelProperty("真实姓名")
+    private String realname;
+    /** 身份证号 */
+    @ApiModelProperty("身份证号")
+    private String idCard;
+    /** 手机号码 */
+    @ApiModelProperty("手机号码")
+    private String telphone;
+    /** 1有效 0禁用 */
+    @ApiModelProperty("1有效 0禁用")
+    private Integer status;
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    private Long createTime;
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+    /** 头像 */
+    @ApiModelProperty("头像")
+    private String avatar;
+    /** 关联用户ID */
+    @ApiModelProperty("关联用户ID")
+    private Long userId;
+    /** 业务员编号 */
+    @ApiModelProperty("业务员编号")
+    private String code;
+    /** 公众号openid */
+    @ApiModelProperty("公众号openid")
+    private String gzhOpenId;
+    /** 微信unionId */
+    @ApiModelProperty("微信unionId")
+    private String unionId;
+    /** 密码 */
+    @ApiModelProperty("密码")
+    private String password;
+}

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

@@ -0,0 +1,69 @@
+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;
+
+
+/**
+ * 分销业务员编辑对象 distribution_seller
+ *
+ * @author hjl
+ * @date 2023-03-13
+ */
+@Data
+@ApiModel("分销业务员编辑对象")
+public class DistributionSellerEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long salerId;
+
+    /** 真实姓名 */
+    @ApiModelProperty("真实姓名")
+    private String realname;
+
+    /** 身份证号 */
+    @ApiModelProperty("身份证号")
+    private String idCard;
+
+    /** 手机号码 */
+    @ApiModelProperty("手机号码")
+    private String telphone;
+
+    /** 1有效 0禁用 */
+    @ApiModelProperty("1有效 0禁用")
+    private Integer status;
+
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+
+
+    /** 头像 */
+    @ApiModelProperty("头像")
+    private String avatar;
+
+    /** 关联用户ID */
+    @ApiModelProperty("关联用户ID")
+    private Long userId;
+
+    /** 业务员编号 */
+    @ApiModelProperty("业务员编号")
+    private String code;
+
+    /** 公众号openid */
+    @ApiModelProperty("公众号openid")
+    private String gzhOpenId;
+
+    /** 微信unionId */
+    @ApiModelProperty("微信unionId")
+    private String unionId;
+
+    /** 密码 */
+    @ApiModelProperty("密码")
+    private String password;
+
+}

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

@@ -0,0 +1,69 @@
+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 com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 分销业务员分页查询对象 distribution_seller
+ *
+ * @author hjl
+ * @date 2023-03-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("分销业务员分页查询对象")
+public class DistributionSellerQueryBo 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 realname;
+	/** 身份证号 */
+	@ApiModelProperty("身份证号")
+	private String idCard;
+	/** 手机号码 */
+	@ApiModelProperty("手机号码")
+	private String telphone;
+	/** 1有效 0禁用 */
+	@ApiModelProperty("1有效 0禁用")
+	private Integer status;
+	/** 头像 */
+	@ApiModelProperty("头像")
+	private String avatar;
+	/** 关联用户ID */
+	@ApiModelProperty("关联用户ID")
+	private Long userId;
+	/** 业务员编号 */
+	@ApiModelProperty("业务员编号")
+	private String code;
+	/** 公众号openid */
+	@ApiModelProperty("公众号openid")
+	private String gzhOpenId;
+	/** 微信unionId */
+	@ApiModelProperty("微信unionId")
+	private String unionId;
+	/** 密码 */
+	@ApiModelProperty("密码")
+	private String password;
+}

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

@@ -0,0 +1,55 @@
+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_seller
+ *
+ * @author hjl
+ * @date 2023-03-13
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("distribution_seller")
+public class DistributionSeller implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "saler_id")
+    private Long salerId;
+    /** 真实姓名 */
+    private String realname;
+    /** 身份证号 */
+    private String idCard;
+    /** 手机号码 */
+    private String telphone;
+    /** 1有效 0禁用 */
+    private Integer status;
+    /** 创建时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 更新时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+    /** 头像 */
+    private String avatar;
+    /** 关联用户ID */
+    private Long userId;
+    /** 业务员编号 */
+    private String code;
+    /** 公众号openid */
+    private String gzhOpenId;
+    /** 微信unionId */
+    private String unionId;
+    /** 密码 */
+    private String password;
+}

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

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.distribution.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.distribution.domain.DistributionSeller;
+
+/**
+ * 分销业务员Mapper接口
+ *
+ * @author hjl
+ * @date 2023-03-13
+ */
+public interface DistributionSellerMapper extends BaseMapper<DistributionSeller> {
+
+}

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

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.distribution.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.distribution.bo.DistributionSellerAddBo;
+import com.zhongzheng.modules.distribution.bo.DistributionSellerEditBo;
+import com.zhongzheng.modules.distribution.bo.DistributionSellerQueryBo;
+import com.zhongzheng.modules.distribution.domain.DistributionSeller;
+import com.zhongzheng.modules.distribution.vo.DistributionSellerVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 分销业务员Service接口
+ *
+ * @author hjl
+ * @date 2023-03-13
+ */
+public interface IDistributionSellerService extends IService<DistributionSeller> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	DistributionSellerVo queryById(Long salerId);
+
+	/**
+	 * 查询列表
+	 */
+	List<DistributionSellerVo> queryList(DistributionSellerQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入分销业务员
+	 * @param bo 分销业务员新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(DistributionSellerAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改分销业务员
+	 * @param bo 分销业务员编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(DistributionSellerEditBo 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/DistributionSellerServiceImpl.java

@@ -0,0 +1,108 @@
+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.DistributionSellerAddBo;
+import com.zhongzheng.modules.distribution.bo.DistributionSellerEditBo;
+import com.zhongzheng.modules.distribution.bo.DistributionSellerQueryBo;
+import com.zhongzheng.modules.distribution.domain.DistributionSeller;
+import com.zhongzheng.modules.distribution.mapper.DistributionSellerMapper;
+import com.zhongzheng.modules.distribution.service.IDistributionSellerService;
+import com.zhongzheng.modules.distribution.vo.DistributionSellerVo;
+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 hjl
+ * @date 2023-03-13
+ */
+@Service
+public class DistributionSellerServiceImpl extends ServiceImpl<DistributionSellerMapper, DistributionSeller> implements IDistributionSellerService {
+
+    @Override
+    public DistributionSellerVo queryById(Long salerId){
+        DistributionSeller db = this.baseMapper.selectById(salerId);
+        return BeanUtil.toBean(db, DistributionSellerVo.class);
+    }
+
+    @Override
+    public List<DistributionSellerVo> queryList(DistributionSellerQueryBo bo) {
+        LambdaQueryWrapper<DistributionSeller> lqw = Wrappers.lambdaQuery();
+        lqw.like(StrUtil.isNotBlank(bo.getRealname()), DistributionSeller::getRealname, bo.getRealname());
+        lqw.eq(StrUtil.isNotBlank(bo.getIdCard()), DistributionSeller::getIdCard, bo.getIdCard());
+        lqw.eq(StrUtil.isNotBlank(bo.getTelphone()), DistributionSeller::getTelphone, bo.getTelphone());
+        lqw.eq(bo.getStatus() != null, DistributionSeller::getStatus, bo.getStatus());
+        lqw.eq(StrUtil.isNotBlank(bo.getAvatar()), DistributionSeller::getAvatar, bo.getAvatar());
+        lqw.eq(bo.getUserId() != null, DistributionSeller::getUserId, bo.getUserId());
+        lqw.eq(StrUtil.isNotBlank(bo.getCode()), DistributionSeller::getCode, bo.getCode());
+        lqw.eq(StrUtil.isNotBlank(bo.getGzhOpenId()), DistributionSeller::getGzhOpenId, bo.getGzhOpenId());
+        lqw.eq(StrUtil.isNotBlank(bo.getUnionId()), DistributionSeller::getUnionId, bo.getUnionId());
+        lqw.eq(StrUtil.isNotBlank(bo.getPassword()), DistributionSeller::getPassword, bo.getPassword());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<DistributionSellerVo> entity2Vo(Collection<DistributionSeller> collection) {
+        List<DistributionSellerVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, DistributionSellerVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<DistributionSeller> page = (Page<DistributionSeller>)collection;
+            Page<DistributionSellerVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(DistributionSellerAddBo bo) {
+        DistributionSeller add = BeanUtil.toBean(bo, DistributionSeller.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(DistributionSellerEditBo bo) {
+        DistributionSeller update = BeanUtil.toBean(bo, DistributionSeller.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(DistributionSeller 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/DistributionSellerVo.java

@@ -0,0 +1,67 @@
+package com.zhongzheng.modules.distribution.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 分销业务员视图对象 mall_package
+ *
+ * @author hjl
+ * @date 2023-03-13
+ */
+@Data
+@ApiModel("分销业务员视图对象")
+public class DistributionSellerVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long salerId;
+
+	/** 真实姓名 */
+	@Excel(name = "真实姓名")
+	@ApiModelProperty("真实姓名")
+	private String realname;
+	/** 身份证号 */
+	@Excel(name = "身份证号")
+	@ApiModelProperty("身份证号")
+	private String idCard;
+	/** 手机号码 */
+	@Excel(name = "手机号码")
+	@ApiModelProperty("手机号码")
+	private String telphone;
+	/** 1有效 0禁用 */
+	@Excel(name = "1有效 0禁用")
+	@ApiModelProperty("1有效 0禁用")
+	private Integer status;
+	/** 头像 */
+	@Excel(name = "头像")
+	@ApiModelProperty("头像")
+	private String avatar;
+	/** 关联用户ID */
+	@Excel(name = "关联用户ID")
+	@ApiModelProperty("关联用户ID")
+	private Long userId;
+	/** 业务员编号 */
+	@Excel(name = "业务员编号")
+	@ApiModelProperty("业务员编号")
+	private String code;
+	/** 公众号openid */
+	@Excel(name = "公众号openid")
+	@ApiModelProperty("公众号openid")
+	private String gzhOpenId;
+	/** 微信unionId */
+	@Excel(name = "微信unionId")
+	@ApiModelProperty("微信unionId")
+	private String unionId;
+	/** 密码 */
+	@Excel(name = "密码")
+	@ApiModelProperty("密码")
+	private String password;
+}

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

@@ -0,0 +1,24 @@
+<?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.system.mapper.DistributionSellerMapper">
+
+    <resultMap type="com.zhongzheng.modules.distribution.domain.DistributionSeller" id="DistributionSellerResult">
+        <result property="salerId" column="saler_id"/>
+        <result property="realname" column="realname"/>
+        <result property="idCard" column="id_card"/>
+        <result property="telphone" column="telphone"/>
+        <result property="status" column="status"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="avatar" column="avatar"/>
+        <result property="userId" column="user_id"/>
+        <result property="code" column="code"/>
+        <result property="gzhOpenId" column="gzh_open_id"/>
+        <result property="unionId" column="union_id"/>
+        <result property="password" column="password"/>
+    </resultMap>
+
+
+</mapper>