customer &records

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.huiju</groupId>
 	<artifactId>estateagents</artifactId>
-	<version>v0.0.2</version>
+	<version>v0.1.0</version>
 	<name>estateagents</name>
 	<description>置业经纪人</description>
 
@@ -166,6 +166,7 @@
 				<includes>
 					<include>application.yml</include>
 					<include>application-${profiles.active}.yml</include>
+					<include>mapper/*.xml</include>
 				</includes>
 			</resource>
 		</resources>

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

@@ -63,6 +63,21 @@ public class CommConstant {
      * 兑换商品
      */
     public final static String POINTS_CHANGE_GOODS = "goods";
+    
+    /**
+     * 签到
+     */
+    public final static String POINTS_CHECKIN = "checkin";
+    
+    /**
+     * 分享
+     */
+    public final static String POINTS_SHARE = "share";
+    
+    /**
+     * 授权
+     */
+    public final static String POINTS_AUTHORIZE = "authorize";
 
 
     /**
@@ -77,9 +92,66 @@ public class CommConstant {
      * 未领取
      */
     public static final Integer STATUS_UNACCALIMED = 0;
+    
+    /**
+     * 成功
+     */
+    public static final String SUCCESS = "success";
+
+
+
+    /**
+     * 活动的当前状态1:进行中
+     */
+    public static final Integer ACTIVITY_CONDITION_ONE = 1;
+
+    /**
+     * 活动的当前状态2:未开始
+     */
+    public static final Integer ACTIVITY_CONDITION_TWO = 2;
+
+    /**
+     * 活动的当前状态3:结束
+     */
+    public static final Integer ACTIVITY_CONDITION_ONE_THREE = 3;
 
+    //=================  首屏广告 / 轮播图 start =======================
 
+    /**
+     * 首页轮播图类型_活动
+     */
+    public static final String CAROUSEL_ACTIVITY = "activity";
+
+    /**
+     * 首页 轮播图/广告 类型_项目
+     */
+    public static final String CAROUSEL_PROJECT = "project";
 
+    /**
+     * 首页轮播图类型_资讯
+     */
+    public static final String CAROUSEL_NEWS = "news";
+
+    /**
+     * 打开放式_开屏
+     */
+    public static final String OPEN_SCREEN = "screen";
+
+    /**
+     * 打开放式_首页轮播图
+     */
+    public static final String CAROUSEL = "banner";
+
+    /**
+     * 首屏广告_发布位置——商城
+     */
+    public static final String MALL = "mall";
+
+    /**
+     * 首屏广告_发布位置——首页
+     */
+    public static final String BANNER_INDEX = "index";
 
+    //=================  首屏广告 / 轮播图 end =======================
 
 }

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

@@ -0,0 +1,144 @@
+package com.huiju.estateagents.controller;
+
+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.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.ExtendContent;
+import com.huiju.estateagents.service.IExtendContentService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+    * 辅助内容表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-07-25
+ */
+@RestController
+@RequestMapping("/api")
+public class ExtendContentController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(ExtendContentController.class);
+
+    @Autowired
+    public IExtendContentService iExtendContentService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/extendContent",method= RequestMethod.GET)
+    public ResponseBean extendContentList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+            IPage<ExtendContent> pg = new Page<>(pageNum, pageSize);
+            IPage<ExtendContent> result = iExtendContentService.page(pg);
+            responseBean.addSuccess(result);
+            return responseBean;
+    }
+
+    /**
+     * 微信 开屏 / 轮播图
+     */
+    @RequestMapping(value="/wx/extendContent/{showType}",method= RequestMethod.GET)
+    public ResponseBean extendContentListShowType(@PathVariable(value = "showType") String showType,
+                                                  @RequestParam(value = "showPosition", required = false) String showPosition,
+                                                  @RequestParam(value = "targetId", required = false) String targetId,
+                                                  @RequestParam(value = "contentType", required = false) String contentType,
+                                                  @RequestParam(value = "buildingId", required = false) String buildingId,
+                                                  @RequestParam(value = "contentId", required = false) String contentId){
+        ResponseBean responseBean= iExtendContentService.selectExtendContentListShowType(showType, showPosition, targetId,contentType, buildingId, contentId);
+        return responseBean;
+    }
+
+
+    /**
+     * 保存对象
+     * @param extendContent 实体对象
+     * @return
+     */
+    @RequestMapping(value="/extendContent",method= RequestMethod.POST)
+    public ResponseBean extendContentAdd(@RequestBody ExtendContent extendContent){
+        ResponseBean  responseBean= iExtendContentService.extendContentAdd(extendContent);
+          responseBean.addSuccess(extendContent);
+          return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/extendContent/{id}", method= RequestMethod.DELETE)
+    public ResponseBean extendContentDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iExtendContentService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("extendContentDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param extendContent 实体对象
+     * @return
+     */
+    @RequestMapping(value="/extendContent/{id}",method= RequestMethod.PUT)
+    public ResponseBean extendContentUpdate(@PathVariable Integer id,
+                                        @RequestBody ExtendContent extendContent){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iExtendContentService.updateById(extendContent)){
+                responseBean.addSuccess(extendContent);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("extendContentUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/extendContent/{id}",method= RequestMethod.GET)
+    public ResponseBean extendContentGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iExtendContentService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("extendContentDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -5,7 +5,10 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.JWTUtils;
+import com.huiju.estateagents.entity.TaActivityDynamicEnlist;
 import com.huiju.estateagents.entity.TaBuildingDynamic;
+import com.huiju.estateagents.mapper.TaActivityDynamicEnlistMapper;
 import com.huiju.estateagents.service.ITaBuildingDynamicService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.propertyeditors.CustomDateEditor;
@@ -14,6 +17,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
+import javax.swing.*;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
@@ -57,18 +61,50 @@ public class TaBuildingDynamicController extends BaseController {
         return responseBean;
     }
 
+    /**
+     * 活动列表
+     * @param pageNum
+     * @param pageSize
+     * @param request
+     * @return
+     */
     @RequestMapping(value = "/wx/buildingDynamiceList", method = RequestMethod.GET)
-    public ResponseBean wxBuildingDynamiceList(@RequestParam("pageNum")Integer pageNum, @RequestParam("pageSize")Integer pageSize, HttpSession session){
-        ResponseBean  responseBean = iBuildingDynamicService.getWxBuildingDynamiceList(pageNum,pageSize);
+    public ResponseBean wxBuildingDynamiceList(@RequestParam(value = "buildingId")Integer buildingId,
+                                               @RequestParam(value = "pageNum",defaultValue = "1")Integer pageNum,
+                                               @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize,
+                                               HttpServletRequest request){
+        ResponseBean  responseBean = iBuildingDynamicService.getWxBuildingDynamiceList(pageNum,pageSize,buildingId);
         return responseBean;
     }
 
+    /**
+     * 活动详情
+     * @param dynamicId
+     * @param buildingId
+     * @return
+     */
     @RequestMapping(value = "/wx/buildingDynamiceInfo/{dynamicId}", method = RequestMethod.GET)
-    public ResponseBean iBuildingDynamicInfo(@PathVariable(value = "dynamicId") String dynamicId, HttpSession session){
-        ResponseBean  responseBean = iBuildingDynamicService.getWxBuildingDynamiceInfo(dynamicId);
+    public ResponseBean iBuildingDynamicInfo(@PathVariable(value = "dynamicId") String dynamicId,
+                                             @RequestParam("buildingId")Integer buildingId){
+        ResponseBean  responseBean = iBuildingDynamicService.getWxBuildingDynamiceInfo(dynamicId,buildingId);
         return responseBean;
     }
 
+    /**
+     * 添加活动报名
+     * @param taActivityDynamicEnlist
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/wx/activityDynamicEnlistAdd", method = RequestMethod.POST)
+    public ResponseBean taActivityDynamicEnlist(@RequestBody TaActivityDynamicEnlist taActivityDynamicEnlist,
+                                                HttpServletRequest request){
+        String openid = JWTUtils.getSubject(request);
+        ResponseBean  responseBean = iBuildingDynamicService.taActivityDynamicEnlistAdd(taActivityDynamicEnlist);
+        return responseBean;
+    }
+
+
     @RequestMapping(value = "/admin/buildingDynamic/add" ,method =RequestMethod.POST)
     public  ResponseBean buildingDynamicAdd(@RequestBody String parameter){
         ResponseBean responseBean = new ResponseBean();

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

@@ -54,8 +54,9 @@ public class TaCheckinController extends BaseController {
      * @return
      */
     @RequestMapping(value="/taCheckin/activity/{activity}",method= RequestMethod.GET)
-    public ResponseBean taCheckinList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                      @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,String activity){
+    public ResponseBean taCheckinList(@PathVariable String activity,
+                                      @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                      @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
@@ -79,7 +80,7 @@ public class TaCheckinController extends BaseController {
      * @return
      */
     @RequestMapping(value="/wx/taCheckin/activity/{activity}",method= RequestMethod.POST)
-    public ResponseBean taCheckinAdd(@RequestBody String activity, HttpServletRequest request){
+    public ResponseBean taCheckinAdd(@PathVariable String activity, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         String openid = JWTUtils.getSubject(request);
         List<TaPerson> taPersons = iTaPersonService.getPersonsByOpenId(openid);

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

@@ -213,7 +213,11 @@ public class TaGoodsController extends BaseController {
             String openid = JWTUtils.getSubject(request);
             //兑换商品
             String state = iTaGoodsService.exchangeGoods(id,openid);
-            responseBean.addSuccess(null);
+            if (state.equals(CommConstant.SUCCESS)){
+                responseBean.addSuccess("兑换成功");
+            }else{
+                responseBean.addError(state);
+            }
         }catch (Exception e){
             e.printStackTrace();
             logger.error("taGoodsGet -=- {}",e.toString());

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

@@ -45,10 +45,10 @@ public class TaNewsController extends BaseController {
     @RequestMapping(value="/taNews",method= RequestMethod.GET)
     public ResponseBean taNewsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                    @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                   @RequestParam(value = "buildingId") Integer buildingId,
-                                   @RequestParam(value = "orgId") Integer orgId,
-                                   @RequestParam(value = "newsTypeId") Integer newsTypeId,
-                                   @RequestParam(value = "newsStatus") Integer newsStatus){
+                                   @RequestParam(value = "buildingId", required = false) String buildingId,
+                                   @RequestParam(value = "orgId", required = false) Integer orgId,
+                                   @RequestParam(value = "newsTypeId", required = false) Integer newsTypeId,
+                                   @RequestParam(value = "newsStatus", required = false) Integer newsStatus){
         ResponseBean responseBean = iTaNewsService.getList(pageNum, pageSize, buildingId, orgId, newsTypeId, newsStatus);
         return responseBean;
     }

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

@@ -45,7 +45,7 @@ public class TaNewsTypeController extends BaseController {
     @RequestMapping(value="/taNewsType",method= RequestMethod.GET)
     public ResponseBean taNewsTypeList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                        @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                       @RequestParam(value = "buildingId", required = false) Integer buildingId,
+                                       @RequestParam(value = "buildingId", required = false) String buildingId,
                                        @RequestParam(value = "orgId", required = false) Integer orgId){
         ResponseBean responseBean = iTaNewsTypeService.getList(pageNum, pageSize, buildingId, orgId);
         return responseBean;

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

@@ -5,7 +5,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 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.common.JWTUtils;
+import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaPointsRecords;
+import com.huiju.estateagents.service.ITaPersonService;
 import com.huiju.estateagents.service.ITaPointsRecordsService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -18,6 +22,9 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
 /**
  * <p>
     * 积分消费流水表  前端控制器
@@ -34,6 +41,9 @@ public class TaPointsRecordsController extends BaseController {
 
     @Autowired
     public ITaPointsRecordsService iTaPointsRecordsService;
+    
+    @Autowired
+    private ITaPersonService taPersonService;
 
 
     /**
@@ -146,4 +156,33 @@ public class TaPointsRecordsController extends BaseController {
         }
         return responseBean;
     }
+    
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/wx/taPointsRecords",method= RequestMethod.GET)
+    public ResponseBean wxPointsRecordsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                            HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            String openid = JWTUtils.getSubject(request);
+            TaPerson taPerson = taPersonService.getPersonsByOpenId(openid).get(0);
+            //使用分页插件
+            IPage<TaPointsRecords> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaPointsRecords> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("person_id",taPerson.getPersonId());
+            queryWrapper.orderByDesc("create_date");
+            IPage<TaPointsRecords> result = iTaPointsRecordsService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taPointsRecordsList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

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

@@ -0,0 +1,90 @@
+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 辅助内容表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-07-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("ta_extend_content")
+public class ExtendContent implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 内容ID
+     */
+    @TableId(value = "content_id", type = IdType.AUTO)
+    private Integer contentId;
+
+    /**
+     * 打开方式
+     */
+    private String showType;
+
+    /**
+     * 发布位置
+     */
+    private String showPosition;
+
+    /**
+     * 类型
+     */
+    private String contentType;
+
+    /**
+     * 链接ID
+     */
+    private String targetId;
+
+    /**
+     * 图片
+     */
+    private String image;
+
+    /**
+     * 自定义内容
+     */
+    private String content;
+
+    /**
+     * 内容标题
+     */
+    private String title;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 楼盘id
+     */
+    private String buildingId;
+
+
+}

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

@@ -0,0 +1,59 @@
+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;
+
+/**
+ * <p>
+ * 点赞表
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaActivityDynamicEnlist implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 报名ID
+     */
+    @TableId(value = "favor_id", type = IdType.AUTO)
+    private Integer enlist_id;
+
+    /**
+     * 活动ID
+     */
+    private String dynamic_id;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 楼盘id
+     */
+    private String building_id;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 手机号
+     */
+    private String phone;
+
+
+}

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

@@ -81,4 +81,43 @@ public class TaBuildingDynamic implements Serializable {
     @TableField(exist = false)
     private TaBuilding building;
 
+    /**
+     * 活动总开关判断活动是否能开始报名_1:可以，0:不可以
+     */
+    private  String isEnlist;
+
+    /**
+     * 活动开始时间
+     */
+    private LocalDateTime startDate;
+
+    /**
+     * 活动结束时间
+     */
+    private  LocalDateTime endDate;
+
+    /**
+     *  报名开始时间
+     */
+    private  LocalDateTime enlistStart;
+
+    /**
+     * 报名结束时间
+     */
+    private  LocalDateTime enlistEnd;
+
+    /**
+     * 活动的当前状态1:进行中，2:未开始,3:结束
+     */
+    @TableField(exist = false)
+    private  Integer activityCondition;
+
+    /**
+     * 报名总数
+     */
+    @TableField(exist = false)
+    private  int count;
+
+
+
 }

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

@@ -0,0 +1,19 @@
+package com.huiju.estateagents.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.ExtendContent;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 辅助内容表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-07-25
+ */
+@Mapper
+public interface ExtendContentMapper extends BaseMapper<ExtendContent> {
+}

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

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.TaActivityDynamicEnlist;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 楼盘户型对应图片表 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-10
+ */
+@Mapper
+public interface TaActivityDynamicEnlistMapper extends BaseMapper<TaActivityDynamicEnlist> {
+
+}

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

@@ -53,5 +53,4 @@ public interface TaBuildingDynamicMapper extends BaseMapper<TaBuildingDynamic> {
      */
     @Update("UPDATE ta_building_dynamic  SET ${field} = IFNULL(${field}, 0) + #{increment}  WHERE dynamic_id = #{newsId}")
     void setFieldNum(@Param("newsId") String newsId, @Param("field") String field, @Param("increment") int increment);
-
 }

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

@@ -0,0 +1,40 @@
+package com.huiju.estateagents.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.ExtendContent;
+
+/**
+ * <p>
+ * 辅助内容表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-07-25
+ */
+public interface IExtendContentService extends IService<ExtendContent> {
+
+    /**
+     * 添加当前
+     * @param extendContent
+     * @return
+     */
+    ResponseBean extendContentAdd(ExtendContent extendContent);
+
+    /**
+     * 根据状态查当前的轮播图
+     * @param contentType
+     * @param buildingId
+     * @return
+     */
+    @Deprecated
+    ResponseBean selectExtendContentList(String contentType, String buildingId);
+
+    /**
+     * 开屏
+     * @param contentType
+     * @param buildingId
+     * @return
+     */
+    ResponseBean selectExtendContentListShowType(String showType, String showPosition, String targetId, String contentType, String buildingId, String contentId);
+}

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

@@ -2,6 +2,7 @@ package com.huiju.estateagents.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaActivityDynamicEnlist;
 import com.huiju.estateagents.entity.TaBuildingDynamic;
 
 import java.util.HashMap;
@@ -33,14 +34,14 @@ public interface ITaBuildingDynamicService extends IService<TaBuildingDynamic> {
      * 微信小程序 项目动态管理列表
      * @return
      */
-    ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize);
+    ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize,Integer buildingId);
 
     /**
      * 微信小程序 项目详情
      * @param dynamicId
      * @return
      */
-    ResponseBean getWxBuildingDynamiceInfo(String dynamicId);
+    ResponseBean getWxBuildingDynamiceInfo(String dynamicId,Integer buildingId);
 
     /**
      * 动态管理添加
@@ -63,4 +64,9 @@ public interface ITaBuildingDynamicService extends IService<TaBuildingDynamic> {
      */
     ResponseBean buildingDynamicUpdate(HashMap<Object, Object> map);
 
+    /**
+     * 报名活动
+     * @return
+     */
+    ResponseBean taActivityDynamicEnlistAdd(TaActivityDynamicEnlist taActivityDynamicEnlist);
 }

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

@@ -24,7 +24,7 @@ public interface ITaNewsService extends IService<TaNews> {
      * @param newsTypeId
      * @return
      */
-    ResponseBean getList(Integer pageNum, Integer pageSize, Integer buildingId, Integer orgId, Integer newsTypeId, Integer newsStatus);
+    ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, Integer newsTypeId, Integer newsStatus);
 
     /**
      * 根据Id查询资讯数据

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

@@ -22,7 +22,7 @@ public interface ITaNewsTypeService extends IService<TaNewsType> {
      * @param orgId
      * @return
      */
-    ResponseBean getList(Integer pageNum, Integer pageSize, Integer buildingId, Integer orgId);
+    ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId);
 
     /**
      * 根据Id查询资讯类型数据

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

@@ -0,0 +1,79 @@
+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.entity.ExtendContent;
+import com.huiju.estateagents.mapper.ExtendContentMapper;
+import com.huiju.estateagents.service.IExtendContentService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 辅助内容表  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-07-25
+ */
+@Service
+public class ExtendContentServiceImpl extends ServiceImpl<ExtendContentMapper, ExtendContent> implements IExtendContentService {
+
+    @Autowired
+    private ExtendContentMapper extendContentMapper;
+    @Override
+    public ResponseBean extendContentAdd(ExtendContent extendContent) {
+        ResponseBean responseBean= new ResponseBean<>();
+        if ("1".equals(extendContent.getContentType())){
+            extendContent.setContentType(CommConstant.CAROUSEL_ACTIVITY);
+        }else if("2".equals(extendContent.getContentType())){
+            extendContent.setContentType(CommConstant.CAROUSEL_PROJECT);
+        }else if ("3".equals(extendContent.getContentType())){
+            extendContent.setContentType(CommConstant.CAROUSEL_NEWS);
+        }
+        extendContentMapper.insert(extendContent);
+        responseBean.addSuccess("成功");
+        return  responseBean;
+    }
+
+    @Override
+    @Deprecated
+    public ResponseBean selectExtendContentList(String contentType, String buildingId) {
+        ResponseBean responseBean = new ResponseBean<>();
+        // 查询轮播图
+        QueryWrapper<ExtendContent> extendContentQuery= new QueryWrapper<>();
+        // banner 或 screen(首屏广告) ,这里是 banner
+        extendContentQuery.eq("show_position",CommConstant.CAROUSEL);
+        // activity(活动) 或 project(项目) 或 news（咨迅）
+        extendContentQuery.eq("content_type",contentType);
+        extendContentQuery.eq("building_id",buildingId);
+        extendContentQuery.eq("status","1");
+        List<ExtendContent> taExtendContent = extendContentMapper.selectList(extendContentQuery);
+        responseBean.addSuccess(taExtendContent);
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean selectExtendContentListShowType(String showType, String showPosition, String targetId, String contentType, String buildingId, String contentId) {
+        ResponseBean responseBean= new ResponseBean<>();
+        // 开屏
+        QueryWrapper<ExtendContent> extendContentQuery= new QueryWrapper<>();
+        // banner 或 screen(首屏广告) ,这里是 screen
+        extendContentQuery.eq("show_type",showType);
+        extendContentQuery.eq(StringUtils.isNotBlank(showPosition), "show_position",showPosition);
+        extendContentQuery.eq(StringUtils.isNotBlank(targetId), "target_id",targetId);
+        extendContentQuery.eq(StringUtils.isNotBlank(contentId), "content_id",contentId);
+        // activity(活动) 或 project(项目) 或 news（咨迅）
+        extendContentQuery.eq(StringUtils.isNotBlank(contentType), "content_type",contentType);
+        extendContentQuery.eq(StringUtils.isNotBlank(buildingId), "building_id",buildingId);
+        extendContentQuery.eq("status","1");
+        ExtendContent taExtendContent = extendContentMapper.selectOne(extendContentQuery);
+        responseBean.addSuccess(taExtendContent);
+        return responseBean;
+    }
+}

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

@@ -6,8 +6,11 @@ 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.TaActivityDynamicEnlist;
 import com.huiju.estateagents.entity.TaBuilding;
 import com.huiju.estateagents.entity.TaBuildingDynamic;
+import com.huiju.estateagents.mapper.TaActivityDynamicEnlistMapper;
 import com.huiju.estateagents.mapper.TaBuildingDynamicMapper;
 import com.huiju.estateagents.mapper.TaBuildingMapper;
 import com.huiju.estateagents.service.ITaBuildingDynamicService;
@@ -22,6 +25,7 @@ import java.text.SimpleDateFormat;
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
+import java.time.ZoneOffset;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -43,6 +47,11 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
     @Autowired
     private TaBuildingMapper buildingMapper;
 
+
+    @Autowired
+    private TaActivityDynamicEnlistMapper taActivityDynamicEnlistMapper;
+
+
     protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) throws Exception {
         DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         CustomDateEditor editor = new CustomDateEditor(df, true);//true表示允许为空，false反之
@@ -72,30 +81,43 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
     }
 
     @Override
-    public ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize) {
+    public ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize,Integer buildingId) {
         Page<TaBuildingDynamic> page = new Page<>();
         page.setCurrent(pageNum);
         page.setSize(pageSize);
         QueryWrapper<TaBuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
+        buildingDynamicQueryWrapper.eq("building_id", buildingId);
         buildingDynamicQueryWrapper.eq("status", "1");
         buildingDynamicQueryWrapper.orderByDesc("create_date");
         IPage<TaBuildingDynamic> buildingDynamicIPage = buildingDynamicMapper.selectPage(page, buildingDynamicQueryWrapper);
         List<TaBuildingDynamic> records = buildingDynamicIPage.getRecords();
-        records.forEach(e -> {
-            QueryWrapper<TaBuilding> buildingQueryWrapper = new QueryWrapper<>();
-            buildingQueryWrapper.eq("building_id", e.getBuildingId());
-            TaBuilding building = buildingMapper.selectOne(buildingQueryWrapper);
-            e.setBuilding(building);
-        });
-
-        return ResponseBean.success(buildingDynamicIPage);
+        // 判断换当前列表活动状态—1:进行中(展示活动报名截止时间)，2:未开始（展示活动报名时间）,3:结束（不展示）
+        for (TaBuildingDynamic taBuildingDynamic:records){
+            // 获取当前时间状态
+            taBuildingDynamic= timeCondition(taBuildingDynamic);
+        }
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("list", records);
+        map.put("total", buildingDynamicIPage.getTotal());
+        map.put("pageNum", buildingDynamicIPage.getCurrent());
+        map.put("pageSize", buildingDynamicIPage.getSize());
+        return ResponseBean.success(map);
     }
 
     @Override
-    public ResponseBean getWxBuildingDynamiceInfo(String dynamicId) {
+    public ResponseBean getWxBuildingDynamiceInfo(String dynamicId,Integer buildingId) {
         QueryWrapper<TaBuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
         buildingDynamicQueryWrapper.eq("dynamic_id", dynamicId);
+        buildingDynamicQueryWrapper.eq("status",1);
         TaBuildingDynamic buildingDynamic = buildingDynamicMapper.selectOne(buildingDynamicQueryWrapper);
+        // 获取报名总数
+        QueryWrapper<TaActivityDynamicEnlist> taActivityDynamicEnlist = new QueryWrapper<>();
+        taActivityDynamicEnlist.eq("dynamic_id", dynamicId);
+        taActivityDynamicEnlist.eq("building_id",buildingId);
+        int applyCount= taActivityDynamicEnlistMapper.selectCount(taActivityDynamicEnlist);
+        buildingDynamic.setCount(applyCount);
+        // 获取当前时间状态
+        buildingDynamic = timeCondition(buildingDynamic);
         return ResponseBean.success(buildingDynamic);
     }
 
@@ -155,5 +177,40 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
         return ResponseBean.success("成功");
     }
 
+    @Override
+    public ResponseBean taActivityDynamicEnlistAdd(TaActivityDynamicEnlist taActivityDynamicEnlist) {
+        // 查询当前活动属于哪个楼盘
+        TaBuildingDynamic taBuildingDynamic= buildingDynamicMapper.iBuildingDynamicSelectId(taActivityDynamicEnlist.getDynamic_id());
+        taActivityDynamicEnlist.setCreateDate(LocalDateTime.now())
+                               .setBuilding_id(taBuildingDynamic.getDynamicId());
+        int state = taActivityDynamicEnlistMapper.insert(taActivityDynamicEnlist);
+        return ResponseBean.success(state);
+    }
 
+    /**
+     *     根据报名开始时间和结束时间判断当前图标状态
+     */
+    private  TaBuildingDynamic  timeCondition(TaBuildingDynamic taBuildingDynamic){
+        Long currentTime = LocalDateTime.now().toInstant(ZoneOffset.of("+8")).toEpochMilli();
+        if (null == taBuildingDynamic.getEnlistEnd () && null == taBuildingDynamic.getEnlistStart()){
+            return  taBuildingDynamic;
+        }
+        // 报名截止时间
+        Long enlistEnd = taBuildingDynamic.getEnlistEnd ().toInstant(ZoneOffset.of("+8")).toEpochMilli();
+        // 报名开始时间
+        Long enlistStart = taBuildingDynamic.getEnlistStart().toInstant(ZoneOffset.of("+8")).toEpochMilli();
+        // (1:进行中)当前时间小于报名截止时间,并且报名状态为1
+        if ("1".equals(taBuildingDynamic.getIsEnlist()) && currentTime <= enlistEnd ) {
+            taBuildingDynamic.setActivityCondition(CommConstant.ACTIVITY_CONDITION_ONE);
+        }
+        //(2:未开始)当前时间是否小于报名时间,并且报名状态为1
+        if (!"1".equals(taBuildingDynamic.getIsEnlist()) && currentTime <= enlistStart){
+            taBuildingDynamic.setActivityCondition(CommConstant.ACTIVITY_CONDITION_TWO);
+        }
+        //(3:结束)当前时间大于报名结束时间,并且报名状态为1
+        if ("1".equals(taBuildingDynamic.getIsEnlist()) && currentTime >= enlistEnd){
+            taBuildingDynamic.setActivityCondition(CommConstant.ACTIVITY_CONDITION_ONE_THREE);
+        }
+        return taBuildingDynamic;
+    }
 }

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

@@ -74,7 +74,7 @@ public class TaGoodsServiceImpl extends ServiceImpl<TaGoodsMapper, TaGoods> impl
 		//商品数减少
 		taGoods.setTotalNum(taGoods.getTotalNum() -1);
 		taGoodsMapper.updateById(taGoods);
-		return "success";
+		return CommConstant.SUCCESS;
 	}
 	
 	/**

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

@@ -52,7 +52,7 @@ public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> impleme
 
 
     @Override
-    public ResponseBean getList(Integer pageNum, Integer pageSize, Integer buildingId, Integer orgId, Integer newsTypeId, Integer newsStatus) {
+    public ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, Integer newsTypeId, Integer newsStatus) {
         ResponseBean responseBean = new ResponseBean();
 
         IPage<TaNews> page = new Page<>();
@@ -101,7 +101,8 @@ public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> impleme
         check(taNews);
 
         BeanTools.copyProperties(taNews, oldNews);
-        responseBean.addSuccess(this.updateById(oldNews));
+        this.updateById(oldNews);
+        responseBean.addSuccess(oldNews);
         return responseBean;
     }
 
@@ -176,7 +177,7 @@ public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> impleme
             responseBean.addError("数据不存!");
         }
 
-        taNewsMapper.setFieldNum(id + "", "pv_num", 1);
+        taNewsMapper.setFieldNum(String.valueOf(id), "pv_num", 1);
 
         responseBean.addSuccess((Object)"");
         return responseBean;

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

@@ -33,7 +33,7 @@ public class TaNewsTypeServiceImpl extends ServiceImpl<TaNewsTypeMapper, TaNewsT
 
 
     @Override
-    public ResponseBean getList(Integer pageNum, Integer pageSize, Integer buildingId, Integer orgId) {
+    public ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId) {
         ResponseBean responseBean = new ResponseBean();
         IPage<TaNewsType> page = new Page<>();
         page.setCurrent(pageNum);
@@ -75,6 +75,7 @@ public class TaNewsTypeServiceImpl extends ServiceImpl<TaNewsTypeMapper, TaNewsT
 
         BeanTools.copyProperties(taNewsType, oldTaNewsType);
         this.updateById(oldTaNewsType);
+        responseBean.addSuccess(oldTaNewsType);
         return responseBean;
     }
 
@@ -86,6 +87,7 @@ public class TaNewsTypeServiceImpl extends ServiceImpl<TaNewsTypeMapper, TaNewsT
         check(taNewsType);
 
         taNewsType.setCreateDate(LocalDateTime.now());
+        taNewsType.setStatus(1);
         this.save(taNewsType);
         responseBean.addSuccess(taNewsType);
         return responseBean;

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

@@ -56,6 +56,12 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
 
     @Autowired
     TaChatMapper taChatMapper;
+    
+    @Autowired
+    private TdPointsRulesMapper tdPointsRulesMapper;
+    
+    @Autowired
+    private TaPointsRecordsMapper taPointsRecordsMapper;
 
     @Override
     public TaPerson mergePersonWxInfo(WxMaUserInfo userInfo) {
@@ -125,6 +131,34 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         if (null == tel || "".equals(tel)){
             person.setTel(phone);
         }
+    
+        //查看是否领取过授权积分
+        QueryWrapper<TaPointsRecords> taPointsRecordsQueryWrapper = new QueryWrapper<>();
+        taPointsRecordsQueryWrapper.eq("change_type",CommConstant.POINTS_AUTHORIZE);
+        taPointsRecordsQueryWrapper.like("change_params","%\""+person.getPersonId()+"\"%");
+        List<TaPointsRecords> taPointsRecordsList = taPointsRecordsMapper.selectList(taPointsRecordsQueryWrapper);
+        if (taPointsRecordsList.size() < 0){
+            //发放积分
+            TdPointsRules tdPointsRules = tdPointsRulesMapper.selectById(2);
+            //插入积分消费流水表
+            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(CommConstant.POINTS_AUTHORIZE);
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put("person_id",person.getPersonId());
+            taPointsRecords.setChangeParams(jsonObject.toJSONString());
+            taPointsRecords.setCreateDate(LocalDateTime.now());
+            taPointsRecords.setStatus(CommConstant.STATUS_NORMAL);
+            taPointsRecordsMapper.insert(taPointsRecords);
+            //添加积分
+            UpdateWrapper<TaPerson> taPersonwrapper = new UpdateWrapper<>();
+            wrapper.eq("person_id", person.getPersonId());
+            wrapper.setSql("points = IFNULL(points, 0) + " + String.valueOf(tdPointsRules.getPointsAmount()));
+            taPersonMapper.update(new TaPerson(), taPersonwrapper);
+        }
 
         return person;
     }
@@ -313,11 +347,28 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         // 增加积分
         // 1-7 天积分 1-7, 超过7天按 7 个积分算
         int points = durationDays >= 7 ? 7 : durationDays;
+        //签到获取积分
+        //TdPointsRules tdPointsRules = tdPointsRulesMapper.selectById(1);
+        //int points = tdPointsRules.getPointsAmount();
         UpdateWrapper<TaPerson> wrapper = new UpdateWrapper<>();
         wrapper.eq("person_id", taPerson.getPersonId());
         wrapper.setSql("points = IFNULL(points, 0) + " + String.valueOf(points));
 //        wrapper.set("points", "points + " + String.valueOf(points));
         taPersonMapper.update(new TaPerson(), wrapper);
+        
+        //插入积分消费流水表
+        TaPointsRecords taPointsRecords = new TaPointsRecords();
+        taPointsRecords.setPersonId(taPerson.getPersonId());
+        taPointsRecords.setPersonName(StringUtils.ifNull(taPerson.getName(),taPerson.getNickname()));
+        taPointsRecords.setPersonType(taPerson.getPersonType());
+        taPointsRecords.setPointsAmount(points);
+        taPointsRecords.setChangeType(CommConstant.POINTS_CHECKIN);
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("person_id",taPerson.getPersonId());
+        taPointsRecords.setChangeParams(jsonObject.toJSONString());
+        taPointsRecords.setCreateDate(LocalDateTime.now());
+        taPointsRecords.setStatus(CommConstant.STATUS_NORMAL);
+        taPointsRecordsMapper.insert(taPointsRecords);
 
         Map<String, Object> result = new HashMap<>();
 

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

@@ -6,6 +6,7 @@ import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaSave;
+import com.huiju.estateagents.mapper.TaBuildingDynamicMapper;
 import com.huiju.estateagents.mapper.TaNewsMapper;
 import com.huiju.estateagents.mapper.TaPersonMapper;
 import com.huiju.estateagents.mapper.TaSaveMapper;
@@ -39,6 +40,9 @@ public class TaSaveServiceImpl extends ServiceImpl<TaSaveMapper, TaSave> impleme
     @Autowired
     private TaNewsMapper taNewsMapper;
 
+    @Autowired
+    private TaBuildingDynamicMapper taBuildingDynamicMapper;
+
     @Override
     public ResponseBean postLike(String openid, String typeOf, String like) {
         List<TaPerson> persons = getPersonsByOpenId(openid);
@@ -51,7 +55,7 @@ public class TaSaveServiceImpl extends ServiceImpl<TaSaveMapper, TaSave> impleme
         // 是否被赞过
         QueryWrapper<TaSave> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("person_id", taPerson.getPersonId());
-        queryWrapper.eq("be_favor", like);
+        queryWrapper.eq("saved_target", like);
         queryWrapper.eq("tagert_type", typeOf);
         List<TaSave> saves = taSaveMapper.selectList(queryWrapper);
         if (null != saves && saves.size() > 0) {
@@ -78,6 +82,11 @@ public class TaSaveServiceImpl extends ServiceImpl<TaSaveMapper, TaSave> impleme
             taNewsMapper.setFieldNum(like, "save_num", 1);
         }
 
+        // 如果是活动收藏, 则 +1
+        if(typeOf.equals(CommConstant.FAVOR_ACTIVITY)) {
+            taBuildingDynamicMapper.setFieldNum(like, "save_num", 1);
+        }
+
         return ResponseBean.success("");
     }
 
@@ -93,7 +102,7 @@ public class TaSaveServiceImpl extends ServiceImpl<TaSaveMapper, TaSave> impleme
         // 是否被赞过
         QueryWrapper<TaSave> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("person_id", taPerson.getPersonId());
-        queryWrapper.eq("be_favor", like);
+        queryWrapper.eq("saved_target", like);
         queryWrapper.eq("tagert_type", typeOf);
         List<TaSave> saves = taSaveMapper.selectList(queryWrapper);
         if (null == saves || saves.size() == 0) {
@@ -102,7 +111,7 @@ public class TaSaveServiceImpl extends ServiceImpl<TaSaveMapper, TaSave> impleme
 
         Map<String, Object> condition = new HashMap<>();
         condition.put("person_id", taPerson.getPersonId());
-        condition.put("be_favor", like);
+        condition.put("saved_target", like);
         condition.put("tagert_type", typeOf);
         taSaveMapper.deleteByMap(condition);
 
@@ -111,6 +120,11 @@ public class TaSaveServiceImpl extends ServiceImpl<TaSaveMapper, TaSave> impleme
             taNewsMapper.setFieldNum(taPerson.getPersonId(),"save_num", -1);
         }
 
+        // 如果是活动收藏, 则 - 1
+        if(typeOf.equals(CommConstant.FAVOR_ACTIVITY)) {
+            taBuildingDynamicMapper.setFieldNum(like, "save_num", -1);
+        }
+
         return ResponseBean.success("");
     }
 

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

@@ -1,15 +1,22 @@
 package com.huiju.estateagents.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 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.common.StringUtils;
 import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.entity.TaPointsRecords;
 import com.huiju.estateagents.entity.TaShare;
+import com.huiju.estateagents.entity.TdPointsRules;
 import com.huiju.estateagents.mapper.TaPersonMapper;
+import com.huiju.estateagents.mapper.TaPointsRecordsMapper;
 import com.huiju.estateagents.mapper.TaShareMapper;
+import com.huiju.estateagents.mapper.TdPointsRulesMapper;
 import com.huiju.estateagents.service.ITaShareService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -32,6 +39,12 @@ public class TaShareServiceImpl extends ServiceImpl<TaShareMapper, TaShare> impl
 
     @Autowired
     TaShareMapper taShareMapper;
+    
+    @Autowired
+    private TdPointsRulesMapper tdPointsRulesMapper;
+    
+    @Autowired
+    private TaPointsRecordsMapper taPointsRecordsMapper;
 
     @Override
     public ResponseBean saveData(String openid, String typeOf, String id) {
@@ -68,6 +81,28 @@ public class TaShareServiceImpl extends ServiceImpl<TaShareMapper, TaShare> impl
         if (typeOf == CommConstant.FAVOR_CONSULTANT) {
             taPersonMapper.setFieldIncrement(id,"share_num", 1);
         }
+        //发放分享积分
+        if (typeOf.equals(CommConstant.FAVOR_PROJECT)){
+            TdPointsRules tdPointsRules = tdPointsRulesMapper.selectById(2);
+            //插入积分消费流水表
+            TaPointsRecords taPointsRecords = new TaPointsRecords();
+            taPointsRecords.setPersonId(taPerson.getPersonId());
+            taPointsRecords.setPersonName(StringUtils.ifNull(taPerson.getName(),taPerson.getNickname()));
+            taPointsRecords.setPersonType(taPerson.getPersonType());
+            taPointsRecords.setPointsAmount(tdPointsRules.getPointsAmount());
+            taPointsRecords.setChangeType(CommConstant.POINTS_SHARE);
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put("person_id",taPerson.getPersonId());
+            taPointsRecords.setChangeParams(jsonObject.toJSONString());
+            taPointsRecords.setCreateDate(LocalDateTime.now());
+            taPointsRecords.setStatus(CommConstant.STATUS_NORMAL);
+            taPointsRecordsMapper.insert(taPointsRecords);
+            //添加积分
+            UpdateWrapper<TaPerson> wrapper = new UpdateWrapper<>();
+            wrapper.eq("person_id", taPerson.getPersonId());
+            wrapper.setSql("points = IFNULL(points, 0) + " + String.valueOf(tdPointsRules.getPointsAmount()));
+            taPersonMapper.update(new TaPerson(), wrapper);
+        }
 
         return ResponseBean.success("");
     }

src/main/resources/application-prod.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8080
+  port: 8001
 spring:
   application:
     name: estateagents

src/main/resources/mapper/ExtendContentMapper.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.ExtendContentMapper">
+
+</mapper>

src/main/resources/mapper/TaActivityDynamicEnlistMapper.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.TaActivityDynamicEnlistMapper">
+
+</mapper>

src/main/resources/mapper/TaCheckinMapper.xml

@@ -11,7 +11,7 @@
         AND activity = #{activity}
     </select>
 
-    <select id="isCustomerChecked" resultType="com.huiju.estateagents.entity.TaCheckin">
+    <select id="isCustomerChecked" resultType="int">
         SELECT
         count(1)
         FROM