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

src/main/java/com/huiju/estateagents/controller/TaBuildingDynamicController.java

@@ -432,7 +432,7 @@ public class TaBuildingDynamicController extends BaseController {
         if ("1".equals(top)) {
             dynamic.setCreateDate(LocalDateTime.now());
         } else {
-            dynamic.setIsEnlist("2");
+            dynamic.setIsEnlist(2);
         }
         iBuildingDynamicService.update(dynamic, taBuildingDynamic);
         responseBean.addSuccess("成功");

src/main/java/com/huiju/estateagents/entity/TaBuildingDynamic.java

@@ -90,7 +90,7 @@ public class TaBuildingDynamic implements Serializable {
     /**
      * 活动总开关判断活动是否能开始报名_1:可以，0:不可以
      */
-    private  String isEnlist;
+    private Integer isEnlist;
 
     /**
      * 活动开始时间

src/main/java/com/huiju/estateagents/service/impl/TaBuildingDynamicServiceImpl.java

@@ -229,7 +229,7 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
 
         // 当报名人数已满时，活动为已结束
         if ((enlistCount + taActivityDynamicEnlist.getAttendNum()) > buildingDynamic.getPersonNum()) {
-            taBuildingDynamic.setIsEnlist("2");
+            taBuildingDynamic.setIsEnlist(2);
             buildingDynamicMapper.updateById(taBuildingDynamic);
             responseBean.addError("当前报名人数已满");
             return responseBean;

src/main/java/com/huiju/estateagents/service/impl/TaRecommendCustomerServiceImpl.java

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.center.taUser.service.ITaUserService;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.DateUtils;
 import com.huiju.estateagents.common.StringUtils;
@@ -53,6 +55,9 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     @Autowired
     TaPersonVisitRecordMapper taPersonVisitRecordMapper;
 
+    @Autowired
+    ITaUserService userService;
+
     @Override
     public ResponseBean getMyCustList(String openid, String keywords, int pageNumber, int pageSize) {
         List<TaPerson> taPersons = getPersonsByOpenId(openid);
@@ -82,10 +87,11 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         if (!StringUtils.isEmpty(taRecommendCustomer.getRealtyConsultant())) {
             TaPerson taPerson = taPersonMapper.selectById(taRecommendCustomer.getRealtyConsultant());
             if (null != taPerson) {
+                TaUser user = userService.getById(taPerson.getUserId());
                 taRecommendCustomer.setConsultants(new HashMap<String, Object>() {{
-                    put("name", taPerson.getName());
-                    put("phone", taPerson.getTel());
-                    put("photo", taPerson.getPhoto());
+                    put("name", user.getUserName());
+                    put("phone", user.getPhone());
+                    put("photo", user.getPhoto());
                 }});
             }
         }
@@ -168,7 +174,9 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         taRecommendCustomer.setDescribe(params.getString("describe"));
         taRecommendCustomer.setRecommendPerson(params.getString("recommendPerson"));
         taRecommendCustomer.setBuildingId(params.getString("buildingId"));
+        taRecommendCustomer.setRealtyConsultant(params.getString("realtyConsultant"));
         taRecommendCustomer.setReportRecommendStatus(CommConstant.RECOMMENDED);
+        taRecommendCustomer.setVerifyStatus(CommConstant.VERIFY_READY);
         taRecommendCustomer.setCreateDate(LocalDateTime.now());
         taRecommendCustomer.setReportDate(LocalDateTime.now());
         taRecommendCustomer.setOrgId(orgId);
@@ -252,7 +260,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 //        taRecommendCustomer.setDescribe(params.getString("describe"));
         taRecommendCustomer.setRealtyConsultant(params.getString("realtyConsultant"));
         taRecommendCustomer.setBuildingId(params.getString("buildingId"));
-        taRecommendCustomer.setReportRecommendStatus(CommConstant.READY);
+        taRecommendCustomer.setReportRecommendStatus(CommConstant.VERIFY_AGREE);
         taRecommendCustomer.setCreateDate(LocalDateTime.now());
         taRecommendCustomer.setReportDate(LocalDateTime.now());
         taRecommendCustomer.setPersonId(taPerson.getPersonId());