瀏覽代碼

Merge branch 'v3.5' of http://git.ycjcjy.com/zhiyuxing/estateagents into v3.5

胡轶钦 5 年之前
父節點
當前提交
5d7efc0b83

+ 1
- 1
pom.xml 查看文件

10
 	</parent>
10
 	</parent>
11
 	<groupId>com.huiju</groupId>
11
 	<groupId>com.huiju</groupId>
12
 	<artifactId>estateagents</artifactId>
12
 	<artifactId>estateagents</artifactId>
13
-	<version>v3.4.4</version>
13
+	<version>v3.5</version>
14
 	<name>estateages</name>
14
 	<name>estateages</name>
15
 	<description>置业经纪人</description>
15
 	<description>置业经纪人</description>
16
 
16
 

+ 6
- 0
src/main/java/com/huiju/estateagents/controller/TaRecommendCustomerController.java 查看文件

519
                         taRecommendCustomer.setRealtyConsultant(taRecommendCustomer.getRecommendPerson());
519
                         taRecommendCustomer.setRealtyConsultant(taRecommendCustomer.getRecommendPerson());
520
                     }
520
                     }
521
                 }
521
                 }
522
+
523
+                // 审核不通过的时候,移除置业顾问选择
524
+                if (CommConstant.VERIFY_DISAGREE == verifyStatus) {
525
+                    taRecommendCustomer.setRealtyConsultant(null);
526
+                }
527
+
522
                 if (taRecommendCustomerService.updateById(taRecommendCustomer)){
528
                 if (taRecommendCustomerService.updateById(taRecommendCustomer)){
523
 
529
 
524
                     // 审核通过增加积分
530
                     // 审核通过增加积分

+ 2
- 2
src/main/resources/application-prod.yml 查看文件

1
 server:
1
 server:
2
-  port: 8566
2
+  port: 8567
3
 spring:
3
 spring:
4
   application:
4
   application:
5
     name: estateagents
5
     name: estateagents
6
   datasource:
6
   datasource:
7
     username: estateagents
7
     username: estateagents
8
     password: DQ@0lW##kBb2+-jPZ
8
     password: DQ@0lW##kBb2+-jPZ
9
-    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/estateagents?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
9
+    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/estateagents3.5?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
10
     driver-class-name: com.mysql.cj.jdbc.Driver
10
     driver-class-name: com.mysql.cj.jdbc.Driver
11
     initial-size: 10 # 初始化连接数
11
     initial-size: 10 # 初始化连接数
12
     max-active: 20 # 最大连接数
12
     max-active: 20 # 最大连接数