兼容邮储产品

eladmin-system/src/main/java/me/zhengjie/application/admin/job/GenerateNotarizationJob.java

@@ -1,27 +1,24 @@
 package me.zhengjie.application.admin.job;
 
 import cfca.trustsign.common.vo.cs.UploadSignInfoVO;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.xxl.job.core.context.XxlJobHelper;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import lombok.RequiredArgsConstructor;
 import me.zhengjie.base.config.AppConfigInfo;
-import me.zhengjie.dao.mybatis.OrderRepository;
-import me.zhengjie.dao.mybatis.entity.SysUserEntity;
-import me.zhengjie.dao.mybatis.mapper.*;
+import me.zhengjie.base.util.CFCACertUtil;
 import me.zhengjie.base.util.FileUploadUtil;
 import me.zhengjie.base.util.StatusEnum.StepStatusEnum;
-import me.zhengjie.base.util.CFCACertUtil;
 import me.zhengjie.dao.mybatis.OrderFileRepository;
+import me.zhengjie.dao.mybatis.OrderRepository;
 import me.zhengjie.dao.mybatis.entity.*;
+import me.zhengjie.dao.mybatis.mapper.NotaryOfficeMapper;
+import me.zhengjie.dao.mybatis.mapper.OrderFileMapper;
+import me.zhengjie.dao.mybatis.mapper.SysUserMapper;
 import me.zhengjie.utils.StringUtils;
-
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.stereotype.Component;
 
 import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -32,12 +29,8 @@ import java.util.stream.Collectors;
 @RequiredArgsConstructor
 @Component
 public class GenerateNotarizationJob {
-    private final OrderMapper orderMapper;
     private final OrderFileRepository orderFileRepository;
     private final OrderFileMapper orderFileMapper;
-    private final BorrowerMapper borrowerMapper;
-    private final MortgageMapper mortgageMapper;
-    private final GuaranteeMapper guaranteeMapper;
     private final NotaryOfficeMapper notaryOfficeMapper;
     private final SysUserMapper userDao;
     private final OrderRepository orderRepository;

eladmin-system/src/main/java/me/zhengjie/application/bank/mq/RedisReceiver.java

@@ -8,14 +8,12 @@ import me.zhengjie.base.util.DateUtils;
 import me.zhengjie.base.util.FileUploadUtil;
 import me.zhengjie.base.util.StatusEnum.SexStatusEnum;
 import me.zhengjie.base.util.TextTempletUtil;
+import me.zhengjie.dao.mybatis.BankRepository;
 import me.zhengjie.dao.mybatis.ModelRepository;
 import me.zhengjie.dao.mybatis.OrderFileRepository;
 import me.zhengjie.dao.mybatis.OrderRepository;
 import me.zhengjie.dao.mybatis.entity.*;
-import me.zhengjie.dao.mybatis.mapper.ICityDao;
-import me.zhengjie.dao.mybatis.mapper.IProvinceDao;
-import me.zhengjie.dao.mybatis.mapper.NotaryOfficeMapper;
-import me.zhengjie.dao.mybatis.mapper.OrderFileMapper;
+import me.zhengjie.dao.mybatis.mapper.*;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.data.redis.connection.Message;
@@ -25,6 +23,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -40,6 +39,8 @@ public class RedisReceiver implements MessageListener {
 	private final OrderRepository orderRepository;
 	private final ModelRepository modelRepository;
 	private final OrderFileRepository orderFileRepository;
+	private final BankMapper bankMapper;
+	private final SysUserMapper sysUserMapper;
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
@@ -84,15 +85,36 @@ public class RedisReceiver implements MessageListener {
 		Map<String, String> map = new HashMap<>();
 		map.put("$Date$", DateUtils.date2String(new Date(), 1));
 		map.put("$Bank$", orderEntity.getBankName());
+		map.put("$BusinessOrderNo$", orderEntity.getBusinessNo());
 		//
 		BorrowerEntity borrower = orderRepository.getBorrowerByBizNo(orderEntity.getBusinessNo());
 		if (borrower != null) {
 			map.put("$LoanName$", borrower.getUsername());
 			map.put("$LoanSex$", SexStatusEnum.getValue(borrower.getSex()));
-			map.put("$LoanBirthdday$", borrower.getBirth());
-			map.put("$LoanHomeAddr$", borrower.getResidence());
+			map.put("$LoanBirthday$", borrower.getBirth());
+			map.put("$LoanAddr$", borrower.getResidence());
 			map.put("$LoanIDNo$", borrower.getIdCard());
 			map.put("$LoanPhone$", borrower.getPhone());
+			if (borrower.getJointFlag() == 1) {
+				try {
+					SimpleDateFormat dateSrcFormatter = new SimpleDateFormat("yyyyMMdd");
+					SimpleDateFormat dateDestFormatter = new SimpleDateFormat("yyyy-MM-dd");
+					Date date = dateSrcFormatter.parse(borrower.getIdCard().substring(6, 14));
+					map.put("$MateName$", borrower.getSpouseName());
+					map.put("$MateSex$", "1".equals(borrower.getSpouseSex()) ? "男" : "女");
+					map.put("$MateBirthday$", dateDestFormatter.format(date));
+					map.put("$MateAddr$", borrower.getResidence());
+					map.put("$MatePhone$", borrower.getSpousePhone());
+				} catch (Exception e) {
+					e.printStackTrace();
+				}
+			} else {
+				map.put("$MateName$", "无");
+				map.put("$MateSex$", "无");
+				map.put("$MateBirthday$", "无");
+				map.put("$MateAddr$", "无");
+				map.put("$MatePhone$", "无");
+			}
 		}
 		MortgageEntity mortgage = orderRepository.getMortgageByBizNo(orderEntity.getBusinessNo());
 		if (mortgage != null) {
@@ -112,6 +134,15 @@ public class RedisReceiver implements MessageListener {
 			map.put("$GuaranteeIDNo$", guarantee.getIdCard());
 			map.put("$GuaranteePhone$", guarantee.getPhone());
 		}
+		BankEntity bank = bankMapper.selectById(orderEntity.getBankId());
+		map.put("$BankAddr$", bank.getAddress());
+		map.put("$BankLeader$", bank.getPrincipal());
+		map.put("$BankPhone$", bank.getPhone());
+		//
+		SysUserEntity user = sysUserMapper.selectById(orderEntity.getCustomerId());
+		map.put("$PBName$", user.getNickName());
+		map.put("$PBSex$", user.getGender());
+		map.put("$PBPhone$", user.getPhone());
 		//
 		NotaryOfficeEntity office = notaryOfficeMapper.selectById(orderEntity.getNotaryOfficeId());
 		String[] areas = office.getAreaCodesStr().split(",");