Merge branch 'feature-2022.07.29' of https://git.flowbb.cn/RK-Dev/fqgz-server into feature-2022.07.29

eladmin-system/src/main/java/me/zhengjie/application/admin/controller/vo/NotaryOrderQueryRsp.java

@@ -26,6 +26,8 @@ public class NotaryOrderQueryRsp {
 	private String prodId;
 	// 合同号
 	private String contractNo;
+	// 合同类型
+	private String contractType;
 	// 当事人
 	private String name;
 	// 当事人手机号

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

@@ -178,6 +178,7 @@ public class ModelNotarizationServiceImpl implements ModelNotarizationService {
         qw.eq("code", req.getCode());
         qw.eq("notary_office_id", req.getNotaryOfficeId());
         qw.eq("product_type", req.getProductType());
+        qw.eq("contract_type", req.getContractType());
         qw.in("status", 0, 1);
         ModelEntity model = modelMapper.selectOne(qw);
         return model;

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

@@ -42,7 +42,7 @@ public class NotaryNoteServiceImpl implements NotaryNoteService {
 
 	@Override
 	public JSONObject getNotaryNoteByType(NotaryNoteVo notary) {
-		Map<String, String> map = modelSynthesizerDomain.prepareNoteTemplateData(notary.getBusinessNo(), notary.getContractNo());
+		Map<String, String> map = modelSynthesizerDomain.prepareNoteTemplateData(notary.getBusinessNo());
 		// 查询问题列表
 		UserDto user = contextUtil.getCurrentUser().getUser();
 		NotaryOfficeEntity entity = notaryOfficeMapper.selectById(user.getOrgId().split("_")[1]);

eladmin-system/src/main/java/me/zhengjie/application/bank/controller/vo/SmsVO.java

@@ -1,22 +0,0 @@
-package me.zhengjie.application.bank.controller.vo;
-
-import lombok.Getter;
-import lombok.Setter;
-
-@Getter
-@Setter
-public class SmsVO {
-    //短信模板
-    private String template;
-    //姓名
-    private String userName;
-    //手机号
-    private String phone;
-    //证件号
-    private String idCode;
-    //验证码
-    private String code;
-    //模板参数
-    private String param;
-    private Integer count;
-}

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

@@ -1,7 +1,6 @@
 package me.zhengjie.application.bank.service;
 
 import me.zhengjie.application.bank.controller.vo.BankOrderVO;
-import me.zhengjie.application.bank.controller.vo.SmsVO;
 import me.zhengjie.base.ResponseDTO;
 import me.zhengjie.dao.mybatis.entity.SysUserEntity;
 import org.springframework.web.multipart.MultipartFile;
@@ -63,11 +62,4 @@ public interface BankOrderService {
 	 * @return
 	 */
 	Object parseContractOrder(Integer orderType, MultipartFile file, SysUserEntity user);
-	/**
-	 * 检查订单是否存在
-	 *
-	 * @param smsVO
-	 * @return
-	 */
-	int checkOrder(SmsVO smsVO);
 }

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

@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import me.zhengjie.application.bank.controller.vo.BankOrderVO;
-import me.zhengjie.application.bank.controller.vo.SmsVO;
 import me.zhengjie.application.bank.mq.RedisReceiver;
 import me.zhengjie.application.bank.service.BankOrderService;
 import me.zhengjie.base.ResponseDTO;
@@ -159,11 +158,6 @@ public class BankOrderServiceImpl implements BankOrderService {
 		return null;
 	}
 
-	@Override
-	public int checkOrder(SmsVO smsVO) {
-		return 0;
-	}
-
 	/**
 	 * 获取订单图片链接
 	 * @param contractOrder

eladmin-system/src/main/java/me/zhengjie/application/user/service/SmsService.java

@@ -1,11 +1,11 @@
 package me.zhengjie.application.user.service;
 
-import me.zhengjie.application.bank.controller.vo.SmsVO;
+import me.zhengjie.application.user.vo.SmsVo;
 import me.zhengjie.base.ResponseDTO;
 
 public interface SmsService {
 
-	String chkSmsLog(SmsVO smsVO);
+	String chkSmsLog(SmsVo smsVO);
 
 	ResponseDTO<?> sendSms(String phone, String ip, String template, Integer type);
 }

eladmin-system/src/main/java/me/zhengjie/application/user/service/impl/ApiServiceImpl.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;
 import me.zhengjie.application.bank.controller.vo.BankOrderVO;
 import me.zhengjie.application.bank.controller.vo.FileInfoVO;
-import me.zhengjie.application.bank.controller.vo.SmsVO;
 import me.zhengjie.application.bank.service.BankOrderService;
 import me.zhengjie.application.user.service.SmsService;
 import me.zhengjie.application.user.service.ApiService;
@@ -76,18 +75,18 @@ public class ApiServiceImpl implements ApiService {
 
 		String smsCode = smsVo.getSmsCode();
 //
-		SmsVO smsVO = new SmsVO();
+		SmsVo smsVO = new SmsVo();
 		smsVO.setUserName(smsVo.getUserName());
 		smsVO.setPhone(smsVo.getPhone());
 		smsVO.setIdCode(smsVo.getIdCode());
 		smsVO.setCode(smsCode);
 
 		// 检测订单是否存在
-		Integer rsOrder = this.bankOrderService.checkOrder(smsVO);
-		if (rsOrder == null || rsOrder == 0) {
-
-			return ResponseDTO.error(ResultCode.ORDER_DATA_NOT_EXIST);
-		}
+//		Integer rsOrder = this.bankOrderService.checkOrder(smsVO);
+//		if (rsOrder == null || rsOrder == 0) {
+//
+//			return ResponseDTO.error(ResultCode.ORDER_DATA_NOT_EXIST);
+//		}
 		String token = tokenProvider.appToken(smsVo.getPhone());
 
 		if (StringUtils.isNotBlank(smsCode) && ("1024".equals(smsCode))) {

eladmin-system/src/main/java/me/zhengjie/application/user/service/impl/SmsServiceImpl.java

@@ -5,6 +5,7 @@ import java.util.Date;
 import java.util.Random;
 
 import lombok.RequiredArgsConstructor;
+import me.zhengjie.application.user.vo.SmsVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -13,7 +14,6 @@ import com.google.gson.JsonObject;
 
 import me.zhengjie.domain.sms.CommonConstants;
 
-import me.zhengjie.application.bank.controller.vo.SmsVO;
 import me.zhengjie.application.user.vo.SmsLog;
 import me.zhengjie.application.bank.service.BankOrderService;
 import me.zhengjie.application.user.service.SmsService;
@@ -52,17 +52,17 @@ public class SmsServiceImpl implements SmsService {
 		templateParam.addProperty("code", code);
 		templateParam.addProperty("time", time);
 		// 发送短信信息
-		SmsVO smsVO = new SmsVO();
+		SmsVo smsVO = new SmsVo();
 		smsVO.setPhone(phone);
 		// 登录获取验证码所需信息
 		JsonObject sendJson = new JsonObject();
  		sendJson.addProperty("phone", phone);
  		String sendContent = sendJson.toString();
 		// 检测订单是否存在
-		Integer rsOrder = this.bankOrderService.checkOrder(smsVO);
-		if (rsOrder == 0) {
-			return ResponseDTO.error(ResultCode.ORDER_DATA_NOT_EXIST);
-		}
+//		Integer rsOrder = this.bankOrderService.checkOrder(smsVO);
+//		if (rsOrder == 0) {
+//			return ResponseDTO.error(ResultCode.ORDER_DATA_NOT_EXIST);
+//		}
 		smsVO.setParam(templateParam.toString());
 		smsVO.setTemplate(template);
 		Integer sendCount = 3;
@@ -95,7 +95,7 @@ public class SmsServiceImpl implements SmsService {
 	}
 
 	@Override
-	public String chkSmsLog(SmsVO smsVO) {
+	public String chkSmsLog(SmsVo smsVO) {
 		return null;
 	}
 

eladmin-system/src/main/java/me/zhengjie/application/user/vo/SmsVo.java

@@ -9,7 +9,8 @@ import lombok.ToString;
 @Data
 @ToString
 public class SmsVo {
-
+	//短信模板
+	private String template;
 	@NotNull(message = "姓名不能为空")
 	@ApiModelProperty
 	private String userName;
@@ -25,5 +26,9 @@ public class SmsVo {
 	@NotNull(message = "验证码不能为空")
 	@ApiModelProperty(value = "验证码")
 	private String smsCode;
-
+	//验证码
+	private String code;
+	//模板参数
+	private String param;
+	private Integer count;
 }

eladmin-system/src/main/java/me/zhengjie/base/util/AliSms.java

@@ -8,14 +8,14 @@ import com.aliyuncs.exceptions.ClientException;
 import com.aliyuncs.exceptions.ServerException;
 import com.aliyuncs.http.MethodType;
 import com.aliyuncs.profile.DefaultProfile;
-import me.zhengjie.application.bank.controller.vo.SmsVO;
+import me.zhengjie.application.user.vo.SmsVo;
 
 public class AliSms {
 
 	private static String accessKeyId = "LTAI4GFuVRN6xY6nTATRYRJz";
 	private static String accessKeySecret = "yQkxup3VDwfbcXdXDtdUnGmKE0VIeh";
 
-	public static String sendSms(SmsVO smsVO) {
+	public static String sendSms(SmsVo smsVO) {
 		String content = "";
 		DefaultProfile profile = DefaultProfile.getProfile("cn-hangzhou", accessKeyId, accessKeySecret);
 		IAcsClient client = new DefaultAcsClient(profile);

eladmin-system/src/main/java/me/zhengjie/dao/mybatis/ContractOrderRepository.java

@@ -215,4 +215,20 @@ public class ContractOrderRepository {
     public void insert(ContractOrderEntity order) {
         contractOrderMapper.insert(order);
     }
+
+    /**
+     * 根据合同号获取订单实体
+     *
+     * @param bankId
+     * @param prodId
+     * @param contractNo
+     * @return
+     */
+    public ContractOrderEntity getEntityWithContractNo(String bankId, String prodId, String contractNo) {
+        QueryWrapper<ContractOrderEntity> qw = new QueryWrapper<>();
+        qw.eq("bank_id", bankId);
+        qw.eq("prod_id", prodId);
+        qw.eq("contract_no", contractNo);
+        return contractOrderMapper.selectOne(qw);
+    }
 }

eladmin-system/src/main/java/me/zhengjie/domain/model/ModelSynthesizerDomain.java

@@ -2,6 +2,7 @@ package me.zhengjie.domain.model;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.RequiredArgsConstructor;
+import me.zhengjie.application.admin.controller.OrderCochainController;
 import me.zhengjie.application.admin.service.dto.UserDto;
 import me.zhengjie.application.admin.controller.vo.NotaryNoteDto;
 import me.zhengjie.base.util.ApplicationContextUtil;
@@ -264,7 +265,7 @@ public class ModelSynthesizerDomain {
      * @param businessNo
      * @return
      */
-    public Map<String, String> prepareNoteTemplateData(String businessNo, String contractNo) {
+    public Map<String, String> prepareNoteTemplateData(String businessNo) {
         Map<String, String> noteValue = new HashMap<String, String>();
         // 设置默认值
         noteValue.put("$Date$", DateUtils.date2String(new Date(), 1));
@@ -290,6 +291,16 @@ public class ModelSynthesizerDomain {
         noteValue.put("$Amounts$", contractOrderEntity.getContractMoney());
         noteValue.put("$Term$", contractOrderEntity.getStartDate() + "~" + contractOrderEntity.getEndDate());
         noteValue.put("$LoanRate$", contractOrderEntity.getRate());
+        noteValue.put("$McontractNO$",contractOrderEntity.getMainContractNo());
+        // 抵押合同需要补充借款合同中借款人信息
+        if (contractOrderEntity.getContractType() == OrderConstant.CONTRACT_TYPE_MORTGAGE || contractOrderEntity.getContractType() == OrderConstant.CONTRACT_TYPE_GUARANTEE) {
+            ContractOrderEntity mainOrder = contractOrderRepository.getEntityWithContractNo(contractOrderEntity.getBankId(), contractOrderEntity.getProdId(), contractOrderEntity.getMainContractNo());
+            if (mainOrder != null) {
+                String jointName = mainOrder.getJointFlag() == OrderConstant.JOINT_FLAG_TRUE ? "，" + mainOrder.getJointName() : "";
+                String obligor = mainOrder.getName() + jointName;
+                noteValue.put("$obligor$", obligor);
+            }
+        }
         try {
             SimpleDateFormat monthformatter = new SimpleDateFormat("yyyy-MM");
             Date beginDate = monthformatter.parse(contractOrderEntity.getStartDate());