8.17 完善二级市场收购商认证相关

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

@@ -16,9 +16,9 @@ public enum UserType {
      */
     USER_TYPE_PEOPLE(1,"普通边民"),
     USER_TYPE_GROUP_LEADER(2,"互市区边民组组长"),
-    USER_TYPE_ENTERPRISE(3,"互市区商家"),
+    USER_TYPE_PURCHASER(3,"国内收购商"),
     USER_TYPE_DRIVER(4,"司机"),
-    USER_TYPE_PURCHASER(5,"国内收购商");
+    USER_TYPE_ENTERPRISE(5,"互市区商家");
 
     private Integer code;
 

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

@@ -38,6 +38,8 @@ public class MethodPurchaserService {
         //开始保存收购商信息
         //注册/认证时间
         TbPurchaser tbPurchaser = new TbPurchaser();
+        //设置名称
+        tbPurchaser.setName(purchaser.getName());
         //审核状态
         tbPurchaser.setJudgeStatus(JudgeStatus.JUDGE_STATUS_ZERO.getCode()); // 待审核
         //默认未被锁
@@ -46,6 +48,8 @@ public class MethodPurchaserService {
         tbPurchaser.setRegisterTime(new Date());
         //创建时间
         tbPurchaser.setCreateTime(new Date());
+        //创建人
+        tbPurchaser.setCreateBy(String.valueOf(purchaser.getLoginUserId()));
         //删除状态:启用
         tbPurchaser.setDeleteStatus(DeleteStatus.DELETE_STATUS_ON.getCode());
         //地址
@@ -79,6 +83,8 @@ public class MethodPurchaserService {
         tbPurchaser.setBankAccount(purchaser.getBankAccount());
         //银行名称
         tbPurchaser.setBankName(purchaser.getBankName());
+        //审核状态,默认待审核
+        tbPurchaser.setJudgeStatus(JudgeStatus.JUDGE_STATUS_ZERO.getCode());
         return tbPurchaser;
     }
 

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

@@ -32,7 +32,7 @@ public class TbPurchaserAppController {
 		return AjaxJson.getSuccessData(t);
 	}
 
-	/** 改个人信息 */
+	/** 修改认证信息 */
 	@RequestMapping("update")
 	public AjaxJson update(TbPurchaser t){
 		tbPurchaserService.update(t);
@@ -48,6 +48,12 @@ public class TbPurchaserAppController {
 		return AjaxJson.getSuccess("收购商认证信息已提交,管理员审核中,请耐心等待!");
 	}
 
+	/** 收购商认证状态查询 */
+	@RequestMapping("auditStatus")
+	public AjaxJson auditStatus(Long appUserId) {
+		return AjaxJson.getSuccessData(tbPurchaserService.auditStatus(appUserId));
+	}
+
 	/*------            正常业务👆👆    rpc远程调用👇👇                         -----------*/
 
 	/**

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

@@ -20,10 +20,7 @@ import com.pj.api.dto.MessageDto;
 import com.pj.api.dto.PurchaserDto;
 import com.pj.common.core.exception.ServiceException;
 import com.pj.current.satoken.StpUserUtil;
-import com.pj.enummj.DeleteStatus;
-import com.pj.enummj.IsLock;
-import com.pj.enummj.JudgeStatus;
-import com.pj.enummj.People;
+import com.pj.enummj.*;
 import com.pj.tb_purchaser.param.PurchaserParam;
 import com.pj.utils.so.SoMap;
 import org.apache.commons.lang3.StringUtils;
@@ -88,6 +85,13 @@ public class TbPurchaserService extends ServiceImpl<TbPurchaserMapper, TbPurchas
 	/** 收购商认证 */
 	boolean identification(PurchaserParam purchaser) throws ParseException {
 		if(null == purchaser) return false;
+		//验证之前是否有被拒的
+		List<TbPurchaser> tbPurchasers = tbPurchaserMapper.selectList(new LambdaQueryWrapper<TbPurchaser>().eq(TbPurchaser::getCreateBy, purchaser.getLoginUserId()));
+		if(tbPurchasers.size() > 0){
+			tbPurchasers.forEach(item -> {
+				tbPurchaserMapper.deleteById(item.getId());
+			});
+		}
 		//身份证号去重
 		String idCard = purchaser.getCorporateIdCard();
 		if(tbPurchaserMapper.selectList(new LambdaQueryWrapper<TbPurchaser>().eq(TbPurchaser::getIdCard,idCard).eq(TbPurchaser::getDeleteStatus,DeleteStatus.DELETE_STATUS_ON.getCode())).size() != 0)
@@ -115,26 +119,56 @@ public class TbPurchaserService extends ServiceImpl<TbPurchaserMapper, TbPurchas
 	public boolean audit(Long purchaserId,Boolean flag,String reason){
 		//审核不通过
 		if(!flag){
+			TbPurchaser selectById = tbPurchaserMapper.selectById(purchaserId);
+			if(selectById == null)throw new ServiceException("商户信息异常!");
+			selectById.setJudgeStatus(JudgeStatus.JUDGE_STATUS_THREE.getCode());
+			selectById.setJudgeContent(reason);
+			tbPurchaserMapper.updateById(selectById);
 			//发送通知给收购商
 			MessageDto dto = new MessageDto();
 			dto.setUrl("/pages/market/one/merchant/order/list");
 			dto.setUserId(purchaserId);
 			dto.setContents("您发起的收购商认证审核不通过,原因是: " + reason);
 			adminInterface.messageSave(dto);
+			return true;
 		}
 		//审核通过
 		TbPurchaser tbPurchaser = tbPurchaserMapper.selectById(purchaserId);
 		if(tbPurchaser == null)throw new ServiceException("收购商信息异常。");
 		//审核同构且完成数据插入则进行关联
-		AppUserDto appUser = adminInterface.getByPhoneAndUserType(tbPurchaser.getContact(), 3);
+		AppUserDto appUser = adminInterface.getByPhoneAndUserType(tbPurchaser.getContact(), UserType.USER_TYPE_PURCHASER.getCode());
+		if(appUser == null)throw new ServiceException("审核的用户的信息异常!");
+		if(appUser.getAuth().equals("1") || appUser.getFkId() != null)
+			throw new ServiceException("该用户认证信息异常。");
+		//设置审核人和审核时间
+		tbPurchaser.setJudgeTime(new Date());
+		tbPurchaser.setPersonId(StpUserUtil.getLoginIdAsString());
+		tbPurchaser.setJudgeStatus(JudgeStatus.JUDGE_STATUS_ONE.getCode());
+		tbPurchaserMapper.updateById(tbPurchaser);
 		//设置关联属性
 		appUser.setFkId(String.valueOf(tbPurchaser.getId()));
 		appUser.setAuth(1 + "");  // 1=审核通过
 		//保存
 		Boolean aBoolean = adminInterface.saveAppUserInfo(appUser);
+		//发送message
+		if(aBoolean){
+			//发送通知给收购商
+			MessageDto dto = new MessageDto();
+			dto.setUrl("/pages/market/one/merchant/order/list");
+			dto.setUserId(appUser.getId());
+			dto.setContents("恭喜商户信息认证成功!");
+			adminInterface.messageSave(dto);
+		}
 		return aBoolean;
 	}
 
+	/** 获取审核状态 */
+	public TbPurchaser auditStatus(Long appUserId){
+		List<TbPurchaser> purchaserList = tbPurchaserMapper.selectList(new LambdaQueryWrapper<TbPurchaser>().eq(TbPurchaser::getCreateBy, appUserId).orderByDesc(TbPurchaser::getCreateTime));
+		if(purchaserList.size() == 0)return null;
+		return purchaserList.get(0);
+	}
+
 	/** 是否锁住收购商 */
 	public int isLock(TbPurchaserDto purchaserDto) {
 		// 获取当前登录用户id