兼容邮储产品

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

@@ -234,43 +234,45 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 	@Override
 	public AppBaseResponse<List<PartyEntity>> orderQueryUser(final HashMap<String, String> map) {
 		AppBaseResponse<List<PartyEntity>> response = new AppBaseResponse<>();
-		List<BorrowerEntity> borrowerList = borrowerMapper.selectList(
-				new QueryWrapper<BorrowerEntity>().eq("business_no", map.get("businessNo")).orderByAsc("order_by"));
-		List<MortgageEntity> mortgageList = mortgageMapper.selectList(
-				new QueryWrapper<MortgageEntity>().eq("business_no", map.get("businessNo")).orderByAsc("order_by"));
-		List<GuaranteeEntity> guaranteeList = guaranteeMapper.selectList(
-				new QueryWrapper<GuaranteeEntity>().eq("business_no", map.get("businessNo")).orderByAsc("order_by"));
+		ContractOrderEntity contractOrderEntity = contractOrderRepository.getContractOrderWithBizNo(map.get("businessNo"));
 		List<PartyEntity> partyList = new LinkedList<>();
-		borrowerList.forEach((item) -> {
-			partyList.add(PartyEntity.builder().id(item.getId()).username(item.getUsername()).idCard(item.getIdCard())
-					.roleId(StatusEnum.StepStatusEnum.BORROWER.getStatus())
-					.role(StatusEnum.StepStatusEnum.BORROWER.getProcess()).build());
-			if (item.getJointFlag() == 1) {
-				partyList.add(PartyEntity.builder().id(item.getId()).username(item.getSpouseName())
-						.idCard(item.getSpouseIdCard()).roleId(StatusEnum.StepStatusEnum.BORROWER.getStatus())
-						.role(StatusEnum.StepStatusEnum.BORROWER.getProcess()).build());
-			}
-		});
-		mortgageList.forEach((item) -> {
-			partyList.add(PartyEntity.builder().id(item.getId()).username(item.getUsername()).idCard(item.getIdCard())
-					.roleId(StatusEnum.StepStatusEnum.MORTGAGOR.getStatus())
-					.role(StatusEnum.StepStatusEnum.MORTGAGOR.getProcess()).build());
-			if (item.getJointFlag() == 1) {
-				partyList.add(PartyEntity.builder().id(item.getId()).username(item.getSpouseName())
-						.idCard(item.getSpouseIdCard()).roleId(StatusEnum.StepStatusEnum.MORTGAGOR.getStatus())
-						.role(StatusEnum.StepStatusEnum.MORTGAGOR.getProcess()).build());
-			}
-		});
-		guaranteeList.forEach((item) -> {
-			partyList.add(PartyEntity.builder().id(item.getId()).username(item.getUsername()).idCard(item.getIdCard())
-					.roleId(StatusEnum.StepStatusEnum.GUARANTEE.getStatus())
-					.role(StatusEnum.StepStatusEnum.GUARANTEE.getProcess()).build());
-			if (item.getJointFlag() == 1) {
-				partyList.add(PartyEntity.builder().id(item.getId()).username(item.getSpouseName())
-						.idCard(item.getSpouseIdCard()).roleId(StatusEnum.StepStatusEnum.GUARANTEE.getStatus())
-						.role(StatusEnum.StepStatusEnum.GUARANTEE.getProcess()).build());
+		PartyEntity partyA = new PartyEntity();
+		partyA.setUsername(contractOrderEntity.getName());
+		partyA.setIdCard(contractOrderEntity.getIdCard());
+		if (OrderConstant.CONTRACT_TYPE_BORROWER == contractOrderEntity.getContractType()) {
+			partyA.setRoleId(StatusEnum.StepStatusEnum.BORROWER.getStatus());
+			partyA.setRole(StatusEnum.StepStatusEnum.BORROWER.getProcess());
+		}else if (OrderConstant.CONTRACT_TYPE_MORTGAGE == contractOrderEntity.getContractType()) {
+			partyA.setRoleId(StatusEnum.StepStatusEnum.MORTGAGOR.getStatus());
+			partyA.setRole(StatusEnum.StepStatusEnum.MORTGAGOR.getProcess());
+		}else if (OrderConstant.CONTRACT_TYPE_GUARANTEE == contractOrderEntity.getContractType()) {
+			partyA.setRoleId(StatusEnum.StepStatusEnum.GUARANTEE.getStatus());
+			partyA.setRole(StatusEnum.StepStatusEnum.GUARANTEE.getProcess());
+		}else if (OrderConstant.CONTRACT_TYPE_CREDIT == contractOrderEntity.getContractType()) {
+			partyA.setRoleId(StatusEnum.StepStatusEnum.CREDIT.getStatus());
+			partyA.setRole(StatusEnum.StepStatusEnum.CREDIT.getProcess());
+		}
+		partyList.add(partyA);
+		// 共同责任人
+		if (contractOrderEntity.getJointFlag() == OrderConstant.JOINT_FLAG_TRUE) {
+			PartyEntity partyB = new PartyEntity();
+			partyB.setUsername(contractOrderEntity.getJointName());
+			partyB.setIdCard(contractOrderEntity.getJointIdCard());
+			if (OrderConstant.CONTRACT_TYPE_BORROWER == contractOrderEntity.getContractType()) {
+				partyB.setRoleId(StatusEnum.StepStatusEnum.BORROWER.getStatus());
+				partyB.setRole(StatusEnum.StepStatusEnum.BORROWER.getProcess());
+			} else if (OrderConstant.CONTRACT_TYPE_MORTGAGE == contractOrderEntity.getContractType()) {
+				partyB.setRoleId(StatusEnum.StepStatusEnum.MORTGAGOR.getStatus());
+				partyB.setRole(StatusEnum.StepStatusEnum.MORTGAGOR.getProcess());
+			} else if (OrderConstant.CONTRACT_TYPE_GUARANTEE == contractOrderEntity.getContractType()) {
+				partyB.setRoleId(StatusEnum.StepStatusEnum.GUARANTEE.getStatus());
+				partyB.setRole(StatusEnum.StepStatusEnum.GUARANTEE.getProcess());
+			} else if (OrderConstant.CONTRACT_TYPE_CREDIT == contractOrderEntity.getContractType()) {
+				partyB.setRoleId(StatusEnum.StepStatusEnum.CREDIT.getStatus());
+				partyB.setRole(StatusEnum.StepStatusEnum.CREDIT.getProcess());
 			}
-		});
+			partyList.add(partyB);
+		}
 		response.setData(new AppResultData<List<PartyEntity>>(partyList));
 		return response;
 	}

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

@@ -159,9 +159,10 @@ public class StatusEnum {
     }
 
     public enum StepStatusEnum {
-     	BORROWER(1, "借款人","borrower","10"),
-    	MORTGAGOR(2, "抵押人","mortgagor","11"),
-    	GUARANTEE(3, "担保人","guarantee","12");
+        BORROWER(1, "借款人", "borrower", "10"),
+        MORTGAGOR(2, "抵押人", "mortgagor", "11"),
+        GUARANTEE(3, "保证人", "guarantee", "12"),
+        CREDIT(4, "授信人", "credit", "13");
     	StepStatusEnum(Integer status, String process,String orderType,String prefix) {
             this.status = status;
             this.process = process;