Merge remote-tracking branch 'origin/feature-2022.06.27' into feature-2022.06.27

# Conflicts:
#	eladmin-system/src/main/java/me/zhengjie/application/bank/service/impl/OrderServiceImpl.java
#	eladmin-system/src/main/java/me/zhengjie/application/user/service/impl/ApiServiceImpl.java

README.md

@@ -104,3 +104,4 @@
  
 https://blog.csdn.net/weixin_44120354/article/details/121116555 linux单机部署minio
 http://docs.minio.org.cn/docs/master/minio-deployment-quickstart-guide 中文文档手册
+https://blog.csdn.net/tianmunan/article/details/118874734 配置主从模式

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

@@ -170,7 +170,21 @@ public class AppBankController extends BaseController {
 		OrderDetailDto detailDto = (OrderDetailDto) response.getData().getResult();
 		return ResponseDTO.success(detailDto);
 	}
+	@RequestMapping("/order/search")
+	public ResponseDTO<?> orderSearch(@RequestBody String json) {
+		 
+		JSONObject jsonObj = JSONObject.parseObject(json);
+		String phone = jsonObj.getString("phone");
+		String status = jsonObj.getString("status");
+		String contractNo = jsonObj.getString("contractNo");
+		Integer startIndex = 1;
 
+		Integer size = Integer.MAX_VALUE;
+
+		List<OrderEntity> list = borrowerService.getOrderList(contractNo,phone, status, startIndex, size);
+
+		return ResponseDTO.success(list);
+	}
 	/**
 	 * 提交订单
 	 * 
@@ -277,11 +291,12 @@ public class AppBankController extends BaseController {
 		JSONObject jsonObj = JSONObject.parseObject(json);
 		String phone = jsonObj.getString("phone");
 		String status = jsonObj.getString("status");
+		String contractNo = jsonObj.getString("contractNo");
 		Integer startIndex = 1;
 
 		Integer size = Integer.MAX_VALUE;
 
-		List<OrderEntity> list = borrowerService.getOrderList(phone, status, startIndex, size);
+		List<OrderEntity> list = borrowerService.getOrderList(contractNo,phone, status, startIndex, size);
 
 		return ResponseDTO.success(list);
 	}

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

@@ -32,7 +32,7 @@ public interface BorrowerService extends AbstractService<BorrowerEntity> {
 
 	public AppBaseResponse<OrderDetailDto> borrowerInfo(Map<String,String> map);
 
-	List<OrderEntity> getOrderList(String phone,String status, Integer pageIndex, Integer pageSize);
+	List<OrderEntity> getOrderList(String contractNo,String phone,String status, Integer pageIndex, Integer pageSize);
 
 	List<OrderDto> getSubOrderList(String businessNo,String status, Integer pageIndex, Integer pageSize);
 }

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

@@ -3,6 +3,7 @@ package me.zhengjie.application.bank.service;
 import me.zhengjie.application.bank.controller.vo.Order;
 import me.zhengjie.application.bank.controller.vo.OrderDetailDto;
 import me.zhengjie.application.bank.controller.vo.OrderDto;
+import me.zhengjie.application.bank.controller.vo.OrderVo;
 import me.zhengjie.base.AppBaseResponse;
 import me.zhengjie.base.ResponseDTO;
 import me.zhengjie.application.bank.controller.vo.Sms;
@@ -51,4 +52,6 @@ public interface OrderService extends IService<NotaryOrderEntity> {
 	public Object parseOrder(String orderType, MultipartFile file, SysUserEntity user);
 	
 	public ResponseDTO<?> videoCall(String json) ;
+	
+	public List<OrderDto> getOrderByContion(OrderVo user);
 }

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

@@ -22,6 +22,7 @@ import me.zhengjie.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -112,7 +113,7 @@ public class BorrowerServiceImpl extends AbstractServiceImpl<BorrowerMapper, Bor
 	}
 
     @Override
-    public List<OrderEntity> getOrderList(String phone, String status, Integer pageIndex, Integer pageSize) {
+    public List<OrderEntity> getOrderList(String contractNo,String phone, String status, Integer pageIndex, Integer pageSize) {
         QueryWrapper<SysUserEntity> qw = new QueryWrapper<>();
         qw.eq("phone", phone);
         SysUserEntity user = userDao.selectOne(qw);
@@ -121,6 +122,7 @@ public class BorrowerServiceImpl extends AbstractServiceImpl<BorrowerMapper, Bor
             QueryWrapper<OrderEntity> orderEntityQueryWrapper = new QueryWrapper<>();
 			orderEntityQueryWrapper.eq("customer_id", user.getUserId());
 			orderEntityQueryWrapper.eq("status",status);
+			orderEntityQueryWrapper.like(!ObjectUtils.isEmpty(contractNo), "contract_no", contractNo);
             List<OrderEntity> orderEntities = orderDaol.selectList(orderEntityQueryWrapper);
             list.addAll(orderEntities);
         }

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

@@ -11,6 +11,9 @@ import me.zhengjie.application.bank.service.*;
 import me.zhengjie.dao.mybatis.entity.*;
 import me.zhengjie.domain.order.OrderBizCodeMessage;
 import me.zhengjie.dao.jdbc.OrderDao;
+import me.zhengjie.application.bank.controller.vo.OrderDetailDto;
+import me.zhengjie.application.bank.controller.vo.OrderDto;
+import me.zhengjie.application.bank.controller.vo.OrderVo;
 import me.zhengjie.base.AppBaseResponse;
 import me.zhengjie.base.plus.QueryWrapperUtil;
 import me.zhengjie.base.util.DateFormatUtils;
@@ -603,7 +606,125 @@ public class OrderServiceImpl extends ServiceImpl<NotaryOrderMapper, NotaryOrder
 		Integer[] intArray = Arrays.stream(array).mapToInt(Integer::parseInt).boxed().toArray(Integer[]::new);
 		return Arrays.asList(intArray);
 	}
+	@Override
+	public List<OrderDto> getOrderByContion(OrderVo user) {
+		AppBorrowerEntity borrower = new AppBorrowerEntity();
+		borrower.setIdCard(user.getIdCode());
+		borrower.setUsername(user.getUserName());
+		borrower.setPhone(user.getPhone());
+		borrower.setBusinessNo(user.getBusinessNo());
+		borrower.setContractNo(user.getContractNo());
+		borrower.setStatus(user.getStatus());
+		QueryWrapper<AppBorrowerEntity> queryWrapper = QueryWrapperUtil.convertQuery(borrower);
+		List<AppBorrowerEntity> borrowers = borrowerService.list(queryWrapper);
+		if (user.getBusinessNo() == null && borrowers != null && borrowers.size() > 0) {
+			user.setBusinessNo(borrowers.get(0).getBusinessNo());
+		}
 
+		AppMortgageEntity mortgage = new AppMortgageEntity();
+		mortgage.setIdCard(user.getIdCode());
+		mortgage.setUsername(user.getUserName());
+		mortgage.setPhone(user.getPhone());
+		mortgage.setStatus(user.getStatus());
+		mortgage.setBusinessNo(user.getBusinessNo());
+		mortgage.setContractNo(user.getContractNo());
+		QueryWrapper<AppMortgageEntity> mortgageWrapper = QueryWrapperUtil.convertQuery(mortgage);
+		List<AppMortgageEntity> mortgages = mortgageService.list(mortgageWrapper);
+		if (user.getBusinessNo() == null && mortgages != null && mortgages.size() > 0) {
+			user.setBusinessNo(mortgages.get(0).getBusinessNo());
+		}
+
+		AppGuaranteeEntity guarantee = new AppGuaranteeEntity();
+		guarantee.setIdCard(user.getIdCode());
+		guarantee.setUsername(user.getUserName());
+		guarantee.setPhone(user.getPhone());
+		guarantee.setStatus(user.getStatus());
+		guarantee.setBusinessNo(user.getBusinessNo());
+		guarantee.setContractNo(user.getContractNo());
+		QueryWrapper<AppGuaranteeEntity> guaranteeWrapper = QueryWrapperUtil.convertQuery(guarantee);
+		List<AppGuaranteeEntity> guarantees = guaranteeService.list(guaranteeWrapper);
+		if (user.getBusinessNo() == null && guarantees != null && guarantees.size() > 0) {
+			user.setBusinessNo(guarantees.get(0).getBusinessNo());
+		}
+
+		// 查询主订单，如果状态是驳回，查询驳回原因
+		NotaryOrderEntity orderEntity = null;
+		if (user.getStatus() != null && user.getStatus().equals(StatusEnum.NotaryStatusEnum.REJECT.getStatus().toString())) {
+			QueryWrapper<NotaryOrderEntity> notaryOrder = new QueryWrapper<>();
+			notaryOrder.eq("business_no", user.getBusinessNo());
+			notaryOrder.eq("status", StatusEnum.NotaryStatusEnum.REJECT.getStatus());
+			orderEntity = this.getOne(notaryOrder);
+		}
+
+		List<OrderDto> list = new ArrayList<OrderDto>();
+		for (AppBorrowerEntity b : borrowers) {
+			OrderDto dto = new OrderDto();
+			dto.setUsername(b.getUsername());
+			dto.setIdCard(b.getIdCard());
+			dto.setSumMoney(b.getSumMoney());
+			dto.setPhone(b.getPhone());
+			dto.setOrderId(b.getId().toString());
+			dto.setStartDate(b.getStartDate());
+			dto.setEndDate(b.getEndDate());
+			dto.setContractNo(b.getContractNo());
+			dto.setSex(b.getSex());
+			dto.setBusinessNo(user.getBusinessNo());
+			dto.setBirth(b.getBirth());
+			dto.setResidence(b.getResidence());
+			dto.setRate(b.getRate());
+			dto.setType("1");
+			dto.setNotaryUserId(b.getNotaryUserId());
+			if (orderEntity != null) {
+				dto.setRejectReason(orderEntity.getRejectReason());
+			}
+			list.add(dto);
+		}
+
+		for (AppMortgageEntity b : mortgages) {
+			OrderDto dto = new OrderDto();
+			dto.setUsername(b.getUsername());
+			dto.setIdCard(b.getIdCard());
+			dto.setPhone(b.getPhone());
+			dto.setOrderId(b.getId().toString());
+			dto.setStartDate(b.getStartDate());
+			dto.setEndDate(b.getEndDate());
+			dto.setContractNo(b.getContractNo());
+			dto.setSex(b.getSex());
+			dto.setBusinessNo(user.getBusinessNo());
+			dto.setBirth(b.getBirth());
+			dto.setResidence(b.getResidence());
+			dto.setHouseLocation(b.getHouseLocation());
+			dto.setHousePropertyNo(b.getHousePropertyNo());
+			dto.setType("2");
+			dto.setNotaryUserId(b.getNotaryUserId());
+			if (orderEntity != null) {
+				dto.setRejectReason(orderEntity.getRejectReason());
+			}
+			list.add(dto);
+		}
+
+		for (AppGuaranteeEntity b : guarantees) {
+			OrderDto dto = new OrderDto();
+			dto.setUsername(b.getUsername());
+			dto.setIdCard(b.getIdCard());
+			dto.setPhone(b.getPhone());
+			dto.setOrderId(b.getId().toString());
+			dto.setStartDate(b.getStartDate());
+			dto.setEndDate(b.getEndDate());
+			dto.setContractNo(b.getContractNo());
+			dto.setSex(b.getSex());
+			dto.setBirth(b.getBirth());
+			dto.setBusinessNo(user.getBusinessNo());
+			dto.setResidence(b.getResidence());
+			dto.setType("3");
+			dto.setNotaryUserId(b.getNotaryUserId());
+			if (orderEntity != null) {
+				dto.setRejectReason(orderEntity.getRejectReason());
+			}
+			list.add(dto);
+		}
+		return list;
+	}
 	@Override
 	public Object parseOrder(String orderType, MultipartFile file, SysUserEntity user) {
 		BankEntity bank = bankMapper.selectById(user.getOrgId().split("_")[1]);

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

@@ -5,6 +5,7 @@ import me.zhengjie.annotation.rest.AnonymousPostMapping;
 import me.zhengjie.application.bank.service.*;
 import me.zhengjie.base.config.TencentHumanFaceVerify;
 import me.zhengjie.application.bank.controller.vo.OrderDto;
+import me.zhengjie.application.bank.controller.vo.OrderVo;
 import me.zhengjie.base.util.tencent.h5face.SdkTest;
 import me.zhengjie.base.util.FileUploadUtil;
 import me.zhengjie.application.bank.controller.vo.SmsVo;
@@ -128,7 +129,16 @@ public class AppUserController {
 
 		return order;
 	}
-
+	@RequestMapping("/order/search")
+	public ResponseDTO<?> orderSearch( @RequestBody OrderVo order ) {
+		 
+		if (order == null) {
+			return ResponseDTO.error(ResultCode.PARAM_IS_BLANK);
+		}
+		 List<OrderDto> orders = this.apiService.getOrderByContion(order);
+		
+		return ResponseDTO.success(orders);
+	}
 	@AnonymousPostMapping("/order/note")
 	public ResponseDTO<?> note(@RequestBody String json) {
 

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

@@ -1,34 +1,52 @@
 package me.zhengjie.application.user.service.impl;
 
+import java.io.IOException;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
 import lombok.extern.slf4j.Slf4j;
-import me.zhengjie.application.bank.controller.vo.*;
-import me.zhengjie.application.bank.service.*;
-import me.zhengjie.base.plus.QueryWrapperUtil;
+import me.zhengjie.application.bank.controller.vo.Account;
+import me.zhengjie.application.bank.controller.vo.FileInfoDto;
+import me.zhengjie.application.bank.controller.vo.Order;
+import me.zhengjie.application.bank.controller.vo.OrderDto;
+import me.zhengjie.application.bank.controller.vo.OrderVo;
+import me.zhengjie.application.bank.controller.vo.Sms;
+import me.zhengjie.application.bank.controller.vo.SmsVo;
+import me.zhengjie.application.bank.controller.vo.UserVo;
+import me.zhengjie.application.bank.service.ModelService;
+import me.zhengjie.application.bank.service.OrderRoomIdService;
+import me.zhengjie.application.bank.service.OrderService;
+import me.zhengjie.application.bank.service.OssService;
+import me.zhengjie.application.bank.service.PdfService;
+import me.zhengjie.application.bank.service.SmsService;
+import me.zhengjie.application.user.service.ApiService;
+import me.zhengjie.base.ResponseDTO;
+import me.zhengjie.base.ResultCode;
+import me.zhengjie.base.mq.RedisCacheConfig;
 import me.zhengjie.base.util.FileUploadUtil;
 import me.zhengjie.base.util.IpAddressUtil;
 import me.zhengjie.base.util.StatusEnum;
-import me.zhengjie.base.ResponseDTO;
-import me.zhengjie.base.ResultCode;
+import me.zhengjie.dao.jdbc.AccountDao;
+import me.zhengjie.dao.jdbc.ConfinfoDao;
+import me.zhengjie.dao.jdbc.FileInfoDao;
+import me.zhengjie.dao.jdbc.ModelDao;
+import me.zhengjie.dao.jdbc.OrderDao;
 import me.zhengjie.dao.mybatis.OrderFileRepository;
-import me.zhengjie.base.mq.RedisCacheConfig;
-import me.zhengjie.dao.jdbc.*;
-import me.zhengjie.dao.mybatis.entity.*;
-import me.zhengjie.modules.security.security.TokenProvider;
+import me.zhengjie.dao.mybatis.entity.OrderFileEntity;
+import me.zhengjie.dao.mybatis.entity.OrderRoomIdEntity;
 import me.zhengjie.dao.mybatis.mapper.NotaryOrderMapper;
-import me.zhengjie.application.user.service.ApiService;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletRequest;
-import java.io.IOException;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
+import me.zhengjie.modules.security.security.TokenProvider;
 
 @Slf4j
 @Service
@@ -54,12 +72,12 @@ public class ApiServiceImpl implements ApiService {
 	ConfinfoDao confinfoDao;
 	@Autowired
 	private TokenProvider tokenProvider;
-	@Autowired
-	private BorrowerService borrowerService;
-	@Autowired
-	private MortgageService mortgageService;
-	@Autowired
-	private GuaranteeService guaranteeService;
+//	@Autowired
+//	private BorrowerService borrowerService;
+//	@Autowired
+//	private MortgageService mortgageService;
+//	@Autowired
+//	private GuaranteeService guaranteeService;
 	@Autowired
 	ModelService modelService;
 	@Autowired
@@ -128,123 +146,8 @@ public class ApiServiceImpl implements ApiService {
 	}
 
 	@Override
-	public List<OrderDto> getOrderByContion(OrderVo user) {
-		BorrowerEntity borrower = new BorrowerEntity();
-		borrower.setIdCard(user.getIdCode());
-		borrower.setUsername(user.getUserName());
-		borrower.setPhone(user.getPhone());
-		borrower.setBusinessNo(user.getBusinessNo());
-		borrower.setContractNo(user.getContractNo());
-		borrower.setStatus(user.getStatus());
-		QueryWrapper<BorrowerEntity> queryWrapper = QueryWrapperUtil.convertQuery(borrower);
-		List<BorrowerEntity> borrowers = borrowerService.list(queryWrapper);
-		if (user.getBusinessNo() == null && borrowers != null && borrowers.size() > 0) {
-			user.setBusinessNo(borrowers.get(0).getBusinessNo());
-		}
-
-		MortgageEntity mortgage = new MortgageEntity();
-		mortgage.setIdCard(user.getIdCode());
-		mortgage.setUsername(user.getUserName());
-		mortgage.setPhone(user.getPhone());
-		mortgage.setStatus(user.getStatus());
-		mortgage.setBusinessNo(user.getBusinessNo());
-		mortgage.setContractNo(user.getContractNo());
-		QueryWrapper<MortgageEntity> mortgageWrapper = QueryWrapperUtil.convertQuery(mortgage);
-		List<MortgageEntity> mortgages = mortgageService.list(mortgageWrapper);
-		if (user.getBusinessNo() == null && mortgages != null && mortgages.size() > 0) {
-			user.setBusinessNo(mortgages.get(0).getBusinessNo());
-		}
-
-		GuaranteeEntity guarantee = new GuaranteeEntity();
-		guarantee.setIdCard(user.getIdCode());
-		guarantee.setUsername(user.getUserName());
-		guarantee.setPhone(user.getPhone());
-		guarantee.setStatus(user.getStatus());
-		guarantee.setBusinessNo(user.getBusinessNo());
-		guarantee.setContractNo(user.getContractNo());
-		QueryWrapper<GuaranteeEntity> guaranteeWrapper = QueryWrapperUtil.convertQuery(guarantee);
-		List<GuaranteeEntity> guarantees = guaranteeService.list(guaranteeWrapper);
-		if (user.getBusinessNo() == null && guarantees != null && guarantees.size() > 0) {
-			user.setBusinessNo(guarantees.get(0).getBusinessNo());
-		}
-
-		// 查询主订单，如果状态是驳回，查询驳回原因
-		NotaryOrderEntity orderEntity = null;
-		if (user.getStatus() != null && user.getStatus().equals(StatusEnum.NotaryStatusEnum.REJECT.getStatus().toString())) {
-			QueryWrapper<NotaryOrderEntity> notaryOrder = new QueryWrapper<>();
-			notaryOrder.eq("business_no", user.getBusinessNo());
-			notaryOrder.eq("status", StatusEnum.NotaryStatusEnum.REJECT.getStatus());
-			orderEntity = orderService.getOne(notaryOrder);
-		}
-
-		List<OrderDto> list = new ArrayList<OrderDto>();
-		for (BorrowerEntity b : borrowers) {
-			OrderDto dto = new OrderDto();
-			dto.setUsername(b.getUsername());
-			dto.setIdCard(b.getIdCard());
-			dto.setSumMoney(b.getSumMoney());
-			dto.setPhone(b.getPhone());
-			dto.setOrderId(b.getId().toString());
-			dto.setStartDate(b.getStartDate());
-			dto.setEndDate(b.getEndDate());
-			dto.setContractNo(b.getContractNo());
-			dto.setSex(b.getSex());
-			dto.setBusinessNo(user.getBusinessNo());
-			dto.setBirth(b.getBirth());
-			dto.setResidence(b.getResidence());
-			dto.setRate(b.getRate());
-			dto.setType("1");
-			dto.setNotaryUserId(String.valueOf(b.getNotaryUserId()));
-			if (orderEntity != null) {
-				dto.setRejectReason(orderEntity.getRejectReason());
-			}
-			list.add(dto);
-		}
-
-		for (MortgageEntity b : mortgages) {
-			OrderDto dto = new OrderDto();
-			dto.setUsername(b.getUsername());
-			dto.setIdCard(b.getIdCard());
-			dto.setPhone(b.getPhone());
-			dto.setOrderId(b.getId().toString());
-			dto.setStartDate(b.getStartDate());
-			dto.setEndDate(b.getEndDate());
-			dto.setContractNo(b.getContractNo());
-			dto.setSex(b.getSex());
-			dto.setBusinessNo(user.getBusinessNo());
-			dto.setBirth(b.getBirth());
-			dto.setResidence(b.getResidence());
-			dto.setHouseLocation(b.getHouseLocation());
-			dto.setHousePropertyNo(b.getHousePropertyNo());
-			dto.setType("2");
-			dto.setNotaryUserId(String.valueOf(b.getNotaryUserId()));
-			if (orderEntity != null) {
-				dto.setRejectReason(orderEntity.getRejectReason());
-			}
-			list.add(dto);
-		}
-
-		for (GuaranteeEntity b : guarantees) {
-			OrderDto dto = new OrderDto();
-			dto.setUsername(b.getUsername());
-			dto.setIdCard(b.getIdCard());
-			dto.setPhone(b.getPhone());
-			dto.setOrderId(b.getId().toString());
-			dto.setStartDate(b.getStartDate());
-			dto.setEndDate(b.getEndDate());
-			dto.setContractNo(b.getContractNo());
-			dto.setSex(b.getSex());
-			dto.setBirth(b.getBirth());
-			dto.setBusinessNo(user.getBusinessNo());
-			dto.setResidence(b.getResidence());
-			dto.setType("3");
-			dto.setNotaryUserId(String.valueOf(b.getNotaryUserId()));
-			if (orderEntity != null) {
-				dto.setRejectReason(orderEntity.getRejectReason());
-			}
-			list.add(dto);
-		}
-		return list;
+	public List<OrderDto> getOrderByContion(OrderVo orderVo) {
+		return orderService.getOrderByContion(orderVo);
 	}
 
 	@Override