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

# Conflicts:
#	src/main/java/com/huiju/estateagents/mapper/TaRecommendCustomerMapper.java
#	src/main/resources/mapper/TaRecommendCustomerMapper.xml

src/main/java/com/huiju/estateagents/center/taUser/entity/TaUser.java

@@ -160,6 +160,9 @@ public class TaUser implements Serializable {
     @TableField(exist = false)
     private String buildingId;
 
+    @TableField(exist = false)
+    private List<String> projects;
+
     /**
      * ta_org/orgNum楼盘最大数
      */

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

@@ -10,15 +10,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
-import com.huiju.estateagents.entity.HelpActivity;
-import com.huiju.estateagents.entity.HelpInitiateRecord;
-import com.huiju.estateagents.entity.HelpRecord;
-import com.huiju.estateagents.entity.TaBuildingDynamic;
-import com.huiju.estateagents.entity.TaChannel;
-import com.huiju.estateagents.entity.TaPerson;
-import com.huiju.estateagents.entity.TaPoster;
-import com.huiju.estateagents.entity.TaShareContent;
-import com.huiju.estateagents.entity.TdPosterTemplate;
+import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.excel.HelpInitiateRecordSucceed;
 import com.huiju.estateagents.excel.HelpProceedAndFinish;
 import com.huiju.estateagents.excel.HelpRecordExport;
@@ -159,6 +151,13 @@ public class HelpActivityController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         Integer orgId = getOrgId(request);
         Integer cityId = iTaBuildingService.getCityById(helpActivity.getBuildingId());
+        QueryWrapper<HelpActivity> helpActivityQueryWrapper = new QueryWrapper<>();
+        helpActivityQueryWrapper.eq("heavy", helpActivity.getHeavy());
+        Integer heavyCount = taHelpActivityService.count(helpActivityQueryWrapper);
+        if (heavyCount != 0){
+            responseBean.addError("权重已存在，请重新编辑");
+            return responseBean;
+        }
         helpActivity.setCityId(cityId);
         // 活动暂且定位为未开始
         helpActivity.setActivityStatus(1);
@@ -201,6 +200,13 @@ public class HelpActivityController extends BaseController {
     public ResponseBean helpActivityUpdate(@RequestBody String parameter) {
         ResponseBean responseBean = new ResponseBean();
         HelpActivity helpActivity = JSONObject.parseObject(parameter, HelpActivity.class);
+        QueryWrapper<HelpActivity> helpActivityQueryWrapper = new QueryWrapper<>();
+        helpActivityQueryWrapper.eq("heavy", helpActivity.getHeavy());
+        Integer heavyCount = taHelpActivityService.count(helpActivityQueryWrapper);
+        if (heavyCount != 0){
+            responseBean.addError("权重已存在，请重新编辑");
+            return responseBean;
+        }
         Integer cityId = iTaBuildingService.getCityById( helpActivity.getBuildingId());
         helpActivity.setCityId(cityId);
         helpActivity.setHelpActivityId(helpActivity.getHelpActivityId());
@@ -264,6 +270,30 @@ public class HelpActivityController extends BaseController {
         return responseBean;
     }
 
+    @RequestMapping(value = "/admin/helpActivity/send/{helpActivityId}", method = RequestMethod.PUT)
+    public ResponseBean send(@PathVariable String helpActivityId, HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        QueryWrapper<HelpActivity> helpActivityQueryWrapper = new QueryWrapper<>();
+        helpActivityQueryWrapper.eq("help_activity_id", helpActivityId);
+        HelpActivity helpActivity = taHelpActivityService.getOne(helpActivityQueryWrapper);
+        helpActivity.setStatus(1);
+        helpActivity.setOrgId(getOrgId(request));
+        taHelpActivityService.update(helpActivity, helpActivityQueryWrapper);
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/admin/helpActivity/cancel/{helpActivityId}", method = RequestMethod.PUT)
+    public ResponseBean cancel(@PathVariable String helpActivityId, HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        QueryWrapper<HelpActivity> taShareActivityQueryWrapper = new QueryWrapper<>();
+        taShareActivityQueryWrapper.eq("help_activity_id", helpActivityId);
+        HelpActivity helpActivity = taHelpActivityService.getOne(taShareActivityQueryWrapper);
+        helpActivity.setStatus(-1);
+        helpActivity.setOrgId(getOrgId(request));
+        taHelpActivityService.update(helpActivity, taShareActivityQueryWrapper);
+        return responseBean;
+    }
+
     @ApiOperation(value = "助力记录", notes = "助力记录")
     @ApiImplicitParams({
             @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query", value = "第几页"),

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

@@ -75,6 +75,9 @@ public class TaBuildingDynamicController extends BaseController {
     @Autowired
     private ITaBuildingService iTaBuildingService;
 
+    @Autowired
+    private ITaRecommendCustomerService recommendCustomerService;
+
     @Autowired
     private TaActivityDynamicEnlistMapper taActivityDynamicEnlistMapper;
 
@@ -310,6 +313,14 @@ public class TaBuildingDynamicController extends BaseController {
                    if (tempIsCheckin.intValue() == CommConstant.STATUS_UNACCALIMED.intValue()){
                        enlist.setEnlistId(Integer.valueOf(enlistId));
                        applicationContext.publishEvent(new EventBus(enlist,ActivityCheckin,getOrgId(request)));
+                       QueryWrapper<TaRecommendCustomer> customerQueryWrapper = new QueryWrapper<>();
+                       customerQueryWrapper.eq("person_id",enlist.getPersonId());
+                       customerQueryWrapper.eq("building_id",enlist.getBuildingId());
+                       TaRecommendCustomer recommendCustomer = recommendCustomerService.getOne(customerQueryWrapper);
+                       if (recommendCustomer.getStatus() < CommConstant.CUSTOMER_VISITE){
+                           recommendCustomer.setStatus(CommConstant.CUSTOMER_VISITE);
+                           recommendCustomerService.updateById(recommendCustomer);
+                       }
                        Integer rulePoints = taPointsRecordsService.getRulePoints(CommConstant.POINTS_CHANGE_ACTIVITY_CHECKIN, getOrgId(request));
                        enlist.setAddPoints(rulePoints);
                        responseBean.addSuccess(enlist);

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

@@ -139,6 +139,42 @@ public class TaPersonController extends BaseController {
         return responseBean;
     }
 
+    @PutMapping("/wx/registerConsultantOneClick")
+    public ResponseBean registerConsultantOneClick(HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        Integer orgId =getOrgId(request);
+        String openid = getOpenId(request);
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = taPersons.get(0);
+        QueryWrapper<TaUser>queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("phone",person.getPhone());
+        queryWrapper.eq("org_id",orgId);
+        queryWrapper.eq("is_consultant",true);
+        List<TaUser> users = taUserService.list(queryWrapper);
+        if(users.size()>0){
+            TaUser user = users.get(0);
+            person.setPersonType(CommConstant.PERSON_REALTY_CONSULTANT);
+            person.setUserId(user.getUserId());
+            person.setAvatarurl(user.getAvatar());
+            person.setCompany(user.getOrgName());
+            person.setTel(user.getPhone());
+            person.setName(user.getUserName());
+            person.setAddress(user.getAddress());
+            person.setIdNo(user.getIdNo());
+            person.setDepartment(user.getDepartment());
+            person.setPost(user.getPosition());
+            person.setPhoto(user.getPhoto());
+            taPersonService.updateById(person);
+            responseBean.addSuccess(person);
+        }else {
+            responseBean.addError("手机号不存在,请联系管理员维护。");
+        }
+        return responseBean;
+    }
+
     @PutMapping("/wx/registerAgent")
     public ResponseBean registerAgent(@RequestParam(required = false) String recommendAgentCode, @RequestParam(required = false) String channelCode,HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();

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

@@ -474,7 +474,7 @@ public class TaRecommendCustomerController extends BaseController {
 
 
     @GetMapping(value = "/admin/customer/recommend/get/{id}")
-    public ResponseBean getCutomerDetail(@PathVariable String id) {
+    public ResponseBean getCustomerDetail(@PathVariable String id) {
         ResponseBean responseBean = new ResponseBean();
         try {
             responseBean.addSuccess(taRecommendCustomerService.getCustomerDetail(id));
@@ -485,6 +485,18 @@ public class TaRecommendCustomerController extends BaseController {
         return responseBean;
     }
 
+    @GetMapping(value = "/admin/customer/recommend/public/get/{id}")
+    public ResponseBean getPublicCustomerDetail(@PathVariable String id) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(taRecommendCustomerService.getPublicCustomerDetail(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
     @GetMapping("/admin/customer/recommend/drift")
     public ResponseBean getDriftCustomerList (HttpServletRequest request,
                                               @RequestParam(value ="buildingId",defaultValue = "false") String buildingId,

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

@@ -132,6 +132,15 @@ public class TaShareActivityController extends BaseController {
                 responseBean.addError("拼团人数必须大于等于2人");
                 return responseBean;
             }
+
+            QueryWrapper<TaShareActivity> taShareActivityQueryWrapper = new QueryWrapper<>();
+            taShareActivityQueryWrapper.eq("heavy", taShareActivity.getHeavy());
+            Integer heavyCount = iTaShareActivityService.count(taShareActivityQueryWrapper);
+            if (heavyCount != 0){
+                responseBean.addError("权重已存在，请重新编辑");
+                return responseBean;
+            }
+
             Integer cityId = iTaBuildingService.getCityById(taShareActivity.getBuildingId());
             taShareActivity.setCityId(cityId);
             taShareActivity.setOrgId(getOrgId(request));
@@ -186,6 +195,15 @@ public class TaShareActivityController extends BaseController {
             TaShareActivity taShareActivity = JSONObject.parseObject(parameter, TaShareActivity.class);
             Integer cityId = iTaBuildingService.getCityById(taShareActivity.getBuildingId());
             taShareActivity.setCityId(cityId);
+
+            QueryWrapper<TaShareActivity> taShareActivityQueryWrapper = new QueryWrapper<>();
+            taShareActivityQueryWrapper.eq("heavy", taShareActivity.getHeavy());
+            Integer heavyCount = iTaShareActivityService.count(taShareActivityQueryWrapper);
+            if (heavyCount != 0){
+                responseBean.addError("权重已存在，请重新编辑");
+                return responseBean;
+            }
+
             if (iTaShareActivityService.updateById(taShareActivity)){
                 responseBean.addSuccess(taShareActivity);
             }else {

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

@@ -106,6 +106,11 @@ public class HelpActivity implements Serializable {
      */
     private String img;
 
+    /**
+     * 列表图
+     */
+    private String detailImg;
+
     /**
      * 城市ID
      */

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

@@ -0,0 +1,37 @@
+package com.huiju.estateagents.entity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 收藏表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-07-25
+ */
+@Data
+public class PersonIntention implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+
+    private String personId;
+
+
+    private String buildingName;
+
+
+    private String buildingId;
+
+
+    private Integer intention;
+
+
+
+
+}

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

@@ -267,6 +267,11 @@ public class TaPerson implements Serializable {
     @TableField(exist = false)
     private List<TaShareContent> shareContents;
 
+    @TableField(exist = false)
+    private List<PersonIntention> intentions;
+
+    @TableField(exist = false)
+    private Integer visitTimes;
     /**
      * 推广人
      */

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

@@ -10,6 +10,7 @@ import com.alibaba.excel.annotation.format.DateTimeFormat;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -168,7 +169,7 @@ public class TaRecommendCustomer implements Serializable {
     private Integer visitTimes;
 
     @TableField(exist = false)
-    private TaPerson consultant;
+    private TaUser consultant;
 
     @TableField(exist = false)
     private String recommendName;
@@ -177,8 +178,11 @@ public class TaRecommendCustomer implements Serializable {
     private String recommendTel;
 
     @TableField(exist = false)
+    private List<PersonIntention> intentions;
+
     private String intentionName;
 
+
     /**
      * 推广人
      */

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

@@ -114,7 +114,12 @@ public class TaShareActivity implements Serializable {
      * 置顶
      */
     private Integer weight;
-    
+
+    /**
+     * 权重，用于排序
+     */
+    private Integer heavy;
+
     /**
      * Initiate 发起者  Booster 助力者
      */

src/main/java/com/huiju/estateagents/mapper/TaRecommendCustomerMapper.java

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.mapper;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huiju.estateagents.entity.PersonIntention;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaRecommendCustomer;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -179,4 +180,6 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      * @return
      */
     TaRecommendCustomer getMyCustDetailById(String customerId);
+
+    List<PersonIntention> getCustomerIntentions(@Param("personId")String personId);
 }

src/main/java/com/huiju/estateagents/service/ITaRecommendCustomerService.java

@@ -44,6 +44,8 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
 
     TaRecommendCustomer getCustomerDetail(String customerId);
 
+    TaPerson getPublicCustomerDetail(String personId);
+
     TaRecommendCustomer getCustomerById(String customerId);
 
     IPage<TaRecommendCustomer>getCustomersIRecommended(int pageNumber, int pageSize,String customerId,Integer orgId);

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

@@ -445,6 +445,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         if(!StringUtils.isEmpty(personId)){
             taRecommendCustomer.setVisitRecords(taPersonVisitRecordMapper.visitRecordByPersonId(personId));
             taRecommendCustomer.setVisitTimes(taPersonVisitRecordMapper.visitRecordByPersonId(personId).size());
+            taRecommendCustomer.setIntentions(taRecommendCustomerMapper.getCustomerIntentions(personId));
             Map<String,String>geoInfo = new HashMap<>();
             geoInfo.put("provience",person.getProvince());
             geoInfo.put("country",person.getCountry());
@@ -458,21 +459,25 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         }
         if(!StringUtils.isEmpty(taRecommendCustomer.getRealtyConsultant())){
             TaPerson consultant =  taPersonMapper.getById(taRecommendCustomer.getRealtyConsultant());
+            TaUser user = new TaUser();
             if(null == consultant){
-                TaUser user = userService.getById(taRecommendCustomer.getRealtyConsultant());
-                consultant.setPersonId(taRecommendCustomer.getRealtyConsultant());
-                consultant.setTel(user.getPhone());
-                consultant.setPhone(user.getPhone());
-                consultant.setDepartment(user.getDepartment());
-                consultant.setUserId(user.getUserId());
-                consultant.setPost(user.getPosition());
-                consultant.setName(user.getUserName());
-                consultant.setAddress(user.getAddress());
-                consultant.setAvatarurl(user.getAvatar());
-                consultant.setCompany(user.getOrgName());
+                user = userService.getById(taRecommendCustomer.getRealtyConsultant());
+            }else {
+                user = userService.getById(consultant.getUserId());
             }
-            consultant.setProjects(taPersonMapper.getUserProjects(consultant.getUserId()));
-            taRecommendCustomer.setConsultant(consultant);
+            user.setProjects(taPersonMapper.getUserProjects(user.getUserId()));
+            taRecommendCustomer.setConsultant(user);
+        }
+        return taRecommendCustomer;
+    }
+
+    @Override
+    public TaPerson getPublicCustomerDetail(String personId){
+        TaPerson taRecommendCustomer = taPersonMapper.getById(personId);
+        if(!StringUtils.isEmpty(personId)){
+            taRecommendCustomer.setVisitRecords(taPersonVisitRecordMapper.visitRecordByPersonId(personId));
+            taRecommendCustomer.setVisitTimes(taPersonVisitRecordMapper.visitRecordByPersonId(personId).size());
+            taRecommendCustomer.setIntentions(taRecommendCustomerMapper.getCustomerIntentions(personId));
         }
         return taRecommendCustomer;
     }

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

@@ -48,8 +48,7 @@ public class TaShareActivityServiceImpl extends ServiceImpl<TaShareActivityMappe
         queryWrapper.eq(endTime != null, "end_time", endTime);
         queryWrapper.eq(orgId != null, "org_id", orgId);
         queryWrapper.eq(cityId != null, "city_id", cityId);
-        queryWrapper.orderByAsc("activity_status");
-        queryWrapper.orderByAsc("start_time");
+        queryWrapper.orderByDesc("heavy");
         IPage<TaShareActivity> taNewsIPage = this.page(page, queryWrapper);
 
         List<TaShareActivity> taShareActivities = taNewsIPage.getRecords();

src/main/resources/mapper/HelpActivityMapper.xml

@@ -31,10 +31,7 @@
             and ha.org_id=#{orgId}
         </where>
         GROUP BY ha.help_activity_id
-        order by ha.activity_status = 0 desc,
-                  ha.activity_status = 1 desc,
-                  ha.activity_status = 2 desc,
-                  ha.start_date asc
+        order by ha.heavy desc
     </select>
 
     <update id="updateActivityToUnStart">

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -226,30 +226,29 @@ FROM
         ) AS sharePersonName
         FROM
         ta_person b
-               <where>
-                    b.status > 0
-                   AND IFNULL(b.person_type, '') in ('estate agent', 'customer')
-                    <if test="name != null and name !=''">
-                        and b.nickname like CONCAT('%',#{name}, '%')
-                    </if>
-                    <if test="tel != null and tel!=''">
-                        and b.phone like CONCAT('%',#{tel}, '%')
-                    </if>
-                    <if test="entryType != null and entryType !=''">
-                        and b.entry_type = #{entryType}
-                    </if>
-                    <if test="sex != null and sex !=''">
-                        and b.sex = #{sex}
-                    </if>
-                    <if test="orgId != null">
-                       and b.org_id = #{orgId}
-                    </if>
-                    <if test="consultTel != null and consultTel !=''">
-                        and b.tel like CONCAT('%',#{consultTel}, '%')
-                    </if>
-                    and NOT EXISTS ( select * from ta_recommend_customer a where a.recommend_person = b.person_id)
-                </where>
-               order by b.create_date desc
+        <where>
+            b.status > 0
+            and b.org_id = #{orgId}
+            AND IFNULL(b.person_type, '') in ('estate agent', 'customer')
+            AND b.person_id not IN ( SELECT c.person_id FROM ta_recommend_customer c WHERE c.org_id = #{orgId} AND person_id is not null AND person_id != ''  )
+            <if test="name != null and name !=''">
+                and b.nickname like CONCAT('%',#{name}, '%')
+            </if>
+            <if test="tel != null and tel!=''">
+                and b.phone like CONCAT('%',#{tel}, '%')
+            </if>
+            <if test="entryType != null and entryType !=''">
+                and b.entry_type = #{entryType}
+            </if>
+            <if test="sex != null and sex !=''">
+                and b.sex = #{sex}
+            </if>
+            <if test="consultTel != null and consultTel !=''">
+                and b.tel like CONCAT('%',#{consultTel}, '%')
+            </if>
+            and NOT EXISTS ( select * from ta_recommend_customer a where a.recommend_person = b.person_id)
+        </where>
+        order by b.create_date desc
     </select>
 
     <select id="getRecCustomerExport" resultType="com.huiju.estateagents.excel.ExcelRecommendCustomer">
@@ -641,6 +640,7 @@ FROM
           AND STATUS = 4
         </if>
     </select>
+    
     <select id="getMyCustDetailById" resultType="com.huiju.estateagents.entity.TaRecommendCustomer">
         SELECT
             *
@@ -649,4 +649,19 @@ FROM
         where customer_id = #{customerId}
     </select>
 
+    <select id="getCustomerIntentions" resultType="com.huiju.estateagents.entity.PersonIntention">
+        SELECT
+            SUM( intention ) AS intention,
+            building_id,
+            building_name
+        FROM
+            `ta_person_intention_record`
+        WHERE
+            person_id = #{personId}
+        GROUP BY
+            building_id
+        ORDER BY
+            intention DESC
+    </select>
+
 </mapper>