Merge branch 'dev'

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.huiju</groupId>
 	<artifactId>estateagents</artifactId>
-	<version>v3.5.13</version>
+	<version>v3.5.14</version>
 	<name>estateages</name>
 	<description>置业经纪人</description>
 

src/main/java/com/huiju/estateagents/bo/request/HousingRaiseRequestBO.java

@@ -61,5 +61,5 @@ public class HousingRaiseRequestBO {
     /**
      * 房源锁定状态
      */
-    private Integer lockingStatus;
+    private String lockingStatus;
 }

src/main/java/com/huiju/estateagents/bo/request/RaiseRecordRequestBO.java

@@ -61,7 +61,7 @@ public class RaiseRecordRequestBO {
     /**
      * 房源锁定状态
      */
-    private Integer lockingStatus;
+    private String lockingStatus;
 
     /**
      * 认筹手机号
@@ -92,4 +92,9 @@ public class RaiseRecordRequestBO {
      * 结束时间
      */
     private String endTime;
+
+    /**
+     * 用户姓名
+     */
+    private String personName;
 }

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

@@ -96,13 +96,14 @@ public class TaUserController extends BaseController {
      */
     @RequestMapping(value="/center/taUser",method= RequestMethod.GET)
     public ResponseBean taUserList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize, HttpServletRequest request){
+									 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                     @RequestParam(value = "miniAppName", required = false) String miniAppName, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
 
         try {
             //使用分页插件
 		    IPage pg = new Page<>(pageNum, pageSize);
-            IPage<Map<String,Object>> result = iTaUserService.getPageList(pg, getChannelId(request));
+            IPage<Map<String,Object>> result = iTaUserService.getPageList(pg, getChannelId(request), miniAppName);
             responseBean.addSuccess(result);
         }catch (Exception e){
             e.printStackTrace();
@@ -125,7 +126,7 @@ public class TaUserController extends BaseController {
         try {
             //使用分页插件
             IPage pg = new Page<>(pageNum, pageSize);
-            IPage<Map<String,Object>> result = iTaUserService.getPageList(pg, null);
+            IPage<Map<String,Object>> result = iTaUserService.getPageList(pg, null, null);
             responseBean.addSuccess(result);
         }catch (Exception e){
             e.printStackTrace();
@@ -387,6 +388,7 @@ public class TaUserController extends BaseController {
                                    @RequestParam(value ="phone",required = false) String phone,
                                    @RequestParam(value ="status",required = false) Integer status,
                                    @RequestParam(value ="isConsultant",required = false) Integer isConsultant,
+                                   @RequestParam(value ="buildingId",required = false) String buildingId,
                                    HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -397,6 +399,7 @@ public class TaUserController extends BaseController {
             taUser.setUserName(userName);
             taUser.setPhone(phone);
             taUser.setStatus(status);
+            taUser.setBuildingId(buildingId);
             if(null != isConsultant && isConsultant == 1){
                 taUser.setIsConsultant(true);
             }else if (null != isConsultant && isConsultant == 0){

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

@@ -22,7 +22,7 @@ import java.util.Map;
 @Mapper
 public interface TaUserMapper extends BaseMapper<TaUser> {
 	
-	List<Map<String,Object>> getPageList(IPage<TaUser> pg, @Param("channelId") Integer channelId);
+	List<Map<String,Object>> getPageList(IPage<TaUser> pg, @Param("channelId") Integer channelId, @Param("miniAppName") String miniAppName);
 	
 	List<TaTags> getTagsList(@Param("userId") Integer userId,@Param("orgId") Integer orgId);
 	

src/main/java/com/huiju/estateagents/center/taUser/service/ITaUserService.java

@@ -20,7 +20,7 @@ import java.util.Map;
  */
 public interface ITaUserService extends IService<TaUser> {
 
-    IPage<Map<String, Object>> getPageList(IPage<TaUser> pg, Integer channelId);
+    IPage<Map<String, Object>> getPageList(IPage<TaUser> pg, Integer channelId, String miniAppName);
 
     TaUser newUserAndOrg(TaUser taUser, Integer channelId) throws Exception;
 

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

@@ -105,8 +105,8 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
     private WxUtils wxUtils;
 
     @Override
-    public IPage<Map<String, Object>> getPageList(IPage pg, Integer channelId) {
-        List<Map<String, Object>> taUserList = taUserMapper.getPageList(pg, channelId);
+    public IPage<Map<String, Object>> getPageList(IPage pg, Integer channelId, String miniAppName) {
+        List<Map<String, Object>> taUserList = taUserMapper.getPageList(pg, channelId, miniAppName);
 
         for (Map map : taUserList) {
             if (map.get("orgId") == null) {
@@ -411,7 +411,7 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
             throw new Exception("同一项目下权重值不能重复");
         }
 
-        List<TaUser> taUserList = taUserMapper.getUserList(taUser.getPhone(), taUser.getLoginName(), null);
+        List<TaUser> taUserList = taUserMapper.getUserList(taUser.getPhone(), taUser.getLoginName(), taUser.getOrgId());
         if (null != taUserList && taUserList.size() > 0) {
             throw new Exception("电话号码或登录名重复");
         }

src/main/java/com/huiju/estateagents/common/DateUtils.java

@@ -29,6 +29,11 @@ public class DateUtils {
         return LocalDateTime.now().format(formatter);
     }
 
+    public static String localDateTimeToString(LocalDateTime d) {
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        return d.format(formatter);
+    }
+
     public static LocalDateTime day2LocalDateime(String day) {
         DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         return LocalDateTime.parse(day + " 00:00:00", df);

src/main/java/com/huiju/estateagents/common/wxpay/WXPayRefundReason.java

@@ -0,0 +1,106 @@
+package com.huiju.estateagents.common.wxpay;
+
+public enum WXPayRefundReason {
+    SYSTEMERROR("SYSTEMERROR","系统超时等"),
+    BIZERR_NEED_RETRY("BIZERR_NEED_RETRY","并发情况下，业务被拒绝，商户重试即可解决"),
+    TRADE_OVERDUE("TRADE_OVERDUE","订单已经超过可退款的最大期限(支付后一年内可退款)"),
+    ERROR("ERROR","申请退款业务发生错误"),
+    USER_ACCOUNT_ABNORMAL("USER_ACCOUNT_ABNORMAL","用户帐号注销"),
+    INVALID_REQ_TOO_MUCH("INVALID_REQ_TOO_MUCH","连续错误请求数过多被系统短暂屏蔽"),
+    NOTENOUGH("NOTENOUGH","商户可用退款余额不足"),
+    INVALID_TRANSACTIONID("INVALID_TRANSACTIONID","请求参数未按指引进行填写"),
+    PARAM_ERROR("PARAM_ERROR","请求参数未按指引进行填写"),
+    APPID_NOT_EXIST("APPID_NOT_EXIST","参数中缺少APPID"),
+    MCHID_NOT_EXIST("MCHID_NOT_EXIST","参数中缺少MCHID"),
+    ORDERNOTEXIST("ORDERNOTEXIST","缺少有效的订单号"),
+    REQUIRE_POST_METHOD("REQUIRE_POST_METHOD","未使用post传递参数 "),
+    SIGNERROR("SIGNERROR","参数签名结果不正确"),
+    XML_FORMAT_ERROR("XML_FORMAT_ERROR","XML格式错误"),
+    FREQUENCY_LIMITED("FREQUENCY_LIMITED","2个月之前的订单申请退款有频率限制"),
+    NOAUTH("NOAUTH","请求ip异常"),
+    ;
+
+    WXPayRefundReason(String code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+
+    private String code;
+
+    private String message;
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+
+    public static String getMsg(String code) {
+        String message = "";
+       switch (code){
+           case "SYSTEMERROR":
+               message = SYSTEMERROR.getMessage();
+               break;
+           case "BIZERR_NEED_RETRY":
+               message = BIZERR_NEED_RETRY.getMessage();
+               break;
+           case "TRADE_OVERDUE":
+               message = TRADE_OVERDUE.getMessage();
+               break;
+           case "ERROR":
+               message = ERROR.getMessage();
+               break;
+           case "USER_ACCOUNT_ABNORMAL":
+               message = USER_ACCOUNT_ABNORMAL.getMessage();
+               break;
+           case "INVALID_REQ_TOO_MUCH":
+               message = INVALID_REQ_TOO_MUCH.getMessage();
+               break;
+           case "NOTENOUGH":
+               message = NOTENOUGH.getMessage();
+               break;
+           case "INVALID_TRANSACTIONID":
+               message = INVALID_TRANSACTIONID.getMessage();
+               break;
+           case "PARAM_ERROR":
+               message = PARAM_ERROR.getMessage();
+               break;
+           case "APPID_NOT_EXIST":
+               message = APPID_NOT_EXIST.getMessage();
+               break;
+           case "MCHID_NOT_EXIST":
+               message = MCHID_NOT_EXIST.getMessage();
+               break;
+           case "REQUIRE_POST_METHOD":
+               message = REQUIRE_POST_METHOD.getMessage();
+               break;
+           case "SIGNERROR":
+               message = SIGNERROR.getMessage();
+               break;
+           case "XML_FORMAT_ERROR":
+               message = XML_FORMAT_ERROR.getMessage();
+               break;
+           case "FREQUENCY_LIMITED":
+               message = FREQUENCY_LIMITED.getMessage();
+               break;
+           case "NOAUTH":
+               message = NOAUTH.getMessage();
+               break;
+           case "ORDERNOTEXIST":
+               message = ORDERNOTEXIST.getMessage();
+               break;
+       }
+        return message;
+    }
+}

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

@@ -218,16 +218,6 @@ public class MiniAppController extends BaseController {
                 return ResponseBean.error("发生未知错误", ResponseBean.ERROR_UNAVAILABLE);
             }
 
-            if (null != from && from.contains("share") && !com.huiju.estateagents.common.StringUtils.isEmpty(recommender) && count > 0) {
-                // 校验是否点击过此人的分享
-                boolean checkPoint = checkSharePersonFrom(from, taPerson.getPersonId(), targetId, orgId);
-                if (checkPoint) {
-                    // 添加积分
-                    applicationContext.publishEvent(new EventBus(recommender, EventBus.EventType.SharePosterAll, orgId));
-                }
-            }
-
-
             Map<Object, Object> map = new HashMap<>();
             map.put("openId", session.getOpenid());
             map.put("orgId", orgId);
@@ -247,6 +237,20 @@ public class MiniAppController extends BaseController {
             }
             taPerson.setMiniappId(appid);
             taPersonService.updateById(taPerson);
+
+            // 增加积分线程
+            ExecutorService threadPool = Executors.newCachedThreadPool();
+            threadPool.execute(() -> {
+                if (null != from && from.contains("share") && !com.huiju.estateagents.common.StringUtils.isEmpty(recommender) && count > 0) {
+                    // 校验是否点击过此人的分享
+                    boolean checkPoint = checkSharePersonFrom(from, taPerson.getPersonId(), targetId, orgId);
+                    if (checkPoint) {
+                        // 添加积分
+                        applicationContext.publishEvent(new EventBus(recommender, EventBus.EventType.SharePosterAll, orgId));
+                    }
+                }
+            });
+
             if (StringUtils.isNotBlank(from) && StringUtils.isNotBlank(recommender) && StringUtils.isNotBlank(targetId)) {
                 TaSharePersonFrom taSharePersonFrom = new TaSharePersonFrom();
                 TaPerson recommenderPerson = taPersonService.getById(recommender);
@@ -473,6 +477,7 @@ public class MiniAppController extends BaseController {
         }
         TaPerson person = taPersons.get(0);
         QueryWrapper<TaRecommendCustomer> cus = new QueryWrapper<>();
+        cus.eq("org_id", orgId);
         cus.eq("phone", phoneNoInfo.getPhoneNumber());
         cus.orderByDesc("create_date");
         List<TaRecommendCustomer> customer = taRecommendCustomerService.list(cus);

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

@@ -160,8 +160,7 @@ public class StatisticalController extends BaseController {
                                             @RequestParam(value = "pageSize", defaultValue = "2") Integer pageSize,
                                             @RequestParam(value = "buildingId", required = false) String buildingId,
                                             HttpServletRequest request) {
-        Integer userId = getUserId(request);
-        return iStatisticalService.selectIntentionUser(pageNum, pageSize, getOrgId(request), buildingId, userId);
+        return iStatisticalService.selectIntentionUser(pageNum, pageSize, getOrgId(request), buildingId, getTaPersonBuildingListByUserId(request));
     }
 
     /**

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

@@ -174,7 +174,7 @@ public class TaBuildingController extends BaseController {
     })
     @RequestMapping(value = "/admin/building/add", method = RequestMethod.POST)
     public ResponseBean buildingAdd(@RequestBody String parameter, HttpServletRequest request) {
-        return taBuildingService.buildingAdd(parameter, getOrgId(request));
+        return taBuildingService.buildingAdd(parameter, getOrgId(request), getUserId(request));
     }
 
     /**

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

@@ -8,6 +8,7 @@ import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.po.TaHousingResourcesPO;
 import com.huiju.estateagents.service.*;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -80,13 +81,15 @@ public class TaHousingResourcesController extends BaseController {
                                                @RequestParam(value = "status", required = false) Integer status,
                                                @RequestParam(value = "houseId", required = false) String houseId,
                                                @RequestParam(value = "lockingStatus", required = false) String lockingStatus,
+                                               @RequestParam(value = "actulStartHot", required = false) String actulStartHot,
+                                               @RequestParam(value = "actulEndHot", required = false) String actulEndHot,
                                                @RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
                                                @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
                                                HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
             responseBean = iTaHousingResourcesService.selectPageList(salesBatchId, buildingId, pageNumber, pageSize, getOrgId(request), termName, blockName,
-                    unitName, floorName, roomName, apartmentId, status, houseId, lockingStatus);
+                    unitName, floorName, roomName, apartmentId, status, houseId, lockingStatus,actulStartHot,actulEndHot);
         } catch (Exception e) {
             e.printStackTrace();
             logger.error("taHousingResourcesList -=- {}", e.toString());
@@ -233,7 +236,7 @@ public class TaHousingResourcesController extends BaseController {
      */
     @RequestMapping(value = "/wx/listHousingResources", method = RequestMethod.GET)
     public ResponseBean listHousingResources(@RequestParam(value = "salesBatchId") String salesBatchId,
-                                             String startPrice, String endPrice, String apartmentId,@RequestParam(value = "source", required = false) String source,
+                                             String startPrice, String endPrice, String apartmentId, @RequestParam(value = "source", required = false) String source,
                                              HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         Integer orgId = getOrgId(request);
@@ -262,9 +265,14 @@ public class TaHousingResourcesController extends BaseController {
             List<TaRaiseRecord> taRaiseRecordList = taRaiseRecordService.list(taRaiseRecordQueryWrapper);
 
             //认筹记录对应的有效房源,我的锁定的房源也在里面
-            QueryWrapper<TaRaiseHouse> taRaiseHouseQueryWrapper = new QueryWrapper<>();
-            taRaiseHouseQueryWrapper.in(taRaiseRecordList.size() > 0, "raise_record_id", taRaiseRecordList.stream().map(TaRaiseRecord::getRaiseRecordId).collect(Collectors.toList()));
-            List<TaRaiseHouse> taRaiseHouseList = taRaiseHouseService.list(taRaiseHouseQueryWrapper);
+            List<TaRaiseHouse> taRaiseHouseList = new ArrayList<>();
+            if (taRaiseRecordList.size() > 0){
+                QueryWrapper<TaRaiseHouse> taRaiseHouseQueryWrapper = new QueryWrapper<>();
+                taRaiseHouseQueryWrapper.in("raise_record_id", taRaiseRecordList.stream().map(TaRaiseRecord::getRaiseRecordId).collect(Collectors.toList()));
+                taRaiseHouseList = taRaiseHouseService.list(taRaiseHouseQueryWrapper);
+            }
+            List<TaRaiseHouse> finalTaRaiseHouseList = taRaiseHouseList;
+
             TaSalesBatch taSalesBatch = taSalesBatchService.getById(salesBatchId);
             taHousingResourcesPOList.forEach(e -> {
                 taPreselectionRecordList.forEach(p -> {
@@ -274,15 +282,18 @@ public class TaHousingResourcesController extends BaseController {
                     }
                 });
                 //我的认筹和锁定
-                taRaiseHouseList.forEach(r -> {
-                    //我的认筹
-                    if (e.getHouseId().equals(r.getHouseId())) {
-                        e.setMineRaise("mine");
-                        if (CommConstant.HOUSE_LOCKING_STATUS_LOCKED.equals(e.getHouseLockingStatus())) {
-                            e.setMineLocked("mine");
+                if (CollectionUtils.isNotEmpty(taRaiseRecordList)) {
+                    finalTaRaiseHouseList.forEach(r -> {
+                        //我的认筹
+                        if (e.getHouseId().equals(r.getHouseId())) {
+                            e.setMineRaise("mine");
+                            if (CommConstant.HOUSE_LOCKING_STATUS_LOCKED.equals(e.getHouseLockingStatus()) && personId.equals(e.getHouseLockingPerson())) {
+                                e.setMineLocked("mine");
+                            }
                         }
-                    }
-                });
+                    });
+                }
+
 
                 //塞入户型信息
                 if (!StringUtils.isEmpty(e.getApartmentId())) {
@@ -533,10 +544,10 @@ public class TaHousingResourcesController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/wx/check/raise", method = RequestMethod.GET)
-    public ResponseBean checkRaise(@RequestParam(value = "houseIds") String houseIds,HttpServletRequest request) {
+    public ResponseBean checkRaise(@RequestParam(value = "houseIds") String houseIds, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            boolean state = iTaHousingResourcesService.checkRaiseState(houseIds,getPersonId(request),getOrgId(request));
+            boolean state = iTaHousingResourcesService.checkRaiseState(houseIds, getPersonId(request), getOrgId(request));
             responseBean.addSuccess(state);
         } catch (Exception e) {
             logger.error("校验房源状态 -=- {}", e.getMessage());

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

@@ -186,7 +186,7 @@ public class TaLiveActivityController extends BaseController {
     public ResponseBean taLiveActivityGet(@PathVariable Integer id) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean.addSuccess(iTaLiveActivityService.getById(id));
+            responseBean.addSuccess(iTaLiveActivityService.getDetailById(id));
         } catch (Exception e) {
             e.printStackTrace();
             logger.error("taLiveActivityDelete -=- {}", e.toString());

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

@@ -84,17 +84,18 @@ public class TaPersonController extends BaseController {
             return ResponseBean.error("分页参数不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
         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);
+
         if (mine){
-            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);
             IPage<Map<String, Object>>  result = taPersonService.getSavedConsaultants(pageNumber,pageSize,person.getPersonId());
             return ResponseBean.success(result);
         }else {
-            IPage<Map<String, Object>> result = taPersonService.getCardList(pageNumber, pageSize,buildingId,orgId);
+            IPage<Map<String, Object>> result = taPersonService.getCardList(pageNumber, pageSize,buildingId,orgId, person);
             return ResponseBean.success(result);
         }
 

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

@@ -274,10 +274,7 @@ public class TaPointsRecordsController extends BaseController {
             queryWrapper.eq("person_id",id);
             queryWrapper.orderByDesc("create_date");
             IPage<TaPointsRecords> result = iTaPointsRecordsService.page(pg, queryWrapper);
-            Integer totalPoints = 0;
-            for (int i = 0;i<result.getRecords().size();i++){
-                totalPoints += result.getRecords().get(i).getPointsAmount();
-            }
+            Integer totalPoints = iTaPointsRecordsService.sumPointByPersonId(id);
             Map<String,Object> data = new HashMap<>();
             data.put("totalPoints",totalPoints);
             data.put("result",result);

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

@@ -7,6 +7,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.bo.request.PresecretRecordRequestBO;
+import com.huiju.estateagents.common.DateUtils;
 import com.huiju.estateagents.entity.TaPreselectionRecord;
 import com.huiju.estateagents.service.ITaPreselectionRecordService;
 import org.apache.commons.lang3.StringUtils;
@@ -17,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -132,9 +134,12 @@ public class TaPreselectionRecordController extends BaseController {
      */
     @RequestMapping(value = "/taPreselectionRecord/{id}", method = RequestMethod.PUT)
     public ResponseBean taPreselectionRecordUpdate(@PathVariable Integer id,
-                                                   @RequestBody TaPreselectionRecord taPreselectionRecord) {
+                                                   @RequestBody TaPreselectionRecord taPreselectionRecord,
+                                                   HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
+            taPreselectionRecord.setUpdateDate(LocalDateTime.now());
+            taPreselectionRecord.setUpdateUser(getUserId(request));
             if (iTaPreselectionRecordService.updateById(taPreselectionRecord)) {
                 responseBean.addSuccess(taPreselectionRecord);
             } else {

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

@@ -9,7 +9,10 @@ import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaRaise;
+import com.huiju.estateagents.entity.TaSalesBatch;
 import com.huiju.estateagents.service.ITaRaiseService;
+import com.huiju.estateagents.service.ITaSalesBatchService;
+import com.huiju.estateagents.service.ITaSaveService;
 import com.huiju.estateagents.service.ITdCityService;
 import io.swagger.models.auth.In;
 import org.slf4j.Logger;
@@ -41,6 +44,9 @@ public class TaRaiseController extends BaseController {
     @Autowired
     public ITdCityService iTdCityService;
 
+    @Autowired
+    public ITaSalesBatchService iTaSalesBatchService;
+
     /**
      * 获取认筹列表
      *
@@ -130,9 +136,18 @@ public class TaRaiseController extends BaseController {
                 return responseBean;
             }
 
+            //获取销售批次状态
+            TaSalesBatch taSalesBatch = new TaSalesBatch();
+            if (taRaise.getSalesBatchId() != null){
+                QueryWrapper<TaSalesBatch> taSalesBatchQueryWrapper = new QueryWrapper<>();
+                taSalesBatchQueryWrapper.eq("sales_batch_id", taRaise.getSalesBatchId());
+                taSalesBatch = iTaSalesBatchService.getOne(taSalesBatchQueryWrapper);
+
+            }
+
             taRaise.setOrgId(orgId);
             taRaise.setRaisePrice(taRaise.getRaisePrice() != null ? taRaise.getRaisePrice() : null );
-            taRaise.setStatus(CommConstant.IS_PUBLISH);
+            taRaise.setStatus(taSalesBatch.getStatus());
             taRaise.setCreateDate(LocalDateTime.now());
             if (iTaRaiseService.save(taRaise)) {
                 responseBean.addSuccess(taRaise);

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

@@ -12,11 +12,8 @@ import com.huiju.estateagents.bo.request.RaiseRecordRequestBO;
 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.drainage.entity.TaDrainageRecord;
 import com.huiju.estateagents.entity.*;
-import com.huiju.estateagents.po.BuildingImgPO;
 import com.huiju.estateagents.service.*;
-import jodd.util.StringUtil;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -160,6 +157,41 @@ public class TaRaiseRecordController extends BaseController {
         return responseBean;
     }
 
+    /**
+     * 批量作废前校验
+     *
+     * @param raiseRecord
+     * @return
+     */
+    @RequestMapping(value = "/admin/raise/checkBeforeInvalidRecord", method = RequestMethod.GET)
+    public ResponseBean checkBeforeInvalidRecord(@RequestBody TaRaiseRecord raiseRecord) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            Integer fitNum = 0;
+            Integer notFitNum = 0;
+            Integer totalNum = raiseRecord.getTaRaiseRecords().size();
+            for (TaRaiseRecord record : raiseRecord.getTaRaiseRecords()) {
+                TaRaiseRecord r = iTaRaiseRecordService.getById(record.getRaiseRecordId());
+                if (CommConstant.STATUS_NORMAL != r.getStatus()) {
+                    notFitNum++;
+                } else {
+                    fitNum++;
+                }
+            }
+
+            // 组装反参
+            JSONObject resultObj = new JSONObject();
+            resultObj.put("totalNum", totalNum);
+            resultObj.put("fitNum", fitNum);
+            resultObj.put("notFitNum", notFitNum);
+            responseBean.addSuccess(resultObj);
+        } catch (Exception e) {
+            logger.error("checkBeforeInvalidRecord 异常：", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
     /**
      * 批量作废
      *
@@ -181,7 +213,6 @@ public class TaRaiseRecordController extends BaseController {
 
             // 获取用户信息
             TaUser taUser = taUserService.getUserInfoById(getUserId(request), getOrgId(request));
-
             raiseRecord.getTaRaiseRecords().stream().forEach(record -> {
                 if (taUser != null) {
                     record.setUpdateUserName(taUser.getUserName());
@@ -193,8 +224,14 @@ public class TaRaiseRecordController extends BaseController {
                 // 更新房源认筹热度
                 iTaRaiseRecordService.updateForSubtractRaiseHeat(record.getRaiseRecordId());
 
-                //发送订阅消息
-                iTaRaiseRecordService.sendRaiseMsg(record.getRaiseRecordId(),record.getRaiseId(),"认筹通知","认筹单已作废","点击详情查看认筹单","具体原因查看详情",false);
+                // 如果房源状态为已锁定，则修改房源锁定状态
+                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);
+                }
+
+                // 发送订阅消息
+                iTaRaiseRecordService.sendRaiseMsg(record.getRaiseRecordId(), record.getRaiseId(), "认筹通知", "认筹单已作废", "点击详情查看认筹单", "具体原因查看详情", false);
             });
 
             if (iTaRaiseRecordService.updateBatchById(raiseRecord.getTaRaiseRecords())) {
@@ -240,8 +277,14 @@ public class TaRaiseRecordController extends BaseController {
                 // 更新房源认筹热度
                 iTaRaiseRecordService.updateForSubtractRaiseHeat(record.getRaiseRecordId());
 
-                //发送订阅消息
-                iTaRaiseRecordService.sendRaiseMsg(record.getRaiseRecordId(),record.getRaiseId(),"认筹通知","认筹单已作废","点击详情查看认筹单","具体原因查看详情",false);
+                // 如果房源状态为已锁定，则修改房源锁定状态
+                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);
+                }
+
+                // 发送订阅消息
+                iTaRaiseRecordService.sendRaiseMsg(record.getRaiseRecordId(), record.getRaiseId(), "认筹通知", "认筹单已作废", "点击详情查看认筹单", "具体原因查看详情", false);
             });
 
             if (iTaRaiseRecordService.updateBatchById(raiseRecord.getTaRaiseRecords())) {
@@ -256,6 +299,58 @@ public class TaRaiseRecordController extends BaseController {
         return responseBean;
     }
 
+    /**
+     * 批量线下缴费前校验
+     *
+     * @param raiseRecord
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/admin/raise/checkBeforePayOfflineRecord", method = RequestMethod.GET)
+    public ResponseBean checkBeforePayOfflineRecord(@RequestBody TaRaiseRecord raiseRecord, HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            Integer fitNum = 0;
+            Integer notFitNum = 0;
+            Integer totalNum = raiseRecord.getTaRaiseRecords().size();
+            // 获取该认筹缴费方式
+            TaRaise taRaise = taRaiseService.getById(raiseRecord.getRaiseId());
+            if (taRaise == null) {
+                responseBean.addError("当前批次不存在");
+                return responseBean;
+            }
+            // 校验缴费方式
+            if (CommConstant.PAY_TYPE_ONLINE == taRaise.getPayType()) {
+                responseBean.addError("当前批次只支持线上缴费，请稍后再试");
+                return responseBean;
+            }
+            for (TaRaiseRecord record : raiseRecord.getTaRaiseRecords()) {
+                TaRaiseRecord r = iTaRaiseRecordService.getById(record.getRaiseRecordId());
+                // 校验是否作废
+                if (CommConstant.STATUS_NORMAL != r.getStatus()) {
+                    notFitNum++;
+                    continue;
+                }
+                // 校验缴费状态
+                if (!CommConstant.PAY_STATUS_UNPAID.equals(r.getPayStatus())) {
+                    notFitNum++;
+                    continue;
+                }
+                fitNum++;
+            }
+            // 组装反参
+            JSONObject resultObj = new JSONObject();
+            resultObj.put("totalNum", totalNum);
+            resultObj.put("fitNum", fitNum);
+            resultObj.put("notFitNum", notFitNum);
+            responseBean.addSuccess(resultObj);
+        } catch (Exception e) {
+            logger.error("checkBeforePayOfflineRecord 异常：", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
     /**
      * 批量线下缴费
      *
@@ -291,7 +386,7 @@ public class TaRaiseRecordController extends BaseController {
                     return responseBean;
                 }
                 if (!CommConstant.PAY_STATUS_UNPAID.equals(tr.getPayStatus())) {
-                    responseBean.addError(String.format("认筹单编号为%s的记录为未缴费状态 ，请重新选择", record.getRaiseRecordId()));
+                    responseBean.addError(String.format("认筹单编号为%s的记录为已缴费或已退费状态 ，请重新选择", record.getRaiseRecordId()));
                     return responseBean;
                 }
             }
@@ -307,7 +402,7 @@ public class TaRaiseRecordController extends BaseController {
                 record.setPayStatus(CommConstant.PAY_STATUS_PAID);
                 record.setUpdateDate(LocalDateTime.now());
                 //发送订阅消息
-                iTaRaiseRecordService.sendRaiseMsg(record.getRaiseRecordId(),record.getRaiseId(),"认筹通知","认筹已缴费","点击详情查看认筹单","您的认筹已成功缴费",false);
+                iTaRaiseRecordService.sendRaiseMsg(record.getRaiseRecordId(), record.getRaiseId(), "认筹通知", "认筹已缴费", "点击详情查看认筹单", "您的认筹已成功缴费", false);
             });
 
             if (iTaRaiseRecordService.updateBatchById(raiseRecord.getTaRaiseRecords())) {
@@ -322,6 +417,42 @@ public class TaRaiseRecordController extends BaseController {
         return responseBean;
     }
 
+    /**
+     * 批量线下退费前校验
+     *
+     * @param raiseRecord
+     * @return
+     */
+    @RequestMapping(value = "/admin/raise/checkBeforeRefundOfflineRecord", method = RequestMethod.GET)
+    public ResponseBean checkBeforeRefundOfflineRecord(@RequestBody TaRaiseRecord raiseRecord) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            Integer fitNum = 0;
+            Integer notFitNum = 0;
+            Integer totalNum = raiseRecord.getTaRaiseRecords().size();
+            for (TaRaiseRecord record : raiseRecord.getTaRaiseRecords()) {
+                TaRaiseRecord r = iTaRaiseRecordService.getById(record.getRaiseRecordId());
+                // 校验缴费状态
+                if (CommConstant.PAY_STATUS_PAID.equals(r.getPayStatus())) {
+                    fitNum++;
+                    continue;
+                }
+                notFitNum++;
+            }
+
+            // 组装反参
+            JSONObject resultObj = new JSONObject();
+            resultObj.put("totalNum", totalNum);
+            resultObj.put("fitNum", fitNum);
+            resultObj.put("notFitNum", notFitNum);
+            responseBean.addSuccess(resultObj);
+        } catch (Exception e) {
+            logger.error("checkBeforeRefundOfflineRecord 异常：", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
     /**
      * 批量线下退费
      *
@@ -379,7 +510,7 @@ public class TaRaiseRecordController extends BaseController {
                 record.setRefundReason(raiseRecord.getRefundReason());
                 record.setUpdateDate(LocalDateTime.now());
                 //发送订阅消息
-                iTaRaiseRecordService.sendRaiseMsg(record.getRaiseRecordId(),record.getRaiseId(),"认筹通知","认筹已退费","点击详情查看认筹单","您的认筹已成功退费",false);
+                iTaRaiseRecordService.sendRaiseMsg(record.getRaiseRecordId(), record.getRaiseId(), "认筹通知", "认筹已退费", "点击详情查看认筹单", "您的认筹已成功退费", false);
             });
 
             if (iTaRaiseRecordService.updateBatchById(raiseRecord.getTaRaiseRecords())) {
@@ -535,6 +666,7 @@ public class TaRaiseRecordController extends BaseController {
             //获取认筹单信息
             TaRaiseRecord taRaiseRecord = iTaRaiseRecordService.getById(raiseRecordId);
 
+            String personId = getPersonId(request);
             //认筹表数据
             TaRaise taRaise = taRaiseService.getById(taRaiseRecord.getRaiseId());
             taRaise.setRaisePrice(taRaise.getRaisePrice());
@@ -559,7 +691,7 @@ public class TaRaiseRecordController extends BaseController {
             houseList.forEach(e -> {
                 taRaiseHouseList.forEach(r -> {
                     //我的认筹
-                    if (e.getHouseId().equals(r.getHouseId()) && CommConstant.HOUSE_LOCKING_STATUS_LOCKED.equals(e.getHouseLockingStatus())) {
+                    if (e.getHouseId().equals(r.getHouseId()) && CommConstant.HOUSE_LOCKING_STATUS_LOCKED.equals(e.getHouseLockingStatus()) && personId.equals(e.getHouseLockingPerson())) {
                         e.setMineLocked("mine");
                     }
                 });
@@ -609,7 +741,7 @@ public class TaRaiseRecordController extends BaseController {
      */
     @RequestMapping(value = "/wx/taRaiseRecord/list", method = RequestMethod.GET)
     public ResponseBean wxGetRaiseRecordList(@RequestParam(value = "buildingId", required = false) String buildingId,
-                                             @RequestParam(value = "salesBtchId", required = false) Integer salesBtchId,
+                                             @RequestParam(value = "salesBatchId", required = false) Integer salesBatchId,
                                              @RequestParam(value = "houseLockingStatus", required = false) String houseLockingStatus,
                                              @RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
                                              @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) {
@@ -621,8 +753,10 @@ public class TaRaiseRecordController extends BaseController {
             taRaiseRecordQueryWrapper.eq("org_id", getOrgId(request));
             taRaiseRecordQueryWrapper.eq("person_id", getPersonId(request));
             taRaiseRecordQueryWrapper.eq(StringUtils.isNotEmpty(buildingId), "building_id", buildingId);
-            taRaiseRecordQueryWrapper.eq(null != salesBtchId, "sales_batch_id", salesBtchId);
+            taRaiseRecordQueryWrapper.eq(null != salesBatchId, "sales_batch_id", salesBatchId);
             taRaiseRecordQueryWrapper.eq(StringUtils.isNotEmpty(houseLockingStatus), "house_locking_status", houseLockingStatus);
+            taRaiseRecordQueryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+            taRaiseRecordQueryWrapper.orderByDesc("create_date");
             IPage<TaRaiseRecord> page = iTaRaiseRecordService.page(pg, taRaiseRecordQueryWrapper);
             List<TaRaiseRecord> list = page.getRecords();
             list.forEach(e -> {
@@ -648,7 +782,6 @@ public class TaRaiseRecordController extends BaseController {
 
     /**
      * 微信端客户选择线下缴费就需要把此人的认筹单的缴费状态改为线下缴费
-     *
      */
     @RequestMapping(value = "/wx/taRaiseRecord/{raiseRecordId}", method = RequestMethod.PUT)
     public ResponseBean taRaiseRecordUpdate(@PathVariable Integer raiseRecordId,

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

@@ -7,6 +7,7 @@ import com.alibaba.excel.write.metadata.WriteSheet;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.center.taUser.service.ITaUserService;
@@ -29,6 +30,7 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
+import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.*;
 
 import com.huiju.estateagents.base.BaseController;
@@ -307,7 +309,9 @@ public class TaRecommendCustomerController extends BaseController {
                                          @RequestParam(value = "sex",required = false)Integer sex,
                                          @RequestParam(value = "customerType") String customerType,// public 公  private 私
                                          @RequestParam(value = "status",required = false) Integer status,
-                                         @RequestParam(value = "sceneType",required = false) String sceneType){
+                                         @RequestParam(value = "sceneType",required = false) String sceneType,
+                                         @RequestParam(value = "startCreateDate",required = false) String startCreateDate,
+                                         @RequestParam(value = "endCreateDate",required = false) String endCreateDate){
         try{
 
             // TODO 目前如果是公客，就取当前操作人员的 buildingId
@@ -321,7 +325,7 @@ public class TaRecommendCustomerController extends BaseController {
 //                TaPersonBuilding personBuilding = taPersonBuildingMapper.selectOne(queryWrapper);
 //                buildingId = personBuilding.getBuildingId();
 //            }
-            return ResponseBean.success(taRecommendCustomerService.getCustomerList(status,pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex, customerType, getOrgId(request),getTaPersonBuildingListByUserId(request),sceneType));
+            return ResponseBean.success(taRecommendCustomerService.getCustomerList(status,pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex, customerType, getOrgId(request),getTaPersonBuildingListByUserId(request),sceneType, startCreateDate, endCreateDate));
         }catch (Exception e){
             e.printStackTrace();
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
@@ -767,7 +771,8 @@ public class TaRecommendCustomerController extends BaseController {
                                          @RequestParam(value ="verifyStatus",required = false) String verifyStatus,
                                          @RequestParam(value = "sex",required = false)Integer sex,
                                          @RequestParam(value = "customerType") String customerType,
-                                         @RequestParam(value = "status",required = false) Integer status) throws IOException { // public 公  private 私
+                                         @RequestParam(value = "status",required = false) Integer status,
+                                       @RequestParam(value = "sceneType",required = false) String sceneType) throws IOException { // public 公  private 私
 
         //        response.setContentType("application/vnd.ms-excel");
         response.setContentType("application/octet-stream");
@@ -795,7 +800,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, name, tel,  entryType, verifyStatus, sex, orgId,consultTel);
+                List<PublicCustomerExport> publicList = taRecommendCustomerMapper.getPublicCustomerExportList(pageCode * pageSize, pageSize, buildingId, name, tel,  entryType, verifyStatus, sex, orgId,consultTel,sceneType);
                 excelWriter.write(publicList, writeSheet);
 
 //                pageCode ++;
@@ -817,7 +822,7 @@ public class TaRecommendCustomerController extends BaseController {
 //            pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
 //            List<PrivateCustomerExport> privateList = null;
 //            do {
-                List<PrivateCustomerExport> privateList = taRecommendCustomerMapper.getCustomerExportList(pageCode *  pageSize, pageSize, buildingId, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId,status,getTaPersonBuildingListByUserId(request));
+                List<PrivateCustomerExport> privateList = taRecommendCustomerMapper.getCustomerExportList(pageCode *  pageSize, pageSize, buildingId, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId,status,sceneType,getTaPersonBuildingListByUserId(request));
                 excelWriter.write(privateList, writeSheet);
 
 //                pageCode ++;

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

@@ -163,7 +163,7 @@ public class TaSalesBatchController extends BaseController {
                 raiseQueryWrapper.eq("status", 1);
                 TaRaise raise = taRaiseService.getOne(raiseQueryWrapper);
                 if (raise != null) {
-                    responseBean.addError(String.format("销售批次%s关联有认筹,请先删除关联的预选模块", ts.getSalesBatchName()));
+                    responseBean.addError(String.format("销售批次%s关联有认筹,请先删除关联的认筹模块", ts.getSalesBatchName()));
                     return responseBean;
                 }
             }
@@ -235,22 +235,26 @@ public class TaSalesBatchController extends BaseController {
                 QueryWrapper<TaPreselection> preselectionQueryWrapper = new QueryWrapper<>();
                 preselectionQueryWrapper.eq("org_id", getOrgId(request));
                 preselectionQueryWrapper.eq("sales_batch_id", taSalesBatch.getSalesBatchId());
-                preselectionQueryWrapper.eq("status", 1);
+                preselectionQueryWrapper.eq("status", CommConstant.STATUS_NORMAL);
                 TaPreselection preselection = taPreselectionService.getOne(preselectionQueryWrapper);
                 if (preselection != null) {
-                    responseBean.addError(String.format("销售批次%s关联有预选,请先删除关联的预选模块", taSalesBatch.getSalesBatchName()));
-                    return responseBean;
+//                    responseBean.addError(String.format("销售批次%s关联有预选,请先删除关联的预选模块", taSalesBatch.getSalesBatchName()));
+//                    return responseBean;
+                    preselection.setStatus(CommConstant.STATUS_UNACCALIMED);
+                    taPreselectionService.updateById(preselection);
                 }
 
                 // 校验批次下是否有认筹
                 QueryWrapper<TaRaise> raiseQueryWrapper = new QueryWrapper<>();
                 raiseQueryWrapper.eq("org_id", getOrgId(request));
                 raiseQueryWrapper.eq("sales_batch_id", taSalesBatch.getSalesBatchId());
-                raiseQueryWrapper.eq("status", 1);
+                raiseQueryWrapper.eq("status", CommConstant.STATUS_NORMAL);
                 TaRaise raise = taRaiseService.getOne(raiseQueryWrapper);
                 if (raise != null) {
-                    responseBean.addError(String.format("销售批次%s关联有认筹,请先删除关联的认筹模块", taSalesBatch.getSalesBatchName()));
-                    return responseBean;
+//                    responseBean.addError(String.format("销售批次%s关联有认筹,请先删除关联的认筹模块", taSalesBatch.getSalesBatchName()));
+//                    return responseBean;
+                    raise.setStatus(CommConstant.STATUS_UNACCALIMED);
+                    taRaiseService.updateById(raise);
                 }
             }
 
@@ -268,6 +272,20 @@ public class TaSalesBatchController extends BaseController {
                 iExtendContentService.updateBatchById(list);
             }
 
+            QueryWrapper<TaPreselection> taPreselectionQueryWrapper = new QueryWrapper<>();
+            TaPreselection taPreselection = new TaPreselection();
+            taPreselection.setStatus(taSalesBatch.getStatus());
+            taPreselectionQueryWrapper.eq("org_id", getOrgId(request));
+            taPreselectionQueryWrapper.eq("sales_batch_id", taSalesBatch.getSalesBatchId());
+            taPreselectionService.update(taPreselection, taPreselectionQueryWrapper);
+
+            QueryWrapper<TaRaise> taRaiseQueryWrapper = new QueryWrapper<>();
+            TaRaise taRaise = new TaRaise();
+            taRaise.setStatus(taSalesBatch.getStatus());
+            taRaiseQueryWrapper.eq("org_id", getOrgId(request));
+            taRaiseQueryWrapper.eq("sales_batch_id", taSalesBatch.getSalesBatchId());
+            taRaiseService.update(taRaise, taRaiseQueryWrapper);
+
             if (iTaSalesBatchService.updateById(taSalesBatch)) {
                 responseBean.addSuccess(taSalesBatch);
             } else {

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

@@ -8,6 +8,7 @@ import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.service.ITaSharePersonFromService;
+import com.huiju.estateagents.service.ITdLiveDictService;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -22,6 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -40,6 +42,9 @@ public class TaSharePersonFromController extends BaseController {
     @Autowired
     public ITaSharePersonFromService iTaSharePersonFromService;
 
+    @Autowired
+    public ITdLiveDictService tdLiveDictService;
+
 
     /**
      * 分页查询列表
@@ -202,4 +207,27 @@ public class TaSharePersonFromController extends BaseController {
         }
         return responseBean;
     }
+
+    /**
+     * 查询直播平台列表
+     * @param pageNum
+     * @param pageSize
+     * @param request
+     * @return
+     */
+    @RequestMapping(value="api/admin/livePlatList",method= RequestMethod.GET)
+    public ResponseBean taLivePlatList (@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                        @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            QueryWrapper<TdLiveDict> tdLiveDictQueryWrapper = new QueryWrapper<>();
+            tdLiveDictQueryWrapper.eq("status", 1);
+            List<TdLiveDict> tdLiveDictList = tdLiveDictService.list(tdLiveDictQueryWrapper);
+            responseBean.addSuccess(tdLiveDictList);
+        }catch (Exception e){
+            e.printStackTrace();
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

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

@@ -77,6 +77,11 @@ public class TaBuildingApartment implements Serializable {
 
     private String houseType;
 
+    /**
+     * 权重
+     */
+    private Integer orderNo;
+
     /**
      * 户型图片列表
      */

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

@@ -43,7 +43,7 @@ public class TaPreselectionRecord implements Serializable {
     /**
      * 更新时间
      */
-    private String updateDate;
+    private LocalDateTime updateDate;
 
     /**
      * 房源id

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

@@ -1,5 +1,7 @@
 package com.huiju.estateagents.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -22,6 +24,12 @@ public class TdLiveDict implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    /**
+     * 认筹记录表
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
     /**
      * 直播平台名称
      */

src/main/java/com/huiju/estateagents/job/JudglActivityTimeJob.java

@@ -54,7 +54,7 @@ public class JudglActivityTimeJob extends BaseController {
     /**
      * 开启定时任务，每天12：30执行
      */
-//    @Scheduled(cron = "* 0/5 * * * ?")
+    @Scheduled(cron = "* 0/5 * * * ?")
     private void configureTasks() {
         String time = DateUtils.cutSecond(LocalDateTime.now());
 

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

@@ -89,6 +89,16 @@ public interface TaHousingResourcesMapper extends BaseMapper<TaHousingResources>
      */
     Boolean updateForSubtractRaiseHeat(@Param("raiseRecordId") Integer raiseRecordId);
 
+    /**
+     * 更新房源锁定状态
+     *
+     * @param raiseRecordId
+     * @param houseLockingStatus
+     * @return
+     */
+    Boolean updateHouseLockingStatus(@Param("raiseRecordId") Integer raiseRecordId,
+                                     @Param("houseLockingStatus") String houseLockingStatus);
+
     /**
      * 根据房源ID获取房源详情
      *
@@ -120,7 +130,7 @@ public interface TaHousingResourcesMapper extends BaseMapper<TaHousingResources>
                                                    @Param("orgId") Integer orgId, @Param("termName") String termName, @Param("blockName") String blockName,
                                                    @Param("unitName") String unitName, @Param("floorName") String floorName, @Param("roomName") String roomName,
                                                    @Param("apartmentId") String apartmentId, @Param("status") Integer status, @Param("houseId") String houseId,
-                                                   @Param("lockingStatus") String lockingStatus);
+                                                   @Param("lockingStatus") String lockingStatus,@Param("actulStartHot") String actulStartHot,@Param("actulEndHot") String actulEndHot);
 
     List<TaHousingResources> selectHousingList(@Param("orgId") Integer orgId, @Param("taSalesBatchList") List<TaSalesBatch> taSalesBatchList);
 

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

@@ -39,5 +39,5 @@ public interface TaLiveActivityMapper extends BaseMapper<TaLiveActivity> {
      */
     void updateLiveActivityStatus(@Param("orgId") Integer orgId, @Param("taLiveActivityList") List<TaLiveActivity> taLiveActivityList);
 
-
+    TaLiveActivity getDetailById(@Param("id")Integer id);
 }

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

@@ -3,10 +3,12 @@ package com.huiju.estateagents.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaPersonIntentionRecord;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -32,5 +34,5 @@ public interface TaPersonIntentionRecordMapper extends BaseMapper<TaPersonIntent
     IPage<Map<String, Object>> selectIntentionUser(IPage<Map<String, Object>> page,
                                                    @Param("orgId") Integer orgId,
                                                    @Param("buildingId") String buildingId,
-                                                   @Param("userId") Integer userId);
+                                                   @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 }

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

@@ -25,10 +25,12 @@ import java.util.Map;
  */
 @Mapper
 public interface TaPersonMapper extends BaseMapper<TaPerson> {
-    List<Map<String, Object>> selectCardList(IPage<Map<String, Object>> page, @Param("personType") String personType, @Param("status") int status, @Param("buildingId") String buildingId, @Param("orgId") Integer orgId);
+    List<Map<String, Object>> selectCardList(IPage<Map<String, Object>> page, @Param("personType") String personType, @Param("status") int status, @Param("buildingId") String buildingId, @Param("orgId") Integer orgId, @Param("consultant") String consultant);
 
     int setFieldIncrement(@Param("personId") String personId, @Param("field") String field, @Param("increment") int increment);
 
+    int setPointsIncrement(@Param("personId") String personId, @Param("increment") int increment);
+
     TaPerson getSalesExecutive();
 
     List<TaPerson> getPersonByOpenId(@Param("openId") String openId);

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

@@ -18,6 +18,6 @@ import org.apache.ibatis.annotations.Param;
 public interface TaPointsRecordsMapper extends BaseMapper<TaPointsRecords> {
     IPage<TaPointsRecords> getCustomerPointsList(IPage<TaPointsRecords> page, @Param("personId") String personId);
 
-
+    Integer sumPointByPersonId(@Param("personId") String personId);
 
 }

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

@@ -10,6 +10,7 @@ import com.huiju.estateagents.excel.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
@@ -32,7 +33,7 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
 
     TaRecommendCustomer getCustomerById(@Param("customerId")String customerId);
 
-    IPage<TaRecommendCustomer> getCustomerList(IPage<TaRecommendCustomer> page,@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId,@Param("status")Integer status, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList,@Param("sceneType") String sceneType);
+    IPage<TaRecommendCustomer> getCustomerList(IPage<TaRecommendCustomer> page,@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId,@Param("status")Integer status, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList,@Param("sceneType") String sceneType, @Param("startCreateDate") String startCreateDate, @Param("endCreateDate") String endCreateDate);
     IPage<TaRecommendCustomer> getRecCustomerList(IPage<TaRecommendCustomer> page,@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
     IPage<TaRecommendCustomer> getRepCustomerList(IPage<TaRecommendCustomer> page,@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
     IPage<TaPerson> getIndependentAgents(IPage<TaPerson>page, @Param("name") String name, @Param("tel") String tel, @Param("orgId") Integer orgId);
@@ -48,7 +49,7 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      * @param personBuildingList
      * @return
      */
-    IPage<TaPerson> getPublicCustomerList(IPage<TaPerson> page, @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,@Param("buildingId") String buildingId);
+    IPage<TaPerson> getPublicCustomerList(IPage<TaPerson> page, @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,@Param("buildingId") String buildingId, @Param("startCreateDate") String startCreateDate, @Param("endCreateDate") String endCreateDate);
 
     /**
      * 导出数据 获取推荐用户数据
@@ -118,7 +119,7 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      * @param consultTel
      * @return
      */
-    List<PublicCustomerExport> getPublicCustomerExportList(@Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize, @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);
+    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);
 
     /**
      * 导出数据 私客总数
@@ -152,7 +153,7 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      * @param status
      * @return
      */
-    List<PrivateCustomerExport> getCustomerExportList(@Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize, @Param("building") String buildingId, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel, @Param("entryType") String entryType, @Param("verifyStatus") String verifyStatus, @Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("status")Integer status,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+    List<PrivateCustomerExport> getCustomerExportList(@Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize, @Param("building") String buildingId, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel, @Param("entryType") String entryType, @Param("verifyStatus") String verifyStatus, @Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("status")Integer status,@Param("sceneType") String sceneType,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
     
     /**
      * 获取我的客户的人数统计

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

@@ -1,9 +1,11 @@
 package com.huiju.estateagents.service;
 
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 
 import java.time.LocalDate;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 数据统计 接口
@@ -105,7 +107,7 @@ public interface IStatisticalService {
      * @param buildingId
      * @return
      */
-    ResponseBean selectIntentionUser(Integer pageNum, Integer pageSize, Integer orgId, String buildingId, Integer userId);
+    ResponseBean selectIntentionUser(Integer pageNum, Integer pageSize, Integer orgId, String buildingId, List<TaPersonBuilding> taPersonBuildingListByUserId);
 
     /**
      * 用户来源数据 首页

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

@@ -68,7 +68,7 @@ public interface ITaBuildingService extends IService<TaBuilding> {
      * @param parameter
      * @return
      */
-    ResponseBean buildingAdd(String parameter, Integer orgId);
+    ResponseBean buildingAdd(String parameter, Integer orgId, Integer userId);
 
     /**
      * 修改成已发布

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

@@ -1,6 +1,5 @@
 package com.huiju.estateagents.service;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaBuildingApartment;
@@ -29,7 +28,7 @@ public interface ITaHousingResourcesService extends IService<TaHousingResources>
      * @param type  为1只展示已发布的房源
      * @return
      */
-    List<TaHousingResourcesPO> listHousingResources(Integer orgId, String salesBatchId, String startPrice, String endPrice, String apartmentId,String personId,String source );
+    List<TaHousingResourcesPO> listHousingResources(Integer orgId, String salesBatchId, String startPrice, String endPrice, String apartmentId, String personId, String source);
 
 
     /* 分页获取房源列表-后台管理端
@@ -95,7 +94,8 @@ public interface ITaHousingResourcesService extends IService<TaHousingResources>
      * @return
      */
     ResponseBean selectPageList(Integer salesBatchId, String buildingId, Integer pageNumber, Integer pageSize, Integer orgId, String termName,
-                                String blockName, String unitName, String floorName, String roomName, String apartmentId, Integer status, String houseId, String lockingStatus);
+                                String blockName, String unitName, String floorName, String roomName, String apartmentId, Integer status, String houseId, String lockingStatus,
+                                String actulStartHot, String actulEndHot);
 
     /**
      * 更新房源信息
@@ -174,6 +174,7 @@ public interface ITaHousingResourcesService extends IService<TaHousingResources>
 
     /**
      * 校验房源的认筹状态
+     *
      * @param houseIds
      * @param personId
      * @param orgId

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

@@ -60,4 +60,6 @@ public interface ITaLiveActivityService extends IService<TaLiveActivity> {
     ResponseBean getLiveActivityDetailById(String id,Integer orgId);
 
     ResponseBean delLiveActivityList(Integer orgId, List<TaLiveActivity> liveActivityList);
+
+    ResponseBean getDetailById(Integer id);
 }

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

@@ -4,7 +4,6 @@ import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
-import com.huiju.estateagents.entity.TaBuildingDynamic;
 import com.huiju.estateagents.entity.TaPerson;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.entity.TaPersonBuilding;
@@ -26,7 +25,7 @@ public interface ITaPersonService extends IService<TaPerson> {
 
     TaPerson updatePersonPhone(String miniOpenid, String phone, Integer orgId);
 
-    IPage<Map<String, Object>> getCardList(int pageNumber, int pageSize, String buildingId, Integer orgId);
+    IPage<Map<String, Object>> getCardList(int pageNumber, int pageSize, String buildingId, Integer orgId, TaPerson person);
 
     ResponseBean checkPhoneAndPass(String phone, String pass);
 

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

@@ -69,4 +69,6 @@ public interface ITaPointsRecordsService extends IService<TaPointsRecords> {
 	 * @param groupActivityId
 	 */
 	void saveGroupRecord(TaPerson person, Integer integral, String buildingId, Integer groupActivityId);
+
+	Integer sumPointByPersonId(String personId);
 }

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

@@ -84,7 +84,22 @@ public interface ITaRaiseRecordService extends IService<TaRaiseRecord> {
     /**
      * 发送认筹消息
      */
-    void sendRaiseMsg(Integer raiseRecordId, String personId, String title, String result, String reason,String remark, Boolean isSuccess);
+    void sendRaiseMsg(Integer raiseRecordId, String personId, String title, String result, String reason, String remark, Boolean isSuccess);
 
+    /**
+     * 减少房源表认筹实际热度值
+     *
+     * @param raiseRecordId
+     * @return
+     */
     Boolean updateForSubtractRaiseHeat(Integer raiseRecordId);
+
+    /**
+     * 更新房源锁定状态
+     *
+     * @param raiseRecordId
+     * @param houseLockingStatus
+     * @return
+     */
+    Boolean updateHouseLockingStatus(Integer raiseRecordId, String houseLockingStatus);
 }

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

@@ -12,6 +12,7 @@ import com.huiju.estateagents.excel.ExcelRecommendCustomer;
 import com.huiju.estateagents.excel.ReporRecommendCustomer;
 import io.swagger.models.auth.In;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -36,7 +37,7 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
 
     IPage<TaRecommendCustomer> getUnSignedCustomerList(int pageNumber, int pageSize, String building,String personId);
 
-    IPage getCustomerList(Integer status,int pageNumber, int pageSize, String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, String customerType, Integer orgId,List<TaPersonBuilding> taPersonBuildingList,String sceneType);
+    IPage getCustomerList(Integer status,int pageNumber, int pageSize, String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, String customerType, Integer orgId,List<TaPersonBuilding> taPersonBuildingList,String sceneType, String startCreateDate, String endCreateDate);
 
     IPage<TaRecommendCustomer> getRecCustomerList(int pageNumber, int pageSize, String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, Integer orgId,List<TaPersonBuilding> taPersonBuildingList);
 

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

@@ -5,6 +5,7 @@ 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.common.CommConstant;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaPersonVisitRecord;
 import com.huiju.estateagents.entity.TdWxDict;
 import com.huiju.estateagents.exception.EstaException;
@@ -309,11 +310,11 @@ public class StatisticalServiceImpl implements IStatisticalService {
     }
 
     @Override
-    public ResponseBean selectIntentionUser(Integer pageNum, Integer pageSize, Integer orgId, String buildingId, Integer userId) {
+    public ResponseBean selectIntentionUser(Integer pageNum, Integer pageSize, Integer orgId, String buildingId, List<TaPersonBuilding> taPersonBuildingListByUserId) {
         ResponseBean responseBean = new ResponseBean();
 
         IPage<Map<String, Object>> pg = new Page<>(pageNum, pageSize);
-        IPage<Map<String, Object>> page = taPersonIntentionRecordMapper.selectIntentionUser(pg, orgId, buildingId, userId);
+        IPage<Map<String, Object>> page = taPersonIntentionRecordMapper.selectIntentionUser(pg, orgId, buildingId, taPersonBuildingListByUserId);
 
         responseBean.addSuccess(page);
         return responseBean;

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

@@ -63,6 +63,9 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     @Autowired
     TaPersonMapper taPersonMapper;
 
+    @Autowired
+    TaUserMapper taUserMapper;
+
     @Autowired
     TdCityMapper tdCityMapper;
 
@@ -111,6 +114,9 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     @Autowired
     private ITaSalesBatchService iTaSalesBatchService;
 
+    @Autowired
+    private TaPersonBuildingMapper taPersonBuildingMapper;
+
     @Override
     public ResponseBean buildingList(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain, Integer orgId, List<TaPersonBuilding> taPersonBuildingList) {
         Page<TaBuilding> page = new Page<>();
@@ -253,6 +259,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         QueryWrapper<TaBuildingApartment> AppointmentQueryWrapper = new QueryWrapper<>();
         AppointmentQueryWrapper.eq("building_id", id);
         AppointmentQueryWrapper.eq("status", 1);
+        AppointmentQueryWrapper.orderByDesc("order_no");
         AppointmentQueryWrapper.orderByDesc("create_date");
         List<TaBuildingApartment> appoint = taBuildingApartmentMapper.selectList(AppointmentQueryWrapper);
         for (TaBuildingApartment apar : appoint) {
@@ -488,7 +495,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     }
 
     @Override
-    public ResponseBean buildingAdd(String parameter, Integer orgId) {
+    public ResponseBean buildingAdd(String parameter, Integer orgId, Integer userId) {
         ResponseBean responseBean = new ResponseBean();
 
         JSONObject object = JSONObject.parseObject(parameter);
@@ -524,6 +531,14 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
             tdCityMapper.updateById(city);
         }
 
+        //新建项目以后自动授权给当前用户
+        TaUser taUser = taUserMapper.selectById(userId);
+        TaPersonBuilding taPersonBuilding = new TaPersonBuilding();
+        taPersonBuilding.setBuildingId(building.getBuildingId());
+        taPersonBuilding.setUserId(taUser.getUserId());
+        taPersonBuilding.setCreateDate(LocalDateTime.now());
+        taPersonBuildingMapper.insert(taPersonBuilding);
+
         // 项目主图
         String imgStr = object.getString("img");
         List<TaBuildingImg> buildingImgs = JSONObject.parseArray(imgStr, TaBuildingImg.class);
@@ -897,6 +912,8 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         // 楼盘户型
         QueryWrapper<TaBuildingApartment> buildingApartmentQueryWrapper = new QueryWrapper<>();
         buildingApartmentQueryWrapper.eq("building_id", building.getBuildingId());
+        buildingApartmentQueryWrapper.orderByDesc("order_no");
+        buildingApartmentQueryWrapper.orderByDesc("create_date");
         List<TaBuildingApartment> buildingApartmentList = taBuildingApartmentMapper.selectList(buildingApartmentQueryWrapper);
 
         // 楼盘户型图
@@ -920,6 +937,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         buildingApartmentQueryWrapper.eq("building_id", id);
         buildingApartmentQueryWrapper.eq("status", 1);
         buildingApartmentQueryWrapper.eq(org.apache.commons.lang3.StringUtils.isNotBlank(apartmentType), "apartment_type", apartmentType);
+        buildingApartmentQueryWrapper.orderByDesc("order_no");
         buildingApartmentQueryWrapper.orderByDesc("create_date");
         List<TaBuildingApartment> buildingApartment = taBuildingApartmentMapper.selectList(buildingApartmentQueryWrapper);
         buildingApartment.forEach(e -> {

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

@@ -24,7 +24,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
-import sun.util.locale.LocaleUtils;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
@@ -394,10 +393,11 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
      */
     @Override
     public ResponseBean selectPageList(Integer salesBatchId, String buildingId, Integer pageNumber, Integer pageSize, Integer orgId, String termName, String blockName,
-                                       String unitName, String floorName, String roomName, String apartmentId, Integer status, String houseId, String lockingStatus) {
+                                       String unitName, String floorName, String roomName, String apartmentId, Integer status, String houseId, String lockingStatus,
+                                       String actulStartHot, String actulEndHot) {
         IPage<TaHousingResources> pg = new Page<>(pageNumber, pageSize);
         IPage<TaHousingResources> pageData = taHousingResourcesMapper.getHouseResourceList(pg, salesBatchId, buildingId, orgId, termName, blockName, unitName,
-                floorName, roomName, apartmentId, status, houseId, lockingStatus);
+                floorName, roomName, apartmentId, status, houseId, lockingStatus, actulStartHot, actulEndHot);
         return ResponseBean.success(pageData);
     }
 
@@ -662,10 +662,10 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
             return responseBean;
         }
 
-        QueryWrapper<TaRaiseHouse> taRaiseHouseQueryWrapper = new QueryWrapper<>();
-        taRaiseHouseQueryWrapper.eq("raise_record_id", raiseRecordId);
-        taRaiseHouseQueryWrapper.eq("raise_house_id", raiseHouseId);
-        TaRaiseHouse taRaiseHouse = taRaiseHouseService.getOne(taRaiseHouseQueryWrapper);
+//        QueryWrapper<TaRaiseHouse> taRaiseHouseQueryWrapper = new QueryWrapper<>();
+//        taRaiseHouseQueryWrapper.eq("raise_record_id", raiseRecordId);
+//        taRaiseHouseQueryWrapper.eq("raise_house_id", raiseHouseId);
+//        TaRaiseHouse taRaiseHouse = taRaiseHouseService.getOne(taRaiseHouseQueryWrapper);
 
         QueryWrapper<TaRaiseRecord> taRaiseRecordQueryWrapper = new QueryWrapper<>();
         taRaiseRecordQueryWrapper.eq("raise_record_id", raiseRecordId);
@@ -673,64 +673,64 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
 
         // 更新为锁定状态
         if ("locked".equals(type)) {
-                // 校验当前房源状态
-                if ("locked".equals(po.getHouseLockingStatus())){
-                    responseBean.addError("房源已被锁定");
-                    return responseBean;
-                }
+            // 校验当前房源状态
+            if ("locked".equals(po.getHouseLockingStatus())) {
+                responseBean.addError("房源已被锁定");
+                return responseBean;
+            }
 
-                TaHousingResources housingResources = new TaHousingResources();
-                housingResources.setHouseId(po.getHouseId());
-                housingResources.setHouseLockingStatus("locked");
-                housingResources.setHouseLockingPerson(personId);
-                housingResources.setUpdateDate(LocalDateTime.now());
-                housingResources.setHouseLockingPerson(raiseRecord.getPersonId());
-                updateById(housingResources);
-
-                //更新认筹单房源锁定状态
-                TaRaiseRecord taRaiseRecord = new TaRaiseRecord();
-                taRaiseRecord.setRaiseRecordId(raiseRecordId);
-                taRaiseRecord.setHouseLockingStatus("locked");
-                taRaiseRecordMapper.updateById(taRaiseRecord);
-
-                // 更新关联表状态
+            TaHousingResources housingResources = new TaHousingResources();
+            housingResources.setHouseId(po.getHouseId());
+            housingResources.setHouseLockingStatus("locked");
+            housingResources.setHouseLockingPerson(personId);
+            housingResources.setUpdateDate(LocalDateTime.now());
+            housingResources.setHouseLockingPerson(raiseRecord.getPersonId());
+            updateById(housingResources);
+
+            //更新认筹单房源锁定状态
+            TaRaiseRecord taRaiseRecord = new TaRaiseRecord();
+            taRaiseRecord.setRaiseRecordId(raiseRecordId);
+            taRaiseRecord.setHouseLockingStatus("locked");
+            taRaiseRecordMapper.updateById(taRaiseRecord);
+
+            // 更新关联表状态
 //                TaRaiseHouse raiseHouse = new TaRaiseHouse();
 //                raiseHouse.setRaiseHouseId(raiseHouseId);
 //                raiseHouse.setHouseLockingStatus("locked");
 //            taRaiseHouseService.updateById(raiseHouse);
-                responseBean.addSuccess(taRaiseRecordMapper.updateById(taRaiseRecord));
-                return responseBean;
+            responseBean.addSuccess(taRaiseRecordMapper.updateById(taRaiseRecord));
+            return responseBean;
         }
 
         // 更新为解锁状态
         if ("unlocked".equals(type)) {
-                // 校验当前房源状态
-                if ("unlocked".equals(po.getHouseLockingStatus())){
-                    responseBean.addError("房源已被解锁");
-                    return responseBean;
-                }
+            // 校验当前房源状态
+            if ("unlocked".equals(po.getHouseLockingStatus())) {
+                responseBean.addError("房源已被解锁");
+                return responseBean;
+            }
 
-                TaHousingResources housingResources = new TaHousingResources();
-                housingResources.setHouseId(po.getHouseId());
-                housingResources.setHouseLockingStatus("unlocked");
-                housingResources.setHouseLockingPerson("");
-                housingResources.setUpdateDate(LocalDateTime.now());
-                updateById(housingResources);
+            TaHousingResources housingResources = new TaHousingResources();
+            housingResources.setHouseId(po.getHouseId());
+            housingResources.setHouseLockingStatus("unlocked");
+            housingResources.setHouseLockingPerson("");
+            housingResources.setUpdateDate(LocalDateTime.now());
+            updateById(housingResources);
 
-                //更新认筹单房源锁定状态
-                TaRaiseRecord taRaiseRecord = new TaRaiseRecord();
-                taRaiseRecord.setRaiseRecordId(raiseRecordId);
-                taRaiseRecord.setHouseLockingStatus("unlocked");
-                taRaiseRecordMapper.updateById(taRaiseRecord);
+            //更新认筹单房源锁定状态
+            TaRaiseRecord taRaiseRecord = new TaRaiseRecord();
+            taRaiseRecord.setRaiseRecordId(raiseRecordId);
+            taRaiseRecord.setHouseLockingStatus("unlocked");
+            taRaiseRecordMapper.updateById(taRaiseRecord);
 
-                // 更新关联表状态
+            // 更新关联表状态
 //                TaRaiseHouse raiseHouse = new TaRaiseHouse();
 //                raiseHouse.setRaiseHouseId(raiseHouseId);
 ////                raiseHouse.setHouseLockingStatus("unlocked");
 ////                raiseHouse.setPersonId("");
 ////                raiseHouse.setPersonName("");
 //                responseBean.addSuccess(taRaiseHouseService.updateById(raiseHouse));
-                return responseBean;
+            return responseBean;
         }
         responseBean.addError("fail");
         return responseBean;
@@ -751,24 +751,24 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
         TaHousingResources taHousingResources = taHousingResourcesMapper.selectById(houseIdArr[0]);
         //通过销售批次信息获取认筹信息
         QueryWrapper<TaRaise> taRaiseQueryWrapper = new QueryWrapper<>();
-        taRaiseQueryWrapper.eq("org_id",orgId);
-        taRaiseQueryWrapper.eq("sales_batch_id",taHousingResources.getSalesBatchId());
-        taRaiseQueryWrapper.eq("building_id",taHousingResources.getBuildingId());
-        taRaiseQueryWrapper.eq("status",CommConstant.STATUS_NORMAL);
+        taRaiseQueryWrapper.eq("org_id", orgId);
+        taRaiseQueryWrapper.eq("sales_batch_id", taHousingResources.getSalesBatchId());
+        taRaiseQueryWrapper.eq("building_id", taHousingResources.getBuildingId());
+        taRaiseQueryWrapper.eq("status", CommConstant.STATUS_NORMAL);
         TaRaise taRaise = taRaiseMapper.selectOne(taRaiseQueryWrapper);
         if (null == taRaise) {
             throw new Exception("认筹单已经作废");
         }
         //校验房源是否同一批次
-        for (String houseId : houseIdArr){
+        for (String houseId : houseIdArr) {
             TaHousingResources taHousingResourcesChecked = taHousingResourcesMapper.selectById(houseId);
-            if (!taHousingResources.getSalesBatchId().equals(taHousingResourcesChecked.getSalesBatchId())){
+            if (!taHousingResources.getSalesBatchId().equals(taHousingResourcesChecked.getSalesBatchId())) {
                 throw new Exception("非同一批次房源");
             }
             if (taHousingResourcesChecked.getStatus() != CommConstant.STATUS_NORMAL) {
                 throw new Exception("其中有房源已被取消发布");
             }
-            if (taRaise.getHouseLockingType().equals(CommConstant.HOUSE_LOCKING_TYPE_AUTO) && CommConstant.HOUSE_LOCKING_STATUS_LOCKED.equals(taHousingResourcesChecked.getHouseLockingStatus())){
+            if (taRaise.getHouseLockingType().equals(CommConstant.HOUSE_LOCKING_TYPE_AUTO) && CommConstant.HOUSE_LOCKING_STATUS_LOCKED.equals(taHousingResourcesChecked.getHouseLockingStatus())) {
                 throw new Exception("房源已被其他客户锁定");
             }
             if (taRaise.getNeedPreselection()) {

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

@@ -186,4 +186,11 @@ public class TaLiveActivityServiceImpl extends ServiceImpl<TaLiveActivityMapper,
         taLiveActivityMapper.updateLiveActivityStatus(orgId, liveActivityList);
         return responseBean;
     }
+
+    @Override
+    public ResponseBean getDetailById(Integer id) {
+        ResponseBean responseBean = new ResponseBean();
+        responseBean.addSuccess(taLiveActivityMapper.getDetailById(id));
+        return responseBean;
+    }
 }

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

@@ -202,13 +202,26 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
     }
 
     @Override
-    public IPage<Map<String, Object>> getCardList(int pageNumber, int pageSize,String buildingId,Integer orgId) {
+    public IPage<Map<String, Object>> getCardList(int pageNumber, int pageSize, String buildingId, Integer orgId, TaPerson person) {
+        // 获取当前人员的推荐置业顾问ID
+        QueryWrapper<TaRecommendCustomer> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("org_id", orgId);
+        queryWrapper.eq("person_id", person.getPersonId());
+        queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+        queryWrapper.last("limit 1");
+        TaRecommendCustomer cust = taRecommendCustomerMapper.selectOne(queryWrapper);
+        String consultant = "";
+        if (cust != null) {
+            // 有可能是 personId, 有可能是 userId
+            consultant = cust.getRealtyConsultant();
+        }
+
         Page<Map<String, Object>> page = new Page<>();
         page.setSize(pageSize);
         page.setPages(pageNumber);
         page.setCurrent(pageNumber);
 
-        List<Map<String, Object>> result = taPersonMapper.selectCardList(page, CommConstant.PERSON_REALTY_CONSULTANT, CommConstant.STATUS_NORMAL,buildingId,orgId);
+        List<Map<String, Object>> result = taPersonMapper.selectCardList(page, CommConstant.PERSON_REALTY_CONSULTANT, CommConstant.STATUS_NORMAL,buildingId,orgId, consultant);
         page.setRecords(result);
 
         return page;

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

@@ -159,8 +159,8 @@ public class TaPersonVisitRecordServiceImpl extends ServiceImpl<TaPersonVisitRec
 			taPersonQueryWrapper.eq("user_id", e.getSharePersonId());
 			TaPerson taPersonUser = taPersonMapper.selectOne(taPersonQueryWrapper);
 
-			e.setShareName(userShareInfo == null ? taPersonUser.getNickname() : userShareInfo.getNickname());
-			e.setShareTel(userShareInfo == null ? taPersonUser.getPhone() :userShareInfo.getPhone());
+			e.setShareName((userShareInfo == null &&  taPersonUser == null) ? null : userShareInfo == null ? taPersonUser.getNickname() : userShareInfo.getNickname());
+			e.setShareTel((userShareInfo == null &&  taPersonUser == null) ? null : userShareInfo == null ? taPersonUser.getPhone(): userShareInfo.getPhone());
 
 			if (CommConstant.H5_SHARE.equals(e.getEventType())) {
 				e.setActivityName(e.getDrainageName());

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

@@ -31,277 +31,279 @@ import java.util.List;
  */
 @Service
 public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMapper, TaPointsRecords> implements ITaPointsRecordsService {
-	@Autowired
-	TaPersonMapper taPersonMapper;
-	
-	@Autowired
-	private TdPointsRulesMapper tdPointsRulesMapper;
-	
-	@Autowired
-	private TaPointsRecordsMapper taPointsRecordsMapper;
-
-	/**
-	 * 获取规则积分, 0 代表未启用
-	 * @param code
-	 * @return
-	 */
-	@Override
-	public Integer getRulePoints(String code,Integer orgId) {
-		QueryWrapper<TdPointsRules> tdPointsRulesQueryWrapper = new QueryWrapper<>();
-		tdPointsRulesQueryWrapper.eq("code",code);
-		tdPointsRulesQueryWrapper.eq("org_id",orgId);
-		tdPointsRulesQueryWrapper.eq("status",CommConstant.STATUS_NORMAL);
-		TdPointsRules rule = tdPointsRulesMapper.selectOne(tdPointsRulesQueryWrapper);
-		if (null == rule) {
-			return 0;
-		}
-
-		Integer status = rule.getStatus();
-		return null != status && status.equals(CommConstant.POINTS_RULE_ON) ? rule.getPointsAmount() : 0;
-	}
-
-	private boolean isPointsRecordsExist(String personId, String changeType, String changeParams) {
-		QueryWrapper<TaPointsRecords> query = new QueryWrapper<>();
-		query.eq("person_id", personId)
-			.eq("change_type", changeType)
-			.like(!StringUtils.isEmpty(changeParams), "change_params", changeParams)
-			.eq("status", CommConstant.STATUS_NORMAL);
-
-		Integer count = taPointsRecordsMapper.selectCount(query);
-		return null != count && count > 0;
-	}
-
-	@Override
-	public void sharePoints(TaShare taShare, Integer orgId) {
-		//
-		String changeType = CommConstant.POINTS_CHANGE_SHARE_POSTER;
-		
-		// 是否开启积分规则
-		Integer pointsAmount = getRulePoints(changeType,orgId);
-		if (pointsAmount == 0) {
-			return;
-		}
-
-		// 已经领取过的不会再次领取
-		String[] params = {
-				"shareId="+String.valueOf(taShare.getShareId()),
-				"openUser="+taShare.getOpenUser().getPersonId()
-		};
-		String changeParams = String.join("&", params);
-		boolean hasJoined = isPointsRecordsExist(taShare.getPersonId(), changeType, changeParams);
-		if (hasJoined) {
-			return;
-		}
-
-		// 发放积分
-		TaPerson person = taPersonMapper.selectById(taShare.getPersonId());
-		if (savePoints(person, changeType, changeParams, pointsAmount, orgId)) {
-			taPersonMapper.setFieldIncrement(person.getPersonId(), "points", pointsAmount);
-		}
-	}
-
-	@Override
-	public void sharePosterAll(String recommenderId, Integer orgId) {
-		String changeType = CommConstant.POINTS_CHANGE_SHARE_POSTER;
-		// 是否开启积分规则
-		Integer pointsAmount = getRulePoints(changeType,orgId);
-		if (pointsAmount == 0) {
-			return;
-		}
-
-		String[] params = {
-				"openUser="+recommenderId
-		};
-		String changeParams = String.join("&", params);
-
-		// 发放积分
-		TaPerson person = taPersonMapper.selectById(recommenderId);
-		if (savePoints(person, changeType, changeParams, pointsAmount, orgId)) {
-			taPersonMapper.setFieldIncrement(person.getPersonId(), "points", pointsAmount);
-		}
-	}
-
-	@Override
-	public void checkinPoints(TaPersonSign taPersonSign,Integer orgId) {
-		//
-		String changeType = CommConstant.POINTS_CHANGE_CHECKIN;
-		
-		// 是否开启积分规则
-		Integer pointsAmount = getRulePoints(changeType,orgId);
-		if (pointsAmount == 0) {
-			return;
-		}
-
-		// 已经领取过的不会再次领取
-		List<String> params = new ArrayList<String>() {{
-			add("date="+DateUtils.today());
-			add("user="+taPersonSign.getPerson().getPersonId());
-		}};
-		String changeParams = String.join("&", params);
-		boolean hasJoined = isPointsRecordsExist(taPersonSign.getPerson().getPersonId(), changeType, changeParams);
-		if (hasJoined) {
-			return;
-		}
-
-		// 添加参数
-		params.add("recId="+taPersonSign.getRecId());
-		changeParams = String.join("&", params);
-
-
-		// 增加积分
-		// 1-7 天积分 1-7, 超过7天按 7 个积分算
+
+    @Autowired
+    TaPersonMapper taPersonMapper;
+
+    @Autowired
+    private TdPointsRulesMapper tdPointsRulesMapper;
+
+    @Autowired
+    private TaPointsRecordsMapper taPointsRecordsMapper;
+
+    /**
+     * 获取规则积分, 0 代表未启用
+     *
+     * @param code
+     * @return
+     */
+    @Override
+    public Integer getRulePoints(String code, Integer orgId) {
+        QueryWrapper<TdPointsRules> tdPointsRulesQueryWrapper = new QueryWrapper<>();
+        tdPointsRulesQueryWrapper.eq("code", code);
+        tdPointsRulesQueryWrapper.eq("org_id", orgId);
+        tdPointsRulesQueryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+        TdPointsRules rule = tdPointsRulesMapper.selectOne(tdPointsRulesQueryWrapper);
+        if (null == rule) {
+            return 0;
+        }
+
+        Integer status = rule.getStatus();
+        return null != status && status.equals(CommConstant.POINTS_RULE_ON) ? rule.getPointsAmount() : 0;
+    }
+
+    private boolean isPointsRecordsExist(String personId, String changeType, String changeParams) {
+        QueryWrapper<TaPointsRecords> query = new QueryWrapper<>();
+        query.eq("person_id", personId)
+                .eq("change_type", changeType)
+                .like(!StringUtils.isEmpty(changeParams), "change_params", changeParams)
+                .eq("status", CommConstant.STATUS_NORMAL);
+
+        Integer count = taPointsRecordsMapper.selectCount(query);
+        return null != count && count > 0;
+    }
+
+    @Override
+    public void sharePoints(TaShare taShare, Integer orgId) {
+        //
+        String changeType = CommConstant.POINTS_CHANGE_SHARE_POSTER;
+
+        // 是否开启积分规则
+        Integer pointsAmount = getRulePoints(changeType, orgId);
+        if (pointsAmount == 0) {
+            return;
+        }
+
+        // 已经领取过的不会再次领取
+        String[] params = {
+                "shareId=" + String.valueOf(taShare.getShareId()),
+                "openUser=" + taShare.getOpenUser().getPersonId()
+        };
+        String changeParams = String.join("&", params);
+        boolean hasJoined = isPointsRecordsExist(taShare.getPersonId(), changeType, changeParams);
+        if (hasJoined) {
+            return;
+        }
+
+        // 发放积分
+        TaPerson person = taPersonMapper.selectById(taShare.getPersonId());
+        if (savePoints(person, changeType, changeParams, pointsAmount, orgId)) {
+            taPersonMapper.setPointsIncrement(person.getPersonId(), pointsAmount);
+        }
+    }
+
+    @Override
+    public void sharePosterAll(String recommenderId, Integer orgId) {
+        String changeType = CommConstant.POINTS_CHANGE_SHARE_POSTER;
+        // 是否开启积分规则
+        Integer pointsAmount = getRulePoints(changeType, orgId);
+        if (pointsAmount == 0) {
+            return;
+        }
+
+        String[] params = {
+                "openUser=" + recommenderId
+        };
+        String changeParams = String.join("&", params);
+
+        // 发放积分
+        TaPerson person = taPersonMapper.selectById(recommenderId);
+        if (savePoints(person, changeType, changeParams, pointsAmount, orgId)) {
+            taPersonMapper.setPointsIncrement(person.getPersonId(), pointsAmount);
+        }
+    }
+
+    @Override
+    public void checkinPoints(TaPersonSign taPersonSign, Integer orgId) {
+        //
+        String changeType = CommConstant.POINTS_CHANGE_CHECKIN;
+
+        // 是否开启积分规则
+        Integer pointsAmount = getRulePoints(changeType, orgId);
+        if (pointsAmount == 0) {
+            return;
+        }
+
+        // 已经领取过的不会再次领取
+        List<String> params = new ArrayList<String>() {{
+            add("date=" + DateUtils.today());
+            add("user=" + taPersonSign.getPerson().getPersonId());
+        }};
+        String changeParams = String.join("&", params);
+        boolean hasJoined = isPointsRecordsExist(taPersonSign.getPerson().getPersonId(), changeType, changeParams);
+        if (hasJoined) {
+            return;
+        }
+
+        // 添加参数
+        params.add("recId=" + taPersonSign.getRecId());
+        changeParams = String.join("&", params);
+
+
+        // 增加积分
+        // 1-7 天积分 1-7, 超过7天按 7 个积分算
 //		Integer durationDays = taPersonSign.getDurationDays();
 //		int points = durationDays >= 7 ? 7 : durationDays;
 
-		// 发放积分
-		TaPerson person = taPersonMapper.selectById(taPersonSign.getPersonId());
-		if (savePoints(person, changeType, changeParams, pointsAmount, orgId)) {
-			taPersonMapper.setFieldIncrement(person.getPersonId(), "points", pointsAmount);
-		}
-	}
-
-	@Override
-	public void checkinActivityPoints(TaActivityDynamicEnlist taActivityDynamicEnlist, Integer orgId){
-		String changeType =CommConstant.POINTS_CHANGE_ACTIVITY_CHECKIN;
-		// 是否开启积分规则
-		Integer pointsAmount = getRulePoints(changeType,orgId);
-		if (pointsAmount == 0) {
-			return;
-		}
-		
-		// 已经领取过的不会再次领取
-		List<String> params = new ArrayList<String>() {{
-			add("user="+taActivityDynamicEnlist.getPersonId());
-			add("targetId="+taActivityDynamicEnlist.getEnlistId().toString());
-		}};
-		String changeParams = String.join("&", params);
-		boolean hasJoined = isPointsRecordsExist(taActivityDynamicEnlist.getPersonId(), changeType, changeParams);
-		if (hasJoined) {
-			return;
-		}
-		// 添加参数
-		params.add("enlistId="+taActivityDynamicEnlist.getEnlistId());
-		changeParams = String.join("&", params);
-
-		// 发放积分
-		TaPerson person = taPersonMapper.selectById(taActivityDynamicEnlist.getPersonId());
-		if (savePoints(person, changeType, changeParams, pointsAmount, orgId)) {
-			taPersonMapper.setFieldIncrement(person.getPersonId(), "points", pointsAmount);
-		}
-	}
-
-	@Override
-	public void signUpPoints(TaPerson taPerson, Integer orgId) {
-		//
-		String changeType = CommConstant.POINTS_CHANGE_SIGNUP_AGENT;
-		// 是否开启积分规则
-		Integer pointsAmount = getRulePoints(changeType,orgId);
-		if (pointsAmount == 0) {
-			return;
-		}
-
-		// 已经领取过的不会再次领取
-		List<String> params = new ArrayList<String>() {{
-			add("user="+taPerson.getPersonId());
-		}};
-		String changeParams = String.join("&", params);
-		boolean hasJoined = isPointsRecordsExist(taPerson.getPersonId(), changeType, changeParams);
-		if (hasJoined) {
-			return;
-		}
-
-		// 发放积分
-		if (savePoints(taPerson, changeType, changeParams, pointsAmount, orgId)) {
-			taPersonMapper.setFieldIncrement(taPerson.getPersonId(), "points", pointsAmount);
-		}
-	}
-
-	@Override
-	public void recommendCustPoints(TaRecommendCustomer taRecommendCustomer, Integer orgId) {
-		//
-		String changeType = CommConstant.POINTS_CHANGE_RECOMMEND_CUSTOMER;
-		
-		// 是否开启积分规则
-		Integer pointsAmount = getRulePoints(changeType,orgId);
-		if (pointsAmount == 0) {
-			return;
-		}
-
-		// 已经领取过的不会再次领取
-		List<String> params = new ArrayList<String>() {{
-			// 推荐人
-			add("person="+taRecommendCustomer.getRecommendPerson());
-			// 推荐客户手机
-			add("phone="+taRecommendCustomer.getPhone());
-		}};
-		String changeParams = String.join("&", params);
-		boolean hasJoined = isPointsRecordsExist(taRecommendCustomer.getRecommendPerson(), changeType, changeParams);
-		if (hasJoined) {
-			return;
-		}
-
-		// 发放积分
-		TaPerson taPerson = taPersonMapper.getById(taRecommendCustomer.getRecommendPerson());
-		if (null != taPerson && savePoints(taPerson, changeType, changeParams, pointsAmount, orgId)) {
-			taPersonMapper.setFieldIncrement(taPerson.getPersonId(), "points", pointsAmount);
-		}
-	}
-
-	@Override
-	public IPage<TaPointsRecords> getWxRecords(Integer pageNum, Integer pageSize,String personId){
-		IPage<TaPointsRecords> pg = new Page<>(pageNum, pageSize);
-		return taPointsRecordsMapper.getCustomerPointsList(pg,personId);
-	}
-
-	@Override
-	public void consumeGoodsPoints(TaGoods taGoods, Integer orgId) {
-		Integer minusPoints = taGoods.getPointPrice();
-		if (null == minusPoints || minusPoints <= 0) {
-			return;
-		}
-
-		TaPerson taPerson = taGoods.getExchanger();
-		Integer origPoints = taPerson.getPoints();
-		if (null == origPoints) {
-			origPoints = 0;
-		}
-
-		// 积分不足
-		if (minusPoints > origPoints) {
-			return;
-		}
-
-		String[] params = {
-				"person="+taPerson.getPersonId(),
-				"goods="+String.valueOf(taGoods.getGoodsId()),
-				"points="+String.valueOf(minusPoints)
-		};
-		String changeParams = String.join("&", params);
-
-		// 发放积分
-		Integer pointsAmount = 0 - minusPoints;
-		if (savePoints(taPerson, CommConstant.POINTS_CHANGE_GOODS, changeParams, pointsAmount, orgId)) {
-			taPersonMapper.setFieldIncrement(taPerson.getPersonId(), "points", pointsAmount);
-		}
-	}
-
-	private boolean savePoints(TaPerson person, String changeType, String changeParams, Integer pointsAmount, Integer orgId) {
-		if (null == person){
-			return true;
-		}
-		TaPointsRecords taPointsRecords = new TaPointsRecords();
-		taPointsRecords.setPersonId(person.getPersonId());
-		taPointsRecords.setPersonName(StringUtils.ifNull(person.getName(),person.getNickname()));
-		taPointsRecords.setPersonType(person.getPersonType());
-		taPointsRecords.setPointsAmount(pointsAmount);
-		taPointsRecords.setChangeType(changeType);
-		taPointsRecords.setChangeParams(changeParams);
-		taPointsRecords.setStatus(CommConstant.STATUS_NORMAL);
-		taPointsRecords.setCreateDate(LocalDateTime.now());
-		taPointsRecords.setOrgId(orgId);
-
-		return taPointsRecordsMapper.insert(taPointsRecords) > 0;
-	}
+        // 发放积分
+        TaPerson person = taPersonMapper.selectById(taPersonSign.getPersonId());
+        if (savePoints(person, changeType, changeParams, pointsAmount, orgId)) {
+            taPersonMapper.setPointsIncrement(person.getPersonId(), pointsAmount);
+        }
+    }
+
+    @Override
+    public void checkinActivityPoints(TaActivityDynamicEnlist taActivityDynamicEnlist, Integer orgId) {
+        String changeType = CommConstant.POINTS_CHANGE_ACTIVITY_CHECKIN;
+        // 是否开启积分规则
+        Integer pointsAmount = getRulePoints(changeType, orgId);
+        if (pointsAmount == 0) {
+            return;
+        }
+
+        // 已经领取过的不会再次领取
+        List<String> params = new ArrayList<String>() {{
+            add("user=" + taActivityDynamicEnlist.getPersonId());
+            add("targetId=" + taActivityDynamicEnlist.getEnlistId().toString());
+        }};
+        String changeParams = String.join("&", params);
+        boolean hasJoined = isPointsRecordsExist(taActivityDynamicEnlist.getPersonId(), changeType, changeParams);
+        if (hasJoined) {
+            return;
+        }
+        // 添加参数
+        params.add("enlistId=" + taActivityDynamicEnlist.getEnlistId());
+        changeParams = String.join("&", params);
+
+        // 发放积分
+        TaPerson person = taPersonMapper.selectById(taActivityDynamicEnlist.getPersonId());
+        if (savePoints(person, changeType, changeParams, pointsAmount, orgId)) {
+            taPersonMapper.setPointsIncrement(person.getPersonId(), pointsAmount);
+        }
+    }
+
+    @Override
+    public void signUpPoints(TaPerson taPerson, Integer orgId) {
+        //
+        String changeType = CommConstant.POINTS_CHANGE_SIGNUP_AGENT;
+        // 是否开启积分规则
+        Integer pointsAmount = getRulePoints(changeType, orgId);
+        if (pointsAmount == 0) {
+            return;
+        }
+
+        // 已经领取过的不会再次领取
+        List<String> params = new ArrayList<String>() {{
+            add("user=" + taPerson.getPersonId());
+        }};
+        String changeParams = String.join("&", params);
+        boolean hasJoined = isPointsRecordsExist(taPerson.getPersonId(), changeType, changeParams);
+        if (hasJoined) {
+            return;
+        }
+
+        // 发放积分
+        if (savePoints(taPerson, changeType, changeParams, pointsAmount, orgId)) {
+            taPersonMapper.setPointsIncrement(taPerson.getPersonId(), pointsAmount);
+        }
+    }
+
+    @Override
+    public void recommendCustPoints(TaRecommendCustomer taRecommendCustomer, Integer orgId) {
+        //
+        String changeType = CommConstant.POINTS_CHANGE_RECOMMEND_CUSTOMER;
+
+        // 是否开启积分规则
+        Integer pointsAmount = getRulePoints(changeType, orgId);
+        if (pointsAmount == 0) {
+            return;
+        }
+
+        // 已经领取过的不会再次领取
+        List<String> params = new ArrayList<String>() {{
+            // 推荐人
+            add("person=" + taRecommendCustomer.getRecommendPerson());
+            // 推荐客户手机
+            add("phone=" + taRecommendCustomer.getPhone());
+        }};
+        String changeParams = String.join("&", params);
+        boolean hasJoined = isPointsRecordsExist(taRecommendCustomer.getRecommendPerson(), changeType, changeParams);
+        if (hasJoined) {
+            return;
+        }
+
+        // 发放积分
+        TaPerson taPerson = taPersonMapper.getById(taRecommendCustomer.getRecommendPerson());
+        if (null != taPerson && savePoints(taPerson, changeType, changeParams, pointsAmount, orgId)) {
+            taPersonMapper.setPointsIncrement(taPerson.getPersonId(), pointsAmount);
+        }
+    }
+
+    @Override
+    public IPage<TaPointsRecords> getWxRecords(Integer pageNum, Integer pageSize, String personId) {
+        IPage<TaPointsRecords> pg = new Page<>(pageNum, pageSize);
+        return taPointsRecordsMapper.getCustomerPointsList(pg, personId);
+    }
+
+    @Override
+    public void consumeGoodsPoints(TaGoods taGoods, Integer orgId) {
+        Integer minusPoints = taGoods.getPointPrice();
+        if (null == minusPoints || minusPoints <= 0) {
+            return;
+        }
+
+        TaPerson taPerson = taGoods.getExchanger();
+        Integer origPoints = taPerson.getPoints();
+        if (null == origPoints) {
+            origPoints = 0;
+        }
+
+        // 积分不足
+        if (minusPoints > origPoints) {
+            return;
+        }
+
+        String[] params = {
+                "person=" + taPerson.getPersonId(),
+                "goods=" + String.valueOf(taGoods.getGoodsId()),
+                "points=" + String.valueOf(minusPoints)
+        };
+        String changeParams = String.join("&", params);
+
+        // 发放积分
+        Integer pointsAmount = 0 - minusPoints;
+        if (savePoints(taPerson, CommConstant.POINTS_CHANGE_GOODS, changeParams, pointsAmount, orgId)) {
+            taPersonMapper.setPointsIncrement(taPerson.getPersonId(), pointsAmount);
+        }
+    }
+
+    private boolean savePoints(TaPerson person, String changeType, String changeParams, Integer pointsAmount, Integer orgId) {
+        if (null == person) {
+            return true;
+        }
+        TaPointsRecords taPointsRecords = new TaPointsRecords();
+        taPointsRecords.setPersonId(person.getPersonId());
+        taPointsRecords.setPersonName(StringUtils.ifNull(person.getName(), person.getNickname()));
+        taPointsRecords.setPersonType(person.getPersonType());
+        taPointsRecords.setPointsAmount(pointsAmount);
+        taPointsRecords.setChangeType(changeType);
+        taPointsRecords.setChangeParams(changeParams);
+        taPointsRecords.setStatus(CommConstant.STATUS_NORMAL);
+        taPointsRecords.setCreateDate(LocalDateTime.now());
+        taPointsRecords.setOrgId(orgId);
+
+        return taPointsRecordsMapper.insert(taPointsRecords) > 0;
+    }
 
 //	@Override
 //	public void authPoints(String personId) {
@@ -316,115 +318,120 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 //			sendPoints(person,4,CommConstant.POINTS_AUTHORIZE);
 //		}
 //	}
-	
-	private void sendPoints(TaPerson person,Integer rulesId,String shareType, Integer orgId) {
-		//发放积分
-		QueryWrapper<TdPointsRules> queryWrapper = new QueryWrapper<>();
-		queryWrapper.eq("rule_id",rulesId);
-		queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
-		TdPointsRules tdPointsRules = tdPointsRulesMapper.selectOne(queryWrapper);
-		if (null != tdPointsRules) {
-			//插入积分消费流水表
-			TaPointsRecords taPointsRecords = new TaPointsRecords();
-			taPointsRecords.setPersonId(person.getPersonId());
-			taPointsRecords.setPersonName(com.huiju.estateagents.common.StringUtils.ifNull(person.getName(),person.getNickname()));
-			taPointsRecords.setPersonType(person.getPersonType());
-			taPointsRecords.setPointsAmount(tdPointsRules.getPointsAmount());
-			taPointsRecords.setChangeType(shareType);
-			JSONObject jsonObject = new JSONObject();
-			jsonObject.put("person_id",person.getPersonId());
-			taPointsRecords.setChangeParams(jsonObject.toJSONString());
-			taPointsRecords.setCreateDate(LocalDateTime.now());
-			taPointsRecords.setStatus(CommConstant.STATUS_NORMAL);
-			taPointsRecords.setOrgId(orgId);
-			taPointsRecordsMapper.insert(taPointsRecords);
-			//添加积分
-			UpdateWrapper<TaPerson> taPersonwrapper = new UpdateWrapper<>();
-			taPersonwrapper.eq("person_id", person.getPersonId());
-			taPersonwrapper.setSql("points = IFNULL(points, 0) + " + String.valueOf(tdPointsRules.getPointsAmount()));
-			taPersonMapper.update(new TaPerson(), taPersonwrapper);
-		}
-	}
-
-
-	@Override
-	public void documentVerify(TaDocumentVerify taDocumentVerify, Integer orgId) {
-		//
-		String changeType = CommConstant.POINTS_CHANGE_DOCUMENT_VERIFY;
-		// 是否开启积分规则
-		Integer pointsAmount = getRulePoints(changeType,orgId);
-		if (pointsAmount == 0) {
-			return;
-		}
-
-		// 已经领取过的不会再次领取
-		String[] params = {
-				"shareId="+String.valueOf(taDocumentVerify.getDocumentVerifyId()),
-				"openUser="+taDocumentVerify.getPersonId()
-		};
-		String changeParams = String.join("&", params);
-		boolean hasJoined = isPointsRecordsExist(taDocumentVerify.getPersonId(), changeType, changeParams);
-		if (hasJoined) {
-			return;
-		}
-
-		// 发放积分
-		TaPerson person = taPersonMapper.selectById(taDocumentVerify.getPersonId());
-		if (savePoints(person, changeType, changeParams, pointsAmount, orgId)) {
-			taPersonMapper.setFieldIncrement(person.getPersonId(), "points", pointsAmount);
-		}
-	}
-
-	@Override
-	public void activityVerificationSign(HelpInitiateRecord helpInitiateRecord, Integer orgId) {
-		//
-		String changeType = CommConstant.POINTS_CHANGE_ACTIVITY_VERIFICATION;
-		// 是否开启积分规则
-		Integer pointsAmount = getRulePoints(changeType,orgId);
-		if (pointsAmount == 0) {
-			return;
-		}
-
-		
-
-		// 已经领取过的不会再次领取
-		String[] params = {
-				"shareId="+String.valueOf(helpInitiateRecord.getHelpRecordInitiateId()),
-				"openUser="+helpInitiateRecord.getPersonId()
-		};
-		String changeParams = String.join("&", params);
-		boolean hasJoined = isPointsRecordsExist(helpInitiateRecord.getPersonId(), changeType, changeParams);
-		if (hasJoined) {
-			return;
-		}
-
-		// 发放积分
-		TaPerson person = taPersonMapper.selectById(helpInitiateRecord.getPersonId());
-		if (savePoints(person, changeType, changeParams, pointsAmount, orgId)) {
-			taPersonMapper.setFieldIncrement(person.getPersonId(), "points", pointsAmount);
-		}
-	}
-	
-	/**
-	 * 消费拼团积分
-	 *  @param person
-	 * @param integral
-	 * @param buildingId
-	 * @param groupActivityId
-	 */
-	@Override
-	public void saveGroupRecord(TaPerson person, Integer integral, String buildingId, Integer groupActivityId) {
-		TaPointsRecords taPointsRecords = new TaPointsRecords();
-		taPointsRecords.setPersonId(person.getPersonId());
-		taPointsRecords.setPersonName(person.getNickname());
-		taPointsRecords.setPersonType(person.getPersonType());
-		taPointsRecords.setPointsAmount(-integral);
-		taPointsRecords.setChangeType(CommConstant.POINTS_CHANGE_GROUP);
-		taPointsRecords.setChangeParams("{\"group_activity_id\":"+groupActivityId+"}");
-		taPointsRecords.setCreateDate(LocalDateTime.now());
-		taPointsRecords.setOrgId(person.getOrgId());
-		taPointsRecords.setBuildingId(buildingId);
-		taPointsRecords.setStatus(CommConstant.STATUS_NORMAL);
-		taPointsRecordsMapper.insert(taPointsRecords);
-	}
+
+    private void sendPoints(TaPerson person, Integer rulesId, String shareType, Integer orgId) {
+        //发放积分
+        QueryWrapper<TdPointsRules> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("rule_id", rulesId);
+        queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+        TdPointsRules tdPointsRules = tdPointsRulesMapper.selectOne(queryWrapper);
+        if (null != tdPointsRules) {
+            //插入积分消费流水表
+            TaPointsRecords taPointsRecords = new TaPointsRecords();
+            taPointsRecords.setPersonId(person.getPersonId());
+            taPointsRecords.setPersonName(com.huiju.estateagents.common.StringUtils.ifNull(person.getName(), person.getNickname()));
+            taPointsRecords.setPersonType(person.getPersonType());
+            taPointsRecords.setPointsAmount(tdPointsRules.getPointsAmount());
+            taPointsRecords.setChangeType(shareType);
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put("person_id", person.getPersonId());
+            taPointsRecords.setChangeParams(jsonObject.toJSONString());
+            taPointsRecords.setCreateDate(LocalDateTime.now());
+            taPointsRecords.setStatus(CommConstant.STATUS_NORMAL);
+            taPointsRecords.setOrgId(orgId);
+            taPointsRecordsMapper.insert(taPointsRecords);
+            //添加积分
+            UpdateWrapper<TaPerson> taPersonwrapper = new UpdateWrapper<>();
+            taPersonwrapper.eq("person_id", person.getPersonId());
+            taPersonwrapper.setSql("points = IFNULL(points, 0) + " + String.valueOf(tdPointsRules.getPointsAmount()));
+            taPersonMapper.update(new TaPerson(), taPersonwrapper);
+        }
+    }
+
+
+    @Override
+    public void documentVerify(TaDocumentVerify taDocumentVerify, Integer orgId) {
+        //
+        String changeType = CommConstant.POINTS_CHANGE_DOCUMENT_VERIFY;
+        // 是否开启积分规则
+        Integer pointsAmount = getRulePoints(changeType, orgId);
+        if (pointsAmount == 0) {
+            return;
+        }
+
+        // 已经领取过的不会再次领取
+        String[] params = {
+                "shareId=" + String.valueOf(taDocumentVerify.getDocumentVerifyId()),
+                "openUser=" + taDocumentVerify.getPersonId()
+        };
+        String changeParams = String.join("&", params);
+        boolean hasJoined = isPointsRecordsExist(taDocumentVerify.getPersonId(), changeType, changeParams);
+        if (hasJoined) {
+            return;
+        }
+
+        // 发放积分
+        TaPerson person = taPersonMapper.selectById(taDocumentVerify.getPersonId());
+        if (savePoints(person, changeType, changeParams, pointsAmount, orgId)) {
+            taPersonMapper.setPointsIncrement(person.getPersonId(), pointsAmount);
+        }
+    }
+
+    @Override
+    public void activityVerificationSign(HelpInitiateRecord helpInitiateRecord, Integer orgId) {
+        //
+        String changeType = CommConstant.POINTS_CHANGE_ACTIVITY_VERIFICATION;
+        // 是否开启积分规则
+        Integer pointsAmount = getRulePoints(changeType, orgId);
+        if (pointsAmount == 0) {
+            return;
+        }
+
+
+        // 已经领取过的不会再次领取
+        String[] params = {
+                "shareId=" + String.valueOf(helpInitiateRecord.getHelpRecordInitiateId()),
+                "openUser=" + helpInitiateRecord.getPersonId()
+        };
+        String changeParams = String.join("&", params);
+        boolean hasJoined = isPointsRecordsExist(helpInitiateRecord.getPersonId(), changeType, changeParams);
+        if (hasJoined) {
+            return;
+        }
+
+        // 发放积分
+        TaPerson person = taPersonMapper.selectById(helpInitiateRecord.getPersonId());
+        if (savePoints(person, changeType, changeParams, pointsAmount, orgId)) {
+            taPersonMapper.setPointsIncrement(person.getPersonId(), pointsAmount);
+        }
+    }
+
+    /**
+     * 消费拼团积分
+     *
+     * @param person
+     * @param integral
+     * @param buildingId
+     * @param groupActivityId
+     */
+    @Override
+    public void saveGroupRecord(TaPerson person, Integer integral, String buildingId, Integer groupActivityId) {
+        TaPointsRecords taPointsRecords = new TaPointsRecords();
+        taPointsRecords.setPersonId(person.getPersonId());
+        taPointsRecords.setPersonName(person.getNickname());
+        taPointsRecords.setPersonType(person.getPersonType());
+        taPointsRecords.setPointsAmount(-integral);
+        taPointsRecords.setChangeType(CommConstant.POINTS_CHANGE_GROUP);
+        taPointsRecords.setChangeParams("{\"group_activity_id\":" + groupActivityId + "}");
+        taPointsRecords.setCreateDate(LocalDateTime.now());
+        taPointsRecords.setOrgId(person.getOrgId());
+        taPointsRecords.setBuildingId(buildingId);
+        taPointsRecords.setStatus(CommConstant.STATUS_NORMAL);
+        taPointsRecordsMapper.insert(taPointsRecords);
+    }
+
+    @Override
+    public Integer sumPointByPersonId(String personId) {
+        return taPointsRecordsMapper.sumPointByPersonId(personId);
+    }
 }

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

@@ -183,6 +183,7 @@ public class TaPreselectionRecordServiceImpl extends ServiceImpl<TaPreselectionR
         taPreselectionRecord.setSalesBatchId(resourcesPO.getSalesBatchId());
         taPreselectionRecord.setStatus(1);
         taPreselectionRecord.setCreateDate(LocalDateTime.now());
+        taPreselectionRecord.setUpdateDate(LocalDateTime.now());
         save(taPreselectionRecord);
 
         // 更新房源表热度
@@ -228,7 +229,7 @@ public class TaPreselectionRecordServiceImpl extends ServiceImpl<TaPreselectionR
         TaPreselectionRecord record = new TaPreselectionRecord();
         record.setPreselectionRecordId(preselectionRecord.getPreselectionRecordId());
         record.setStatus(0);
-        record.setUpdateDate(DateUtils.today());
+        record.setUpdateDate(LocalDateTime.now());
         updateById(record);
 
         // 更新房源表热度

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

@@ -224,6 +224,7 @@ public class TaRaiseRecordServiceImpl extends ServiceImpl<TaRaiseRecordMapper, T
         taRaiseRecord.setPayStatus(CommConstant.PAY_STATUS_UNPAID);
         taRaiseRecord.setPayType(CommConstant.PAY_TYPE_ONLINE);
         taRaiseRecord.setCreateDate(LocalDateTime.now());
+        taRaiseRecord.setUpdateDate(LocalDateTime.now());
         //插入认筹单信息
         taRaiseRecordMapper.insert(taRaiseRecord);
 
@@ -310,6 +311,13 @@ public class TaRaiseRecordServiceImpl extends ServiceImpl<TaRaiseRecordMapper, T
 
     @Override
     public Boolean updateForSubtractRaiseHeat(Integer raiseRecordId) {
+        logger.info("TaRaiseRecordServiceImpl.updateForSubtractRaiseHeat 接收参数:raiseRecordId:{}", raiseRecordId);
         return taHousingResourcesMapper.updateForSubtractRaiseHeat(raiseRecordId);
     }
+
+    @Override
+    public Boolean updateHouseLockingStatus(Integer raiseRecordId, String houseLockingStatus) {
+        logger.info("TaRaiseRecordServiceImpl.updateHouseLockingStatus 接收参数:raiseRecordId:{},houseLockingStatus:{}", raiseRecordId, houseLockingStatus);
+        return taHousingResourcesMapper.updateHouseLockingStatus(raiseRecordId, houseLockingStatus);
+    }
 }

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

@@ -413,6 +413,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         QueryWrapper<TaRecommendCustomer> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("phone", taRecommendCustomer.getPhone());
         queryWrapper.eq("building_id",taRecommendCustomer.getBuildingId());
+        queryWrapper.eq("org_id", taRecommendCustomer.getOrgId());
         queryWrapper.in("verify_status",CommConstant.VERIFY_AGREE,CommConstant.VERIFY_READY);
         List<TaRecommendCustomer> result = taRecommendCustomerMapper.selectList(queryWrapper);
         if (null != result && result.size() > 0) {
@@ -486,17 +487,17 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     }
 
     @Override
-    public IPage getCustomerList(Integer status,int pageNumber, int pageSize,String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, String customerType, Integer orgId,List<TaPersonBuilding> taPersonBuildingList,String sceneType){
+    public IPage getCustomerList(Integer status,int pageNumber, int pageSize,String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, String customerType, Integer orgId,List<TaPersonBuilding> taPersonBuildingList,String sceneType, String startCreateDate, String endCreateDate){
 
         if (CommConstant.CUTOMER_TYPE_PUBLIC.equals(customerType)) {
             // 公客
             IPage<TaPerson>page = new Page<>(pageNumber,pageSize);
             // 公客就不用 buildingId 进行查询
-            return taRecommendCustomerMapper.getPublicCustomerList(page,name, tel,  entryType, verifyStatus, sex, orgId,consultTel,sceneType, taPersonBuildingList,building);
+            return taRecommendCustomerMapper.getPublicCustomerList(page,name, tel,  entryType, verifyStatus, sex, orgId,consultTel,sceneType, taPersonBuildingList,building, startCreateDate, endCreateDate);
         } else {
             // 私客
             IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);
-            return taRecommendCustomerMapper.getCustomerList(page, building, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId,status,taPersonBuildingList,sceneType);
+            return taRecommendCustomerMapper.getCustomerList(page, building, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId,status,taPersonBuildingList,sceneType, startCreateDate, endCreateDate);
         }
 
     }
@@ -722,7 +723,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         }
 
         // 已经存在的, 随机返回一条记录
-        List<TaRecommendCustomer> custs = getCustomerByPhone(phone);
+        List<TaRecommendCustomer> custs = getCustomerByPhone(phone, person.getOrgId());
         if (null != custs && custs.size() > 0) {
             return custs.get(0);
         }
@@ -797,8 +798,9 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 
     }
 
-    private List<TaRecommendCustomer> getCustomerByPhone(String phone) {
+    private List<TaRecommendCustomer> getCustomerByPhone(String phone, Integer orgId) {
         QueryWrapper<TaRecommendCustomer> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("org_id", orgId);
         queryWrapper.eq("phone", phone);
         queryWrapper.gt("status", CommConstant.STATUS_DELETE);
         queryWrapper.orderByDesc("report_date");

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

@@ -3,10 +3,8 @@ package com.huiju.estateagents.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
-import com.huiju.estateagents.common.wxpay.WXPay;
-import com.huiju.estateagents.common.wxpay.WXPayConstants;
-import com.huiju.estateagents.common.wxpay.WXPayUtil;
-import com.huiju.estateagents.common.wxpay.WxConfig;
+import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.common.wxpay.*;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.mapper.*;
 import com.huiju.estateagents.service.ITaRaiseRecordService;
@@ -215,9 +213,13 @@ public class WxPayServiceImpl implements IWxPayService {
                 TaRaiseRecord taRaiseRecord = taRaiseRecordMapper.selectOne(new QueryWrapper<TaRaiseRecord>().eq("order_id", e.getParentOrderId()));
                 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")));
+                    }
                 }
                 if (!orderInfo.get("refund_status").equals(WXPayConstants.SUCCESS)){
                     taRaiseRecord.setPayStatus(CommConstant.PAY_STATUS_CHANGE);
+                    taRaiseRecord.setRefundReason("");
                 }
 
                 taRaiseRecordMapper.updateById(taRaiseRecord);
@@ -488,6 +490,7 @@ public class WxPayServiceImpl implements IWxPayService {
         //更改支付状态并插入订单id
         TaRaiseRecord taRaiseRecord = taRaiseRecordMapper.selectById(taOrder.getTargetId());
         taRaiseRecord.setOrderId(taOrder.getOrderId());
+        taRaiseRecord.setPayType(CommConstant.PAY_TYPE_ONLINE);
         taRaiseRecordMapper.updateById(taRaiseRecord);
     }
 }

src/main/resources/application-prod-blue.yml

@@ -68,7 +68,7 @@ sms:
     # 验证码长度
     size: 4
     # 短信签名
-    sign: AI智慧案场
+    sign: 橙蕉
 
   visitor:
     code: "0501"

src/main/resources/application-prod-green.yml

@@ -68,7 +68,7 @@ sms:
     # 验证码长度
     size: 4
     # 短信签名
-    sign: AI智慧案场
+    sign: 橙蕉
 
   visitor:
     code: "0501"

src/main/resources/mapper/TaHousingResourcesMapper.xml

@@ -190,14 +190,16 @@
 
     <update id="updateForAddHeat" parameterType="java.lang.Integer">
         UPDATE ta_housing_resources t
-        SET t.real_heat = IFNULL(t.real_heat, 0) + 1
+        SET t.real_heat = IFNULL(t.real_heat, 0) + 1,
+            t.update_date = now()
         WHERE
             t.house_id = #{houseId}
     </update>
 
     <update id="updateForSubtractHeat" parameterType="java.lang.Integer">
         UPDATE ta_housing_resources t
-        SET t.real_heat = IFNULL(t.real_heat, 0) - 1
+        SET t.real_heat = IFNULL(t.real_heat, 0) - 1,
+            t.update_date = now()
         WHERE
             t.house_id = #{houseId}
             AND t.real_heat > 0
@@ -205,12 +207,21 @@
 
     <update id="updateForSubtractRaiseHeat" parameterType="java.lang.Integer">
         UPDATE ta_housing_resources t
-        SET t.raise_real_heat = IFNULL( t.raise_real_heat, 0 ) - 1
+        SET t.raise_real_heat = IFNULL( t.raise_real_heat, 0 ) - 1,
+            t.update_date = now()
         WHERE
             t.house_id IN ( SELECT tr.house_id FROM ta_raise_house tr WHERE tr.raise_record_id = #{raiseRecordId})
             AND t.raise_real_heat > 0
     </update>
 
+    <update id="updateHouseLockingStatus">
+        UPDATE ta_housing_resources t
+        SET t.house_locking_status = #{houseLockingStatus},
+            t.update_date = now()
+        WHERE
+            t.house_id IN ( SELECT tr.house_id FROM ta_raise_house tr WHERE tr.raise_record_id = #{raiseRecordId})
+    </update>
+
     <select id="getHousingDetailById" resultType="com.huiju.estateagents.po.TaHousingResourcesPO">
         SELECT
         t.house_id,
@@ -290,9 +301,22 @@
         <if test="roomName != null and roomName != ''">
             AND t.room_name like CONCAT('%',#{roomName}, '%')
         </if>
-        <if test="lockingStatus != null and lockingStatus != ''">
-            AND t.house_locking_status = #{lockingStatus}
+        <choose>
+            <when test="lockingStatus == 'unlocked'">
+                AND (t.house_locking_status = #{lockingStatus} OR t.house_locking_status IS NULL)
+            </when>
+            <when test="lockingStatus != null and lockingStatus != ''">
+                AND t.house_locking_status = #{lockingStatus}
+            </when>
+        </choose>
+        <if test="actulStartHot != '' and actulStartHot != null">
+            and t.real_heat &gt;= #{actulStartHot}
+        </if>
+        <if test="actulEndHot != '' and actulEndHot != null">
+            and t.real_heat &lt;= #{actulEndHot}
         </if>
+        ORDER BY
+            t.create_date DESC
     </select>
 
     <select id="selectHousingList" resultType="com.huiju.estateagents.entity.TaHousingResources">

src/main/resources/mapper/TaLiveActivityMapper.xml

@@ -47,5 +47,10 @@
     </if>
         order by t.weight desc
     </select>
+    <select id="getDetailById" resultType="com.huiju.estateagents.entity.TaLiveActivity">
+        select t.*,a.live_plat_name as liveAppName From ta_live_activity t
+        left join td_live_dict a on t.live_app = a.id
+        where t.live_activity_id = #{id}
+    </select>
 
 </mapper>

src/main/resources/mapper/TaPersonIntentionRecordMapper.xml

@@ -31,8 +31,11 @@
                     AND tpir.org_id = #{orgId}
                     AND tp.org_id = #{orgId}
                 </if>
-                <if test="userId != null">
-                    AND tpir.building_id IN ( SELECT t3.building_id FROM ta_person_building t3 WHERE t3.user_id = #{userId} )
+                <if test="personBuildingList != null and personBuildingList.size > 0">
+                    AND tpir.building_id in
+                    <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                        #{personBuilding.buildingId}
+                    </foreach>
                 </if>
             </trim>
         GROUP BY

src/main/resources/mapper/TaPersonMapper.xml

@@ -12,7 +12,8 @@
             t.tel AS phone,
             t.avatarurl AS avatar,
             t.photo,
-            u.description as description
+            u.description as description,
+            (t.person_id = #{consultant} or t.user_id = #{consultant}) as mine
         FROM
             ta_person t left join ta_user u on t.user_id = u.user_id
         LEFT JOIN ta_person_building p ON u.user_id = p.user_id
@@ -83,6 +84,12 @@
         WHERE person_id = #{personId}
     </update>
 
+    <update id="setPointsIncrement">
+        UPDATE ta_person
+        SET  points = IFNULL(points, 0) + #{increment}
+        WHERE person_id = #{personId}
+    </update>
+
     <select id="selectCustomer" resultType="com.huiju.estateagents.entity.TaPerson">
         SELECT
 	a.*,

src/main/resources/mapper/TaPointsRecordsMapper.xml

@@ -4,5 +4,8 @@
     <select id="getCustomerPointsList" resultType="com.huiju.estateagents.entity.TaPointsRecords">
 
     </select>
+    <select id="sumPointByPersonId" resultType="java.lang.Integer">
+        select sum(points_amount) from ta_points_records t where t.person_id = #{personId}
+    </select>
 
 </mapper>

src/main/resources/mapper/TaPreselectionRecordMapper.xml

@@ -119,7 +119,7 @@
                 AND a.room_name like CONCAT('%',#{bo.roomName}, '%')
             </if>
             <if test="bo.houseId != null and bo.houseId !=''">
-                AND t.house_id = #{bo.houseId}
+                AND t.house_id like CONCAT('%',#{bo.houseId}, '%')
             </if>
             <if test="bo.phone != null and bo.phone != ''">
                 AND b.phone like CONCAT('%',#{bo.phone}, '%')

src/main/resources/mapper/TaRaiseMapper.xml

@@ -17,7 +17,7 @@
             t.pay_description_online,
             t.pay_description_offline,
             t.pay_protocol,
-            t.`status`,
+            t2.`status`,
             t.create_date,
             t2.sales_batch_name,
             t2.sales_number,

src/main/resources/mapper/TaRaiseRecordMapper.xml

@@ -38,9 +38,12 @@
         <if test="bo.status != null">
             AND t.`status` = #{bo.status}
         </if>
-        <if test="bo.lockingStatus != null">
+        <if test="bo.lockingStatus == 'locked'">
             AND t.house_locking_status = #{bo.lockingStatus}
         </if>
+        <if test="bo.lockingStatus == 'unlocked'">
+            AND (t.house_locking_status = #{bo.lockingStatus} || t.house_locking_status is null)
+        </if>
         <if test="bo.apartmentId != null and bo.apartmentId != ''">
             AND t.apartment_id = #{bo.apartmentId}
         </if>
@@ -81,7 +84,7 @@
             AND t.raise_id =#{bo.raiseId}
         </if>
         <if test="bo.houseId != null and bo.houseId != ''">
-            AND t3.house_id =  =#{bo.houseId}
+            AND t3.house_id = #{bo.houseId}
         </if>
         <if test="bo.raiseRecordId != null and bo.raiseRecordId != ''">
             AND t.raise_record_id = #{bo.raiseRecordId}
@@ -111,7 +114,7 @@
             AND t.tel like CONCAT('%',#{bo.tel} , '%')
         </if>
         <if test="bo.personTel != null and bo.personTel != ''">
-            AND t5.tel like CONCAT('%',#{bo.personTel}  , '%')
+            AND t.tel like CONCAT('%',#{bo.personTel}  , '%')
         </if>
         <if test="bo.payStatus != null and bo.payStatus != ''">
             AND t.pay_status = #{bo.payStatus}
@@ -125,6 +128,9 @@
         <if test = "bo.endTime != null and bo.endTime != ''">
             AND t.create_date &lt;= STR_TO_DATE(#{bo.endTime}, '%Y-%m-%d %H:%i:%s')
         </if>
+        <if test="bo.personName != null and bo.personName != ''">
+            AND t.name like CONCAT('%', #{bo.personName} , '%')
+        </if>
         GROUP BY
             t2.raise_record_id
         ORDER BY

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -212,6 +212,12 @@ FROM
             <if test="sex != null and sex !=''">
                 and a.sex = #{sex}
             </if>
+            <if test="startCreateDate != null and startCreateDate !=''">
+                and a.create_Date >= #{startCreateDate}
+            </if>
+            <if test="endCreateDate != null and endCreateDate !=''">
+                and a.create_Date  &lt;= #{endCreateDate}
+            </if>
             <if test="personBuildingList != null and personBuildingList.size > 0">
                 AND a.building_id in
                 <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
@@ -264,6 +270,12 @@ FROM
             <if test="sex != null and sex !=''">
                 and b.sex = #{sex}
             </if>
+            <if test="startCreateDate != null and startCreateDate !=''">
+                and b.create_Date >= #{startCreateDate}
+            </if>
+            <if test="endCreateDate != null and endCreateDate !=''">
+                and b.create_Date  &lt;= #{endCreateDate}
+            </if>
             <if test="consultTel != null and consultTel !=''">
                 and b.tel like CONCAT('%',#{consultTel}, '%')
             </if>
@@ -537,15 +549,23 @@ FROM
           if(b.gender = 1, '男', if(b.gender = 2, '女', '未知')) as sex
         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 td_wx_dict d on r.scene_id = d.scene_id
         <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="buildingId != null and buildingId !=''">
+                AND r.building_id = #{buildingId}
+            </if>
             <if test="tel != null and tel!=''">
                 and b.phone like CONCAT('%',#{tel}, '%')
             </if>
+            <if test="sceneType !=null and sceneType !=''">
+                and d.scene_type = #{sceneType}
+            </if>
             <if test="entryType != null and entryType !=''">
                 and b.entry_type = #{entryType}
             </if>
@@ -636,8 +656,9 @@ FROM
         LEFT JOIN ta_person b ON a.realty_consultant = b.person_id
         LEFT JOIN ta_person c ON a.realty_consultant = c.user_id
         LEFT JOIN ta_user d on d.user_id = a.realty_consultant
-        LEFT JOIN ta_person_from_record p ON a.person_id = p.person_id AND p.is_first_time = 1
+        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
         <where>
             a.status > 0
             and a.verify_status = 1
@@ -679,6 +700,9 @@ FROM
                     #{personBuilding.buildingId}
                 </foreach>
             </if>
+            <if test="sceneType !=null and sceneType !=''">
+                and p.scene_type = #{sceneType}
+            </if>
         </where>
         group by a.customer_id,a.building_id
         order by a.create_date desc

src/main/resources/mapper/TaSalesBatchMapper.xml

@@ -30,12 +30,13 @@
             </foreach>
         </if>
         ORDER BY
-          a.create_date DESC
+          t.create_date DESC
     </select>
 
     <select id="countPreSelectRecord" resultType="java.lang.Integer">
         select count(*) from ta_preselection_record t
         where t.org_id = #{orgId}
+        and t.status != -1
         and t.sales_batch_id in
         <foreach collection="taSalesBatchList" item="taSalesBatch" open="(" close=")" separator=",">
             #{taSalesBatch.salesBatchId}

src/main/resources/mapper/TaUserMapper.xml

@@ -34,6 +34,9 @@
             <if test="channelId != null and channelId != ''">
                 and n.channel_id = #{channelId}
             </if>
+            <if test="miniAppName != null and miniAppName != ''">
+                and m.name like CONCAT('%', #{miniAppName}, '%')
+            </if>
     </select>
 
     <select id="getTagsList" resultType="com.huiju.estateagents.center.taUser.entity.TaTags">
@@ -80,6 +83,9 @@
             <if test="taUser.isConsultant != null and taUser.isConsultant != '' or taUser.isConsultant ==0">
                 and t.is_consultant = #{taUser.isConsultant}
             </if>
+            <if test="taUser.buildingId != null and taUser.buildingId != ''">
+                and b.building_id = #{taUser.buildingId}
+            </if>
             <if test="personBuildingList != null and personBuildingList.size > 0">
                 AND b.building_id in
                 <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">