|
|
@@ -143,7 +143,12 @@ public class BorrowerServiceImpl extends AbstractServiceImpl<BorrowerMapper, Bor
|
|
|
notaryOrder.eq("status", 4);
|
|
|
orderEntity = orderService.getOne(notaryOrder);
|
|
|
}
|
|
|
-
|
|
|
+ //查询主订单状态
|
|
|
+ QueryWrapper<NotaryOrderEntity> statusOrder = new QueryWrapper<>();
|
|
|
+ statusOrder.eq("business_no", businessNo);
|
|
|
+
|
|
|
+ NotaryOrderEntity orderStatus = orderService.getOne(statusOrder);
|
|
|
+
|
|
|
List<OrderDto> list = new ArrayList<OrderDto>();
|
|
|
for (BorrowerEntity b : borrowers) {
|
|
|
OrderDto dto = new OrderDto();
|
|
|
@@ -161,7 +166,7 @@ public class BorrowerServiceImpl extends AbstractServiceImpl<BorrowerMapper, Bor
|
|
|
dto.setResidence(b.getResidence());
|
|
|
dto.setRate(b.getRate());
|
|
|
dto.setType("1");
|
|
|
- dto.setStatus(orderEntity.getStatus());
|
|
|
+ dto.setStatus(orderStatus.getStatus());
|
|
|
//子订单
|
|
|
dto.setSubStatus(b.getStatus());
|
|
|
if (orderEntity != null) {
|
|
|
@@ -192,7 +197,7 @@ public class BorrowerServiceImpl extends AbstractServiceImpl<BorrowerMapper, Bor
|
|
|
dto.setHouseLocation(b.getHouseLocation());
|
|
|
dto.setHousePropertyNo(b.getHousePropertyNo());
|
|
|
dto.setType("2");
|
|
|
- dto.setStatus(orderEntity.getStatus());
|
|
|
+ dto.setStatus(orderStatus.getStatus());
|
|
|
dto.setSubStatus(b.getStatus());
|
|
|
if (orderEntity != null) {
|
|
|
dto.setReturnReason(orderEntity.getReturnReason());
|
|
|
@@ -219,7 +224,7 @@ public class BorrowerServiceImpl extends AbstractServiceImpl<BorrowerMapper, Bor
|
|
|
dto.setBusinessNo(businessNo);
|
|
|
dto.setResidence(b.getResidence());
|
|
|
dto.setType("3");
|
|
|
- dto.setStatus(orderEntity.getStatus());
|
|
|
+ dto.setStatus(orderStatus.getStatus());
|
|
|
//子订单状态
|
|
|
dto.setSubStatus(b.getStatus());
|
|
|
if (orderEntity != null) {
|
