Merge branch 'dev'

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

@@ -226,4 +226,10 @@ public class TaUser implements Serializable {
      */
     @TableField(exist = false)
     private String consultantPersonId;
+
+    /**
+     * personId集合
+     */
+    @TableField(exist = false)
+    private List<TaPerson> personIds;
 }

src/main/java/com/huiju/estateagents/center/taUser/mapper/TaUserMapper.java

@@ -26,7 +26,7 @@ public interface TaUserMapper extends BaseMapper<TaUser> {
 	
 	List<TaTags> getTagsList(@Param("userId") Integer userId,@Param("orgId") Integer orgId);
 	
-	List<TaUser> getUserList(@Param("phone") String phone,@Param("loginName") String loginName,@Param("orgId") Integer orgId);
+	List<TaUser> getUserList(@Param("phone") String phone,@Param("orgId") Integer orgId);
 
     IPage<TaUser> seleUserList(IPage pg,@Param("taUser") TaUser taUser,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 

src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserServiceImpl.java

@@ -402,8 +402,13 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
             throw new Exception("用户名称不能为空");
         }
 
-        if (StringUtils.isEmpty(taUser.getLoginName())) {
-            taUser.setLoginName(taUser.getPhone());
+        if (!StringUtils.isEmpty(taUser.getLoginName())) {
+            QueryWrapper<TaUser> wrapper = new QueryWrapper<>();
+            wrapper.eq("login_name", taUser.getLoginName());
+            List<TaUser> taUserList = this.list(wrapper);
+            if (null != taUserList && taUserList.size() > 0) {
+                throw new Exception("登录名重复");
+            }
         }
 
         boolean weightCount = validateWeight(taUser, "add");
@@ -411,9 +416,9 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
             throw new Exception("同一项目下权重值不能重复");
         }
 
-        List<TaUser> taUserList = taUserMapper.getUserList(taUser.getPhone(), taUser.getLoginName(), taUser.getOrgId());
+        List<TaUser> taUserList = taUserMapper.getUserList(taUser.getPhone(), taUser.getOrgId());
         if (null != taUserList && taUserList.size() > 0) {
-            throw new Exception("电话号码或登录名重复");
+            throw new Exception("电话号码重复");
         }
         taUser.setLoginPassword(MD5Utils.md5(MD5Utils.md5("123456")));
         taUser.setStatus(CommConstant.STATUS_NORMAL);
@@ -481,8 +486,15 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
         if (StringUtils.isEmpty(taUser.getWeight())) {
             taUser.setWeight(null);
         }
-        if (StringUtils.isEmpty(taUser.getLoginName()) && taUserBefore.getLoginName().equals(taUserBefore.getPhone())) {
-            taUser.setLoginName(taUser.getPhone());
+        if (!StringUtils.isEmpty(taUser.getLoginName()) && !taUser.getLoginName().equals(taUserBefore.getLoginName())) {
+            if (!StringUtils.isEmpty(taUser.getLoginName())) {
+                QueryWrapper<TaUser> wrapper = new QueryWrapper<>();
+                wrapper.eq("login_name", taUser.getLoginName());
+                List<TaUser> taUserList = this.list(wrapper);
+                if (null != taUserList && taUserList.size() > 0) {
+                    throw new Exception("登录名重复");
+                }
+            }
         }
 
         boolean weightCount = validateWeight(taUser, "update");
@@ -491,12 +503,13 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
         }
 
         QueryWrapper<TaUser> wrapper = new QueryWrapper<>();
-        wrapper.nested(q -> q.eq("phone", taUser.getPhone()).or().eq("login_Name", taUser.getLoginName()));
+//        wrapper.nested(q -> q.eq("phone", taUser.getPhone()).or().eq("login_Name", taUser.getLoginName()));
+        wrapper.eq("phone", taUser.getPhone());
         wrapper.eq("org_id", taUser.getOrgId());
         wrapper.ne("user_id", taUser.getUserId());
         List<TaUser> taUserList = this.list(wrapper);
         if (null != taUserList && taUserList.size() > 0) {
-            throw new Exception("电话号码或登录名重复");
+            throw new Exception("电话号码重复");
         }
         if (taUserMapper.updateById(taUser) < 1) {
             throw new Exception("更新用户信息失败");

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

@@ -105,6 +105,7 @@ public class ExtendContentController extends BaseController {
             queryWrapper.eq(status != null, "status", status);
             queryWrapper.eq( "org_id", getOrgId(request));
             queryWrapper.and(taPersonBuildingList.size() > 0, wapper -> wapper.in("building_id",taPersonBuildingList.stream().map(TaPersonBuilding::getBuildingId).collect(Collectors.toList())).or().isNull("building_id"));
+            queryWrapper.orderByDesc("order_no");
             queryWrapper.orderByDesc("create_date");
             IPage<ExtendContent> result = iExtendContentService.page(pg, queryWrapper);
 

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

@@ -463,6 +463,7 @@ public class MiniAppController extends BaseController {
         String sessionKey = params.getString("sessionKey");
         String encryptedData = params.getString("encryptedData");
         String iv = params.getString("iv");
+        String buildingId = params.getString("buildingId");
 
         // 解密
         WxMaPhoneNumberInfo phoneNoInfo = miniAppService.getPhoneNoInfo(sessionKey, encryptedData, iv, appid);
@@ -470,7 +471,7 @@ public class MiniAppController extends BaseController {
         // 更新用户绑定手机
         String openid = getOpenId(request);
         Integer orgId = getOrgId(request);
-        taPersonService.updatePersonPhone(openid, phoneNoInfo.getPhoneNumber(), orgId);
+        taPersonService.updatePersonPhone(openid, phoneNoInfo.getPhoneNumber(), buildingId, orgId);
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
         if (null == taPersons || taPersons.size() != 1) {
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);

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

@@ -529,7 +529,7 @@ public class TaHousingResourcesController extends BaseController {
                                             HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean = iTaHousingResourcesService.updateLockingStatus(houseId, type, getOrgId(request), raiseHouseId, personId, raiseRecordId);
+            responseBean = iTaHousingResourcesService.updateLockingStatus(houseId, type, getOrgId(request), raiseHouseId, personId, raiseRecordId,getUserId(request));
             logger.info("updateLockingStatus 返回结果：", JSONObject.toJSONString(responseBean));
         } catch (Exception e) {
             logger.error("updateLockingStatus 异常：", e);

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

@@ -1,18 +1,24 @@
 package com.huiju.estateagents.controller;
 
 
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.excel.HelpRecordExport;
+import com.huiju.estateagents.excel.SalesExport;
+import com.huiju.estateagents.excel.handler.CustomCellWriteHandler;
 import com.huiju.estateagents.service.ITaPersonBuildingService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
 
 /**
  * <p>
@@ -55,4 +61,31 @@ public class TaPersonBuildingController extends BaseController {
         return responseBean;
     }
 
+    /**
+     * 销售分享统计导出
+     *
+     * @param request
+     * @param response
+     * @throws IOException
+     */
+    @GetMapping("/admin/exportSales")
+    public void gethelpRecordExport(@RequestParam(value = "buildingId", required = false) String buildingId,
+                                    @RequestParam(value ="startCreateDate",required = false) String startCreateDate,
+                                    @RequestParam(value ="endCreateDate",required = false) String endCreateDate,
+                                    HttpServletRequest request,
+                                    HttpServletResponse response) throws IOException {
+        response.setContentType("application/octet-stream");
+        response.setCharacterEncoding("utf-8");
+        response.setHeader("Content-disposition", "attachment;filename=销售分享统计.xlsx");
+        Integer orgId = getOrgId(request);
+
+        // 设置读取的class
+        ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), SalesExport.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+        // 设置 sheet, 同一个sheet只需要设置一次
+        WriteSheet writeSheet = EasyExcel.writerSheet("销售分享统计").build();
+        List<SalesExport> salesList = taPersonBuildingService.selectSalesList(orgId,buildingId,startCreateDate,endCreateDate,getTaPersonBuildingListByUserId(request));
+        excelWriter.write(salesList, writeSheet);
+        // finish 会帮忙关闭流
+        excelWriter.finish();
+    }
 }

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

@@ -272,14 +272,14 @@ public class TaPersonVisitRecordController extends BaseController {
     @RequestMapping(value = "/wx/activityVisitRecord", method = RequestMethod.GET)
     public ResponseBean wxPersonActivityVisitRecordList(@RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
                                                         @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
-                                                        @RequestParam(value = "userId") Integer userId,
+                                                        @RequestParam(value = "personId") String personId,
                                                         @RequestParam(value = "targetId") String targetId,
                                                         @RequestParam(value = "eventType") String eventType,
                                                         HttpServletRequest request) {
         try {
             //使用分页插件
             IPage<TaPersonVisitRecord> pg = new Page<>(pageNumber, pageSize);
-            IPage<TaPersonVisitRecord> result = iTaPersonVisitRecordService.getWxActivityVisitRecordList(pg, userId, getOrgId(request), targetId, eventType);
+            IPage<TaPersonVisitRecord> result = iTaPersonVisitRecordService.getWxActivityVisitRecordList(pg, personId, getOrgId(request), targetId, eventType);
             return ResponseBean.success(result);
         } catch (Exception e) {
             e.printStackTrace();
@@ -293,29 +293,29 @@ public class TaPersonVisitRecordController extends BaseController {
      *
      * @param pageNumber
      * @param pageSize
-     * @param userId
+     * @param personId
      * @param request
      * @return
      */
     @RequestMapping(value = "/wx/shareRecords", method = RequestMethod.GET)
     public ResponseBean wxShareRecordsByUserId(@RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
                                                @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
-                                               @RequestParam(value = "userId") Integer userId,
+                                               @RequestParam(value = "personId") String personId,
                                                HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
-        if (userId == null) {
+        if (personId == null) {
             return responseBean;
         }
         //使用分页插件
         IPage<TaConsultantInfo> pg = new Page<>(pageNumber, pageSize);
         QueryWrapper<TaPerson> taPersonQueryWrapper = new QueryWrapper<>();
-        taPersonQueryWrapper.eq("user_id", userId);
+        taPersonQueryWrapper.eq("person_id", personId);
         TaPerson taPerson = taPersonService.getOne(taPersonQueryWrapper);
-        IPage<TaConsultantInfo> result = iTaPersonVisitRecordService.getConsultantShareInfoList(pg, taPerson.getPersonId());
+        IPage<TaConsultantInfo> result = iTaPersonVisitRecordService.getConsultantShareInfoList(pg, personId);
 
         List<TaConsultantInfo> taConsultantInfos = result.getRecords();
         taConsultantInfos.forEach(e -> {
-            Integer shareNum = iTaPersonVisitRecordService.countShareNumByEventType(getOrgId(request), e.getTargetId(), userId, taPerson.getPersonId(), (CommConstant.FAVOR_PROJECT.equals(e.getEventType()) ? "building" : CommConstant.FAVOR_ACTIVITY.equals(e.getEventType()) ? "dynamic" : e.getEventType()) + "_share");
+            Integer shareNum = iTaPersonVisitRecordService.countShareNumByEventType(getOrgId(request), e.getTargetId(), taPerson.getUserId(), taPerson.getPersonId(), (CommConstant.FAVOR_PROJECT.equals(e.getEventType()) ? "building" : CommConstant.FAVOR_ACTIVITY.equals(e.getEventType()) ? "dynamic" : e.getEventType()) + "_share");
             switch (e.getEventType()) {
                 case CommConstant.FAVOR_ACTIVITY:
                     e.setActivityShareNum(shareNum);

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

@@ -219,16 +219,14 @@ public class TaRaiseRecordController extends BaseController {
                 }
                 record.setInvalidReason(raiseRecord.getInvalidReason());
                 record.setUpdateDate(LocalDateTime.now());
-                record.setStatus(0);
+                record.setStatus(CommConstant.STATUS_UNACCALIMED);
 
                 // 更新房源认筹热度
                 iTaRaiseRecordService.updateForSubtractRaiseHeat(record.getRaiseRecordId());
 
-                // 如果房源状态为已锁定，则修改房源锁定状态
-                if (CommConstant.HOUSE_LOCKING_STATUS_LOCKED.equals(record.getHouseLockingStatus())) {
-                    record.setHouseLockingStatus(CommConstant.HOUSE_LOCKING_STATUS_UNLOCKED);
-                    iTaRaiseRecordService.updateHouseLockingStatus(record.getRaiseRecordId(), CommConstant.HOUSE_LOCKING_STATUS_UNLOCKED);
-                }
+                // 修改房源锁定状态为未锁定
+                record.setHouseLockingStatus(CommConstant.HOUSE_LOCKING_STATUS_UNLOCKED);
+                iTaRaiseRecordService.updateHouseLockingStatus(record.getRaiseRecordId(), CommConstant.HOUSE_LOCKING_STATUS_UNLOCKED);
 
                 // 发送订阅消息
                 iTaRaiseRecordService.sendRaiseMsg(record.getRaiseRecordId(), record.getRaiseId(), "认筹通知", "认筹单已作废", "点击详情查看认筹单", "具体原因查看详情", false);
@@ -277,11 +275,9 @@ public class TaRaiseRecordController extends BaseController {
                 // 更新房源认筹热度
                 iTaRaiseRecordService.updateForSubtractRaiseHeat(record.getRaiseRecordId());
 
-                // 如果房源状态为已锁定，则修改房源锁定状态
-                if (CommConstant.HOUSE_LOCKING_STATUS_LOCKED.equals(record.getHouseLockingStatus())) {
-                    record.setHouseLockingStatus(CommConstant.HOUSE_LOCKING_STATUS_UNLOCKED);
-                    iTaRaiseRecordService.updateHouseLockingStatus(record.getRaiseRecordId(), CommConstant.HOUSE_LOCKING_STATUS_UNLOCKED);
-                }
+                // 修改房源锁定状态为未锁定
+                record.setHouseLockingStatus(CommConstant.HOUSE_LOCKING_STATUS_UNLOCKED);
+                iTaRaiseRecordService.updateHouseLockingStatus(record.getRaiseRecordId(), CommConstant.HOUSE_LOCKING_STATUS_UNLOCKED);
 
                 // 发送订阅消息
                 iTaRaiseRecordService.sendRaiseMsg(record.getRaiseRecordId(), record.getRaiseId(), "认筹通知", "认筹单已作废", "点击详情查看认筹单", "具体原因查看详情", false);
@@ -755,7 +751,7 @@ public class TaRaiseRecordController extends BaseController {
             taRaiseRecordQueryWrapper.eq(StringUtils.isNotEmpty(buildingId), "building_id", buildingId);
             taRaiseRecordQueryWrapper.eq(null != salesBatchId, "sales_batch_id", salesBatchId);
             taRaiseRecordQueryWrapper.eq(StringUtils.isNotEmpty(houseLockingStatus), "house_locking_status", houseLockingStatus);
-            taRaiseRecordQueryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+            taRaiseRecordQueryWrapper.ne("status", CommConstant.STATUS_DELETE);
             taRaiseRecordQueryWrapper.orderByDesc("create_date");
             IPage<TaRaiseRecord> page = iTaRaiseRecordService.page(pg, taRaiseRecordQueryWrapper);
             List<TaRaiseRecord> list = page.getRecords();

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

@@ -28,6 +28,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -413,6 +414,24 @@ public class TaRecommendCustomerController extends BaseController {
         }
     }
 
+    /**
+     * 批量分配置业顾问
+     */
+    @RequestMapping(value="/admin/customer/consultant/batchAssist",method= RequestMethod.POST)
+    public ResponseBean batchAssistConsultant (@RequestBody TaUser taUser, HttpServletRequest request){
+        if (CollectionUtils.isEmpty(taUser.getPersonIds())){
+            return ResponseBean.error("请至少选择一条数据", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        try{
+            Integer orgId = getOrgId(request);
+            taRecommendCustomerService.batchConsultantAssist(taUser, orgId);
+            return ResponseBean.success("");
+        }catch (Exception e){
+            e.printStackTrace();
+            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
     @GetMapping("/admin/customer/recommend/{customerId}")
     public ResponseBean getCustomersIRecommended (@RequestParam int pageNumber, @RequestParam int pageSize, @PathVariable String customerId,HttpServletRequest request){
         Integer orgId = getOrgId(request);
@@ -800,7 +819,7 @@ public class TaRecommendCustomerController extends BaseController {
 //            pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
 //            List<PublicCustomerExport> publicList = null;
 //            do {
-                List<PublicCustomerExport> publicList = taRecommendCustomerMapper.getPublicCustomerExportList(pageCode * pageSize, pageSize, buildingId, name, tel,  entryType, verifyStatus, sex, orgId,consultTel,sceneType);
+                List<PublicCustomerExport> publicList = taRecommendCustomerMapper.getPublicCustomerExportList(pageCode * pageSize, pageSize, buildingId, name, tel,  entryType, verifyStatus, sex, orgId,consultTel,sceneType,getTaPersonBuildingListByUserId(request));
                 excelWriter.write(publicList, writeSheet);
 
 //                pageCode ++;

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

@@ -1,9 +1,7 @@
 package com.huiju.estateagents.entity;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.*;
+
 import java.time.LocalDateTime;
 import java.io.Serializable;
 import lombok.Data;
@@ -101,5 +99,9 @@ public class ExtendContent implements Serializable {
 
     private Integer cityId;
 
-
+    /**
+     * 排序
+     */
+    @TableField(strategy = FieldStrategy.IGNORED)
+    private Integer orderNo;
 }

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

@@ -189,6 +189,20 @@ public class TaPerson implements Serializable {
      */
     private String idcard;
 
+    /**
+     * 项目id
+     */
+    private String buildingId;
+    /**
+     * 授权手机号时间
+     */
+    private LocalDateTime authPhoneTime;
+
+    /**
+     * 授权昵称时间
+     */
+    private LocalDateTime authNicknameTime;
+
     /**
      * 访问记录
      */

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

@@ -114,6 +114,11 @@ public class TaRaiseRecord implements Serializable {
      */
     private String refundReason;
 
+    /**
+     * 退费失败原因
+     */
+    private String refundFailReason;
+
     /**
      * 创建时间
      */

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

@@ -14,21 +14,21 @@ public class PrivateCustomerExport {
      * 姓名
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "姓名", index = 0)
+    @ExcelProperty(value = "客户昵称", index = 0)
     private String name;
 
     /**
      * 电话
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "电话", index = 1)
+    @ExcelProperty(value = "手机号码", index = 1)
     private String phone;
 
     /**
      * 性别
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "性别", index = 2)
+    @ExcelProperty(value = "性别", index = 9)
     private String sex;
 
     /**
@@ -52,4 +52,38 @@ public class PrivateCustomerExport {
     @ExcelProperty(value = "项目名称", index = 5)
     private String buildingName;
 
+    /**
+     * 用户注册时间
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "关注时间（用户注册时间）", index = 2)
+    private String createDate;
+
+    /**
+     * 国家
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "归属地", index = 6)
+    private String province;
+
+//    /**
+//     * 省份
+//     */
+//    @ColumnWidth(15)
+//    @ExcelProperty(value = "省份", index = 8)
+//    private String province;
+
+    /**
+     * 来访方式
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "来访方式（场景渠道）", index = 7)
+    private String sceneType;
+
+    /**
+     * 意向度
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "意向度（意向值）", index = 8)
+    private String intention ;
 }

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

@@ -14,21 +14,62 @@ public class PublicCustomerExport {
      * 姓名
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "姓名", index = 0)
+    @ExcelProperty(value = "客户昵称", index = 0)
     private String nickname;
 
     /**
      * 电话
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "电话", index = 1)
+    @ExcelProperty(value = "手机号码", index = 1)
     private String phone;
 
     /**
      * 性别
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "性别", index = 2)
+    @ExcelProperty(value = "性别", index = 7)
     private String sex;
 
+    /**
+     * 关注时间
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "关注时间（用户注册时间）", index = 2)
+    private String createDate;
+
+    /**
+     * 归属地
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "归属地", index = 4)
+    private String province;
+
+//    /**
+//     * 省份
+//     */
+//    @ColumnWidth(15)
+//    @ExcelProperty(value = "省份", index = 5)
+//    private String province;
+
+    /**
+     * 来访方式
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "来访方式（场景渠道）", index = 5)
+    private String sceneType;
+
+    /**
+     * 意向度
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "意向度（意向值）", index = 6)
+    private String intention;
+
+    /**
+     * 项目名称
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "项目名称", index = 3)
+    private String buildingName;
 }

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

@@ -0,0 +1,55 @@
+package com.huiju.estateagents.excel;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 助力活动发起人员记录
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-10-17
+ */
+@Data
+public class SalesExport {
+
+    /**
+     * 项目名称
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "项目名称", index = 0)
+    private String buildingName;
+
+    /**
+     * 置业顾问
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "置业顾问", index = 1)
+    private String consultantName;
+
+    /**
+     * 分享次数
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "分享次数", index = 2)
+    private int shareCount;
+
+    /**
+     * 点击人数
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "点击人数", index = 3)
+    private int clickNum;
+
+    @ExcelIgnore
+    private String personId;
+
+    @ExcelIgnore
+    private Integer userId;
+}

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.entity.TaPointsExchange;
+import com.huiju.estateagents.excel.SalesExport;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -20,4 +21,6 @@ import java.util.List;
 @Mapper
 public interface TaPersonBuildingMapper extends BaseMapper<TaPersonBuilding> {
     List<TaPersonBuilding> selectListByParams(Page page, @Param("orgId")Integer orgId, @Param("buildingId") String buildingId, @Param("startCreateDate") String startCreateDate, @Param("endCreateDate") String endCreateDate, @Param("personBuildingList")List<TaPersonBuilding> taPersonBuildingList);
+
+    List<SalesExport> selectSalesList(@Param("orgId") Integer orgId,@Param("buildingId") String buildingId, @Param("startCreateDate")  String startCreateDate,@Param("endCreateDate") String endCreateDate, @Param("personBuildingList") List<TaPersonBuilding> taPersonBuildingList);
 }

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

@@ -119,7 +119,7 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      * @param consultTel
      * @return
      */
-    List<PublicCustomerExport> getPublicCustomerExportList(@Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize, @Param("buildingId")String buildingId, @Param("name") String name, @Param("tel") String tel, @Param("entryType") String entryType, @Param("verifyStatus") String verifyStatus, @Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("consultTel")String consultTel, @Param("sceneType")String sceneType);
+    List<PublicCustomerExport> getPublicCustomerExportList(@Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize, @Param("buildingId")String buildingId, @Param("name") String name, @Param("tel") String tel, @Param("entryType") String entryType, @Param("verifyStatus") String verifyStatus, @Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("consultTel")String consultTel, @Param("sceneType")String sceneType,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 
     /**
      * 导出数据 私客总数

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

@@ -162,7 +162,7 @@ public interface ITaHousingResourcesService extends IService<TaHousingResources>
     ResponseBean listHouseByRaiseRecordId(Integer raiseRecordId, Integer orgId, Integer pageNumber, Integer pageSize);
 
     /**
-     * 更新房源锁定状态
+     * 更新房源状态
      *
      * @param houseId
      * @param type
@@ -170,7 +170,7 @@ public interface ITaHousingResourcesService extends IService<TaHousingResources>
      * @param personId
      * @return
      */
-    ResponseBean updateLockingStatus(Integer houseId, String type, Integer orgId, Integer raiseHouseId, String personId, Integer raiseRecordId);
+    ResponseBean updateLockingStatus(Integer houseId, String type, Integer orgId, Integer raiseHouseId, String personId, Integer raiseRecordId, Integer userId);
 
     /**
      * 校验房源的认筹状态

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

@@ -3,6 +3,7 @@ package com.huiju.estateagents.service;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.excel.SalesExport;
 
 import java.util.List;
 
@@ -16,4 +17,14 @@ import java.util.List;
  */
 public interface ITaPersonBuildingService extends IService<TaPersonBuilding> {
     ResponseBean selectList(Integer pageNum, Integer pageSize, Integer orgId, String buildingId, String startCreateDate, String endCreateDate, List<TaPersonBuilding> getTaPersonBuildingListByUserId);
+
+    /**
+     * 导出
+     * @param buildingId
+     * @param startCreateDate
+     * @param endCreateDate
+     * @param taPersonBuildingListByUserId
+     * @return
+     */
+    List<SalesExport> selectSalesList(Integer orgId, String buildingId, String startCreateDate, String endCreateDate, List<TaPersonBuilding> taPersonBuildingListByUserId);
 }

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

@@ -23,7 +23,7 @@ import java.util.Map;
 public interface ITaPersonService extends IService<TaPerson> {
     TaPerson mergePersonWxInfo(WxMaUserInfo userInfo);
 
-    TaPerson updatePersonPhone(String miniOpenid, String phone, Integer orgId);
+    TaPerson updatePersonPhone(String miniOpenid, String phone, String buildingId, Integer orgId);
 
     IPage<Map<String, Object>> getCardList(int pageNumber, int pageSize, String buildingId, Integer orgId, TaPerson person);
 

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

@@ -45,7 +45,7 @@ public interface ITaPersonVisitRecordService extends IService<TaPersonVisitRecor
 	 * @param orgId
 	 * @return
 	 */
-	IPage<TaPersonVisitRecord> getWxActivityVisitRecordList(IPage<TaPersonVisitRecord> pg, Integer userId, Integer orgId, String targetId, String eventType);
+	IPage<TaPersonVisitRecord> getWxActivityVisitRecordList(IPage<TaPersonVisitRecord> pg, String personId, Integer orgId, String targetId, String eventType);
 
 	/**
 	 * 获取这个人的活动数据列表

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

@@ -58,6 +58,7 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
 
     ResponseBean consultantAssist(TaUser taUser, String personId, Integer orgId);
 
+    ResponseBean batchConsultantAssist(TaUser taUser, Integer orgId);
     /**
      * 导出数据(推荐客户)
      * @param orgId

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

@@ -86,6 +86,8 @@ public class ExtendContentServiceImpl extends ServiceImpl<ExtendContentMapper, E
         extendContentQuery.eq(null != cityId && cityId != 0, "city_id", cityId);
         extendContentQuery.eq("status","1");
         extendContentQuery.eq("org_id",orgId);
+        extendContentQuery.orderByDesc("order_no");
+        extendContentQuery.orderByDesc("create_date");
         List<ExtendContent> taExtendContent = extendContentMapper.selectList(extendContentQuery);
         responseBean.addSuccess(taExtendContent);
         return responseBean;

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

@@ -949,9 +949,8 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
                 QueryWrapper<TaBuildingImg> buildingImgQueryWrapper = new QueryWrapper<>();
                 buildingImgQueryWrapper.eq("img_id", img.getImgId());
                 buildingImgQueryWrapper.eq("img_type", CommConstant.BUILDING_IMG_APARMENT);
-                buildingImgQueryWrapper.orderByAsc("order_no");
                 return taBuildingImgMapper.selectOne(buildingImgQueryWrapper);
-            }).collect(Collectors.toList());
+            }).sorted(Comparator.comparing(TaBuildingImg::getOrderNo)).collect(Collectors.toList());
 
             e.setBuildingImgList(buildingImag);
 

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

@@ -650,9 +650,9 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
     }
 
     @Override
-    public ResponseBean updateLockingStatus(Integer houseId, String type, Integer orgId, Integer raiseHouseId, String personId, Integer raiseRecordId) {
-        logger.info("updateLockingStatus 接收参数：houseId:{},type:{},orgId:{},raiseHouseId:{},personId:{}",
-                houseId, type, orgId, raiseHouseId, personId);
+    public ResponseBean updateLockingStatus(Integer houseId, String type, Integer orgId, Integer raiseHouseId, String personId, Integer raiseRecordId, Integer userId) {
+        logger.info("updateLockingStatus 接收参数：houseId:{},type:{},orgId:{},raiseHouseId:{},personId:{},userId:{}",
+                houseId, type, orgId, raiseHouseId, personId, userId);
         ResponseBean responseBean = new ResponseBean();
 
         // 获取房源信息
@@ -685,6 +685,7 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
             housingResources.setHouseLockingPerson(personId);
             housingResources.setUpdateDate(LocalDateTime.now());
             housingResources.setHouseLockingPerson(raiseRecord.getPersonId());
+            housingResources.setUpdateUser(userId);
             updateById(housingResources);
 
             //更新认筹单房源锁定状态
@@ -715,6 +716,7 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
             housingResources.setHouseLockingStatus("unlocked");
             housingResources.setHouseLockingPerson("");
             housingResources.setUpdateDate(LocalDateTime.now());
+            housingResources.setUpdateUser(userId);
             updateById(housingResources);
 
             //更新认筹单房源锁定状态

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

@@ -7,6 +7,7 @@ import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaShareCount;
+import com.huiju.estateagents.excel.SalesExport;
 import com.huiju.estateagents.mapper.TaPersonBuildingMapper;
 import com.huiju.estateagents.mapper.TaPersonMapper;
 import com.huiju.estateagents.mapper.TaShareCountMapper;
@@ -61,4 +62,27 @@ public class TaPersonBuildingServiceImpl extends ServiceImpl<TaPersonBuildingMap
         page.setRecords(list);
         return ResponseBean.success(page);
     }
+
+    /**
+     * 导出
+     *
+     * @param buildingId
+     * @param startCreateDate
+     * @param endCreateDate
+     * @param taPersonBuildingList
+     * @return
+     */
+    @Override
+    public List<SalesExport> selectSalesList(Integer orgId, String buildingId, String startCreateDate, String endCreateDate, List<TaPersonBuilding> taPersonBuildingList) {
+        List<SalesExport> list = taPersonBuildingMapper.selectSalesList(orgId, buildingId, startCreateDate, endCreateDate, taPersonBuildingList);
+        for (SalesExport salesExport : list) {
+            if (StringUtils.isEmpty(salesExport.getPersonId())){
+                salesExport.setClickNum(0);
+                continue;
+            }
+
+            salesExport.setClickNum(taSharePersonFromMapper.countViewNum(salesExport.getUserId(), orgId, salesExport.getPersonId(), startCreateDate, endCreateDate));
+        }
+        return list;
+    }
 }

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

@@ -127,6 +127,7 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
             wrapper.set("language",userInfo.getLanguage());
             wrapper.set("union_id",userInfo.getUnionId());
             wrapper.set("country",userInfo.getCountry());
+            wrapper.set("auth_nickname_time", LocalDateTime.now());
             taPersonMapper.update(person, wrapper);
 
             person.setAvatarurl(userInfo.getAvatarUrl());
@@ -157,7 +158,7 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
     }
 
     @Override
-    public TaPerson updatePersonPhone(String miniOpenid, String phone,Integer orgId) {
+    public TaPerson updatePersonPhone(String miniOpenid, String phone, String buildingId, Integer orgId) {
         // 先查询是否存在用户
         TaPerson person = null;
         List<TaPerson> taPersons = getPersonsByOpenId(miniOpenid);
@@ -179,6 +180,10 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
 
         UpdateWrapper<TaPerson> wrapper = new UpdateWrapper<>();
         wrapper.set("phone", phone);
+        wrapper.set("auth_phone_time", LocalDateTime.now());
+        if (!StringUtils.isEmpty(buildingId)){
+            wrapper.set("building_id", buildingId);
+        }
 
         if (CommConstant.PERSON_ESTATE_DRIFT.equals(person.getPersonType())) {
             wrapper.set("person_type",CommConstant.PERSON_ESTATE_CUSTOMER);

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

@@ -304,14 +304,14 @@ public class TaPersonVisitRecordServiceImpl extends ServiceImpl<TaPersonVisitRec
 	 * @return
 	 */
 	@Override
-	public IPage<TaPersonVisitRecord> getWxActivityVisitRecordList(IPage<TaPersonVisitRecord> pg, Integer userId, Integer orgId, String targetId, String eventType) {
+	public IPage<TaPersonVisitRecord> getWxActivityVisitRecordList(IPage<TaPersonVisitRecord> pg, String personId, Integer orgId, String targetId, String eventType) {
 		//根据userId获取用户信息
 		QueryWrapper<TaPerson> taPersonQueryWrapper = new QueryWrapper<>();
-		taPersonQueryWrapper.eq("user_id",userId);
+		taPersonQueryWrapper.eq("person_id",personId);
 		taPersonQueryWrapper.eq("org_id",orgId);
 		TaPerson taPerson = taPersonMapper.selectOne(taPersonQueryWrapper);
 		//获取我的访问客户列表
-		IPage<TaPersonVisitRecord> result = personVisitRecordMapper.getWxActivityVisitRecordList(pg,userId,orgId, targetId,taPerson.getPersonId(), (CommConstant.FAVOR_PROJECT.equals(eventType) ? "building" : CommConstant.FAVOR_ACTIVITY.equals(eventType) ? "dynamic" : eventType)  + "_share");
+		IPage<TaPersonVisitRecord> result = personVisitRecordMapper.getWxActivityVisitRecordList(pg, taPerson.getUserId(), orgId, targetId, personId, (CommConstant.FAVOR_PROJECT.equals(eventType) ? "building" : CommConstant.FAVOR_ACTIVITY.equals(eventType) ? "dynamic" : eventType)  + "_share");
 		List<TaPersonVisitRecord> records = result.getRecords();
 		//判断是否我的客户状态
 		records.forEach(e -> {

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

@@ -24,6 +24,7 @@ import com.huiju.estateagents.service.ITaRecommendCustomerService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.statistic.entity.TaCustomerFollowUpRecord;
 import com.huiju.estateagents.statistic.mapper.TaCustomerFollowUpRecordMapper;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -751,6 +752,16 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         }
     }
 
+    @Override
+    public ResponseBean batchConsultantAssist(TaUser taUser, Integer orgId) {
+        if (CollectionUtils.isNotEmpty(taUser.getPersonIds())){
+            for (TaPerson taPerson : taUser.getPersonIds()){
+                consultantAssist(taUser, taPerson.getPersonId(), orgId);
+            }
+        }
+        return ResponseBean.success("操作成功");
+    }
+
     @Override
     public ResponseBean consultantAssist(TaUser taUser, String personId, Integer orgId) {
         TaPerson taPerson = taPersonMapper.getById(personId);

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

@@ -66,6 +66,9 @@ public class TaSalesBatchServiceImpl extends ServiceImpl<TaSalesBatchMapper, TaS
     @Autowired
     private ITaBuildingService taBuildingService;
 
+    @Autowired
+    private TaRaiseServiceImpl taRaiseService;
+
     @Override
     public IPage<TaSalesBatch> selectByCondition(IPage<TaSalesBatch> page, String salesBatchName, String buildingId, Integer status, Integer orgId, List<TaPersonBuilding> taPersonBuildingListByUserId) {
         return taSalesBatchMapper.selectByCondition(page, salesBatchName, buildingId, status, orgId, taPersonBuildingListByUserId);
@@ -125,6 +128,8 @@ public class TaSalesBatchServiceImpl extends ServiceImpl<TaSalesBatchMapper, TaS
         Long totalHouses = null;
         BigDecimal totalRealHeat = null;
         BigDecimal totalHeat = null;
+        BigDecimal raiseRealNumber = null;
+        BigDecimal raiseNumber = null;
 
         // 获取房源预选数量
         Map<String, Object> result = taSalesBatchMapper.getTotalHousesAndHeat(salesBatchId);
@@ -132,14 +137,32 @@ public class TaSalesBatchServiceImpl extends ServiceImpl<TaSalesBatchMapper, TaS
             totalHouses = (Long) result.get("totalHouses");
             totalRealHeat = (BigDecimal) result.get("totalRealHeat");
             totalHeat = (BigDecimal) result.get("totalHeat");
+            raiseRealNumber = (BigDecimal) result.get("totalRaiseRealHeat");
+            raiseNumber = (BigDecimal) result.get("totalRaiseHeat");
         }
 
+        // 获取认筹信息
+        QueryWrapper<TaRaise> taRaiseQueryWrapper = new QueryWrapper<>();
+        taRaiseQueryWrapper.eq("sales_batch_id", salesBatch.getSalesBatchId());
+        taRaiseQueryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+        TaRaise taRaise = taRaiseService.getOne(taRaiseQueryWrapper);
+
         JSONObject obj = new JSONObject();
         obj.put("preselectionStartTime", salesBatch.getPreselectionStartTime());
         obj.put("preselectionEndTime", salesBatch.getPreselectionEndTime());
+        obj.put("raiseRealNumber", raiseRealNumber == null ? 0 : raiseRealNumber);
+        obj.put("raiseNumber", raiseNumber == null ? 0 : raiseNumber);
+        if(taRaise != null){
+            obj.put("raiseStartTime", taRaise.getRaiseStartTime());
+            obj.put("raiseEndTime", taRaise.getRaiseEndTime());
+        }else{
+            obj.put("raiseStartTime", "");
+            obj.put("raiseEndTime", "");
+        }
         obj.put("salesNumber", totalHouses == null ? 0 : totalHouses);
         obj.put("preselectionNumber", totalRealHeat == null ? 0 : totalRealHeat);
         obj.put("heatNumber", totalHeat == null ? 0 : totalHeat);
+
         responseBean.addSuccess(obj);
         return responseBean;
     }

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

@@ -214,12 +214,12 @@ public class WxPayServiceImpl implements IWxPayService {
                 if (orderInfo.get("refund_status").equals(WXPayConstants.SUCCESS)){
                     taRaiseRecord.setPayStatus(CommConstant.PAY_STATUS_REFUNDED);
                     if (!StringUtils.isEmpty(orderInfo.get("err_code"))){
-                        taRaiseRecord.setRefundReason(WXPayRefundReason.getMsg(orderInfo.get("err_code")));
+                        taRaiseRecord.setRefundFailReason(WXPayRefundReason.getMsg(orderInfo.get("err_code")));
                     }
                 }
                 if (!orderInfo.get("refund_status").equals(WXPayConstants.SUCCESS)){
                     taRaiseRecord.setPayStatus(CommConstant.PAY_STATUS_CHANGE);
-                    taRaiseRecord.setRefundReason("");
+                    taRaiseRecord.setRefundFailReason("");
                 }
 
                 taRaiseRecordMapper.updateById(taRaiseRecord);

src/main/resources/mapper/TaPersonBuildingMapper.xml

@@ -12,6 +12,12 @@
             <if test="buildingId != null and buildingId != ''">
               and a.building_id = #{buildingId}
             </if>
+            <if test="personBuildingList != null and personBuildingList.size > 0">
+                AND a.building_id in
+                <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                    #{personBuilding.buildingId}
+                </foreach>
+            </if>
             <if test="startCreateDate != null and startCreateDate != ''">
                 and  date_format(c.create_date,'%Y-%m-%d') >= date_format(#{startCreateDate},'%Y-%m-%d')
             </if>
@@ -21,4 +27,40 @@
         group by t.user_id
     </select>
 
+    <select id="selectSalesList" resultType="com.huiju.estateagents.excel.SalesExport">
+        SELECT
+            a.building_id,
+            t.user_name AS consultant_name,
+            d.building_name,
+            b.person_id,
+            t.user_id ,
+            count(c.person_id) as share_count
+        FROM
+            ta_user t
+        LEFT JOIN ta_person_building a ON t.user_id = a.user_id
+        LEFT JOIN ta_person b ON t.user_id = b.user_id
+        LEFT JOIN ta_share_count c ON b.person_id = c.person_id
+        LEFT JOIN ta_building d ON a.building_id = d.building_id
+        WHERE
+        t.org_id =  #{orgId}
+        AND t.is_consultant = 1
+        <if test="buildingId != null and buildingId != ''">
+            and a.building_id = #{buildingId}
+        </if>
+        <if test="personBuildingList != null and personBuildingList.size > 0">
+            AND a.building_id in
+            <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                #{personBuilding.buildingId}
+            </foreach>
+        </if>
+        <if test="startCreateDate != null and startCreateDate != ''">
+            and  date_format(c.create_date,'%Y-%m-%d') >= date_format(#{startCreateDate},'%Y-%m-%d')
+        </if>
+        <if test="endCreateDate != null and endCreateDate != ''">
+            and  date_format(c.create_date,'%Y-%m-%d') &lt;= date_format(#{endCreateDate},'%Y-%m-%d')
+        </if>
+        GROUP BY
+        t.user_id
+    </select>
+
 </mapper>

src/main/resources/mapper/TaPersonVisitRecordMapper.xml

@@ -123,7 +123,7 @@
 
     <select id="getWxActivityVisitRecordList" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">
         SELECT
-            t.share_from_id, t.share_person as consultant_id, t.share_person_type, t.person_id, t.target_type, t.target_id, t.create_date as visit_time, t.org_id ,building_id, t.status, t.is_first_time,
+            t.share_from_id, t.share_person as consultant_id, t.share_person_type, t.person_id, t.target_type, t.target_id, t.create_date as visit_time, t.org_id ,t.building_id, t.status, t.is_first_time,
 	        p.`name` as user_name,
 	        p.`nickname` as nickname,
 	        p.avatarurl
@@ -384,9 +384,9 @@
         select count(DISTINCT t.person_id)  from ta_share_person_from t
         left join ta_person a on t.person_id = a.person_id
         where
-        (t.share_person = #{userId}
-        <if test="personId != null and personId != ''">
-            or t.share_person = #{personId}
+        (t.share_person = #{personId}
+        <if test="userId != null and userId != ''">
+            or t.share_person = #{userId}
         </if>
         )
         and t.org_id = #{orgId}

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -244,12 +244,11 @@ FROM
         SELECT
         b.*,
         IF
-        ( IFNULL( tpp.NAME, '' ) != '', tpp.NAME, tpp.nickname ) AS sharePersonName
+        ( IFNULL( b.NAME, '' ) != '', b.NAME, b.nickname ) AS sharePersonName
         FROM
         ta_person b
-        LEFT JOIN ta_person_from_record r ON b.person_id = r.person_id AND r.is_first_time = 1 and r.org_id = #{orgId}
-        LEFT JOIN ta_person tpp ON r.share_person_id = tpp.person_id
-        left join td_wx_dict d on r.scene_id = d.scene_id
+        LEFT JOIN ta_person_from_record r ON r.share_person_id = b.person_id AND r.is_first_time = 1 and r.org_id = #{orgId}
+        LEFT JOIN td_wx_dict d ON r.scene_id = d.scene_id
         <where>
             b.status > 0
             and b.org_id = #{orgId}
@@ -280,11 +279,11 @@ FROM
                 and b.tel like CONCAT('%',#{consultTel}, '%')
             </if>
             <if test="buildingId != null and buildingId !=''">
-                AND r.building_id = #{buildingId}
+                AND b.building_id = #{buildingId}
             </if>
-            and NOT EXISTS ( select * from ta_recommend_customer a where a.org_id = #{orgId} and a.recommend_person = b.person_id)
+<!--            and NOT EXISTS ( select * from ta_recommend_customer a where a.org_id = #{orgId} and a.recommend_person = b.person_id)-->
             <if test="personBuildingList != null and personBuildingList.size > 0">
-                AND r.building_id in
+                AND b.building_id in
                 <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
                     #{personBuilding.buildingId}
                 </foreach>
@@ -546,10 +545,17 @@ FROM
         SELECT
           b.nickname as nickname,
           b.phone as phone,
-          if(b.gender = 1, '男', if(b.gender = 2, '女', '未知')) as sex
+          if(b.gender = 1, '男', if(b.gender = 2, '女', '未知')) as sex,
+          b.create_date,
+          concat(b.country, b.province) as province,
+          z.intention,
+          d.scene_alias as sceneType,
+          t.building_name
         FROM
         ta_person b
         LEFT JOIN ta_person_from_record r ON b.person_id = r.person_id AND r.is_first_time = 1 and r.org_id = #{orgId}
+        left join ta_building t on b.building_id = t.building_id
+        left join (select sum(t.intention) as intention,t.person_id From ta_person_intention_record t where t.org_id = #{orgId} group by t.person_id) z on z.person_id = b.person_id
         left join td_wx_dict d on r.scene_id = d.scene_id
         <where>
             b.status > 0
@@ -558,7 +564,13 @@ FROM
                 and b.nickname like CONCAT('%',#{name}, '%')
             </if>
             <if test="buildingId != null and buildingId !=''">
-                AND r.building_id = #{buildingId}
+                AND b.building_id = #{buildingId}
+            </if>
+            <if test="personBuildingList != null and personBuildingList.size > 0">
+                AND b.building_id in
+                <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                    #{personBuilding.buildingId}
+                </foreach>
             </if>
             <if test="tel != null and tel!=''">
                 and b.phone like CONCAT('%',#{tel}, '%')
@@ -650,7 +662,11 @@ FROM
         WHEN b.tel IS NULL THEN
         d.phone ELSE b.tel
         END AS consultTel,
-        t.building_name
+        t.building_name,
+        z.intention,
+        a.create_date,
+        concat(a.country,a.province) as province,
+        w.scene_alias as scene_type
         FROM
         ta_recommend_customer a
         LEFT JOIN ta_person b ON a.realty_consultant = b.person_id
@@ -659,6 +675,7 @@ FROM
         LEFT JOIN ta_person_from_record p ON a.person_id = p.person_id AND p.is_first_time = 1 and p.org_id = #{orgId}
         left join ta_building t on a.building_id = t.building_id
         LEFT JOIN td_wx_dict w ON p.scene_id = w.scene_id
+        left join (select sum(t.intention) as intention,t.person_id From ta_person_intention_record t where t.org_id = #{orgId} group by t.person_id) z on z.person_id = a.person_id
         <where>
             a.status > 0
             and a.verify_status = 1

src/main/resources/mapper/TaSalesBatchMapper.xml

@@ -47,7 +47,9 @@
         SELECT
             count( * ) totalHouses,
             sum( t.real_heat ) totalRealHeat,
-            sum( t.heat) totalHeat
+            sum( t.heat) totalHeat,
+            sum( t.raise_real_heat ) totalRaiseRealHeat,
+	        sum( t.raise_heat ) totalRaiseHeat
         FROM
             ta_housing_resources t
         WHERE

src/main/resources/mapper/TaUserMapper.xml

@@ -56,11 +56,8 @@
     FROM
         ta_user
     WHERE
-    <if test="orgId != null and orgId != ''">
-        org_id = #{orgId} and
-    </if>
-         (phone = #{phone}
-        OR login_Name = #{loginName})
+        org_id = #{orgId}
+        and phone = #{phone}
     </select>
     <select id="seleUserList" resultType="com.huiju.estateagents.center.taUser.entity.TaUser">
         SELECT