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

sp-core/sp-api/src/main/java/com/pj/api/client/admin/AdminInterface.java

@@ -26,6 +26,18 @@ import java.util.List;
 public interface AdminInterface {
 
     /**
+     * 收购商认证 步骤2
+     */
+    @RequestMapping("/AppUser/rpc/saveAppUserInfo")
+    public Boolean saveAppUserInfo(@RequestBody AppUserDto appUser);
+
+    /**
+     * 收购商认证 步骤1
+     */
+    @RequestMapping("app/AppUser/rpc/getByPhoneAndUserType")
+    public AppUserDto getByPhoneAndUserType(@RequestParam("phone") String phone,@RequestParam("userType")Integer userType);
+
+    /**
      * 启/停边民的app账号登陆限制
      */
     @RequestMapping("/AppUser/rpc/isLock")

sp-core/sp-api/src/main/java/com/pj/api/client/admin/AdminInterfaceFallback.java

@@ -33,6 +33,18 @@ public class AdminInterfaceFallback implements FallbackFactory<AdminInterface> {
         // 返回熔断后的对象
         return new AdminInterface() {
 
+            @Override
+            public Boolean saveAppUserInfo(AppUserDto appUser) {
+                log.error("错误对象信息:{},保护操作:{}", appUser, "熔断");
+                return null;
+            }
+
+            @Override
+            public AppUserDto getByPhoneAndUserType(String phone, Integer userType) {
+                log.error("错误的手机号码:{},边民类型:{},保护操作:{}", phone, userType, "熔断");
+                return null;
+            }
+
             //启/停边民的app账号登陆限制
             @Override
             public int isLock(String id, Integer type, Integer status) {

sp-core/sp-api/src/main/java/com/pj/api/client/level_two_server/LevelTwoServerInterface.java

@@ -18,14 +18,6 @@ import org.springframework.web.bind.annotation.RequestParam;
         fallbackFactory = LevelTwoServerInterfaceFallback.class	// 服务降级
 )
 public interface LevelTwoServerInterface {
-    /**
-     * 根据手机号和身份证查询收购商
-     * @param phone 手机号
-     * @param idCard 身份证
-     * @return
-     */
-    @RequestMapping("rpc/getByPhoneAndIdCard")
-    public PurchaserDto getByPhoneAndIdCard(@RequestParam("phone") String phone,@RequestParam("idCard")String idCard);
 
     @RequestMapping("/app/TbPurchaser/rpc/getByPurchaserId")
     public PurchaserDto getByPurchaserId(@RequestParam("id") Long id);

sp-core/sp-api/src/main/java/com/pj/api/client/level_two_server/LevelTwoServerInterfaceFallback.java

@@ -20,12 +20,6 @@ public class LevelTwoServerInterfaceFallback implements FallbackFactory<LevelTwo
     public LevelTwoServerInterface create(Throwable throwable) {
         return new LevelTwoServerInterface() {
             @Override
-            public PurchaserDto getByPhoneAndIdCard(String phone, String idCard) {
-                log.error("错误的手机号:{},身份证:{},降级类型:{}", phone, idCard, "熔断");
-                return null;
-            }
-
-            @Override
             public PurchaserDto getByPurchaserId(Long id) {
                 System.out.println(throwable.getMessage());
                 log.error("国内商家信息查询错误:{},错误信息是{}",id,throwable.getMessage());

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

@@ -4,6 +4,8 @@ import com.pj.api.dto.PurchaserDto;
 import com.pj.tb_purchaser.param.PurchaserParam;
 import com.pj.utils.sg.AjaxJson;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
@@ -39,7 +41,7 @@ public class TbPurchaserAppController {
 
 	/** 收购商认证 */
 	@RequestMapping("identification")
-	public AjaxJson identification(PurchaserParam purchaser) throws ParseException {
+	public AjaxJson identification(@RequestBody @Validated PurchaserParam purchaser) throws ParseException {
 		boolean identification = tbPurchaserService.identification(purchaser);
 		if(!identification) return AjaxJson.getError("收购商认证信息提交失败!!!");
 

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

@@ -136,10 +136,10 @@ public class TbPurchaserController {
 	/** 收购商审核 */
 	@RequestMapping("audit")
 	@SaCheckPermission(TbPurchaser.PERMISSION_CODE_EDIT)
-	public AjaxJson audit(@RequestBody @Validated PurchaserParam purchaserParam,Boolean flag,String reason){
-
-		int line = tbPurchaserService.audit(purchaserParam,flag,reason);
-		return AjaxJson.getByLine(line);
+	public AjaxJson audit(Long purchaserId,Boolean flag,String reason){
+		boolean line = tbPurchaserService.audit(purchaserId,flag,reason);
+		if(line)return AjaxJson.getSuccess("认证完成!");
+		return AjaxJson.getError("认证失败!");
 	}
 
 	/** 是否锁住收购商 */
@@ -159,16 +159,5 @@ public class TbPurchaserController {
 		return b;
 	}
 
-	/**
-	 * 根据手机号和身份证查询收购商
-	 * @param phone 手机号
-	 * @param idCard 身份证
-	 * @return
-	 */
-	@RequestMapping("rpc/getByPhoneAndIdCard")
-	public PurchaserDto getByPhoneAndIdCard(@RequestParam("phone") String phone,@RequestParam("idCard")String idCard){
-		PurchaserDto byPurchaserId = tbPurchaserService.getByPhoneAndIdCard(phone,idCard);
-		return byPurchaserId;
-	}
 
 }

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

@@ -15,7 +15,6 @@ import java.util.Objects;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.pj.api.client.admin.AdminInterface;
-import com.pj.api.client.level_two_server.LevelTwoServerInterface;
 import com.pj.api.dto.AppUserDto;
 import com.pj.api.dto.MessageDto;
 import com.pj.api.dto.PurchaserDto;
@@ -59,9 +58,6 @@ public class TbPurchaserService extends ServiceImpl<TbPurchaserMapper, TbPurchas
 	@Autowired
 	private MethodPurchaserService methodPurchaserService;
 
-	@Autowired
-	private LevelTwoServerInterface levelTwoServerInterface;
-
 
 	/** 增 */
 	void add(TbPurchaser t){
@@ -111,45 +107,32 @@ public class TbPurchaserService extends ServiceImpl<TbPurchaserMapper, TbPurchas
 
 	/**
 	 *  收购商审核
-	 * @param purchaserParam
+	 * @param purchaserId 二级市场商户表主键
 	 * @param flag true=审核通过  false=审核失败
 	 * @param reason 审核备注
 	 * @return
 	 */
-	public int audit(PurchaserParam purchaserParam,Boolean flag,String reason){
+	public boolean audit(Long purchaserId,Boolean flag,String reason){
 		//审核不通过
 		if(!flag){
 			//发送通知给收购商
 			MessageDto dto = new MessageDto();
 			dto.setUrl("/pages/market/one/merchant/order/list");
-			dto.setUserId(purchaserParam.getLoginUserId());
+			dto.setUserId(purchaserId);
 			dto.setContents("您发起的收购商认证审核不通过,原因是: " + reason);
 			adminInterface.messageSave(dto);
 		}
-		//审核通过,开始创建
-		TbPurchaser purchaser = new TbPurchaser();
-		//数据拷贝
-		BeanUtils.copyProperties(purchaserParam,purchaser);
-		purchaser.setName(purchaserParam.getName());
-		purchaser.setDutyParagraph(purchaserParam.getDutyParagraph());
-		purchaser.setLegalPerson(purchaserParam.getCorporateName());
-		purchaser.setIdCard(purchaserParam.getCorporateIdCard());
-		purchaser.setContact(purchaserParam.getLinkPhone());
-		//公共属性设置
-		purchaser.setCreateBy(StpUserUtil.getLoginIdAsString());
-		purchaser.setCreateName(StpUserUtil.getLoginName());
-		purchaser.setCreateTime(new Date());
-		purchaser.setDeleteStatus(DeleteStatus.DELETE_STATUS_ON.getCode());
-		int insert = tbPurchaserMapper.insert(purchaser);
-		if(insert != 1)throw new ServiceException("审核失败!");
+		//审核通过
+		TbPurchaser tbPurchaser = tbPurchaserMapper.selectById(purchaserId);
+		if(tbPurchaser == null)throw new ServiceException("收购商信息异常。");
 		//审核同构且完成数据插入则进行关联
-		AppUserDto appUser = adminInterface.getAppUserById(purchaserParam.getLoginUserId());
-		if(appUser == null)throw new ServiceException("审核过程异常!");
-		PurchaserDto purchaserDto = levelTwoServerInterface.getByPhoneAndIdCard(purchaser.getContact(), purchaser.getIdCard());
+		AppUserDto appUser = adminInterface.getByPhoneAndUserType(tbPurchaser.getContact(), 3);
 		//设置关联属性
-		appUser.setFkId(String.valueOf(purchaserDto.getId()));
+		appUser.setFkId(String.valueOf(tbPurchaser.getId()));
 		appUser.setAuth(1 + "");  // 1=审核通过
-		return 3;
+		//保存
+		Boolean aBoolean = adminInterface.saveAppUserInfo(appUser);
+		return aBoolean;
 	}
 
 	/** 是否锁住收购商 */
@@ -311,13 +294,5 @@ public class TbPurchaserService extends ServiceImpl<TbPurchaserMapper, TbPurchas
 		return purchaserDto;
 	}
 
-	/** 远程调用: 根据手机号和身份证号查询二级市场商户 */
-	public PurchaserDto getByPhoneAndIdCard(String phone,String idCard){
-		List<TbPurchaser> purchasers = tbPurchaserMapper.selectList(new LambdaQueryWrapper<TbPurchaser>().eq(TbPurchaser::getContact, phone).eq(TbPurchaser::getIdCard, idCard).eq(TbPurchaser::getDeleteStatus, DeleteStatus.DELETE_STATUS_ON.getCode()));
-		if(purchasers.size() == 0)throw new ServiceException("服务器繁忙~");
-		//数据拷贝
-		PurchaserDto purchaserDto = new PurchaserDto();
-		BeanUtils.copyProperties(purchasers.get(0),purchaserDto);
-		return purchaserDto;
-	}
+
 }

sp-service/sp-admin/src/main/java/com/pj/project/app_user/AppUserApiController.java

@@ -1,5 +1,6 @@
 package com.pj.project.app_user;
 
+import com.pj.api.dto.AppUserDto;
 import com.pj.current.satoken.StpAPPUserUtil;
 import com.pj.project.app_user.dto.ForgetPasswordDto;
 import com.pj.project.app_user.dto.LoginDto;
@@ -95,7 +96,15 @@ public class AppUserApiController {
         if (result) return AjaxJson.getSuccess("密码修改成功!");
         return AjaxJson.getError("密码修改失败!");
     }
-
+    /*-----               正常业务接口👆👆    不越界     rpc远程调用 👇👇                     -----*/
+    /**
+     * 收购商认证
+     */
+    @RequestMapping("rpc/getByPhoneAndUserType")
+    public AppUserDto getByPhoneAndUserType(@RequestParam("phone") String phone,@RequestParam("userType")Integer userType) {
+        AppUserDto byPhoneAndUserType = appUserService.getByPhoneAndUserType(phone, userType);
+        return byPhoneAndUserType;
+    }
 
 
 }

sp-service/sp-admin/src/main/java/com/pj/project/app_user/AppUserController.java

@@ -117,4 +117,13 @@ public class AppUserController {
 		return appUserService.updateById(user);
 	}
 
+	/**
+	 * 收购商认证
+	 */
+	@RequestMapping("rpc/saveAppUserInfo")
+	public Boolean saveAppUserInfo(@RequestBody AppUserDto appUser) {
+		boolean info = appUserService.saveAppUserInfo(appUser);
+		return info;
+	}
+
 }

sp-service/sp-admin/src/main/java/com/pj/project/app_user/AppUserService.java

@@ -412,5 +412,21 @@ public class AppUserService extends ServiceImpl<AppUserMapper, AppUser> implemen
 		return 1 == appUserMapper.updateById(appUser);
 	}
 
+	/** 远程调用: 收购商认证 */
+	public AppUserDto getByPhoneAndUserType(String phone,Integer userType){
+		List<AppUser> appUsers = appUserMapper.selectList(new LambdaQueryWrapper<AppUser>().eq(AppUser::getPhone, phone).eq(AppUser::getUserType, userType).eq(AppUser::getDeleteStatus, DeleteStatus.DELETE_STATUS_ON.getCode()).eq(AppUser::getStatus, 1));
+		if(appUsers.size() != 1)throw new ServiceException("用户信息有误。");
+		AppUserDto appUserDto = new AppUserDto();
+		BeanUtils.copyProperties(appUsers.get(0),appUserDto);
+		return appUserDto;
+	}
+
+	/** 远程调用: 保存appUser信息 */
+	public boolean saveAppUserInfo(AppUserDto appUser){
+		AppUser user = new AppUser();
+		BeanUtils.copyProperties(appUser,user);
+		int update = appUserMapper.updateById(user);
+		return update == 1;
+	}
 
 }