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/bank/service/impl/BankOrderServiceImpl.java

@@ -104,12 +104,9 @@ public class BankOrderServiceImpl implements BankOrderService {
 
 	@Override
 	public ResponseDTO<String> submitContractOrder(String businessNo, SysUserEntity currentUser) {
-		ResponseDTO response = new ResponseDTO<>();
 		ContractOrderEntity contractOrderEntity = contractOrderRepository.getContractOrderWithBizNo(businessNo);
-		if (modelRepository.existModelInEditing(contractOrderEntity.getProdId(),contractOrderEntity.getContractType(), contractOrderEntity.getNotaryOfficeId(), ModelConstant.MODEL_TYPE_COMMON_LIST)) {
-			response.setCode(OrderBizCodeMessage.MODEL_IN_EDITING.getCode());
-			response.setMessage(OrderBizCodeMessage.MODEL_IN_EDITING.getMessage());
-			return response;
+		if (modelRepository.existModelInEditing(contractOrderEntity.getProdId(), contractOrderEntity.getContractType(), contractOrderEntity.getNotaryOfficeId(), ModelConstant.MODEL_TYPE_COMMON_LIST)) {
+			return new ResponseDTO<>(OrderBizCodeMessage.MODEL_IN_EDITING.getCode(), OrderBizCodeMessage.MODEL_IN_EDITING.getMessage());
 		}
 		updateStatus(businessNo, OrderConstant.ORDER_STATUS_UNCHECKED, "");
 		// 推送创建订单文档任务消息
@@ -118,9 +115,7 @@ public class BankOrderServiceImpl implements BankOrderService {
 		jsonObject.put("userId", currentUser.getUserId());
 		redisReceiver.generateCommonDoc(jsonObject);
 //		redisTemplate.convertAndSend(RedisCacheConfig.CHANNEL_HTML_PDF, jsonObject.toJSONString());
-		response.setCode(ResultCode.SUCCESS.code());
-		response.setMessage(ResultCode.SUCCESS.message());
-		return response;
+		return ResponseDTO.success();
 	}
 
 	@Override