update

whole-estate/src/main/java/com/example/wholeestate/controller/BuildingController.java

@@ -301,7 +301,7 @@ public class BuildingController extends BaseController {
         return responseBean;
     }
 
-    @RequestMapping(value = "/wx/building/visit", method = RequestMethod.GET)
+    @RequestMapping(value = "/wx/building/visit/{id}", method = RequestMethod.POST)
     @ApiOperation(value = "楼盘访问", notes = "楼盘访问")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "path", dataTypeClass=String.class, name = "id", value = "楼盘id"),
@@ -317,13 +317,13 @@ public class BuildingController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         if (visitList.size() > 0) {
             Visit updataVisit = visitList.get(0);
-            updataVisit.setVisitDate(LocalDateTime.now());
+            updataVisit.setVisitDate(new Date());
             QueryWrapper<Visit> updateQ = new QueryWrapper<>();
             updateQ.eq("visit_id", updataVisit.getVisitId());
             visitMapper.update(updataVisit, updateQ);
         } else {
             visit.setVisitId(idGen.nextId()+"");
-            visit.setVisitDate(LocalDateTime.now());
+            visit.setVisitDate(new Date());
             visitMapper.insert(visit);
         }
         return responseBean;

whole-estate/src/main/java/com/example/wholeestate/controller/CustomerController.java

@@ -81,6 +81,4 @@ public class CustomerController extends BaseController {
         ResponseBean  responseBean = iCustomerService.customerSelectId(id);
         return responseBean;
     }
-
-
 }

whole-estate/src/main/java/com/example/wholeestate/controller/PropagandaController.java

@@ -68,7 +68,9 @@ public class PropagandaController extends BaseController {
     })
     public ResponseBean getById(@PathVariable String propagandaId) {
         ResponseBean responseBean = new ResponseBean();
-        Propaganda propaganda = iPropagandaService.getById(propagandaId);
+        QueryWrapper<Propaganda> propagandaQueryWrapper = new QueryWrapper<>();
+        propagandaQueryWrapper.eq("propaganda_id",propagandaId);
+        Propaganda propaganda = iPropagandaService.getOne(propagandaQueryWrapper);
         responseBean.addSuccess(propaganda);
         return responseBean;
     }

whole-estate/src/main/java/com/example/wholeestate/dao/ActivityEnrollMapper.java

@@ -8,6 +8,7 @@ import com.example.wholeestate.model.ActivityEnroll;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -41,4 +42,16 @@ public interface ActivityEnrollMapper extends BaseMapper<ActivityEnroll> {
             "WHERE tacus.openid = #{openid} and tac.status > -1 order by tace.enroll_date desc")
     IPage<Activity> selectOpenidActivityEnroll(Page page, @Param("openid") String openid);
 
+    /**
+     * 根据 openid 查询 我参加的活动
+     * @param openid
+     * @return
+     */
+    @Select("SELECT tac.*,tacus.phone as phone,tacus.`name` as name,tacus.customer_name as customerName,tab.building_name AS buildingName FROM ta_activity tac " +
+            "RIGHT JOIN ta_activity_enroll tace ON tac.activity_id = tace.activity_id " +
+            "LEFT JOIN ta_customer tacus ON tace.customer_id = tacus.customer_id " +
+            "LEFT JOIN ta_building tab ON tac.building_id = tab.building_id " +
+            "WHERE tacus.openid = #{openid} and tac.status > -1 order by tace.enroll_date desc")
+    List<Activity> selectOpenidActivityEnrollList(@Param("openid") String openid);
+
 }

whole-estate/src/main/java/com/example/wholeestate/dao/AppointmentMapper.java

@@ -7,6 +7,8 @@ import com.example.wholeestate.model.Appointment;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
+import java.util.List;
+
 /**
  * <p>
  * 预约记录表 Mapper 接口
@@ -33,6 +35,16 @@ public interface AppointmentMapper extends BaseMapper<Appointment> {
             "WHERE tac.openid = #{openid} and taa.status = 1 order by taa.create_date desc")
     IPage<Appointment> getOpenidAppendableList(Page<Appointment> page, @Param("openid") String openid);
 
+    @Select("SELECT " +
+            "taa.*, " +
+            "tab.building_name AS buildingName " +
+            "FROM " +
+            "ta_appointment taa " +
+            "LEFT JOIN ta_building tab ON taa.building_id = tab.building_id " +
+            "LEFT JOIN ta_customer tac ON taa.customer_id = tac.customer_id " +
+            "WHERE tac.openid = #{openid} and taa.status = 1 order by taa.create_date desc")
+    List<Appointment> getOpenidAppendables(@Param("openid") String openid);
+
     IPage<Appointment> appendableList(Page page, @Param("buildingId") String buildingId, @Param("username")String username,@Param("phone") String phone,@Param("status") String status);
 
 }

whole-estate/src/main/java/com/example/wholeestate/dao/TaCollectionMapper.java

@@ -9,6 +9,8 @@ import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
+import java.util.List;
+
 /**
  * <p>
  * 收藏表 Mapper 接口
@@ -34,6 +36,20 @@ public interface TaCollectionMapper extends BaseMapper<TaCollection> {
             "WHERE tacu.openid = #{openid} order by tac.create_date desc")
     IPage<Building> openidCollectionBuilding(Page<Building> page, @Param("openid") String openid);
 
+    /**
+     * 根据 openid 查询 收藏楼盘记录
+     * @param openid
+     * @return
+     */
+    @Select("SELECT " +
+            "tab.* " +
+            "FROM " +
+            "ta_collection tac " +
+            "LEFT JOIN ta_building tab ON tac.building_id = tab.building_id " +
+            "LEFT JOIN ta_customer tacu ON tac.customer_id = tacu.customer_id " +
+            "WHERE tacu.openid = #{openid} order by tac.create_date desc")
+    List<Building> openidCollectionBuildingList(@Param("openid") String openid);
+
     /**
      * 根据 openid 和 楼盘id 删除收藏列表
      * @param openid

whole-estate/src/main/java/com/example/wholeestate/model/Building.java

@@ -109,6 +109,11 @@ public class Building implements Serializable {
      */
     private  String marketStatus;
 
+    /**
+     * 楼盘区域
+     */
+    private  String buildingArea;
+
     /**
      * 排序
      */
@@ -119,6 +124,11 @@ public class Building implements Serializable {
      */
     private  Integer isMain;
 
+
+    /**
+     * 地址图片
+     */
+    private  String mapImg;
     /**
      * 图片
      */

whole-estate/src/main/java/com/example/wholeestate/model/Customer.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
+import java.util.List;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -54,4 +56,22 @@ public class Customer implements Serializable {
      */
     private Integer hasReg;
 
+    /**
+     * 报名的活动
+     */
+    @TableField(exist = false)
+    private List<Activity> Activity;
+
+    /**
+     * 预约记录
+     */
+    @TableField(exist = false)
+    private List<Appointment> Appointment;
+
+    /**
+     * 收藏的楼盘
+     */
+    @TableField(exist = false)
+    private List<Building> CollectionBuilding;
+
 }

whole-estate/src/main/java/com/example/wholeestate/model/Visit.java

@@ -7,6 +7,7 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * <p>
@@ -30,7 +31,7 @@ public class Visit implements Serializable {
 
     private String customerName;
 
-    private LocalDateTime visitDate;
+    private Date visitDate;
 
     private String avatar;
 

whole-estate/src/main/java/com/example/wholeestate/service/impl/BuildingServiceImpl.java

@@ -448,13 +448,6 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
             BuildingImgQueryWrapper.eq("img_type", "banner");
             List<BuildingImg> buildingImg = buildingImgMapper.selectList(BuildingImgQueryWrapper);
             build.setBuildingImg(buildingImg);
-
-            QueryWrapper<Visit> BuildingVisitQueryWrapper = new QueryWrapper<>();
-            BuildingVisitQueryWrapper.eq("visit_type", "building");
-            BuildingVisitQueryWrapper.eq("visit_content", build.getBuildingId());
-            BuildingVisitQueryWrapper.orderByDesc("visit_date");
-            List<Visit> visits = visitMapper.selectList(BuildingVisitQueryWrapper);
-            build.setVisits(visits);
         }
 
         responseBean.addSuccess(buildingList);
@@ -478,6 +471,18 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
             BuildingImgQueryWrapper.eq("img_type", "banner");
             List<BuildingImg> buildingImg = buildingImgMapper.selectList(BuildingImgQueryWrapper);
             build.setBuildingImg(buildingImg);
+
+            QueryWrapper<Visit> BuildingVisitQueryWrapper = new QueryWrapper<>();
+            BuildingVisitQueryWrapper.eq("visit_type", "building");
+            BuildingVisitQueryWrapper.eq("visit_content", build.getBuildingId());
+            BuildingVisitQueryWrapper.orderByDesc("visit_date");
+            List<Visit> visits = visitMapper.selectList(BuildingVisitQueryWrapper);
+            build.setVisits(visits);
+
+            QueryWrapper<BuildingTag> buildingTagQueryWrapper = new QueryWrapper<>();
+            buildingTagQueryWrapper.eq("building_id", build.getBuildingId());
+            List<BuildingTag> buildingTags = buildingTagMapper.selectList(buildingTagQueryWrapper);
+            build.setBuildingTag(buildingTags);
         }
 
         responseBean.addSuccess(buildingList);

whole-estate/src/main/java/com/example/wholeestate/service/impl/CustomerServiceImpl.java

@@ -9,13 +9,20 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.example.wholeestate.common.Constant;
 import com.example.wholeestate.common.resp.ResponseBean;
 import com.example.wholeestate.common.uuid.IdGen;
+import com.example.wholeestate.dao.ActivityEnrollMapper;
+import com.example.wholeestate.dao.AppointmentMapper;
 import com.example.wholeestate.dao.CustomerMapper;
 
+import com.example.wholeestate.dao.TaCollectionMapper;
+import com.example.wholeestate.model.Activity;
+import com.example.wholeestate.model.Appointment;
 import com.example.wholeestate.model.Customer;
+import com.example.wholeestate.model.Building;
 import com.example.wholeestate.service.ICustomerService;
 import com.example.wholeestate.utils.BeanTools;
 import com.example.wholeestate.wx.mini.IWxMini;
 import org.apache.http.HttpStatus;
+import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -23,7 +30,6 @@ import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
-
 /**
  * <p>
  *  服务实现类
@@ -43,6 +49,15 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
 
     private IdGen idGen = IdGen.get();
 
+    @Autowired
+    private ActivityEnrollMapper activityEnrollMapper;
+
+    @Autowired
+    private AppointmentMapper appointmentMapper;
+
+    @Autowired
+    private TaCollectionMapper taCollectionMapper;
+
     @Override
     public ResponseBean customerList(Integer pageNum, Integer pageSize, String phone, Date beginDate, Date endDate, String name , String cardNo) {
         ResponseBean response= new ResponseBean();
@@ -112,6 +127,18 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
             return responseBean;
         }
 
+        // 获取用户报名活动信息
+        List<Activity> activitys = activityEnrollMapper.selectOpenidActivityEnrollList(openid);
+        customer.setActivity(activitys);
+
+        // 获取用户预约信息
+        List<Appointment> appointments = appointmentMapper.getOpenidAppendables(openid);
+        customer.setAppointment(appointments);
+
+        // 获取用户收藏记录
+        List<Building> taCollections = taCollectionMapper.openidCollectionBuildingList(openid);
+        customer.setCollectionBuilding(taCollections);
+
         responseBean.addSuccess(customer);
         return responseBean;
     }
@@ -125,6 +152,17 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
         queryWrapper.eq("openid", openid);
         Customer customer = customerMapper.selectOne(queryWrapper);
         if (null != customer) {
+            // 获取用户报名活动信息
+            List<Activity> activitys = activityEnrollMapper.selectOpenidActivityEnrollList(openid);
+            customer.setActivity(activitys);
+
+            // 获取用户预约信息
+            List<Appointment> appointments = appointmentMapper.getOpenidAppendables(openid);
+            customer.setAppointment(appointments);
+
+            // 获取用户收藏记录
+            List<Building> taCollections = taCollectionMapper.openidCollectionBuildingList(openid);
+            customer.setCollectionBuilding(taCollections);
             responseBean.addSuccess(customer);
             return responseBean;
         }

whole-estate/src/main/resources/application.yml

@@ -6,7 +6,7 @@ spring:
   datasource:
     username: whole-estate
     password: whole-estate
-    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/whole-estate?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true
+    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/whole-estate?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true
     driver-class-name: com.mysql.jdbc.Driver
     initial-size: 10 # 初始化连接数
     max-active: 20 # 最大连接数