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

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

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

@@ -1,6 +1,5 @@
 package me.zhengjie.application.admin.controller;
 
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;

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

@@ -10,7 +10,7 @@ import static me.zhengjie.base.util.Constants.*;
 import com.alibaba.fastjson.JSONObject;
 
 import lombok.extern.slf4j.Slf4j;
-import me.zhengjie.application.bank.service.ApiBankService;
+import me.zhengjie.application.bank.service.BankLoginService;
 import me.zhengjie.application.bank.service.FileInfoService;
 import me.zhengjie.base.util.FileUploadUtil;
 import me.zhengjie.base.util.StatusEnum.StepStatusEnum;
@@ -24,7 +24,7 @@ import me.zhengjie.base.ResultCode;
 @RequestMapping("/api/file")
 @Slf4j
 public class FileInfoController {
-	ApiBankService apiBankService;
+	BankLoginService bankLoginService;
 	@Autowired
 	FileInfoService fileInfoService;
 	/**

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

@@ -33,9 +33,9 @@ import me.zhengjie.base.AppBaseResponse;
 import me.zhengjie.base.util.ApplicationContextUtil;
 import me.zhengjie.base.util.FileUploadUtil;
 import me.zhengjie.config.RsaProperties;
-import me.zhengjie.dao.mybatis.entity.Dept;
-import me.zhengjie.dao.mybatis.entity.FileInfoEntity;
-import me.zhengjie.dao.mybatis.entity.User;
+import me.zhengjie.dao.mybatis.entity.*;
+import me.zhengjie.dao.mybatis.mapper.BankMapper;
+import me.zhengjie.dao.mybatis.mapper.NotaryOfficeMapper;
 import me.zhengjie.exception.BadRequestException;
 import me.zhengjie.utils.RsaUtils;
 import me.zhengjie.utils.enums.CodeEnum;
@@ -75,6 +75,8 @@ public class UserController {
     private final VerifyService verificationCodeService;
     private final FileInfoService fileInfoService;
     private final ApplicationContextUtil contextUtil;
+    private final BankMapper bankMapper;
+    private final NotaryOfficeMapper notaryOfficeMapper;
 
     @ApiOperation("获取用户信息")
     @GetMapping(value = "/info")
@@ -82,19 +84,24 @@ public class UserController {
         // 这里需要处理图片显示问题
         JwtUserDto jwtUserDto = contextUtil.getCurrentUser();
         // 处理图片的显示，重新查询一下当前的用户的值
-        UserDto cacheUser = jwtUserDto.getUser();
-        UserDto nocacheUser = userService.findUserNoCacheId(cacheUser.getId());
-        //重新设置user
+        UserDto nocacheUser = userService.findUserNoCacheId(jwtUserDto.getUser().getId());
+        // 重新设置user
         if (nocacheUser != null) {
-        	jwtUserDto.setUser(nocacheUser);
+            String[] split = nocacheUser.getOrgId().split("_");
+            if ("bank".equals(split[0])) {
+                nocacheUser.setOrgName(bankMapper.selectById(split[1]).getBankName());
+            } else {
+                NotaryOfficeEntity notaryOfficeEntity = notaryOfficeMapper.selectById(split[1]);
+                nocacheUser.setOrgName(notaryOfficeEntity.getName());
+                nocacheUser.setAutoGenerate(notaryOfficeEntity.getAutoGenerate());
+            }
             FileInfoEntity fileInfo = fileInfoService.getById(nocacheUser.getSignImgId());
             if (fileInfo != null) {
-                String signImgUrl = FileUploadUtil.getFileUrl(fileInfo.getPath());
-                cacheUser.setSignImgUrl(signImgUrl);
-            }else {
-                //这里需要设置图片的路径为空
-                cacheUser.setSignImgUrl("");
+                nocacheUser.setSignImgUrl(FileUploadUtil.getFileUrl(fileInfo.getPath()));
+            } else {
+                nocacheUser.setSignImgUrl("");
             }
+            jwtUserDto.setUser(nocacheUser);
         }
         return ResponseEntity.ok(jwtUserDto);
     }

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

@@ -338,8 +338,12 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 			return response;
 		}
 		// 检查面谈笔录是否提交
+<<<<<<< HEAD
 		OrderFileEntity orderFile = orderFileRepository.getOrderFileWithCode(contractOrderEntity.getProdId(),
 				contractOrderEntity.getBusinessNo(), OrderFileConstant.TYPE_CODE_NOTE);
+=======
+		OrderFileEntity orderFile = orderFileRepository.getOrderFileWithCode(contractOrderEntity.getBusinessNo(), OrderFileConstant.TYPE_CODE_NOTE);
+>>>>>>> 47d830245b3b258a0d0b40cc7bcce1c15b89786a
 		if (orderFile == null) {
 			response.fail(ResultCode.INTERVIEW_NOTE_UNSUBMIT);
 			return response;
@@ -486,8 +490,6 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 		//
 		OrderFileEntity notaryOrderFile = new OrderFileEntity();
 		notaryOrderFile.setBusinessNo(contractOrderEntity.getBusinessNo());
-		notaryOrderFile.setContractNo(contractOrderEntity.getContractNo());
-		notaryOrderFile.setContractId(req.getPartyId());
 		notaryOrderFile.setCode(code);
 		notaryOrderFile.setDocNo(String.valueOf(currentNum));
 		notaryOrderFile.setHtmlUrl(htmlPath);
@@ -495,7 +497,6 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 		notaryOrderFile.setSortNum(modelEntity.getSort());
 		notaryOrderFile.setCreateTime(new Date());
 		notaryOrderFile.setCreatorId(contextUtil.getCurrentUserId());
-		notaryOrderFile.setProdId(contractOrderEntity.getProdId());
 		notaryOrderFile.setFileName(modelEntity.getTitle());
 		orderFileMapper.insert(notaryOrderFile);
 		// 更新当前公证书编号
@@ -711,8 +712,12 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 				put("6", "面谈笔录");
 			}
 		};
+<<<<<<< HEAD
 		List<OrderFileEntity> orderFileList = orderFileRepository.getOrderFileListWithCodes(req.getProdId(),
 				req.getBusinessNo(), "1,2,3,4,5,6".split(","));
+=======
+		List<OrderFileEntity> orderFileList = orderFileRepository.getOrderFileListWithCodes(req.getBusinessNo(),"1,2,3,4,5,6".split(","));
+>>>>>>> 47d830245b3b258a0d0b40cc7bcce1c15b89786a
 		List<Map<String, String>> fileList = new ArrayList<>();
 		for (OrderFileEntity orderFile : orderFileList) {
 			Map<String, String> content = new HashMap<>();

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

@@ -9,7 +9,7 @@ import me.zhengjie.application.bank.controller.vo.BankLoginVo;
 import me.zhengjie.application.bank.controller.vo.FileInfoDto;
 import me.zhengjie.application.bank.controller.vo.FileUploadVo;
 import me.zhengjie.application.bank.controller.vo.ImageUploadVo;
-import me.zhengjie.application.bank.service.ApiBankService;
+import me.zhengjie.application.bank.service.BankLoginService;
 import me.zhengjie.application.bank.service.FileInfoService;
 import me.zhengjie.base.ResponseDTO;
 import me.zhengjie.base.ResultCode;
@@ -41,7 +41,7 @@ import java.util.List;
 @Slf4j
 @RequiredArgsConstructor
 public class BankLoginController extends BaseController {
-    private final ApiBankService apiBankService;
+    private final BankLoginService bankLoginService;
     private final FileInfoService fileInfoService;
     private final UserAXQInfoRepository userAXQInfoRepository;
 
@@ -53,8 +53,7 @@ public class BankLoginController extends BaseController {
      */
     @AnonymousPostMapping("/login")
     public ResponseDTO<String> login(@Valid @RequestBody BankLoginVo loginVo) {
-        return apiBankService.login(loginVo);
-
+        return bankLoginService.login(loginVo);
     }
 
     /**

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

@@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import me.zhengjie.annotation.rest.AnonymousPostMapping;
-import me.zhengjie.application.bank.service.ApiBankService;
 import me.zhengjie.application.bank.service.BankNotarizeService;
 import me.zhengjie.application.bank.service.UserAXQInfoService;
 import me.zhengjie.base.ResponseDTO;
@@ -29,21 +28,23 @@ import org.springframework.web.bind.annotation.RestController;
 public class BankNotarizeController {
     private final OrderFileRepository orderFileRepository;
     private final UserAXQInfoService userAXQInfoService;
-    private final ApiBankService apiBankService;
     private final BankNotarizeService bankNotarizeService;
     private final TencentHumanFaceVerify faceVerify;
 
-    // 得到公证书
+    /**
+     * 获取签名公证书URL
+     *
+     * @param json
+     * @return
+     */
     @RequestMapping("/getNotarization")
     public ResponseDTO<?> getNotarization(@RequestBody String json) {
         JSONObject jsonObj = JSONObject.parseObject(json);
         String businessNo = jsonObj.getString("businessNo");
-        String prodId = jsonObj.getString("prodId");
-        if (StringUtils.isEmpty(businessNo) || StringUtils.isEmpty(prodId)) {
+        if (StringUtils.isEmpty(businessNo)) {
             return ResponseDTO.error(ResultCode.PARAM_IS_BLANK);
         }
-        OrderFileEntity orderFile = orderFileRepository.getOrderNotarization(prodId, businessNo);
-        //
+        OrderFileEntity orderFile = orderFileRepository.getOrderNotarization(businessNo);
         return ResponseDTO.success(FileUploadUtil.getPreviewUrl(orderFile.getSignedPdfUrl()));
     }
 
@@ -84,11 +85,10 @@ public class BankNotarizeController {
 
         JSONObject jsonObj = JSONObject.parseObject(json);
         String businessNo = jsonObj.getString("businessNo");
-        String prodId = jsonObj.getString("prodId");
-        if (StringUtils.isEmpty(businessNo) || StringUtils.isEmpty(prodId)) {
+        if (StringUtils.isEmpty(businessNo)) {
             return ResponseDTO.error(ResultCode.PARAM_IS_BLANK);
         }
-        ResponseDTO<?> order = this.apiBankService.getOrderPDF(businessNo,prodId);
+        ResponseDTO<?> order = bankNotarizeService.getOrderPDF(businessNo);
 
         return order;
     }
@@ -98,12 +98,11 @@ public class BankNotarizeController {
 
         JSONObject jsonObj = JSONObject.parseObject(json);
         String businessNo = jsonObj.getString("businessNo");
-        String prodId = jsonObj.getString("prodId");
-        if (StringUtils.isEmpty(businessNo) || StringUtils.isEmpty(prodId)) {
+        if (StringUtils.isEmpty(businessNo)) {
             return ResponseDTO.error(ResultCode.PARAM_IS_BLANK);
         }
         //
-        OrderFileEntity orderFile = orderFileRepository.getOrderNote(businessNo,prodId);
+        OrderFileEntity orderFile = orderFileRepository.getOrderNote(businessNo);
         // pdf的地址预览
         String noteUrl = FileUploadUtil.getPreviewUrl(orderFile.getHtmlUrl());
 
@@ -145,11 +144,10 @@ public class BankNotarizeController {
     public ResponseDTO<?> uploadSeal(@RequestBody String json) {
         JSONObject jsonObj = JSONObject.parseObject(json);
         String businessNo = jsonObj.getString("businessNo");
-        String contractNo = jsonObj.getString("contractNo");
         JSONArray jsonArray = jsonObj.getJSONArray("signInfo");
         if (StringUtils.isEmpty(businessNo) || jsonArray == null) {
             return ResponseDTO.error(ResultCode.PARAM_IS_BLANK);
         }
-        return userAXQInfoService.uploadSeal(businessNo, contractNo, jsonArray);
+        return userAXQInfoService.uploadSeal(businessNo, jsonArray);
     }
 }

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

@@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.validation.Valid;
 import java.util.List;
 
 @Validated
@@ -44,7 +45,7 @@ public class BankOrderController extends BaseController {
      * @return
      */
     @RequestMapping("/save")
-    public ResponseDTO<String> saveOrder(@RequestBody BankOrderVO vo) {
+    public ResponseDTO<String> saveOrder(@RequestBody @Valid BankOrderVO vo) {
         bankOrderService.saveContractOrder(vo, getCurrentUser());
         return ResponseDTO.success();
     }

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

@@ -16,15 +16,18 @@ public class BankOrderVO {
     @NotNull(message = "业务编号不能为空")
     private String businessNo;
     // 产品ID
+    @NotNull(message = "产品ID不能为空")
     private String prodId;
     // 合同类型ID
+    @NotNull(message = "合同类型ID不能为空")
     private String contractTypeId;
     // 主合同编号
     private String mainContractNo;
     // 合同编号
-    @NotNull(message = "借款合同编号不能为空")
+    @NotNull(message = "合同编号不能为空")
     private String contractNo;
     // 合同类型
+    @NotNull(message = "合同类型不能为空")
     private Integer contractType;
     // 合同起始日
     @NotNull(message = "合同起始日不能为空")
@@ -33,14 +36,20 @@ public class BankOrderVO {
     @NotNull(message = "合同终止日不能为空")
     private String endDate;
     // 合同金额
+    @NotNull(message = "合同金额不能为空")
     private String contractMoney;
     // 利率(借款合同专有)
-    @NotNull(message = "利率不能为空")
     private String rate;
-    // 合同附件
-    private String contractAttachment;
     // 抵押物（抵押合同专有）
     private String mortgagePic;
+    // 授信额度
+    private String creditLimit;
+    // 授信起始日期
+    private String creditStartDate;
+    // 授信结束日期
+    private String creditEndDate;
+    // 合同附件
+    private String contractAttachment;
     // 当事人姓名
     @NotNull(message = "姓名不能为空")
     private String name;
@@ -54,8 +63,10 @@ public class BankOrderVO {
     @NotNull(message = "身份证号码不能为空")
     private String idCard;
     // 身份证正面照片
+    @NotNull(message = "身份证照片不能为空")
     private String idcardFrontPic;
     // 身份证反面照片
+    @NotNull(message = "身份证照片不能为空")
     private String idcardBackPic;
     // 居住地
     @NotNull(message = "居住地不能为空")

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

@@ -45,7 +45,6 @@ public class RedisReceiver implements MessageListener {
 	public void generateCommonDoc(JSONObject jsonObject) {
 		String userId = jsonObject.getString("userId");
 		String businessNo = jsonObject.getString("businessNo");
-		String contractNo = jsonObject.getString("contractNo");
 		//
 		ContractOrderEntity contractOrderEntity = contractOrderRepository.getContractOrderWithBizNo(businessNo);
 		List<ModelEntity> models = modelRepository.getCommonModel(contractOrderEntity.getProdId(), contractOrderEntity.getNotaryOfficeId());
@@ -55,7 +54,6 @@ public class RedisReceiver implements MessageListener {
 			OrderFileEntity fileEntity = new OrderFileEntity();
 			fileEntity.setBusinessNo(businessNo);
 			fileEntity.setCode(m.getCode());
-			fileEntity.setContractNo(contractNo);
 			fileEntity.setSortNum(m.getSort());
 			String html = modelSynthesizerDomain.composeCommonTemplateWithData(businessNo, m.getContent());
 			String htmlPath = FileUploadUtil.saveHtml(html, businessNo);
@@ -65,7 +63,6 @@ public class RedisReceiver implements MessageListener {
 			fileEntity.setCreateTime(new Date());
 			fileEntity.setCreatorId(Long.parseLong(userId));
 			fileEntity.setFileName(m.getTitle());
-			fileEntity.setProdId(m.getProductType());
 			//
 			orderFileMapper.insert(fileEntity);
 		}

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

@@ -10,9 +10,12 @@ import me.zhengjie.base.ResponseDTO;
  * @author auas
  *
  */
-public interface ApiBankService {
+public interface BankLoginService {
 
+	/**
+	 * 登录
+	 * @param sms
+	 * @return
+	 */
 	ResponseDTO<String> login(BankLoginVo sms);
-	
-	public ResponseDTO<?> getOrderPDF(String businessNo,String prodId) ;
 }

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

@@ -3,5 +3,18 @@ package me.zhengjie.application.bank.service;
 import me.zhengjie.base.ResponseDTO;
 
 public interface BankNotarizeService {
+    /**
+     * 发起视频通话请求
+     *
+     * @param json
+     * @return
+     */
     ResponseDTO<?> videoCall(String json);
+
+    /**
+     * 获取订单文件
+     * @param businessNo
+     * @return
+     */
+    ResponseDTO<?> getOrderPDF(String businessNo) ;
 }

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

@@ -9,7 +9,7 @@ public interface UserAXQInfoService {
 
     ResponseDTO<?> registAXQUser(String idCard, String phone, String name);
 
-    ResponseDTO<?> uploadSeal(String businessNo, String contractNo, JSONArray jsonArray);
+    ResponseDTO<?> uploadSeal(String businessNo, JSONArray jsonArray);
 
     ResponseDTO<?> sendAuthMessage(String idCard);
 

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

@@ -3,23 +3,17 @@ package me.zhengjie.application.bank.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
 import me.zhengjie.application.bank.controller.vo.BankLoginVo;
-import me.zhengjie.application.bank.controller.vo.FileInfoDto;
-import me.zhengjie.application.bank.service.ApiBankService;
+import me.zhengjie.application.bank.service.BankLoginService;
 import me.zhengjie.application.bank.service.BankOrderService;
 import me.zhengjie.application.bank.service.SysUserService;
 import me.zhengjie.base.ResponseDTO;
 import me.zhengjie.base.ResultCode;
-import me.zhengjie.base.util.FileUploadUtil;
 import me.zhengjie.dao.mybatis.OrderFileRepository;
-import me.zhengjie.dao.mybatis.entity.OrderFileEntity;
 import me.zhengjie.dao.mybatis.entity.SysUserEntity;
 import me.zhengjie.security.security.TokenProvider;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * 银行app端登录
  * 
@@ -28,7 +22,7 @@ import java.util.List;
  */
 @Service
 @Slf4j
-public class ApiBankServiceImpl implements ApiBankService {
+public class BankLoginServiceImpl implements BankLoginService {
 	@Autowired
 	OrderFileRepository orderFileRepository;
 
@@ -50,17 +44,4 @@ public class ApiBankServiceImpl implements ApiBankService {
 		}
 		return ResponseDTO.error(ResultCode.USER_LOGIN_ERROR);
 	}
-
-	@Override
-	public ResponseDTO<?> getOrderPDF(String businessNo, String prodId) {
-		List<OrderFileEntity> orderFileList = orderFileRepository.getOrderFileListWithCodes(prodId, businessNo, "1,2,3,4,5".split(","));
-		List<FileInfoDto> infos = new ArrayList<>();
-		for (OrderFileEntity orderFile : orderFileList) {
-			FileInfoDto info = new FileInfoDto();
-			info.setUrl(FileUploadUtil.getPreviewUrl(orderFile.getHtmlUrl()));
-			infos.add(info);
-		}
-		log.info("方法getOrderPDF的url地址返回参数: " + infos);
-		return ResponseDTO.success(infos);
-	}
 }

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

@@ -3,21 +3,30 @@ package me.zhengjie.application.bank.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import me.zhengjie.application.bank.controller.vo.FileInfoDto;
 import me.zhengjie.application.bank.service.BankNotarizeService;
 import me.zhengjie.application.bank.service.OrderRoomIdService;
 import me.zhengjie.base.ResponseDTO;
 import me.zhengjie.base.mq.RedisCacheConfig;
+import me.zhengjie.base.util.FileUploadUtil;
+import me.zhengjie.dao.mybatis.OrderFileRepository;
+import me.zhengjie.dao.mybatis.entity.OrderFileEntity;
 import me.zhengjie.dao.mybatis.entity.OrderRoomIdEntity;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
 @Service
 @Slf4j
 @RequiredArgsConstructor
 public class BankNotarizeServiceImpl implements BankNotarizeService {
     private final OrderRoomIdService orderRoomIdService;
     private final RedisTemplate<String, String> redisTemplate;
+    private final OrderFileRepository orderFileRepository;
+
     @Override
     public ResponseDTO<?> videoCall(String json) {
 
@@ -55,4 +64,17 @@ public class BankNotarizeServiceImpl implements BankNotarizeService {
         return ResponseDTO.success();
 
     }
+
+    @Override
+    public ResponseDTO<?> getOrderPDF(String businessNo) {
+        List<OrderFileEntity> orderFileList = orderFileRepository.getOrderFileListWithCodes(businessNo, "1,2,3,4,5".split(","));
+        List<FileInfoDto> infos = new ArrayList<>();
+        for (OrderFileEntity orderFile : orderFileList) {
+            FileInfoDto info = new FileInfoDto();
+            info.setUrl(FileUploadUtil.getPreviewUrl(orderFile.getHtmlUrl()));
+            infos.add(info);
+        }
+        log.info("方法getOrderPDF的url地址返回参数: " + infos);
+        return ResponseDTO.success(infos);
+    }
 }

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

@@ -132,8 +132,6 @@ public class NotaryNoteServiceImpl extends ServiceImpl<NotaryNoteMapper, NotaryN
 		ModelEntity modelEntity = modelRepository.getModelEntity(notary.getProdId(),String.valueOf(officeEntity.getId()), ModelConstant.MODEL_TYPE_NOTE, ModelConstant.MODEL_STATUS_ENABLE);
 		OrderFileEntity orderFile = new OrderFileEntity();
 		orderFile.setBusinessNo(notary.getBusinessNo());
-		orderFile.setContractNo(notary.getContractNo());
-		orderFile.setContractId(notary.getOrderId());
 		orderFile.setCode(ModelConstant.MODEL_TYPE_NOTE);
 		orderFile.setHtmlUrl(htmlpath);
 		orderFile.setPdfUrl(pdfPath);
@@ -141,8 +139,7 @@ public class NotaryNoteServiceImpl extends ServiceImpl<NotaryNoteMapper, NotaryN
 		orderFile.setCreateTime(new Date());
 		orderFile.setCreatorId(userDto.getId());
 		orderFile.setFileName(modelEntity.getTitle());
-		orderFile.setProdId(notary.getProdId());
-		OrderFileEntity orderFileEntity = orderFileRepository.getOrderFileWithCode(notary.getProdId(), notary.getBusinessNo(), ModelConstant.MODEL_TYPE_NOTE);
+		OrderFileEntity orderFileEntity = orderFileRepository.getOrderFileWithCode(notary.getBusinessNo(), ModelConstant.MODEL_TYPE_NOTE);
 		if (orderFileEntity == null) {
 			orderFileMapper.insert(orderFile);
 		} else {
@@ -300,7 +297,7 @@ public class NotaryNoteServiceImpl extends ServiceImpl<NotaryNoteMapper, NotaryN
 	public void recreateApplyDoc(String businessNo,String contractNo) {
 		ContractOrderEntity contractOrderEntity = contractOrderRepository.getContractOrderWithBizNo(businessNo);
 		ModelEntity model = modelRepository.getModelEntity(contractOrderEntity.getProdId(), contractOrderEntity.getNotaryOfficeId(), ModelConstant.MODEL_TYPE_APPLY, ModelConstant.MODEL_STATUS_ENABLE);
-		OrderFileEntity fileEntity = orderFileRepository.getOrderFileWithCode(contractOrderEntity.getProdId(), businessNo, ModelConstant.MODEL_TYPE_APPLY);
+		OrderFileEntity fileEntity = orderFileRepository.getOrderFileWithCode(businessNo, ModelConstant.MODEL_TYPE_APPLY);
 		OrderFileEntity saveFile = new OrderFileEntity();
 		saveFile.setId(fileEntity.getId());
 		String html = modelSynthesizerDomain.composeCommonTemplateWithData(businessNo, model.getContent());

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

@@ -43,7 +43,6 @@ public class UserAXQInfoServiceImpl implements UserAXQInfoService {
 	private final OrderFileRepository orderFileRepository;
 	private final OrderFileMapper orderFileMapper;
 	private final FileInfoMapper fileInfoMapper;
-	private final ApplicationContextUtil applicationContextUtil;
 	private final ContractOrderRepository contractOrderRepository;
 	private final SysUserMapper sysUserMapper;
 
@@ -73,7 +72,7 @@ public class UserAXQInfoServiceImpl implements UserAXQInfoService {
 	}
 
 	@Override
-	public ResponseDTO<?> uploadSeal(String businessNo,String contractNo, JSONArray jsonArray) {
+	public ResponseDTO<?> uploadSeal(String businessNo, JSONArray jsonArray) {
 		try {
 			List<UploadSignInfoVO> signInfoList = new ArrayList<>();
 			for (Object object : jsonArray) {
@@ -114,7 +113,7 @@ public class UserAXQInfoServiceImpl implements UserAXQInfoService {
 			notartyUser.setAuthorizationTime("20220214171200");
 			signInfoList.add(notartyUser);
 			//
-			signContract(signInfoList, businessNo, order.getProdId());
+			signContract(signInfoList, businessNo);
 		} catch (Exception e) {
 			e.printStackTrace();
 			return ResponseDTO.error(ResultCode.FILE_UPLOAD_FAIL);
@@ -165,10 +164,9 @@ public class UserAXQInfoServiceImpl implements UserAXQInfoService {
 	 *
 	 * @param signInfoList
 	 * @param businessNo
-	 * @param prodId
 	 */
-	private void signContract(List<UploadSignInfoVO> signInfoList, String businessNo, String prodId) {
-		List<OrderFileEntity> orderFileList = orderFileRepository.getOrderFileListWithCodes(prodId, businessNo, "1,2,3,4,5,6,7,8,9".split(","));
+	private void signContract(List<UploadSignInfoVO> signInfoList, String businessNo) {
+		List<OrderFileEntity> orderFileList = orderFileRepository.getOrderFileListWithCodes(businessNo, "1,2,3,4,5,6,7,8,9".split(","));
 		CFCACertUtil.proxySwitchOn = "dev".equals(systemEnv);
 		for (OrderFileEntity orderFile : orderFileList) {
 			String path = businessNo + "/signed-doc-" + orderFile.getId() + "/";

eladmin-system/src/main/java/me/zhengjie/application/user/app/controller/AppUserController.java

@@ -142,13 +142,12 @@ public class AppUserController {
 	public ResponseDTO<?> note(@RequestBody String json) {
 
 		JSONObject jsonObj = JSONObject.parseObject(json);
-		String prodId = jsonObj.getString("prodId");
 		String businessNo = jsonObj.getString("businessNo");
-		if (StringUtils.isEmpty(prodId) || StringUtils.isEmpty(businessNo)) {
+		if (StringUtils.isEmpty(businessNo)) {
 			return ResponseDTO.error(ResultCode.PARAM_IS_BLANK);
 		}
 		//
-		OrderFileEntity orderFile = orderFileRepository.getOrderNote(businessNo,prodId);
+		OrderFileEntity orderFile = orderFileRepository.getOrderNote(businessNo);
 		// pdf的地址预览
 		String noteUrl = FileUploadUtil.getPreviewUrl(orderFile.getHtmlUrl());
 
@@ -248,12 +247,11 @@ public class AppUserController {
 	@RequestMapping("/getNotarization")
 	public ResponseDTO<?> getNotarization(@RequestBody String json) {
 		JSONObject jsonObj = JSONObject.parseObject(json);
-		String prodId = jsonObj.getString("prodId");
 		String businessNo = jsonObj.getString("businessNo");
-		if (StringUtils.isEmpty(prodId) || StringUtils.isEmpty(businessNo)) {
+		if (StringUtils.isEmpty(businessNo)) {
 			return ResponseDTO.error(ResultCode.PARAM_IS_BLANK);
 		}
-		OrderFileEntity orderFile = orderFileRepository.getOrderNotarization(prodId, businessNo);
+		OrderFileEntity orderFile = orderFileRepository.getOrderNotarization(businessNo);
 		return ResponseDTO.success(FileUploadUtil.getPreviewUrl(orderFile.getSignedPdfUrl()));
 	}
 }

eladmin-system/src/main/java/me/zhengjie/application/user/mini/controller/MiniUserController.java

@@ -137,13 +137,12 @@ public class MiniUserController {
 	public ResponseDTO<?> note(@RequestBody String json) {
 		
 		JSONObject jsonObj = JSONObject.parseObject(json);
-		String prodId = jsonObj.getString("prodId");
 		String businessNo = jsonObj.getString("businessNo");
-		if (StringUtils.isEmpty(prodId) || StringUtils.isEmpty(businessNo)) {
+		if (StringUtils.isEmpty(businessNo)) {
 			return ResponseDTO.error(ResultCode.PARAM_IS_BLANK);
 		}
 		//
-		OrderFileEntity orderFile = orderFileRepository.getOrderNote(businessNo,prodId);
+		OrderFileEntity orderFile = orderFileRepository.getOrderNote(businessNo);
 		// pdf的地址预览
 		String noteUrl = FileUploadUtil.getPreviewUrl(orderFile.getHtmlUrl());
 		
@@ -265,13 +264,11 @@ public class MiniUserController {
 	@RequestMapping("/getNotarization")
 	public ResponseDTO<?> getNotarization(@RequestBody String json) {
 		JSONObject jsonObj = JSONObject.parseObject(json);
-		String prodId = jsonObj.getString("prodId");
 		String businessNo = jsonObj.getString("businessNo");
-		if (StringUtils.isEmpty(prodId) || StringUtils.isEmpty(businessNo)) {
+		if (StringUtils.isEmpty(businessNo)) {
 			return ResponseDTO.error(ResultCode.PARAM_IS_BLANK);
 		}
-		OrderFileEntity orderFile = orderFileRepository.getOrderNotarization(prodId,businessNo);
+		OrderFileEntity orderFile = orderFileRepository.getOrderNotarization(businessNo);
 		return ResponseDTO.success(orderFile.getSignedPdfUrl());
 	}
-
 }

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

@@ -17,6 +17,7 @@ import me.zhengjie.dao.mybatis.OrderFileRepository;
 import me.zhengjie.dao.mybatis.entity.OrderFileEntity;
 import me.zhengjie.dao.mybatis.entity.OrderRoomIdEntity;
 import me.zhengjie.dao.mybatis.mapper.ContractOrderMapper;
+import me.zhengjie.domain.model.ModelConstant;
 import me.zhengjie.security.security.TokenProvider;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -160,8 +161,7 @@ public class ApiServiceImpl implements ApiService {
 
 	@Override
 	public ResponseDTO<?> getOrderPDF(String businessNo, String prodId) {
-		List<OrderFileEntity> orderFileList = orderFileRepository.getOrderFileListWithCodes(prodId, businessNo,
-				"1,2,3,4,5".split(","));
+		List<OrderFileEntity> orderFileList = orderFileRepository.getOrderFileListWithCodes(businessNo, ModelConstant.MODEL_TYPE_COMMON_LIST);
 		List<FileInfoDto> infos = new ArrayList<>();
 		for (OrderFileEntity orderFile : orderFileList) {
 			FileInfoDto info = new FileInfoDto();

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

@@ -20,16 +20,12 @@ public class OrderFileRepository {
     /**
      * 获取指定订单指定类型的公证文书列表
      *
-     * @param prodId
      * @param businessNo
      * @param codes
      * @return
      */
-    public List<OrderFileEntity> getOrderFileListWithCodes(String prodId, String businessNo, String[] codes) {
+    public List<OrderFileEntity> getOrderFileListWithCodes(String businessNo, String[] codes) {
         QueryWrapper<OrderFileEntity> qw = new QueryWrapper<>();
-        if (!StringUtils.isEmpty(prodId)) {
-            qw.eq("prod_id", prodId);
-        }
         qw.eq("business_no", businessNo);
         qw.in("code", codes);
         qw.orderByAsc("sort_num");
@@ -39,14 +35,13 @@ public class OrderFileRepository {
     /**
      * 获取指定订单指定类型的公证文书
      *
-     * @param prodId
      * @param businessNo
      * @param code
      * @return
      */
-    public OrderFileEntity getOrderFileWithCode(String prodId, String businessNo, String code) {
+    public OrderFileEntity getOrderFileWithCode(String businessNo, String code) {
         String[] codes = {code};
-        List<OrderFileEntity> orderFileList = getOrderFileListWithCodes(prodId, businessNo, codes);
+        List<OrderFileEntity> orderFileList = getOrderFileListWithCodes(businessNo, codes);
         if (orderFileList != null && orderFileList.size() > 0) {
             return orderFileList.get(0);
         }
@@ -56,23 +51,21 @@ public class OrderFileRepository {
     /**
      * 获取指定订单指定产品的公证书
      *
-     * @param prodId
      * @param businessNo
      * @return
      */
-    public OrderFileEntity getOrderNotarization(String prodId, String businessNo) {
-        return getOrderFileWithCode(prodId, businessNo, OrderFileConstant.TYPE_CODE_NOTARIZATION);
+    public OrderFileEntity getOrderNotarization(String businessNo) {
+        return getOrderFileWithCode(businessNo, OrderFileConstant.TYPE_CODE_NOTARIZATION);
     }
 
     /**
      * 获取指定订单指定产品面谈笔录
      *
      * @param businessNo
-     * @param prodId
      * @return
      */
-    public OrderFileEntity getOrderNote(String businessNo, String prodId) {
-        return getOrderFileWithCode(prodId, businessNo, OrderFileConstant.TYPE_CODE_NOTE);
+    public OrderFileEntity getOrderNote(String businessNo) {
+        return getOrderFileWithCode(businessNo, OrderFileConstant.TYPE_CODE_NOTE);
     }
 
     /**

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

@@ -51,12 +51,21 @@ public class ContractOrderEntity implements Serializable {
     @TableField("rate")
     private String rate;
 
-    @TableField("contract_attachment")
-    private String contractAttachment;
-
     @TableField("mortgage_pic")
     private String mortgagePic;
 
+    @TableField("credit_limit")
+    private String creditLimit;
+
+    @TableField("credit_start_date")
+    private String creditStartDate;
+
+    @TableField("credit_end_date")
+    private String creditEndDate;
+
+    @TableField("contract_attachment")
+    private String contractAttachment;
+
     @TableField("name")
     private String name;
 

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

@@ -24,12 +24,6 @@ public class OrderFileEntity implements Serializable {
     @TableField("business_no")
     private String businessNo;
 
-    @TableField("contract_id")
-    private String contractId;
-
-    @TableField("contract_no")
-    private String contractNo;
-
     @TableField("code")
     private String code;
 
@@ -68,7 +62,4 @@ public class OrderFileEntity implements Serializable {
 
     @TableField("file_name")
     private String fileName;
-
-    @TableField("prod_id")
-    private String prodId;
 }

eladmin-system/src/main/resources/config/application.yml

@@ -3,7 +3,7 @@ spring:
   freemarker:
     check-template-location: false
   profiles:
-    active: dev
+    active: prod
   jackson:
     time-zone: GMT+8
   data: