新增采购商时，新增一个账号

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

@@ -77,7 +77,7 @@ public interface AdminInterface {
      * @param createDTO
      */
     @PostMapping("AppUser/rpc/createAppAccount")
-    public void createAccount(@RequestBody AppUserCreateDTO createDTO);
+    public boolean createAccount(@RequestBody AppUserCreateDTO createDTO);
 
 
     /**

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

@@ -76,8 +76,8 @@ public class AdminInterfaceFallback implements FallbackFactory<AdminInterface> {
             }
 
             @Override
-            public void createAccount(AppUserCreateDTO createDTO) {
-
+            public boolean createAccount(AppUserCreateDTO createDTO) {
+                return false;
             }
 
             @Override

sp-service/level-one-server/src/main/java/com/pj/ht_trade_settlement/HtTradeSettlement.java

@@ -2,6 +2,7 @@ package com.pj.ht_trade_settlement;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
@@ -248,4 +249,7 @@ public class HtTradeSettlement extends Model<HtTradeSettlement> implements Seria
 	 */
 	private Date checkPassTime;
 
+	@TableField(exist = false)
+	private Integer checkUp;
+
 }

sp-service/level-one-server/src/main/java/com/pj/ht_trade_settlement/HtTradeSettlementApi.java

@@ -52,4 +52,5 @@ public class HtTradeSettlementApi {
     }
 
 
+
 }

sp-service/level-one-server/src/main/java/com/pj/ht_trade_settlement/HtTradeSettlementMapper.xml

@@ -13,7 +13,7 @@
 
 	<!-- 公共查询sql片段 -->
 	<sql id="select_sql">
-		select *
+		select *,(SELECT count(*) from tb_order WHERE tb_order.sale_main_id=ht_trade_settlement.id and tb_order.up_status =1) as check_up
 		from ht_trade_settlement
 	</sql>
 
@@ -49,6 +49,7 @@
 			<if test=' this.has("declTime") '> and decl_time = #{declTime} </if>
 			<if test=' this.has("billNo") '> and bill_no = #{billNo} </if>
 			<if test=' this.has("voyageNo") '> and voyage_no = #{voyageNo} </if>
+			<if test=' this.has("finishStatus") '> and finish_status = #{finishStatus} </if>
 			<if test=' this.has("goodsNames") '> and goods_names like concat('%',#{goodsNames},'%') </if>
 			<if test=' this.has("bordersList") '> and borders_list = #{bordersList} </if>
 			<if test=' this.has("borderBuyGoodsList") '> and border_buy_goods_list = #{borderBuyGoodsList} </if>
@@ -89,6 +90,7 @@
 			<when test='sortType == 30'> border_buy_goods_list desc </when>
 			<when test='sortType == 31'> sell_goods_list desc </when>
 			<when test='sortType == 32'> id desc </when>
+			<when test='sortType == 33'> finish_time desc </when>
 			<otherwise> plat_seq_no desc </otherwise>
 		</choose>
 	</select>

sp-service/level-one-server/src/main/java/com/pj/ht_trade_settlement/PCController.java

@@ -0,0 +1,25 @@
+package com.pj.ht_trade_settlement;
+
+import com.pj.utils.sg.AjaxJson;
+import com.pj.utils.so.SoMap;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@RequestMapping("pc/settlement")
+@RestController
+public class PCController {
+    @Resource
+    private HtTradeSettlementService htTradeSettlementService;
+
+    @RequestMapping("getList")
+    public AjaxJson getList() {
+        SoMap so = SoMap.getRequestSoMap();
+        so.put("finishStatus","1");
+        so.put("sortType","33");
+        List<HtTradeSettlement> list = htTradeSettlementService.getList(so.startPage());
+        return AjaxJson.getPageData(so.getDataCount(), list);
+    }
+}

sp-service/level-one-server/src/main/java/com/pj/ht_trade_settlement/PcSettlementVO.java

@@ -0,0 +1,4 @@
+package com.pj.ht_trade_settlement;
+
+public class PcSettlementVO {
+}

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

@@ -16,10 +16,8 @@ import java.util.Objects;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.pj.api.client.admin.AdminInterface;
-import com.pj.api.dto.AppUserDto;
-import com.pj.api.dto.EnterpriseAuditDto;
-import com.pj.api.dto.MessageDto;
-import com.pj.api.dto.PurchaserDto;
+import com.pj.api.consts.FeignFactory;
+import com.pj.api.dto.*;
 import com.pj.common.core.exception.ServiceException;
 import com.pj.current.satoken.StpUserUtil;
 import com.pj.enummj.*;
@@ -44,295 +42,336 @@ import javax.swing.filechooser.FileSystemView;
 
 /**
  * Service: tb_purchaser -- 收购商
+ *
  * @author qzy
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
-public class TbPurchaserService extends ServiceImpl<TbPurchaserMapper, TbPurchaser> implements IService<TbPurchaser>{
-
-	/** 底层 Mapper 对象 */
-	@Autowired
-	TbPurchaserMapper tbPurchaserMapper;
-
-	@Autowired
-	AdminInterface adminInterface;
-
-	@Autowired
-	private MethodPurchaserService methodPurchaserService;
-
-
-	/** 增 */
-	void add(TbPurchaser t){
-		save(t);
-	}
-
-	/** 删 */
-	void delete(Long id){
-		removeById(id);
-	}
-
-	/** 改 */
-	void update(TbPurchaser t){
-		updateById(t);
-
-	}
-
-	/** 查 */
-	TbPurchaser getById(Long id){
-		return super.getById(id);
-	}
-
-	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */
-	List<TbPurchaser> getList(SoMap so) {
-		return tbPurchaserMapper.getList(so);
-	}
-
-	/** 收购商认证 */
-	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)
-			throw new RuntimeException("当前身份证号已被认证!");
-		//手机号去重
-		String contact = purchaser.getLinkPhone();
-		if(tbPurchaserMapper.selectList(new LambdaQueryWrapper<TbPurchaser>().eq(TbPurchaser::getContact,contact).eq(TbPurchaser::getDeleteStatus,DeleteStatus.DELETE_STATUS_ON.getCode())).size() != 0)
-			throw new RuntimeException("当前手机号已被认证!");
-		//TODO:是否需要手机发送验证码认证?
-
-		//封装收购商信息
-		TbPurchaser tbPurchaser = methodPurchaserService.setPurchaserProperties(purchaser);
-		// 保存收购商信息
-		int insert = tbPurchaserMapper.insert(tbPurchaser);
-		return insert == 1;
-	}
-
-	/**
-	 *  收购商审核
-	 * @param purchaserId 二级市场商户表主键
-	 * @param judgeStatus 审核状态(0=待审核,1=审核通过,2=审核驳回)
-	 * @param judgeContent 审核备注
-	 * @return
-	 */
-	public boolean audit(Long purchaserId,Integer judgeStatus,String judgeContent) {
-		TbPurchaser tbPurchaser = tbPurchaserMapper.selectById(purchaserId);
-		if (tbPurchaser == null) {
-			throw new AjaxError("收购商不存在");
-		}
-		String name = StpUserUtil.getLoginName();
-		tbPurchaser.setJudgeStatus(judgeStatus).setJudgeContent(judgeContent).setJudgeTime(new Date()).setJudgeBy(name);
-		if (judgeStatus == 1) {
-			EnterpriseAuditDto auditDto = new EnterpriseAuditDto();
-			auditDto.setAuth("1");
-			auditDto.setFkId(purchaserId);
-			auditDto.setId(Long.parseLong(tbPurchaser.getCreateBy()));
-			if (adminInterface.audit(auditDto)) {
-				//发送通知给收购商
-				MessageDto dto = new MessageDto();
-				dto.setUserId(purchaserId);
-				dto.setContents("恭喜商户信息认证成功!");
-				adminInterface.messageSave(dto);
-				return updateById(tbPurchaser);
-			}
-			throw new ServiceException("审核失败");
-		}
-		return updateById(tbPurchaser);
-	}
-	/** 获取审核状态 */
-	public PurchaserParamVo auditStatus(Long appUserId){
-		List<TbPurchaser> purchaserList = tbPurchaserMapper.selectList(new LambdaQueryWrapper<TbPurchaser>().eq(TbPurchaser::getCreateBy, appUserId).orderByDesc(TbPurchaser::getCreateTime));
-		if(purchaserList.size() == 0)return null;
-		PurchaserParamVo purchaserParam = methodPurchaserService.setPurchaserParamProperties(purchaserList.get(0));
-		return purchaserParam;
-	}
-	/** 收购商批量审核 */
-	public void auditBatch(List<Long> ids, Integer judgeStatus, String judgeContent) {
-		if (ids.isEmpty()) {
-			throw new AjaxError("必要参数不能为空");
-		}
-		List<TbPurchaser> list = listByIds(ids);
-		String name = StpUserUtil.getLoginName();
-		list.forEach(tbPurchaser -> {
-			tbPurchaser.setJudgeStatus(judgeStatus).setJudgeContent(judgeContent).setJudgeTime(new Date()).setJudgeBy(name);
-		});
-		this.updateBatchById(list);
-	}
-
-
-	/** 是否锁住收购商 */
-	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端登录
-		adminInterface.isLock(String.valueOf(purchaser.getId()), People.PEOPLE_TYPE_THREE.getCode(),isLock);
-		return line;
-	}
-
-	/**
-	 * 导入
-	 * @param file excel文件
-	 * @return
-	 * @throws IOException
-	 */
-	public String importData(MultipartFile file) throws IOException {
-		System.out.println("\n开始执行文件上传....\n");
-
-		//判空
-		if(file.isEmpty()) return "文件为空,无法执行上传...";
-		//获取文件上传数据
-		HSSFWorkbook wb = new HSSFWorkbook(file.getInputStream());
-		//获取第一页sheet
-		HSSFSheet sheet = wb.getSheetAt(0);
-		//定义计数器
-		int count = 0;
-		//定义行对象
-		HSSFRow row = null;
-		//解析数据封装到集合
-		count = methodPurchaserService.importMethod(row, sheet, count);
-		wb.close();
-		System.out.println("\n文件上传完成,共上传 " + count + "条 " + "数据...\n");
-		return "上传完成,共上传"  + count + "条"  + "数据。";
-	}
-
-	/**
-	 * 导出 excel文件
-	 * @param keyword
-	 * @return
-	 */
-	public String outportExcel(String keyword,String filepath) throws IOException {
-		System.out.println("\n开始执行文件导出....\n");
-		//导出的文件的路径
-		if(filepath == null){
-			// 获取当前用户的桌面路径
-			FileSystemView fileSystemView = FileSystemView.getFileSystemView();
-			filepath = fileSystemView.getHomeDirectory().getPath();
-		}
-		filepath = filepath + "\\收购商数据表_" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")) + ".xlsx";
-		//根据需求查询数据
-		List<TbPurchaser> selectedList = tbPurchaserMapper.selectList
-				(new LambdaQueryWrapper<TbPurchaser>().eq(StringUtils.isNoneBlank(keyword), TbPurchaser::getName, keyword));
-		if(selectedList.size() == 0)return "没有可导出的数据。";
-		//建立excel对象封装数据
-		HSSFWorkbook workbook = new HSSFWorkbook();
-		//创建excel表格右下角的sheet页名称
-		HSSFSheet sheet = workbook.createSheet("1");
-		//创建表头
-		HSSFRow row = sheet.createRow(0);
-		row.createCell(0).setCellValue("序号");
-		row.createCell(1).setCellValue("名称");
-		row.createCell(2).setCellValue("法人");
-		row.createCell(3).setCellValue("身份证");
-		row.createCell(4).setCellValue("手机号码");
-		row.createCell(5).setCellValue("营业执照");
-		row.createCell(6).setCellValue("银行编号");
-		row.createCell(7).setCellValue("银行名称");
-		row.createCell(8).setCellValue("银行账号");
-		row.createCell(9).setCellValue("税号");
-		row.createCell(10).setCellValue("地址编号");
-		row.createCell(10).setCellValue("地址");
-		row.createCell(11).setCellValue("审核状态");
-		row.createCell(13).setCellValue("审核意见");
-		row.createCell(12).setCellValue("上次审核时间");
-		row.createCell(12).setCellValue("注册时间");
-		row.createCell(12).setCellValue("人脸编号");
-
-		row.createCell(14).setCellValue("创建时间");
-		row.createCell(15).setCellValue("创建人编号");
-		row.createCell(16).setCellValue("创建人名称");
-		row.createCell(17).setCellValue("更新时间");
-		row.createCell(18).setCellValue("更新人编号");
-		row.createCell(19).setCellValue("更新人名称");
-		row.createCell(20).setCellValue("删除状态");
-
-		//定义计数器
-		int count = 0;
-		//遍历集合
-		for (int i = 0; i < selectedList.size(); i++) {
-			HSSFRow sheetRow = sheet.createRow(sheet.getLastRowNum() + 1);
-			sheetRow.createCell(0).setCellValue(i + 1);
-			sheetRow.createCell(1).setCellValue((selectedList.get(i).getName() + "").equals("null")? "": selectedList.get(i).getName() + "");
-			sheetRow.createCell(2).setCellValue((selectedList.get(i).getLegalPerson() + "").equals("null")? "": selectedList.get(i).getLegalPerson() + "");
-			sheetRow.createCell(3).setCellValue((selectedList.get(i).getIdCard() + "").equals("null")? "": selectedList.get(i).getIdCard() + "");
-			sheetRow.createCell(4).setCellValue((selectedList.get(i).getContact() + "").equals("null")? "": selectedList.get(i).getContact() + "");
-			sheetRow.createCell(5).setCellValue((selectedList.get(i).getBusinessLicense() + "").equals("null")? "": selectedList.get(i).getBusinessLicense() + "");
-			sheetRow.createCell(6).setCellValue((selectedList.get(i).getBankNo() + "").equals("null")? "": selectedList.get(i).getBankNo() + "");
-			sheetRow.createCell(7).setCellValue((selectedList.get(i).getBankName() + "").equals("null")? "": selectedList.get(i).getBankName() + "");
-			sheetRow.createCell(8).setCellValue((selectedList.get(i).getBankAccount() + "" ).equals("null")? "": selectedList.get(i).getBankAccount() + "");
-			sheetRow.createCell(9).setCellValue((selectedList.get(i).getDutyParagraph() + "").equals("null")? "": selectedList.get(i).getDutyParagraph() + "");
-			sheetRow.createCell(10).setCellValue((selectedList.get(i).getAddressIds() + "").equals("null")? "": selectedList.get(i).getAddressIds() + "");
-			sheetRow.createCell(11).setCellValue((selectedList.get(i).getAddress() + "").equals("null")? "": selectedList.get(i).getAddress() + "");
-			sheetRow.createCell(12).setCellValue((selectedList.get(i).getJudgeStatus() + "").equals("null")? "": selectedList.get(i).getJudgeStatus() + "");
-			sheetRow.createCell(13).setCellValue((selectedList.get(i).getJudgeContent() + "").equals("null")? "": selectedList.get(i).getJudgeContent() + "");
-			sheetRow.createCell(13).setCellValue((selectedList.get(i).getJudgeTime() + "").equals("null")? "": selectedList.get(i).getJudgeTime() + "");
-			sheetRow.createCell(13).setCellValue((selectedList.get(i).getRegisterTime() + "").equals("null")? "": selectedList.get(i).getRegisterTime() + "");
-			sheetRow.createCell(13).setCellValue((selectedList.get(i).getPersonId() + "").equals("null")? "": selectedList.get(i).getPersonId() + "");
-			//公共字段
-			sheetRow.createCell(22).setCellValue((selectedList.get(i).getCreateTime() + "").equals("null")? "": selectedList.get(i).getCreateTime() + "");
-			sheetRow.createCell(23).setCellValue((selectedList.get(i).getCreateBy() + "").equals("null")? "": selectedList.get(i).getCreateBy() + "");
-			sheetRow.createCell(24).setCellValue((selectedList.get(i).getCreateName() + "").equals("null")? "": selectedList.get(i).getCreateName() + "");
-			sheetRow.createCell(25).setCellValue((selectedList.get(i).getUpdateTime() + "").equals("null")? "": selectedList.get(i).getUpdateTime() + "");
-			sheetRow.createCell(26).setCellValue((selectedList.get(i).getUpdateBy() + "").equals("null")? "": selectedList.get(i).getUpdateBy() + "");
-			sheetRow.createCell(27).setCellValue((selectedList.get(i).getUpdateName() + "").equals("null")? "": selectedList.get(i).getUpdateName() + "");
-			sheetRow.createCell(28).setCellValue((selectedList.get(i).getDeleteStatus() + "").equals("null")? "": selectedList.get(i).getDeleteStatus() + "");
-			count += 1;
-		}
-		//建立输出流，输出文件
-		FileOutputStream fos = new FileOutputStream(filepath);
-
-		workbook.write(fos);
-		fos.flush();
-		//关闭输出流
-		fos.close();
-		workbook.close();
-		System.out.println("\n数据导出完成!共导出 " + count + " 条数据。");
-		return "数据导出完成!共导出 " + count + " 条数据。";
-	}
-
-	/** 远程调用方法 注册身份为国内收购商时调用*/
-	public boolean purchaserDto(PurchaserDto purchaserDto){
-		TbPurchaser tbPurchaser = new TbPurchaser();
-		BeanUtils.copyProperties(purchaserDto,tbPurchaser);
-		boolean save = this.save(tbPurchaser);
-		return save;
-	}
-
-	/** 远程调用方法 根据ID查询国内收购商*/
-	public PurchaserDto getByPurchaserId(Long id){
-		TbPurchaser byId = getById(id);
-		PurchaserDto purchaserDto = new PurchaserDto();
-		BeanUtils.copyProperties(byId,purchaserDto);
-		return purchaserDto;
-	}
-
-	/** 收购商保存银行卡信息 */
-	public boolean saveBankByPurchaser(Long id,String bankName,String bankAccount) {
-		LambdaUpdateWrapper<TbPurchaser> wrapper = new LambdaUpdateWrapper<>();
-		wrapper.set(TbPurchaser::getBankName, bankName);
-		wrapper.set(TbPurchaser::getBankAccount, bankAccount);
-		wrapper.eq(TbPurchaser::getId, id);
-
-		return update(wrapper);
-	}
+public class TbPurchaserService extends ServiceImpl<TbPurchaserMapper, TbPurchaser> implements IService<TbPurchaser> {
+
+    /**
+     * 底层 Mapper 对象
+     */
+    @Autowired
+    TbPurchaserMapper tbPurchaserMapper;
+
+    @Autowired
+    AdminInterface adminInterface;
+
+    @Autowired
+    private MethodPurchaserService methodPurchaserService;
+
+
+    /**
+     * 增
+     */
+    void add(TbPurchaser t) {
+        save(t);
+        AppUserCreateDTO createDTO = new AppUserCreateDTO();
+        createDTO.setUserType(UserType.USER_TYPE_PURCHASER.getCode() + "");
+        createDTO.setPhone(t.getContact());
+        createDTO.setName(t.getName());
+        createDTO.setFkId(t.getId());
+        boolean result = FeignFactory.adminInterface.createAccount(createDTO);
+        if (!result) {
+            throw new ServiceException("创建账户失败");
+        }
+    }
+
+    /**
+     * 删
+     */
+    void delete(Long id) {
+        removeById(id);
+    }
+
+    /**
+     * 改
+     */
+    void update(TbPurchaser t) {
+        updateById(t);
+
+    }
+
+    /**
+     * 查
+     */
+    TbPurchaser getById(Long id) {
+        return super.getById(id);
+    }
+
+    /**
+     * 查集合 - 根据条件（参数为空时代表忽略指定条件）
+     */
+    List<TbPurchaser> getList(SoMap so) {
+        return tbPurchaserMapper.getList(so);
+    }
+
+    /**
+     * 收购商认证
+     */
+    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)
+            throw new RuntimeException("当前身份证号已被认证!");
+        //手机号去重
+        String contact = purchaser.getLinkPhone();
+        if (tbPurchaserMapper.selectList(new LambdaQueryWrapper<TbPurchaser>().eq(TbPurchaser::getContact, contact).eq(TbPurchaser::getDeleteStatus, DeleteStatus.DELETE_STATUS_ON.getCode())).size() != 0)
+            throw new RuntimeException("当前手机号已被认证!");
+        //TODO:是否需要手机发送验证码认证?
+
+        //封装收购商信息
+        TbPurchaser tbPurchaser = methodPurchaserService.setPurchaserProperties(purchaser);
+        // 保存收购商信息
+        int insert = tbPurchaserMapper.insert(tbPurchaser);
+        return insert == 1;
+    }
+
+    /**
+     * 收购商审核
+     *
+     * @param purchaserId  二级市场商户表主键
+     * @param judgeStatus  审核状态(0=待审核,1=审核通过,2=审核驳回)
+     * @param judgeContent 审核备注
+     * @return
+     */
+    public boolean audit(Long purchaserId, Integer judgeStatus, String judgeContent) {
+        TbPurchaser tbPurchaser = tbPurchaserMapper.selectById(purchaserId);
+        if (tbPurchaser == null) {
+            throw new AjaxError("收购商不存在");
+        }
+        String name = StpUserUtil.getLoginName();
+        tbPurchaser.setJudgeStatus(judgeStatus).setJudgeContent(judgeContent).setJudgeTime(new Date()).setJudgeBy(name);
+        if (judgeStatus == 1) {
+            EnterpriseAuditDto auditDto = new EnterpriseAuditDto();
+            auditDto.setAuth("1");
+            auditDto.setFkId(purchaserId);
+            auditDto.setId(Long.parseLong(tbPurchaser.getCreateBy()));
+            if (adminInterface.audit(auditDto)) {
+                //发送通知给收购商
+                MessageDto dto = new MessageDto();
+                dto.setUserId(purchaserId);
+                dto.setContents("恭喜商户信息认证成功!");
+                adminInterface.messageSave(dto);
+                return updateById(tbPurchaser);
+            }
+            throw new ServiceException("审核失败");
+        }
+        return updateById(tbPurchaser);
+    }
+
+    /**
+     * 获取审核状态
+     */
+    public PurchaserParamVo auditStatus(Long appUserId) {
+        List<TbPurchaser> purchaserList = tbPurchaserMapper.selectList(new LambdaQueryWrapper<TbPurchaser>().eq(TbPurchaser::getCreateBy, appUserId).orderByDesc(TbPurchaser::getCreateTime));
+        if (purchaserList.size() == 0) return null;
+        PurchaserParamVo purchaserParam = methodPurchaserService.setPurchaserParamProperties(purchaserList.get(0));
+        return purchaserParam;
+    }
+
+    /**
+     * 收购商批量审核
+     */
+    public void auditBatch(List<Long> ids, Integer judgeStatus, String judgeContent) {
+        if (ids.isEmpty()) {
+            throw new AjaxError("必要参数不能为空");
+        }
+        List<TbPurchaser> list = listByIds(ids);
+        String name = StpUserUtil.getLoginName();
+        list.forEach(tbPurchaser -> {
+            tbPurchaser.setJudgeStatus(judgeStatus).setJudgeContent(judgeContent).setJudgeTime(new Date()).setJudgeBy(name);
+        });
+        this.updateBatchById(list);
+    }
+
+
+    /**
+     * 是否锁住收购商
+     */
+    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端登录
+        adminInterface.isLock(String.valueOf(purchaser.getId()), People.PEOPLE_TYPE_THREE.getCode(), isLock);
+        return line;
+    }
+
+    /**
+     * 导入
+     *
+     * @param file excel文件
+     * @return
+     * @throws IOException
+     */
+    public String importData(MultipartFile file) throws IOException {
+        System.out.println("\n开始执行文件上传....\n");
+
+        //判空
+        if (file.isEmpty()) return "文件为空,无法执行上传...";
+        //获取文件上传数据
+        HSSFWorkbook wb = new HSSFWorkbook(file.getInputStream());
+        //获取第一页sheet
+        HSSFSheet sheet = wb.getSheetAt(0);
+        //定义计数器
+        int count = 0;
+        //定义行对象
+        HSSFRow row = null;
+        //解析数据封装到集合
+        count = methodPurchaserService.importMethod(row, sheet, count);
+        wb.close();
+        System.out.println("\n文件上传完成,共上传 " + count + "条 " + "数据...\n");
+        return "上传完成,共上传" + count + "条" + "数据。";
+    }
+
+    /**
+     * 导出 excel文件
+     *
+     * @param keyword
+     * @return
+     */
+    public String outportExcel(String keyword, String filepath) throws IOException {
+        System.out.println("\n开始执行文件导出....\n");
+        //导出的文件的路径
+        if (filepath == null) {
+            // 获取当前用户的桌面路径
+            FileSystemView fileSystemView = FileSystemView.getFileSystemView();
+            filepath = fileSystemView.getHomeDirectory().getPath();
+        }
+        filepath = filepath + "\\收购商数据表_" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")) + ".xlsx";
+        //根据需求查询数据
+        List<TbPurchaser> selectedList = tbPurchaserMapper.selectList
+                (new LambdaQueryWrapper<TbPurchaser>().eq(StringUtils.isNoneBlank(keyword), TbPurchaser::getName, keyword));
+        if (selectedList.size() == 0) return "没有可导出的数据。";
+        //建立excel对象封装数据
+        HSSFWorkbook workbook = new HSSFWorkbook();
+        //创建excel表格右下角的sheet页名称
+        HSSFSheet sheet = workbook.createSheet("1");
+        //创建表头
+        HSSFRow row = sheet.createRow(0);
+        row.createCell(0).setCellValue("序号");
+        row.createCell(1).setCellValue("名称");
+        row.createCell(2).setCellValue("法人");
+        row.createCell(3).setCellValue("身份证");
+        row.createCell(4).setCellValue("手机号码");
+        row.createCell(5).setCellValue("营业执照");
+        row.createCell(6).setCellValue("银行编号");
+        row.createCell(7).setCellValue("银行名称");
+        row.createCell(8).setCellValue("银行账号");
+        row.createCell(9).setCellValue("税号");
+        row.createCell(10).setCellValue("地址编号");
+        row.createCell(10).setCellValue("地址");
+        row.createCell(11).setCellValue("审核状态");
+        row.createCell(13).setCellValue("审核意见");
+        row.createCell(12).setCellValue("上次审核时间");
+        row.createCell(12).setCellValue("注册时间");
+        row.createCell(12).setCellValue("人脸编号");
+
+        row.createCell(14).setCellValue("创建时间");
+        row.createCell(15).setCellValue("创建人编号");
+        row.createCell(16).setCellValue("创建人名称");
+        row.createCell(17).setCellValue("更新时间");
+        row.createCell(18).setCellValue("更新人编号");
+        row.createCell(19).setCellValue("更新人名称");
+        row.createCell(20).setCellValue("删除状态");
+
+        //定义计数器
+        int count = 0;
+        //遍历集合
+        for (int i = 0; i < selectedList.size(); i++) {
+            HSSFRow sheetRow = sheet.createRow(sheet.getLastRowNum() + 1);
+            sheetRow.createCell(0).setCellValue(i + 1);
+            sheetRow.createCell(1).setCellValue((selectedList.get(i).getName() + "").equals("null") ? "" : selectedList.get(i).getName() + "");
+            sheetRow.createCell(2).setCellValue((selectedList.get(i).getLegalPerson() + "").equals("null") ? "" : selectedList.get(i).getLegalPerson() + "");
+            sheetRow.createCell(3).setCellValue((selectedList.get(i).getIdCard() + "").equals("null") ? "" : selectedList.get(i).getIdCard() + "");
+            sheetRow.createCell(4).setCellValue((selectedList.get(i).getContact() + "").equals("null") ? "" : selectedList.get(i).getContact() + "");
+            sheetRow.createCell(5).setCellValue((selectedList.get(i).getBusinessLicense() + "").equals("null") ? "" : selectedList.get(i).getBusinessLicense() + "");
+            sheetRow.createCell(6).setCellValue((selectedList.get(i).getBankNo() + "").equals("null") ? "" : selectedList.get(i).getBankNo() + "");
+            sheetRow.createCell(7).setCellValue((selectedList.get(i).getBankName() + "").equals("null") ? "" : selectedList.get(i).getBankName() + "");
+            sheetRow.createCell(8).setCellValue((selectedList.get(i).getBankAccount() + "").equals("null") ? "" : selectedList.get(i).getBankAccount() + "");
+            sheetRow.createCell(9).setCellValue((selectedList.get(i).getDutyParagraph() + "").equals("null") ? "" : selectedList.get(i).getDutyParagraph() + "");
+            sheetRow.createCell(10).setCellValue((selectedList.get(i).getAddressIds() + "").equals("null") ? "" : selectedList.get(i).getAddressIds() + "");
+            sheetRow.createCell(11).setCellValue((selectedList.get(i).getAddress() + "").equals("null") ? "" : selectedList.get(i).getAddress() + "");
+            sheetRow.createCell(12).setCellValue((selectedList.get(i).getJudgeStatus() + "").equals("null") ? "" : selectedList.get(i).getJudgeStatus() + "");
+            sheetRow.createCell(13).setCellValue((selectedList.get(i).getJudgeContent() + "").equals("null") ? "" : selectedList.get(i).getJudgeContent() + "");
+            sheetRow.createCell(13).setCellValue((selectedList.get(i).getJudgeTime() + "").equals("null") ? "" : selectedList.get(i).getJudgeTime() + "");
+            sheetRow.createCell(13).setCellValue((selectedList.get(i).getRegisterTime() + "").equals("null") ? "" : selectedList.get(i).getRegisterTime() + "");
+            sheetRow.createCell(13).setCellValue((selectedList.get(i).getPersonId() + "").equals("null") ? "" : selectedList.get(i).getPersonId() + "");
+            //公共字段
+            sheetRow.createCell(22).setCellValue((selectedList.get(i).getCreateTime() + "").equals("null") ? "" : selectedList.get(i).getCreateTime() + "");
+            sheetRow.createCell(23).setCellValue((selectedList.get(i).getCreateBy() + "").equals("null") ? "" : selectedList.get(i).getCreateBy() + "");
+            sheetRow.createCell(24).setCellValue((selectedList.get(i).getCreateName() + "").equals("null") ? "" : selectedList.get(i).getCreateName() + "");
+            sheetRow.createCell(25).setCellValue((selectedList.get(i).getUpdateTime() + "").equals("null") ? "" : selectedList.get(i).getUpdateTime() + "");
+            sheetRow.createCell(26).setCellValue((selectedList.get(i).getUpdateBy() + "").equals("null") ? "" : selectedList.get(i).getUpdateBy() + "");
+            sheetRow.createCell(27).setCellValue((selectedList.get(i).getUpdateName() + "").equals("null") ? "" : selectedList.get(i).getUpdateName() + "");
+            sheetRow.createCell(28).setCellValue((selectedList.get(i).getDeleteStatus() + "").equals("null") ? "" : selectedList.get(i).getDeleteStatus() + "");
+            count += 1;
+        }
+        //建立输出流，输出文件
+        FileOutputStream fos = new FileOutputStream(filepath);
+
+        workbook.write(fos);
+        fos.flush();
+        //关闭输出流
+        fos.close();
+        workbook.close();
+        System.out.println("\n数据导出完成!共导出 " + count + " 条数据。");
+        return "数据导出完成!共导出 " + count + " 条数据。";
+    }
+
+    /**
+     * 远程调用方法 注册身份为国内收购商时调用
+     */
+    public boolean purchaserDto(PurchaserDto purchaserDto) {
+        TbPurchaser tbPurchaser = new TbPurchaser();
+        BeanUtils.copyProperties(purchaserDto, tbPurchaser);
+        boolean save = this.save(tbPurchaser);
+        return save;
+    }
+
+    /**
+     * 远程调用方法 根据ID查询国内收购商
+     */
+    public PurchaserDto getByPurchaserId(Long id) {
+        TbPurchaser byId = getById(id);
+        PurchaserDto purchaserDto = new PurchaserDto();
+        BeanUtils.copyProperties(byId, purchaserDto);
+        return purchaserDto;
+    }
+
+    /**
+     * 收购商保存银行卡信息
+     */
+    public boolean saveBankByPurchaser(Long id, String bankName, String bankAccount) {
+        LambdaUpdateWrapper<TbPurchaser> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.set(TbPurchaser::getBankName, bankName);
+        wrapper.set(TbPurchaser::getBankAccount, bankAccount);
+        wrapper.eq(TbPurchaser::getId, id);
+
+        return update(wrapper);
+    }
 
 }

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

@@ -156,8 +156,8 @@ public class AppUserController {
 	 * @param createDTO
 	 */
 	@PostMapping("rpc/createAppAccount")
-	public void createAccount(@RequestBody AppUserCreateDTO createDTO){
-		appUserService.createUser(createDTO);
+	public boolean createAccount(@RequestBody AppUserCreateDTO createDTO){
+		return appUserService.createUser(createDTO);
 	}
 	@PostMapping("rpc/changeBindShopStatus")
 	public void changeBindShopStatus(@RequestBody BindShopDTO bindShopDTO){

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

@@ -614,19 +614,17 @@ public class AppUserService extends ServiceImpl<AppUserMapper, AppUser> implemen
      *
      * @param createDTO
      */
-    public void createUser(AppUserCreateDTO createDTO) {
+    public boolean createUser(AppUserCreateDTO createDTO) {
         log.info("创建APP账号:{}", JSONUtil.toJsonStr(createDTO));
         String phone = createDTO.getPhone().trim();
-        boolean phoneStatus = true;
         if (StringUtils.isEmpty(phone)) {
-            phoneStatus = false;
             log.info("创建APP账号失败: 手机号不能为空");
-            phone = RandomUtil.randomNumbers(11);
+            return false;
         }
         AppUser appUser = this.findByPhone(phone);
         if (appUser != null) {
             log.info("创建APP账号失败:当前账号的手机号码已存在！！！");
-            return;
+            return false;
         }
         appUser = new AppUser();
         BeanUtils.copyProperties(createDTO, appUser);
@@ -637,13 +635,10 @@ public class AppUserService extends ServiceImpl<AppUserMapper, AppUser> implemen
                 .setUserType(Integer.parseInt(createDTO.getUserType()))
                 .setDeleteStatus(DeleteStatus.DELETE_STATUS_ON.getCode())
                 .setCreateTime(new Date());
-        if (phoneStatus) {
-            boolean save = this.save(appUser);
-            String content = "您好,您的app账号已生成。账号:" + phone + ", 初始密码:" + phone + "。可前往app进行修改";
-            // todo 发送短信
-            SystemObject.smsFactory.handler().sendSMS(phone, content);
-        }
-
+        String content = "您好,您的app账号已生成。账号:" + phone + ", 初始密码:" + phone + "。可前往app进行修改";
+        // todo 发送短信
+        SystemObject.smsFactory.handler().sendSMS(phone, content);
+        return this.save(appUser);
     }
 
 
@@ -789,19 +784,20 @@ public class AppUserService extends ServiceImpl<AppUserMapper, AppUser> implemen
 
     /**
      * 修改手机并且修改密码
+     *
      * @param updateAccountDTO
      * @return
      */
     public int updateAccount(UpdateAccountDTO updateAccountDTO) {
         Long id = updateAccountDTO.getId();
-        AppUser appUser =  this.getById(id);
-        if (appUser==null) {
+        AppUser appUser = this.getById(id);
+        if (appUser == null) {
             return 0;
         }
-        String phone=updateAccountDTO.getPhone();
+        String phone = updateAccountDTO.getPhone();
         appUser.setId(id);
         appUser.setUpdateTime(new Date()).setPhone(phone);
         appUser.setPassword(passwordEncoder.encode(phone));
-        return updateById(appUser)?1:0;
+        return updateById(appUser) ? 1 : 0;
     }
 }

sp-service/sp-admin/src/main/java/com/pj/project4sp/uploadfile/UploadController.java

@@ -22,7 +22,7 @@ public class UploadController {
 		UploadUtil.checkFileSize(file);
 		UploadUtil.checkSubffix(file.getOriginalFilename(), UploadUtil.uploadConfig.imageSuffix);
 		String httpUrl = UploadUtil.saveFile(file, UploadUtil.uploadConfig.imageFolder);
-		httpUrl = httpUrl.substring(httpUrl.indexOf("/sp-admin/"));
+//		httpUrl = httpUrl.substring(httpUrl.indexOf("/sp-admin/"));
 		return AjaxJson.getSuccessData(httpUrl);
 	}