Browse Source

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

魏超 5 years ago
parent
commit
306211bb58

+ 2
- 2
src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserServiceImpl.java View File

357
         if (!isOn){
357
         if (!isOn){
358
             //查看是否置业顾问
358
             //查看是否置业顾问
359
             if (taUser.getIsConsultant()){
359
             if (taUser.getIsConsultant()){
360
-                taUser.setIsConsultant(false);
361
-                taUserMapper.updateById(taUser);
360
+//                taUser.setIsConsultant(false);
361
+//                taUserMapper.updateById(taUser);
362
                 //小程序端调整为普通客户
362
                 //小程序端调整为普通客户
363
                 QueryWrapper<TaPerson> taPersonQueryWrapper = new QueryWrapper<>();
363
                 QueryWrapper<TaPerson> taPersonQueryWrapper = new QueryWrapper<>();
364
                 taPersonQueryWrapper.eq("user_id",id);
364
                 taPersonQueryWrapper.eq("user_id",id);

+ 0
- 2
src/main/java/com/huiju/estateagents/entity/TaPerson.java View File

1
 package com.huiju.estateagents.entity;
1
 package com.huiju.estateagents.entity;
2
 
2
 
3
-import com.baomidou.mybatisplus.annotation.FieldStrategy;
4
 import com.baomidou.mybatisplus.annotation.IdType;
3
 import com.baomidou.mybatisplus.annotation.IdType;
5
 import com.baomidou.mybatisplus.annotation.TableField;
4
 import com.baomidou.mybatisplus.annotation.TableField;
6
 import com.baomidou.mybatisplus.annotation.TableId;
5
 import com.baomidou.mybatisplus.annotation.TableId;
251
 
250
 
252
     private Integer orgId;
251
     private Integer orgId;
253
 
252
 
254
-    @TableField(strategy = FieldStrategy.IGNORED)
255
     private Integer userId;
253
     private Integer userId;
256
 
254
 
257
     private String userPort;
255
     private String userPort;

+ 1
- 1
src/main/java/com/huiju/estateagents/service/impl/TaPersonServiceImpl.java View File

982
 
982
 
983
 
983
 
984
             TaRecommendCustomer customer = copyByPerosn(person, new TaRecommendCustomer());
984
             TaRecommendCustomer customer = copyByPerosn(person, new TaRecommendCustomer());
985
-            customer.setVerifyStatus(CommConstant.VERIFY_READY);
985
+            customer.setVerifyStatus(CommConstant.VERIFY_AGREE);
986
             customer.setStatus(CommConstant.CUSTOMER_REPORT);
986
             customer.setStatus(CommConstant.CUSTOMER_REPORT);
987
             customer.setEntryType(CommConstant.ENTRY_INPUT);
987
             customer.setEntryType(CommConstant.ENTRY_INPUT);
988
             customer.setCreateDate(now);
988
             customer.setCreateDate(now);