收购商管理-审核与启停

sp-core/sp-base/src/main/java/com/pj/enummj/People.java

@@ -12,7 +12,8 @@ import lombok.Getter;
 public enum People {
 
     PEOPLE_TYPE_ONE(1,"边民类型"),
-    PEOPLE_TYPE_TWO(2,"商户类型");
+    PEOPLE_TYPE_TWO(2,"商户类型"),
+    PEOPLE_TYPE_Three(3,"收购商类型");
 
 
 

sp-service/level-two-server/src/main/java/com/pj/tb_purchaser/TbPurchaser.java

@@ -15,7 +15,7 @@ import lombok.experimental.Accessors;
 
 /**
  * Model: tb_purchaser -- 收购商
- * @author qzy 
+ * @author qzy
  */
 @Data
 @Accessors(chain = true)
@@ -25,15 +25,15 @@ public class TbPurchaser extends Model<TbPurchaser> implements Serializable {
 
 	// ---------- 模块常量 ----------
 	/**
-	 * 序列化版本id 
+	 * 序列化版本id
 	 */
-	private static final long serialVersionUID = 1L;	
+	private static final long serialVersionUID = 1L;
 	/**
-	 * 此模块对应的表名 
+	 * 此模块对应的表名
 	 */
-	public static final String TABLE_NAME = "tb_purchaser";	
+	public static final String TABLE_NAME = "tb_purchaser";
 	/**
-	 * 此模块对应的权限码 
+	 * 此模块对应的权限码
 	 */
 	public static final String PERMISSION_CODE = "tb-purchaser";
 	public static final String PERMISSION_CODE_ADD = "tb-purchaser-add";
@@ -45,160 +45,160 @@ public class TbPurchaser extends Model<TbPurchaser> implements Serializable {
 
 	// ---------- 表中字段 ----------
 	/**
-	 * 主键 
+	 * 主键
 	 */
 	@Excel(name = "id")
 	@TableId(type = IdType.AUTO)
 	@JsonSerialize(using = ToStringSerializer.class)
-	private Long id;	
+	private Long id;
 
 	/**
-	 * 名称 
+	 * 名称
 	 */
 	@Excel(name = "名称")
 	private String name;
 
 	/**
-	 * 法人 
+	 * 法人
 	 */
 	@Excel(name = "法人")
-	private String legalPerson;	
+	private String legalPerson;
 
 	/**
-	 * 身份证号 
+	 * 身份证号
 	 */
 	@Excel(name = "身份证号码")
-	private String idCard;	
+	private String idCard;
 
 	/**
-	 * 手机号码 
+	 * 手机号码
 	 */
 	@Excel(name = "手机号码")
-	private String contact;	
+	private String contact;
 
 	/**
-	 * 营业执照 
+	 * 营业执照
 	 */
 	@Excel(name = "营业执照")
-	private String businessLicense;	
+	private String businessLicense;
 
 	/**
-	 * 银行编号 
+	 * 银行编号
 	 */
 	@Excel(name = "银行编号")
-	private String bankNo;	
+	private String bankNo;
 
 	/**
-	 * 银行名称 
+	 * 银行名称
 	 */
 	@Excel(name = "银行名称")
-	private String bankName;	
+	private String bankName;
 
 	/**
-	 * 银行账号 
+	 * 银行账号
 	 */
 	@Excel(name = "银行账号")
-	private String bankAccount;	
+	private String bankAccount;
 
 	/**
-	 * 税号 
+	 * 税号
 	 */
 	@Excel(name = "税号")
-	private String dutyParagraph;	
+	private String dutyParagraph;
 
 	/**
-	 * 地址编号 
+	 * 地址编号
 	 */
 	@Excel(name = "地址编号")
-	private String addressIds;	
+	private String addressIds;
 
 	/**
-	 * 地址 
+	 * 地址
 	 */
 	@Excel(name = "地址")
-	private String address;	
+	private String address;
 
 	/**
-	 * 审核状态(0=未通过,1=已通过) 
+	 * 审核状态(0=未通过,1=已通过)
 	 */
 	@Excel(name = "审核状态")
 	private Integer judgeStatus;
 
 	/**
-	 * 审核意见 
+	 * 审核意见
 	 */
 	@Excel(name = "审核意见")
-	private String judgeContent;	
+	private String judgeContent;
 
 	/**
-	 * 上次审核时间 
+	 * 上次审核时间
 	 */
 	@Excel(name = "上次审核时间")
 	@JsonFormat(pattern = "yyyy-MM-dd")
-	private Date judgeTime;	
+	private Date judgeTime;
 
 	/**
-	 * 注册时间 
+	 * 注册时间
 	 */
 	@Excel(name = "注册时间")
 	@JsonFormat(pattern = "yyyy-MM-dd")
-	private Date registerTime;	
+	private Date registerTime;
 
 	/**
-	 * 人脸编号 
+	 * 人脸编号
 	 */
 	@Excel(name = "人脸编号")
-	private String personId;	
+	private String personId;
 
 	/**
-	 * 创建时间 
+	 * 创建时间
 	 */
 	@Excel(name = "创建时间")
 	@JsonFormat(pattern = "yyyy-MM-dd")
 	private Date createTime;
 
 	/**
-	 * 创建人编号 
+	 * 创建人编号
 	 */
 	@Excel(name = "创建人编号")
-	private String createBy;	
+	private String createBy;
 
 	/**
-	 * 创建人名称 
+	 * 创建人名称
 	 */
 	@Excel(name = "创建人名称")
-	private String createName;	
+	private String createName;
 
 	/**
-	 * 更新时间 
+	 * 更新时间
 	 */
 	@Excel(name = "更新时间")
 	@JsonFormat(pattern = "yyyy-MM-dd")
 	private Date updateTime;
 
 	/**
-	 * 更新人编号 
+	 * 更新人编号
 	 */
 	@Excel(name = "更信人编号")
-	private String updateBy;	
+	private String updateBy;
 
 	/**
-	 * 更新人名称 
+	 * 更新人名称
 	 */
 	@Excel(name = "更新人名称")
-	private String updateName;	
+	private String updateName;
 
 	/**
-	 * 删除状态(0=禁用,1=启用) 
+	 * 删除状态(0=禁用,1=启用)
 	 */
 	@Excel(name = "删除状态")
-	private Integer deleteStatus;	
+	private Integer deleteStatus;
 
 
-
-
-
-	
+	/**
+	 * 是否锁定
+	 */
+	private Integer isLock;
 
 
 }

sp-service/level-two-server/src/main/java/com/pj/tb_purchaser/TbPurchaserController.java

@@ -19,7 +19,7 @@ import javax.servlet.http.HttpServletResponse;
 
 /**
  * Controller: tb_purchaser -- 收购商
- * @author qzy 
+ * @author qzy
  */
 @RestController
 @RequestMapping("/TbPurchaser/")
@@ -29,7 +29,7 @@ public class TbPurchaserController {
 	@Autowired
 	TbPurchaserService tbPurchaserService;
 
-	/** 增 */  
+	/** 增 */
 	@RequestMapping("add")
 	@SaCheckPermission(TbPurchaser.PERMISSION_CODE_ADD)
 	public AjaxJson add(TbPurchaser t){
@@ -38,24 +38,24 @@ public class TbPurchaserController {
 		return AjaxJson.getSuccessData(t);
 	}
 
-	/** 删 */  
+	/** 删 */
 	@RequestMapping("delete")
 	@SaCheckPermission(TbPurchaser.PERMISSION_CODE_DEL)
 	public AjaxJson delete(Long id){
 		 tbPurchaserService.delete(id);
 		return AjaxJson.getSuccess();
 	}
-	
-	/** 删 - 根据id列表 */  
+
+	/** 删 - 根据id列表 */
 	@RequestMapping("deleteByIds")
 	@SaCheckPermission(TbPurchaser.PERMISSION_CODE_DEL)
 	public AjaxJson deleteByIds(){
-		List<Long> ids = SoMap.getRequestSoMap().getListByComma("ids", long.class); 
+		List<Long> ids = SoMap.getRequestSoMap().getListByComma("ids", long.class);
 		int line = SP.publicMapper.deleteByIds(TbPurchaser.TABLE_NAME, ids);
 		return AjaxJson.getByLine(line);
 	}
-	
-	/** 改 */  
+
+	/** 改 */
 	@RequestMapping("update")
 	@SaCheckPermission(TbPurchaser.PERMISSION_CODE_EDIT)
 	public AjaxJson update(TbPurchaser t){
@@ -63,7 +63,7 @@ public class TbPurchaserController {
 		return AjaxJson.getSuccess();
 	}
 
-	/** 查 - 根据id */  
+	/** 查 - 根据id */
 	@RequestMapping("getById")
 		@SaCheckPermission(TbPurchaser.PERMISSION_CODE)
 	public AjaxJson getById(Long id){
@@ -71,18 +71,18 @@ public class TbPurchaserController {
 		return AjaxJson.getSuccessData(t);
 	}
 
-	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */  
+	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */
 	@RequestMapping("getList")
 		@SaCheckPermission(TbPurchaser.PERMISSION_CODE)
-	public AjaxJson getList() { 
+	public AjaxJson getList() {
 		SoMap so = SoMap.getRequestSoMap();
 		List<TbPurchaser> list = tbPurchaserService.getList(so.startPage());
 		return AjaxJson.getPageData(so.getDataCount(), list);
 	}
-	
-	
-	
-	/** 改 - 删除状态(0=禁用,1=启用) */  
+
+
+
+	/** 改 - 删除状态(0=禁用,1=启用) */
 	@RequestMapping("updateDeleteStatus")
 	@SaCheckPermission(TbPurchaser.PERMISSION_CODE_EDIT)
 	public AjaxJson updateDeleteStatus(Long id, Integer value){
@@ -130,8 +130,22 @@ public class TbPurchaserController {
 	}
 
 
+	/** 收购商审核 */
+	@RequestMapping("audit")
+	@SaCheckPermission(TbPurchaser.PERMISSION_CODE_EDIT)
+	public AjaxJson audit(@RequestBody TbPurchaserDto purchaserDto){
 
+		int line = tbPurchaserService.audit(purchaserDto);
+		return AjaxJson.getByLine(line);
+	}
 
+	/** 是否锁住收购商 */
+	@RequestMapping("isLock")
+	@SaCheckPermission(TbPurchaser.PERMISSION_CODE_EDIT)
+	public AjaxJson isLock(@RequestBody TbPurchaserDto purchaserDto){
 
+		int line = tbPurchaserService.isLock(purchaserDto);
+		return AjaxJson.getByLine(line);
+	}
 
 }

sp-service/level-two-server/src/main/java/com/pj/tb_purchaser/TbPurchaserDto.java

@@ -0,0 +1,99 @@
+package com.pj.tb_purchaser;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class TbPurchaserDto {
+
+	// ---------- 表中字段 ----------
+	/**
+	 * 主键
+	 */
+	private Long id;
+
+	/**
+	 * 名称
+	 */
+	private String name;
+
+	/**
+	 * 法人
+	 */
+	private String legalPerson;
+
+	/**
+	 * 身份证号
+	 */
+	private String idCard;
+
+	/**
+	 * 手机号码
+	 */
+	private String contact;
+
+	/**
+	 * 营业执照
+	 */
+	private String businessLicense;
+
+	/**
+	 * 银行编号
+	 */
+	private String bankNo;
+
+	/**
+	 * 银行名称
+	 */
+	private String bankName;
+
+	/**
+	 * 银行账号
+	 */
+	private String bankAccount;
+
+	/**
+	 * 税号
+	 */
+	private String dutyParagraph;
+
+	/**
+	 * 地址编号
+	 */
+	private String addressIds;
+
+	/**
+	 * 地址
+	 */
+	private String address;
+
+	/**
+	 * 审核状态(0=未通过,1=已通过)
+	 */
+	private Integer judgeStatus;
+
+	/**
+	 * 审核意见
+	 */
+	private String judgeContent;
+
+	/**
+	 * 人脸编号
+	 */
+	private String personId;
+
+	/**
+	 * 是否锁定
+	 */
+	private Integer isLock;
+
+
+
+}

sp-service/level-two-server/src/main/java/com/pj/tb_purchaser/TbPurchaserService.java

@@ -6,13 +6,18 @@ import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.pj.api.client.admin.AdminInterface;
+import com.pj.current.satoken.StpUserUtil;
+import com.pj.enummj.People;
 import com.pj.utils.so.SoMap;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.hssf.usermodel.HSSFRow;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -35,6 +40,9 @@ public class TbPurchaserService extends ServiceImpl<TbPurchaserMapper, TbPurchas
 	TbPurchaserMapper tbPurchaserMapper;
 
 	@Autowired
+	AdminInterface adminInterface;
+
+	@Autowired
 	private MethodPurchaserService methodPurchaserService;
 
 	/** 增 */
@@ -91,6 +99,51 @@ public class TbPurchaserService extends ServiceImpl<TbPurchaserMapper, TbPurchas
 		return insert == 1;
 	}
 
+	/** 收购商审核 */
+	public int audit(TbPurchaserDto purchaserDto){
+
+		// 获取当前登录用户id
+		Long loginId = StpUserUtil.getLoginIdAsLong();
+
+		// 根据id获取收购商
+		TbPurchaser purchaser = tbPurchaserMapper.selectById(purchaserDto.getId());
+		// 如果收购商不存在则抛出异常
+		if(Objects.isNull(purchaser)){
+			throw new RuntimeException("该收购商不存在");
+		}
+		BeanUtils.copyProperties(purchaserDto,purchaser);
+		// 写入更新者id
+		purchaser.setUpdateBy(String.valueOf(loginId));
+		// 更新收购商审核状态
+		int line = tbPurchaserMapper.updateById(purchaser);
+		return line;
+	}
+
+	/** 是否锁住收购商 */
+	public int isLock(TbPurchaserDto purchaserDto) {
+		// 获取当前登录用户id
+		Long loginId = StpUserUtil.getLoginIdAsLong();
+
+		// 根据id获取收购商
+		TbPurchaser purchaser = tbPurchaserMapper.selectById(purchaserDto.getId());
+		// 如果收购商不存在则抛出异常
+		if(Objects.isNull(purchaser)){
+			throw new RuntimeException("该收购商不存在");
+		}
+		BeanUtils.copyProperties(purchaserDto,purchaser);
+		// 写入更新者id
+		purchaser.setUpdateBy(String.valueOf(loginId));
+		// 更新收购商锁定状态
+		int  line = tbPurchaserMapper.updateById(purchaser);
+		//获取收购商锁定状态
+		int isLock = purchaser.getIsLock();
+		// 如果收购商被锁住则禁止app端登录
+		// TODO
+		adminInterface.isLock(String.valueOf(purchaser.getId()), People.PEOPLE_TYPE_Three.getCode(),isLock);
+
+		return line;
+	}
+
 	/**
 	 * 导入
 	 * @param file excel文件