增加子订单

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

@@ -74,6 +74,8 @@ public class OrderDto {
 	private String notaryUserId;
 	// 驳回原因
 	private String rejectReason;
-	// 子订单状态
+	// 主订单状态
 	private String status;
+	//子订单状态
+	private String subStatus;
 }

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

@@ -161,8 +161,9 @@ public class BorrowerServiceImpl extends AbstractServiceImpl<BorrowerMapper, Bor
             dto.setResidence(b.getResidence());
             dto.setRate(b.getRate());
             dto.setType("1");
-            dto.setStatus(b.getStatus());
-
+            dto.setStatus(orderEntity.getStatus());
+            //子订单
+            dto.setSubStatus(b.getStatus());
             if (orderEntity != null) {
                 dto.setReturnReason(orderEntity.getReturnReason());
             }
@@ -191,7 +192,8 @@ public class BorrowerServiceImpl extends AbstractServiceImpl<BorrowerMapper, Bor
             dto.setHouseLocation(b.getHouseLocation());
             dto.setHousePropertyNo(b.getHousePropertyNo());
             dto.setType("2");
-            dto.setStatus(b.getStatus());
+            dto.setStatus(orderEntity.getStatus());
+            dto.setSubStatus(b.getStatus());
             if (orderEntity != null) {
                 dto.setReturnReason(orderEntity.getReturnReason());
             }
@@ -217,7 +219,9 @@ public class BorrowerServiceImpl extends AbstractServiceImpl<BorrowerMapper, Bor
             dto.setBusinessNo(businessNo);
             dto.setResidence(b.getResidence());
             dto.setType("3");
-            dto.setStatus(b.getStatus());
+            dto.setStatus(orderEntity.getStatus());
+            //子订单状态
+            dto.setSubStatus(b.getStatus());
             if (orderEntity != null) {
                 dto.setReturnReason(orderEntity.getReturnReason());
             }

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

@@ -5,14 +5,14 @@ spring:
   mvc:
     static-path-pattern: /image/**
   resources:
-    static-locations: file:/image/,file:/image/
+    static-locations: file:/data/image/,file:/data/image/
   datasource:
     druid:
       db-type: com.alibaba.druid.pool.DruidDataSource
       driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
-      url: jdbc:log4jdbc:mysql://${DB_HOST:114.55.230.80}:${DB_PORT:3306}/${DB_NAME:eladmin}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&autoReconnect=true&failOverReadOnly=false
-      username: ${DB_USER:root}
-      password: ${DB_PWD:QopraffaQWPRPPR123}
+      url: jdbc:log4jdbc:mysql://127.0.0.1:3306/ntgzc?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&autoReconnect=true&failOverReadOnly=false
+      username: root
+      password: ntfqgz123!
       # 初始连接数
       initial-size: 5
       # 最小连接数