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

src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserController.java

             return ResponseBean.error("用户名或密码错误", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
     
-        if (taUser.getStatus() != CommConstant.STATUS_NORMAL) {
+        if (!taUser.getStatus().equals(CommConstant.STATUS_NORMAL) ) {
             return ResponseBean.error("用户状态异常", ResponseBean.ERROR_UNAVAILABLE);
         }
 

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

     public ResponseBean helpActivityUpdate(@RequestBody String parameter) {
         ResponseBean responseBean = new ResponseBean();
         HelpActivity helpActivity = JSONObject.parseObject(parameter, HelpActivity.class);
+        Integer cityId = iTaBuildingService.getCityById( helpActivity.getBuildingId());
+        helpActivity.setCityId(cityId);
         helpActivity.setHelpActivityId(helpActivity.getHelpActivityId());
         taHelpActivityService.helpActivityUpdate(helpActivity);
         return responseBean;
             helpInitiateRecordQuery.eq("help_activity_id",helpActivityId);
                 List<HelpInitiateRecord> list= helpInitiateRecordMapper.selectList(helpInitiateRecordQuery);
                 for (HelpInitiateRecord helpInitiateRecord:list){
-                    helpInitiateRecord.setStatus(2);
-                    helpInitiateRecordMapper.updateById(helpInitiateRecord);
+                    // 助力成功的不更新。
+                    if (!helpInitiateRecord.getStatus().equals(0)) {
+                        helpInitiateRecord.setStatus(2);
+                        helpInitiateRecordMapper.updateById(helpInitiateRecord);
+                    }
                 }
         }
         Boolean isA = taHelpActivityService.updateById(helpActivity);

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

             miniResp.put("openid", session.getOpenid());
             miniResp.put("sessionKey", session.getSessionKey());
             miniResp.put("unionid", session.getUnionid());
-            miniResp.put("miniAppName",miniapp.getName());
+            miniResp.put("name",miniapp.getName());
 
             //如果是分享进来且没有进入过小程序，给分享人发放积分
             QueryWrapper<TaPerson> personQueryWrapper = new QueryWrapper<>();

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

      * @param paramStr
      * @return
      */
-    @PostMapping("/admin/signin")
-    public ResponseBean signin(@RequestBody String paramStr) {
-        JSONObject params = JSONObject.parseObject(paramStr);
-        if (params == null) {
-            return ResponseBean.error("非法参数", ResponseBean.ERROR_MISSING_PARAMS);
-        }
-
-        String userPhone = params.getString("phone");
-        String userCaptcha = params.getString("captcha");
-
-        // todo
-        if (!"1234".equals(userCaptcha)) {
-            return ResponseBean.error("验证码不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
-        }
-
-        TaPerson taPerson = taPersonService.getPersonByTel(userPhone);
-        if (taPerson == null) {
-            return ResponseBean.error("手机号不存在", ResponseBean.ERROR_ILLEGAL_PARAMS);
-        }
-
-        if (taPerson.getStatus() != CommConstant.STATUS_NORMAL) {
-            return ResponseBean.error("用户状态异常", ResponseBean.ERROR_UNAVAILABLE);
-        }
-
-        String token = JWTUtils.newToken(taPerson.getPersonId());
-
-        Map<String, Object> result = new HashMap<>();
-        result.put("token", token);
-        result.put("person", taPerson);
-
-        return ResponseBean.success(result);
-    }
+//    @PostMapping("/admin/signin")
+//    public ResponseBean signin(@RequestBody String paramStr) {
+//        JSONObject params = JSONObject.parseObject(paramStr);
+//        if (params == null) {
+//            return ResponseBean.error("非法参数", ResponseBean.ERROR_MISSING_PARAMS);
+//        }
+//
+//        String userPhone = params.getString("phone");
+//        String userCaptcha = params.getString("captcha");
+//
+//        // todo
+//        if (!"1234".equals(userCaptcha)) {
+//            return ResponseBean.error("验证码不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
+//        }
+//
+//        TaPerson taPerson = taPersonService.getPersonByTel(userPhone);
+//        if (taPerson == null) {
+//            return ResponseBean.error("手机号不存在", ResponseBean.ERROR_ILLEGAL_PARAMS);
+//        }
+//
+//        if (taPerson.getStatus() != CommConstant.STATUS_NORMAL) {
+//            return ResponseBean.error("用户状态异常", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//
+//        String token = JWTUtils.newToken(taPerson.getPersonId());
+//
+//        Map<String, Object> result = new HashMap<>();
+//        result.put("token", token);
+//        result.put("person", taPerson);
+//
+//        return ResponseBean.success(result);
+//    }
 
     /**
      * 获取当前用户
         }
         if (!StringUtils.isEmpty(phone)){
             person.setTel(phone);
+            if(person.getPersonType().equals(CommConstant.PERSON_REALTY_CONSULTANT)){
+                TaUser user = taUserService.getById(person.getUserId());
+                user.setPhone(phone);
+                user.setLoginName(phone);
+                taUserService.updateById(user);
+            }
         }
         try{
             if(taPersonService.updateById(person)){

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

         ResponseBean responseBean = new ResponseBean();
         try {
             TaShareActivity taShareActivity = JSONObject.parseObject(parameter, TaShareActivity.class);
+            Integer cityId = iTaBuildingService.getCityById(taShareActivity.getBuildingId());
+            taShareActivity.setCityId(cityId);
             if (iTaShareActivityService.updateById(taShareActivity)){
                 responseBean.addSuccess(taShareActivity);
             }else {

src/main/java/com/huiju/estateagents/excel/ExcelRecommendCustomer.java

      * 审核状态名
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "审核状态名", index = 7)
+    @ExcelProperty(value = "审核状态", index = 7)
     private String verifyStatusName;
 
 

src/main/resources/application-dev.yml

   datasource:
     username: estateagents
     password: estateagents
-    url: jdbc:mysql://47.101.36.130:3306/estateagents?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
+    url: jdbc:mysql://47.101.36.130:3306/estateagents?useUnicode=true&serverTimezone=GMT%2B8&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
     driver-class-name: com.mysql.cj.jdbc.Driver
     initial-size: 10 # 初始化连接数
     max-active: 20 # 最大连接数

src/main/resources/mapper/TaRecommendCustomerMapper.xml

         if(a.sex = 1, '男',if(a.sex = 2, '女', '未知')) as sex,
         c.nickname as recommend,
         c.phone as recommendTel,
-        if(a.verify_status = 0, '未通过', if(a.verify_status = 1, '已通过', if(a.verify_status = 2, '已驳回', ''))) as verifyStatusName
+        if(a.verify_status = 0, '待审核', if(a.verify_status = 1, '已通过', if(a.verify_status = 2, '未通过', ''))) as verifyStatusName
         FROM
         ta_recommend_customer a
         LEFT JOIN ta_person c on a.recommend_person = c.person_id