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

pom.xml

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

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

@@ -14,17 +14,8 @@ import com.huiju.estateagents.center.taUser.service.ITaUserService;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.MD5Utils;
 import com.huiju.estateagents.common.StringUtils;
-import com.huiju.estateagents.entity.TaMiniapp;
-import com.huiju.estateagents.entity.TaMiniappTemplate;
-import com.huiju.estateagents.entity.TaOrg;
-import com.huiju.estateagents.entity.TaPerson;
-import com.huiju.estateagents.entity.TaPersonBuilding;
-import com.huiju.estateagents.mapper.TaMiniappMapper;
-import com.huiju.estateagents.mapper.TaMiniappTemplateMapper;
-import com.huiju.estateagents.mapper.TaOrgMapper;
-import com.huiju.estateagents.mapper.TaPersonBuildingMapper;
-import com.huiju.estateagents.mapper.TaPersonMapper;
-import org.checkerframework.checker.units.qual.A;
+import com.huiju.estateagents.entity.*;
+import com.huiju.estateagents.mapper.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -66,6 +57,9 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 	
 	@Autowired
 	private TaUserRoleMapper taUserRoleMapper;
+
+	@Autowired
+	private TdPointsRulesMapper tdPointsRulesMapper;
 	
 	@Override
 	public IPage<Map<String,Object>> getPageList(IPage pg) {
@@ -103,6 +97,18 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 			throw new Exception("生成用户公司信息失败");
 		}
 
+		// 插入积分, 默认全部 1 积分
+		List<TdPointsRules> pointsRules = tdPointsRulesMapper.getTPLRules();
+		if (pointsRules != null) {
+			for (int i = 0; i < pointsRules.size(); i ++) {
+				TdPointsRules rule = pointsRules.get(i);
+				rule.setOrgId(taOrg.getOrgId());
+				rule.setStatus(CommConstant.STATUS_NORMAL);
+				rule.setPointsAmount(1);	// 默认1积分
+				tdPointsRulesMapper.insert(rule);
+			}
+		}
+
 		taUser.setOrgId(taOrg.getOrgId());
 		taUser.setIsAdmin(true);
 		taUser.setLoginPassword(MD5Utils.md5(taUser.getLoginPassword()));

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

@@ -447,4 +447,9 @@ public class CommConstant {
      * 必须存在表   td_miniapp_template_type 中
      */
     public static final String MINIAPP_TPL_GROUP = "group-result";
+    
+    /**
+     * 活动以结束
+     */
+    public static final Integer ACTIVITY_STATUS_FINISH = 2;
 }

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

@@ -6,6 +6,7 @@ import com.huiju.estateagents.common.AliOSSUtils;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.SMSUtils;
 import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.service.ITdMiniappTemplateTypeService;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -23,6 +24,9 @@ public class CommonController {
     @Autowired
     SMSUtils smsUtils;
 
+    @Autowired
+    ITdMiniappTemplateTypeService iTdMiniappTemplateTypeService;
+
     /**
      * 图片上传
      * @param multipartFile
@@ -74,6 +78,11 @@ public class CommonController {
         }
     }
 
+    @GetMapping("/center/dict/templateType")
+    public ResponseBean getAllTplTypes() {
+        return ResponseBean.success(iTdMiniappTemplateTypeService.getAllTypes());
+    }
+
     @GetMapping("/wx/awesome/dict/{typeFor}")
     public ResponseBean dicts(@PathVariable String typeFor) {
 

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

@@ -512,9 +512,8 @@ public class HelpActivityController extends BaseController {
     })
     @RequestMapping(value = "/wx/helpActivityAndGroup", method = RequestMethod.GET)
     public ResponseBean wxhelpActivityAndGroup(HttpServletRequest request,
-                                               @RequestParam(value = "buildingId",required = false) String buildingId,
-                                               @RequestParam(value = "type",required = false)Integer type) {
-            ResponseBean lsit = taHelpActivityService.wxhelpActivityAndGroup(getOrgId(request),type,buildingId);
+                                               @RequestParam(value = "buildingId",required = false) String buildingId) {
+            ResponseBean lsit = taHelpActivityService.wxhelpActivityAndGroup(getOrgId(request),buildingId);
                 return lsit;
         }
 

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

@@ -6,9 +6,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.entity.HelpActivity;
 import com.huiju.estateagents.entity.HelpInitiateRecord;
+import com.huiju.estateagents.entity.HelpRecord;
 import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.service.IHelpActivityService;
 import com.huiju.estateagents.service.IHelpInitiateRecordService;
+import com.huiju.estateagents.service.IHelpRecordService;
 import com.huiju.estateagents.service.ITaPersonService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -23,7 +27,10 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -44,8 +51,13 @@ public class HelpInitiateRecordController extends BaseController {
     
     @Autowired
     private ITaPersonService taPersonService;
-
-
+    
+    @Autowired
+    public IHelpRecordService helpRecordService;
+    
+    @Autowired
+    public IHelpActivityService taHelpActivityService;
+    
     /**
      * 分页查询列表
      * @param pageNum
@@ -164,7 +176,7 @@ public class HelpInitiateRecordController extends BaseController {
      * @return
      */
     @RequestMapping(value="/wx/helpInitiateRecord",method= RequestMethod.GET)
-    public ResponseBean wxhelpInitiateRecordList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNumber,
+    public ResponseBean wxhelpInitiateRecordList(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
                                                  @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                                  HttpServletRequest request){
         String openid = getOpenId(request);
@@ -202,6 +214,14 @@ public class HelpInitiateRecordController extends BaseController {
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
         }
         TaPerson person = taPersons.get(0);
+        Map<String,Object> map = new HashMap<>();
+        HelpActivity helpActivity = taHelpActivityService.getById(helpInitiateRecord.getHelpActivityId());
+        if(helpActivity.getActivityStatus().equals(CommConstant.ACTIVITY_STATUS_FINISH)){
+            return ResponseBean.error("活动已结束", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        if(helpActivity.getStatus().equals(CommConstant.STATUS_UNACCALIMED)){
+            return ResponseBean.error("活动已失效", ResponseBean.ERROR_UNAVAILABLE);
+        }
         try {
  
             //查看是否发起过助力
@@ -212,7 +232,14 @@ public class HelpInitiateRecordController extends BaseController {
             helpInitiateRecordQueryWrapper.ne("status",-1);
             HelpInitiateRecord recordServiceOne = taHelpInitiateRecordService.getOne(helpInitiateRecordQueryWrapper);
             if (null != recordServiceOne){
-                responseBean.addSuccess(recordServiceOne);
+                map.put("helpInitiateRecord",recordServiceOne);
+                QueryWrapper<HelpRecord> helpRecordQueryWrapper = new QueryWrapper<>();
+                helpRecordQueryWrapper.eq("help_activity_id",helpInitiateRecord.getHelpActivityId());
+                helpRecordQueryWrapper.eq("org_id",orgId);
+                helpRecordQueryWrapper.eq("help_record_initiate_id",recordServiceOne.getHelpRecordInitiateId());
+                List<HelpRecord> list = helpRecordService.list(helpRecordQueryWrapper);
+                map.put("helpRecordList",list);
+                responseBean.addSuccess(map);
                 return responseBean;
             }
  
@@ -222,7 +249,9 @@ public class HelpInitiateRecordController extends BaseController {
             helpInitiateRecord.setOrgId(orgId);
             helpInitiateRecord.setStatus(1);
             if (taHelpInitiateRecordService.save(helpInitiateRecord)){
-                responseBean.addSuccess(helpInitiateRecord);
+                map.put("helpInitiateRecord",helpInitiateRecord);
+                map.put("helpRecordList",new ArrayList<>());
+                responseBean.addSuccess(map);
             }else {
                 responseBean.addError("fail");
             }

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

@@ -197,7 +197,6 @@ public class MiniAppController extends BaseController {
                     taSharePersonFrom.setIsFirstTime(true);
                 }
                 taSharePersonFromService.save(taSharePersonFrom);
-
             }
 
             taPerson.setPassword(null);

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

@@ -161,7 +161,7 @@ public class TaBuildingDynamicController extends BaseController {
                 return responseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
             }
             TaPerson person = taPersons.get(0);
-            responseBean.addSuccess(iBuildingDynamicService.getJoinedActivity(pageNumber,pageSize,"",person));
+            responseBean.addSuccess(iBuildingDynamicService.getJoinedActivity(pageNumber,pageSize,"",person,orgId));
         }else {
             responseBean = iBuildingDynamicService.getWxBuildingDynamiceList(pageNumber,pageSize,buildingId,openid,cityId,orgId);
         }

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

@@ -12,6 +12,7 @@ import com.huiju.estateagents.event.EventBus;
 import com.huiju.estateagents.service.ITaDocumentImgService;
 import com.huiju.estateagents.service.ITaDocumentVerifyService;
 import com.huiju.estateagents.service.ITaPersonService;
+import io.swagger.models.auth.In;
 import org.apache.ibatis.annotations.Param;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -110,11 +111,11 @@ public class TaDocumentVerifyController extends BaseController {
 
     /**
      * 保存对象
-     * @param list List<TaDocumentImg>
+     * @param documentVerify List<TaDocumentImg>
      * @return
      */
     @RequestMapping(value="/wx/documentVerify",method= RequestMethod.POST)
-    public ResponseBean wxDocumentVerifyAdd(@RequestBody List<TaDocumentImg>list,@RequestParam(value ="documentTitle",required = false)String documentTitle, HttpServletRequest request){
+    public ResponseBean wxDocumentVerifyAdd(@RequestBody TaDocumentVerify documentVerify, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         Integer orgId = getOrgId(request);
         String openid = getOpenId(request);
@@ -123,13 +124,12 @@ public class TaDocumentVerifyController extends BaseController {
             return responseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
         }
         TaPerson person = taPersons.get(0);
-        TaDocumentVerify documentVerify = new TaDocumentVerify();
         documentVerify.setCreateDate(LocalDateTime.now());
         documentVerify.setOrgId(orgId);
         documentVerify.setPersonId(person.getPersonId());
         documentVerify.setStatus(CommConstant.STATUS_NORMAL);
         documentVerify.setVerifyStatus(CommConstant.VERIFY_READY);
-        documentVerify.setDocumentTitle(documentTitle);
+        List<TaDocumentImg>list = documentVerify.getImgList();
         try {
             if (iTaDocumentVerifyService.save(documentVerify)){
                 for(int i =0; i<list.size();i++){
@@ -200,13 +200,11 @@ public class TaDocumentVerifyController extends BaseController {
     /**
      * 微信修改对象
      * @param id  实体ID
-     * @param list List<TaDocumentImg>
      * @return
      */
     @RequestMapping(value="/wx/documentVerify/{id}",method= RequestMethod.PUT)
     public ResponseBean wxDocumentVerifyUpdate(@PathVariable Integer id,
-                                               @RequestBody List<TaDocumentImg>list,
-                                               @RequestParam(value ="documentTitle",required = false)String documentTitle,
+                                               @RequestBody TaDocumentVerify documentVerify,
                                                HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         Integer orgId = getOrgId(request);
@@ -216,11 +214,9 @@ public class TaDocumentVerifyController extends BaseController {
             return responseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
         }
         TaPerson person = taPersons.get(0);
-        TaDocumentVerify documentVerify = iTaDocumentVerifyService.getById(id);
+        documentVerify.setDocumentVerifyId(id);
         documentVerify.setVerifyStatus(CommConstant.VERIFY_READY);
-        if(!StringUtils.isEmpty(documentTitle)){
-            documentVerify.setDocumentTitle(documentTitle);
-        }
+        List<TaDocumentImg>list = documentVerify.getImgList();
         try {
             if (iTaDocumentVerifyService.updateById(documentVerify)){
                 QueryWrapper<TaDocumentImg>queryWrapper = new QueryWrapper<>();
@@ -258,9 +254,8 @@ public class TaDocumentVerifyController extends BaseController {
                                              HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         if (documentVerify.getVerifyStatus().equals(CommConstant.STATUS_NORMAL)){
-            String personId = getPersonId(request);
-            TaPerson person = taPersonService.getById(personId);
-            documentVerify.setVerifyUser(person.getUserId().toString());
+            Integer userId = getUserId(request);
+            documentVerify.setVerifyUser(userId.toString());
         }
         try {
             documentVerify.setDocumentVerifyId(id);
@@ -294,7 +289,7 @@ public class TaDocumentVerifyController extends BaseController {
     @RequestMapping(value="/admin/documentVerify/{id}",method= RequestMethod.GET)
     public ResponseBean documentVerifyGet(@PathVariable String id,
                                           @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                          @RequestParam(value ="pageSize",defaultValue = "5") Integer pageSize,
                                           HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {

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

@@ -128,10 +128,13 @@ public class TaPersonController extends BaseController {
             person.setDepartment(user.getDepartment());
             person.setPost(user.getPosition());
             person.setPhoto(user.getPhoto());
+            if(StringUtils.isEmpty(person.getPhone())){
+                person.setPhone(user.getPhone());
+            }
             taPersonService.updateById(person);
             responseBean.addSuccess(person);
         }else {
-            responseBean.addError("手机号不存在。");
+            responseBean.addError("此手机号未录入到后台系统，请联系营销云管理员。");
         }
         return responseBean;
     }

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

@@ -285,7 +285,7 @@ public class TaShareRecordController extends BaseController {
      * @return
      */
     @RequestMapping(value="/wx/taShareRecord",method= RequestMethod.GET)
-    public ResponseBean wxShareRecordList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNumber,
+    public ResponseBean wxShareRecordList(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
                                                  @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                                  HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();

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

@@ -1,8 +1,5 @@
 package com.huiju.estateagents.entity;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
 import java.io.Serializable;
 import java.time.LocalDateTime;
 
@@ -15,8 +12,7 @@ import java.time.LocalDateTime;
  * @since 2019-10-23
  */
 @Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
+
 public class TaDocumentVerifyModel implements Serializable {
 
     private static final long serialVersionUID = 1L;

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

@@ -176,6 +176,9 @@ public class TaRecommendCustomer implements Serializable {
     @TableField(exist = false)
     private String recommendTel;
 
+    @TableField(exist = false)
+    private String intentionName;
+
     /**
      * 推广人
      */

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

@@ -0,0 +1,27 @@
+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;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TdMiniappTemplateType  implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @TableId(value = "code", type = IdType.INPUT)
+    private String code;
+
+    private String name;
+    private String remark;
+    private LocalDateTime createDate;
+}

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

@@ -40,9 +40,10 @@ public interface HelpActivityMapper extends BaseMapper<HelpActivity> {
     /**
      * 微信端查询拼团和助力推首页的活动的
      * @param orgId
+     * @param buildingId
      * @return
      */
-    List<HelpActivity> selectWxhelpActivityAndGroup(Integer orgId);
+    List<HelpActivity> selectWxhelpActivityAndGroup(@Param("orgId")Integer orgId,@Param("buildingId") String buildingId);
 
     /**
      * 列表 已开始 和 未开始

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

@@ -0,0 +1,9 @@
+package com.huiju.estateagents.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.TdMiniappTemplateType;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TdMiniappTemplateTypeMapper extends BaseMapper<TdMiniappTemplateType> {
+}

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

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.entity.TdPointsRules;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * <p>
  * 积分获取规则字典表  Mapper 接口
@@ -15,4 +17,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TdPointsRulesMapper extends BaseMapper<TdPointsRules> {
 
+    List<TdPointsRules> getTPLRules();
 }

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

@@ -130,7 +130,7 @@ public interface IHelpActivityService extends IService<HelpActivity> {
      * @param orgId
      * @return
      */
-    ResponseBean wxhelpActivityAndGroup(Integer orgId,Integer type,String buildingId);
+    ResponseBean wxhelpActivityAndGroup(Integer orgId,String buildingId);
 
     /**
      * 列表  已开始 和 未开始

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

@@ -83,7 +83,7 @@ public interface ITaBuildingDynamicService extends IService<TaBuildingDynamic> {
      */
     ResponseBean signList(Page<TaActivityDynamicEnlist> page,String dynamicId, Integer orgId,String isCheckin,String name,String phone);
 
-    IPage<TaBuildingDynamic> getJoinedActivity(int pageNumber, int pageSize, String building, TaPerson person);
+    IPage<TaBuildingDynamic> getJoinedActivity(int pageNumber, int pageSize, String building, TaPerson person,Integer orgId);
 
     void setExtendInfo(TaBuildingDynamic taBuildingDynamic, TaPerson taPerson);
 

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

@@ -0,0 +1,10 @@
+package com.huiju.estateagents.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.TdMiniappTemplateType;
+
+import java.util.List;
+
+public interface ITdMiniappTemplateTypeService extends IService<TdMiniappTemplateType> {
+    public List<TdMiniappTemplateType> getAllTypes();
+}

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

@@ -207,28 +207,10 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
     }
 
     @Override
-    public ResponseBean wxhelpActivityAndGroup(Integer orgId,Integer type,String buildingId) {
+    public ResponseBean wxhelpActivityAndGroup(Integer orgId,String buildingId) {
         ResponseBean responseBean = new ResponseBean<>();
-        // 根据楼盘id查助力
-        if ("1".equals(type)){
-            QueryWrapper<HelpActivity> helpActivityQuery= new QueryWrapper<>();
-            helpActivityQuery.eq("building_id",buildingId);
-            helpActivityQuery.eq("org_id",orgId);
-            List<HelpActivity> list = taHelpActivityMapper.selectList(helpActivityQuery);
-            responseBean.addSuccess(list);
-            return responseBean;
-        }
-        // 根据楼盘id查拼团
-        if ("2".equals(type)){
-            QueryWrapper<TaShareActivity> taShareActivityQuery= new QueryWrapper<>();
-            taShareActivityQuery.eq("building_id",buildingId);
-            taShareActivityQuery.eq("org_id",orgId);
-            List<TaShareActivity> list = taShareActivityMapper.selectList(taShareActivityQuery);
-            responseBean.addSuccess(list);
-            return responseBean;
-        }
-
-        List<HelpActivity> HelpActivity = taHelpActivityMapper.selectWxhelpActivityAndGroup(orgId);
+        // buildingId 楼盘ID为空时首页只查置顶的活动，楼盘ID不为空查所有拼团和助力
+        List<HelpActivity> HelpActivity = taHelpActivityMapper.selectWxhelpActivityAndGroup(orgId,buildingId);
         responseBean.addSuccess(HelpActivity);
         return responseBean;
     }

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

@@ -3,6 +3,7 @@ package com.huiju.estateagents.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.HelpActivity;
 import com.huiju.estateagents.entity.HelpInitiateRecord;
@@ -76,6 +77,13 @@ public class HelpRecordServiceImpl extends ServiceImpl<HelpRecordMapper, HelpRec
 		if (helpActivity.getEndDate().isBefore(LocalDateTime.now())){
 			return ResponseBean.error("活动已超时", ResponseBean.ERROR_UNAVAILABLE);
 		}
+		if(helpActivity.getActivityStatus().equals(CommConstant.ACTIVITY_STATUS_FINISH)){
+			return ResponseBean.error("活动已结束", ResponseBean.ERROR_UNAVAILABLE);
+		}
+		if(helpActivity.getStatus().equals(CommConstant.STATUS_UNACCALIMED)){
+			return ResponseBean.error("活动已失效", ResponseBean.ERROR_UNAVAILABLE);
+		}
+		
 		//查看每个人的助力次数
 		Integer helpNum = helpActivity.getHelpNum();
 		

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

@@ -357,9 +357,10 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
     }
 
     @Override
-    public IPage<TaBuildingDynamic> getJoinedActivity(int pageNumber, int pageSize,String building,TaPerson person){
+    public IPage<TaBuildingDynamic> getJoinedActivity(int pageNumber, int pageSize,String building,TaPerson person,Integer orgId){
         QueryWrapper<TaActivityDynamicEnlist> activityDynamicEnlistQueryWrapper = new QueryWrapper<>();
         activityDynamicEnlistQueryWrapper.eq("phone",person.getPhone());
+        activityDynamicEnlistQueryWrapper.eq("org_id",orgId);
         if(!StringUtils.isEmpty(building)){
             activityDynamicEnlistQueryWrapper.eq("building_id",building);
         }

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

@@ -87,8 +87,22 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         Page<TaBuilding> page = new Page<>();
         page.setSize(pageSize == null ? 10 : pageSize);
         page.setCurrent(pageNum == null ? 1 : pageNum);
-        List<TaBuilding> building = taBuildingMapper.buildingList(page, name, code,startDate,buildingStatus,marketStatus,cityId,isMain, orgId);
-        page.setRecords(building);
+
+        List<TaBuilding> buildings = taBuildingMapper.buildingList(page, name, code,startDate,buildingStatus,marketStatus,cityId,isMain, orgId);
+
+        if (null != buildings) {
+            for(TaBuilding taBuilding: buildings) {
+                //查询当前图片
+                QueryWrapper<TaBuildingImg> queryWrapper = new QueryWrapper<>();
+                queryWrapper.eq("building_id", taBuilding.getBuildingId());
+                queryWrapper.eq("img_type", "banner");
+                queryWrapper.orderByAsc("create_date");
+                List<TaBuildingImg> buildingImg = taBuildingImgMapper.selectList(queryWrapper);
+                taBuilding.setBuildingImg(buildingImg);
+            }
+        }
+
+        page.setRecords(buildings);
 
         return ResponseBean.success(page);
     }

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

@@ -133,6 +133,12 @@ public class TaShareChildRecordServiceImpl extends ServiceImpl<TaShareChildRecor
         if (taShareActivity.getEndTime().isBefore(LocalDateTime.now())){
             return ResponseBean.error("活动已超时", ResponseBean.ERROR_UNAVAILABLE);
         }
+        if(taShareActivity.getActivityStatus().equals(CommConstant.ACTIVITY_STATUS_FINISH)){
+            return ResponseBean.error("活动已结束", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        if(taShareActivity.getStatus().equals(CommConstant.STATUS_UNACCALIMED)){
+            return ResponseBean.error("活动已失效", ResponseBean.ERROR_UNAVAILABLE);
+        }
         
         //查看这个人是否是团员
         QueryWrapper<TaShareChildRecord> taShareChildRecordQueryWrapper = new QueryWrapper<>();

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaShareActivity;
 import com.huiju.estateagents.entity.TaShareChildRecord;
@@ -23,7 +24,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -181,15 +185,28 @@ public class TaShareRecordServiceImpl extends ServiceImpl<TaShareRecordMapper, T
      */
     @Override
     public ResponseBean saveShareRecord(TaShareRecord taShareRecord, Integer orgId, TaPerson person) {
+        Map<String,Object> map = new HashMap<>();
         TaShareActivity taShareActivity = activityMapper.selectTaShareActivityById(taShareRecord.getGroupActivityId());
-    
+        if(taShareActivity.getActivityStatus().equals(CommConstant.ACTIVITY_STATUS_FINISH)){
+            return ResponseBean.error("活动已结束", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        if(taShareActivity.getStatus().equals(CommConstant.STATUS_UNACCALIMED)){
+            return ResponseBean.error("活动已失效", ResponseBean.ERROR_UNAVAILABLE);
+        }
         QueryWrapper<TaShareRecord> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("person_id", taShareRecord.getPersonId());
         queryWrapper.eq("group_activity_id",taShareRecord.getGroupActivityId());
         TaShareRecord record = taShareRecordMapper.selectOne(queryWrapper);
     
         if (record != null){
-            return ResponseBean.error("您已经发起拼团，请勿再次发起，加入好友的拼团吧",ResponseBean.ERROR_UNAVAILABLE);
+            map.put("record",record);
+            QueryWrapper<TaShareChildRecord> taShareChildRecordQueryWrapper = new QueryWrapper<>();
+            taShareChildRecordQueryWrapper.eq("group_activity_id",taShareRecord.getGroupActivityId());
+            taShareChildRecordQueryWrapper.eq("org_id",orgId);
+            taShareChildRecordQueryWrapper.eq("record_id",record.getRecordId());
+            List<TaShareChildRecord> shareChildRecordList = taShareChildRecordMapper.selectList(taShareChildRecordQueryWrapper);
+            map.put("shareChildRecordList",shareChildRecordList);
+            return ResponseBean.success(map);
         }
         if (null == taShareActivity.getIntegral()){
             taShareActivity.setIntegral(0);
@@ -207,6 +224,8 @@ public class TaShareRecordServiceImpl extends ServiceImpl<TaShareRecordMapper, T
         taShareRecord.setCreateTime(LocalDateTime.now());
         taShareRecord.setStatus(1);
         taShareRecordMapper.insert(taShareRecord);
-        return ResponseBean.success(taShareRecord);
+        map.put("record",taShareRecord);
+        map.put("shareChildRecordList",new ArrayList<>());
+        return ResponseBean.success(map);
     }
 }

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

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.entity.TdMiniappTemplateType;
+import com.huiju.estateagents.mapper.TdMiniappTemplateTypeMapper;
+import com.huiju.estateagents.service.ITdMiniappTemplateTypeService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class TdMiniappTemplateTypeServiceImpl extends ServiceImpl<TdMiniappTemplateTypeMapper, TdMiniappTemplateType> implements ITdMiniappTemplateTypeService {
+    @Override
+    public List<TdMiniappTemplateType> getAllTypes() {
+        QueryWrapper<TdMiniappTemplateType> queryWrapper = new QueryWrapper<>();
+        queryWrapper.orderByAsc("create_date");
+        return this.list(queryWrapper);
+    }
+}

src/main/resources/mapper/HelpActivityMapper.xml

@@ -60,8 +60,14 @@
 				1 AS type
 			FROM
 				ta_help_activity a
-				WHERE a.is_main = 1
-				and org_id =#{orgId}
+				WHERE
+                  org_id =#{orgId}
+                <if test="buildingId  == null ">
+                  and  a.is_main = 1
+                </if>
+                <if test="buildingId != null and buildingId != ''">
+                  and a.building_id = #{buildingId}
+                </if>
 		)
 		UNION ALL
 			(
@@ -71,8 +77,14 @@
 					2 AS type
 				FROM
 					ta_share_activity s
-					WHERE s.sort = 1
-					and org_id =#{orgId}
+					WHERE
+                        org_id =#{orgId}
+                <if test="buildingId  == null ">
+                    and  s.sort = 1
+                </if>
+                <if test="buildingId != null and buildingId != ''">
+                    and s.building_id = #{buildingId}
+                </if>
 			)
     </select>
 

src/main/resources/mapper/TaPersonIntentionRecordMapper.xml

@@ -34,5 +34,6 @@
             </trim>
         GROUP BY
             tpir.person_id, tpir.building_id
+        ORDER BY SUM(tpir.intention) DESC
     </select>
 </mapper>

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -106,10 +106,12 @@ FROM
         a.*,
         a.customer_id AS customerId,
         b.NAME AS consultantName,
-        b.tel AS consultTel
+        b.tel AS consultTel,
+        c.building_name as intentionName
         FROM
         ta_recommend_customer a
         LEFT JOIN ta_person b ON a.realty_consultant = b.person_id
+        LEFT JOIN ta_building c ON a.building_id = c.building_id
         <where>
             a.status > 0
             and a.report_recommend_status = 1

src/main/resources/mapper/TdMiniappTemplateTypeMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huiju.estateagents.mapper.TdMiniappTemplateTypeMapper">
+
+</mapper>

src/main/resources/mapper/TdPointsRulesMapper.xml

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.mapper.TdPointsRulesMapper">
-
+    <select id="getTPLRules" resultType="com.huiju.estateagents.entity.TdPointsRules">
+        select * from td_points_rules where org_id = -1
+    </select>
 </mapper>