兼容邮储产品

eladmin-system/src/main/java/me/zhengjie/application/admin/service/impl/AdminOrderServiceImpl.java

@@ -427,7 +427,19 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 			map.put("$GuaranteeSex$", "1".equals(guaranteeEntity.getSex()) ? "男" : "女");
 			map.put("$GuaranteeBirthdday$", guaranteeEntity.getBirth());
 		}
-
+		// 客户经理
+		try {
+			SimpleDateFormat dateSrcFormatter = new SimpleDateFormat("yyyyMMdd");
+			SimpleDateFormat dateDestFormatter = new SimpleDateFormat("yyyy/MM/dd");
+			SysUserEntity customer = userDao.selectById(orderEntity.getCustomerId());
+			Date date = dateSrcFormatter.parse(customer.getIdCard().substring(6, 14));
+			map.put("$PBName$", customer.getNickName());
+			map.put("$PBSex$", customer.getGender());
+			map.put("$PBBirthday$", dateDestFormatter.format(date));
+			map.put("$PBIDNo$", customer.getIdCard());
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
 		// 银行信息
 		BankEntity bankEntity = bankMapper.selectById(orderEntity.getBankId());
 		map.put("$Bank$", bankEntity.getBankName());
@@ -463,6 +475,8 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 		notaryOrderFile.setSortNum(modelEntity.getSort());
 		notaryOrderFile.setCreateTime(new Date());
 		notaryOrderFile.setCreatorId(contextUtil.getCurrentUserId());
+		notaryOrderFile.setProdId(orderEntity.getProdId());
+		notaryOrderFile.setFileName(modelEntity.getTitle());
 		orderFileMapper.insert(notaryOrderFile);
 		// 更新当前公证书编号
 		NotarizationNoEntity notarizationNo = new NotarizationNoEntity();

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

@@ -105,6 +105,7 @@ public class RedisReceiver implements MessageListener {
 					map.put("$MateBirthday$", dateDestFormatter.format(date));
 					map.put("$MateAddr$", borrower.getResidence());
 					map.put("$MatePhone$", borrower.getSpousePhone());
+
 				} catch (Exception e) {
 					e.printStackTrace();
 				}

eladmin-system/src/main/java/me/zhengjie/application/bank/service/impl/NotaryNoteServiceImpl.java

@@ -284,62 +284,68 @@ public class NotaryNoteServiceImpl extends ServiceImpl<INotaryNoteDao, NotaryNot
 		BankEntity bank = bankMapper.selectById(order.getBankId());
 		String lender = "贷款人：" + bank.getBankName() + "，住所：" + bank.getAddress() + "，负责人：" + bank.getPrincipal() + "<br/>";
 		//
-		SysUserEntity user = sysUserMapper.selectById(order.getCustomerId());
-		Map<String, String> customerMap = new HashMap<>();
-		customerMap.put("title", "委托代理人");
-		customerMap.put("name", user.getNickName());
-		customerMap.put("sex", user.getGender());
-		customerMap.put("birth", user.getIdCard().substring(6, 8));
-		customerMap.put("idCard", user.getIdCard());
-		customerMap.put("phone", user.getPhone());
-		userList.add(customerMap);
-		BorrowerEntity borrower = orderRepository.getBorrowerByBizNo(businessNo);
-		Map<String, String> borrowerMap = new HashMap<>();
-		borrowerMap.put("title", "借款人");
-		borrowerMap.put("name", borrower.getUsername());
-		borrowerMap.put("sex", "1".equals(borrower.getSex()) ? "男" : "女");
-		borrowerMap.put("birth", borrower.getBirth());
-		borrowerMap.put("idCard", borrower.getIdCard());
-		borrowerMap.put("phone", borrower.getPhone());
-		userList.add(borrowerMap);
-		if (borrower.getJointFlag() == 1) {
-			borrowerMap = new HashMap<>();
+		SimpleDateFormat dateSrcFormatter = new SimpleDateFormat("yyyyMMdd");
+		SimpleDateFormat dateDestFormatter = new SimpleDateFormat("yyyy/MM/dd");
+		try {
+			SysUserEntity user = sysUserMapper.selectById(order.getCustomerId());
+			Map<String, String> customerMap = new HashMap<>();
+			customerMap.put("title", "委托代理人");
+			customerMap.put("name", user.getNickName());
+			customerMap.put("sex", user.getGender());
+			customerMap.put("birth", dateDestFormatter.format(dateSrcFormatter.parse(user.getIdCard().substring(6, 14))));
+			customerMap.put("idCard", user.getIdCard());
+			customerMap.put("phone", user.getPhone());
+			userList.add(customerMap);
+			BorrowerEntity borrower = orderRepository.getBorrowerByBizNo(businessNo);
+			Map<String, String> borrowerMap = new HashMap<>();
 			borrowerMap.put("title", "借款人");
-			borrowerMap.put("name", borrower.getSpouseName());
-			String sex="男";
-			if(StringUtils.isNotEmpty(borrower.getSpouseSex())&& borrower.getSpouseSex().equals("2")) {
-				sex="女";
-			}
-			borrowerMap.put("sex", sex);
-			borrowerMap.put("birth", borrower.getSpouseIdCard().substring(6,14));
-			borrowerMap.put("idCard", borrower.getSpouseIdCard());
-			borrowerMap.put("phone", borrower.getSpousePhone());
+			borrowerMap.put("name", borrower.getUsername());
+			borrowerMap.put("sex", "1".equals(borrower.getSex()) ? "男" : "女");
+			borrowerMap.put("birth", borrower.getBirth());
+			borrowerMap.put("idCard", borrower.getIdCard());
+			borrowerMap.put("phone", borrower.getPhone());
 			userList.add(borrowerMap);
-		}
-		MortgageEntity mortgage = orderRepository.getMortgageByBizNo(businessNo);
-		if (mortgage != null) {
-			Map<String, String> mortgageMap = new HashMap<>();
-			mortgageMap.put("title", "抵押人");
-			mortgageMap.put("name", mortgage.getUsername());
-			mortgageMap.put("sex", "1".equals(mortgage.getSex()) ? "男" : "女");
-			mortgageMap.put("birth", mortgage.getBirth());
-			mortgageMap.put("idCard", mortgage.getIdCard());
-			mortgageMap.put("phone", mortgage.getPhone());
-			userList.add(mortgageMap);
-			if (mortgage.getJointFlag() == 1) {
-				mortgageMap = new HashMap<>();
-				mortgageMap.put("title", "抵押人");
-				mortgageMap.put("name", mortgage.getSpouseName());
-				String sex="男";
-				if(StringUtils.isNotEmpty(borrower.getSpouseSex())&& borrower.getSpouseSex().equals("2")) {
-					sex="女";
+			if (borrower.getJointFlag() == 1) {
+				borrowerMap = new HashMap<>();
+				borrowerMap.put("title", "借款人");
+				borrowerMap.put("name", borrower.getSpouseName());
+				String sex = "男";
+				if (StringUtils.isNotEmpty(borrower.getSpouseSex()) && borrower.getSpouseSex().equals("2")) {
+					sex = "女";
 				}
-				mortgageMap.put("sex", sex);
-				mortgageMap.put("birth", mortgage.getSpouseIdCard().substring(6,14));
-				mortgageMap.put("idCard", mortgage.getSpouseIdCard());
-				mortgageMap.put("phone", mortgage.getSpousePhone());
+				borrowerMap.put("sex", sex);
+				borrowerMap.put("birth", dateDestFormatter.format(dateSrcFormatter.parse(borrower.getSpouseIdCard().substring(6, 14))));
+				borrowerMap.put("idCard", borrower.getSpouseIdCard());
+				borrowerMap.put("phone", borrower.getSpousePhone());
+				userList.add(borrowerMap);
+			}
+			MortgageEntity mortgage = orderRepository.getMortgageByBizNo(businessNo);
+			if (mortgage != null) {
+				Map<String, String> mortgageMap = new HashMap<>();
+				mortgageMap.put("title", "抵押人");
+				mortgageMap.put("name", mortgage.getUsername());
+				mortgageMap.put("sex", "1".equals(mortgage.getSex()) ? "男" : "女");
+				mortgageMap.put("birth", mortgage.getBirth());
+				mortgageMap.put("idCard", mortgage.getIdCard());
+				mortgageMap.put("phone", mortgage.getPhone());
 				userList.add(mortgageMap);
+				if (mortgage.getJointFlag() == 1) {
+					mortgageMap = new HashMap<>();
+					mortgageMap.put("title", "抵押人");
+					mortgageMap.put("name", mortgage.getSpouseName());
+					String sex = "男";
+					if (StringUtils.isNotEmpty(borrower.getSpouseSex()) && borrower.getSpouseSex().equals("2")) {
+						sex = "女";
+					}
+					mortgageMap.put("sex", sex);
+					mortgageMap.put("birth", dateDestFormatter.format(dateSrcFormatter.parse(mortgage.getSpouseIdCard().substring(6, 14))));
+					mortgageMap.put("idCard", mortgage.getSpouseIdCard());
+					mortgageMap.put("phone", mortgage.getSpousePhone());
+					userList.add(mortgageMap);
+				}
 			}
+		} catch (Exception e) {
+			e.printStackTrace();
 		}
 		String template = "$title：$name，$sex，$birth出生，公民身份证号码：$idCard，联系电话：$phone<br/>";
 		String users = lender;