合并

whole-estate/src/main/java/com/example/wholeestate/WholeEstateApplication.java

@@ -25,7 +25,7 @@ public class WholeEstateApplication {
         FastJsonConfig fastJsonConfig = new FastJsonConfig();
         fastJsonConfig.setSerializerFeatures(SerializerFeature.PrettyFormat,SerializerFeature.DisableCircularReferenceDetect,SerializerFeature.WriteMapNullValue);
         //日期格式化
-        //fastJsonConfig.setDateFormat("yyyy-MM-dd HH:mm:ss");
+        fastJsonConfig.setDateFormat("yyyy-MM-dd HH:mm:ss");
         converter.setFastJsonConfig(fastJsonConfig);
         return new HttpMessageConverters(converter);
     }

whole-estate/src/main/java/com/example/wholeestate/common/Constant.java

@@ -6,9 +6,16 @@ package com.example.wholeestate.common;
 public class Constant {
 
 
+    /**
+     * 系统异常
+     */
     public static final Integer REQUEST_ERROR = 500;
 
-    public static final Integer NOT_SESSION_USER = 401;
+    /**
+     * 用户 不存在
+     */
+    public static final Integer NOT_USER = 401;
+
 
     /**
      * 用户 session

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

@@ -118,5 +118,16 @@ public class ActivityController extends BaseController {
         return responseBean;
     }
 
+    @RequestMapping(value = "/wx/activity/{openid}", method = RequestMethod.GET)
+    @ApiOperation(value = "根据openid查询参加过的活动列表", notes = "根据openid查询参加过的活动列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "pageNum", value = "pageNum第几页"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "pageSize", value = "pageSize一页多少行")
+    })
+    public ResponseBean getOpenidActivityUpList(@PathVariable("openid") String openid, @RequestParam(defaultValue = "1") Integer pageNum, @RequestParam(defaultValue = "10") Integer pageSize) {
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = iActivityEnrollService.getOpenidActivityUpList(openid, pageNum, pageSize);
+        return responseBean;
+    }
 
 }

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

@@ -0,0 +1,43 @@
+package com.example.wholeestate.controller;
+
+import com.example.wholeestate.common.base.BaseController;
+import com.example.wholeestate.common.resp.ResponseBean;
+import com.example.wholeestate.service.ICustomerService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/")
+@Api(value = "微信小程序 用户 API", description = "微信小程序 用户 API")
+public class WxUserController extends BaseController {
+
+    @Autowired
+    private ICustomerService iCustomerService;
+
+    @RequestMapping(value = "/wx/registered", method = RequestMethod.POST)
+    @ApiOperation(value = "注册用户", notes = "注册用户")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "customerName用户姓名;name昵称;phone手机号;idNum证件号码;openid标记;uuid标记;avatar头像;")
+    })
+    public ResponseBean registeredCustomer(@RequestBody String parameter) {
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = iCustomerService.registeredCustomer(parameter);
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/wx/info/{openid}", method = RequestMethod.GET)
+    @ApiOperation(value = "获取微信小程序用户信息", notes = "获取微信小程序用户信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", dataTypeClass = String.class, name = "openid", value = "openid")
+    })
+    public ResponseBean getWXCustomer(@PathVariable String openid) {
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = iCustomerService.getWXCustomer(openid);
+        return responseBean;
+    }
+
+}

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

@@ -1,15 +0,0 @@
-package com.example.wholeestate.controller.wx.controller;
-
-import com.example.wholeestate.common.base.BaseController;
-import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@RequestMapping("/")
-@Api(value = "微信小程序 用户 API", description = "微信小程序 用户 API")
-public class WxUserController extends BaseController {
-
-
-
-}

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

@@ -3,7 +3,9 @@ package com.example.wholeestate.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.example.wholeestate.model.Activity;
 import com.example.wholeestate.model.ActivityEnroll;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 /**
@@ -16,10 +18,30 @@ import org.apache.ibatis.annotations.Select;
  */
 public interface ActivityEnrollMapper extends BaseMapper<ActivityEnroll> {
 
-    @Select("SELECT tac.*,tacus.phone as phone,tacus.`name` as name,tacus.customer_name as customerName FROM ta_activity tac " +
+    /**
+     * 根据 活动id 查询 活动列表用户
+     * @param page
+     * @param activityId
+     * @return
+     */
+    @Select("SELECT 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 tac.activity_id = #{activityId}")
-    IPage<ActivityEnroll> selectPageActivityEnroll(Page page, String activityId);
+    IPage<Activity> selectPageActivityEnroll(Page page, @Param("activityId") String activityId);
+
+    /**
+     * 根据 openid 查询 我参加的活动
+     * @param page
+     * @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}")
+    IPage<Activity> selectOpenidActivityEnroll(Page page, @Param("openid") String openid);
 
 }

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

@@ -20,5 +20,6 @@ public interface AppointmentMapper extends BaseMapper<Appointment> {
      * @return
      */
     IPage<Appendable> appendableList(Page<Appendable> page);
+    
 
 }

whole-estate/src/main/java/com/example/wholeestate/exception/ExceptionHandleAdice.java

@@ -36,7 +36,7 @@ public class ExceptionHandleAdice {
         ResponseBean response = new ResponseBean();
         String message = e.getMessage();
         if (message.equals("用户 session 不存在!")) {
-            response.addError(Constant.NOT_SESSION_USER, message);
+            response.addError(Constant.NOT_USER, message);
             return response;
         }
         response.addError(message);

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

@@ -116,4 +116,9 @@ public class Activity implements Serializable {
     @TableField(exist = false)
     private String customerName;
 
+    /**
+     * 楼盘名称
+     */
+    @TableField(exist = false)
+    private String buildingName;
 }

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

@@ -23,4 +23,11 @@ public interface IActivityEnrollService extends IService<ActivityEnroll> {
      */
     ResponseBean getActivitySignUpList(String activityId, Integer pageNum, Integer pageSize);
 
+    /**
+     * 根据 openid 查询. 我的活动记录
+     * @param openid
+     * @return
+     */
+    ResponseBean getOpenidActivityUpList(String openid, Integer pageNum, Integer pageSize);
+
 }

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

@@ -27,4 +27,19 @@ public interface ICustomerService extends IService<Customer> {
      * @return
      */
     ResponseBean customerSelectId(Integer id);
+
+    /**
+     * 注册微信小程序用户
+     * @param parameter
+     * @return
+     */
+    ResponseBean registeredCustomer(String parameter);
+
+    /**
+     * 根据 openId 获取, 用户信息
+     * @param openid
+     * @return
+     */
+    ResponseBean getWXCustomer(String openid);
+
 }

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

@@ -43,9 +43,20 @@ public class ActivityEnrollServiceImpl extends ServiceImpl<ActivityEnrollMapper,
         Page<Activity> page = new Page<>();
         page.setCurrent(pageNum == null ? 1 : pageNum);
         page.setSize(pageSize == null ? 10 : pageSize);
-        IPage<ActivityEnroll> activityEnrollIPage = activityEnrollMapper.selectPageActivityEnroll(page, activityId);
+        IPage<Activity> activityEnrollIPage = activityEnrollMapper.selectPageActivityEnroll(page, activityId);
 
         responseBean.addSuccess(activityEnrollIPage);
         return responseBean;
     }
+
+    @Override
+    public ResponseBean getOpenidActivityUpList(String openid, Integer pageNum, Integer pageSize) {
+        ResponseBean responseBean = new ResponseBean();
+        Page<Activity> page = new Page<>();
+        page.setCurrent(pageNum);
+        page.setSize(pageSize);
+        IPage<Activity> activityIPage = activityEnrollMapper.selectOpenidActivityEnroll(page, openid);
+        responseBean.addSuccess(activityIPage);
+        return responseBean;
+    }
 }

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

@@ -5,7 +5,9 @@ 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.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.CustomerMapper;
 
 import com.example.wholeestate.model.Building;
@@ -14,6 +16,7 @@ import com.example.wholeestate.service.ICustomerService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.List;
 
@@ -31,6 +34,8 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
     @Autowired
     private CustomerMapper customerMapper;
 
+    private IdGen idGen = IdGen.get();
+
     @Override
     public ResponseBean customerList(String parameter) {
         ResponseBean response= new ResponseBean();
@@ -63,4 +68,31 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
         response.addSuccess(customerList);
         return response;
     }
+
+    @Override
+    public ResponseBean registeredCustomer(String parameter) {
+        ResponseBean responseBean = new ResponseBean();
+        Customer customer = JSONObject.parseObject(parameter, Customer.class);
+        customer.setCreateDate(LocalDateTime.now());
+        customer.setStatus(1);
+
+        customer.setCustomerId(idGen.nextId()+"");
+        customerMapper.insert(customer);
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean getWXCustomer(String openid) {
+        ResponseBean responseBean = new ResponseBean();
+        QueryWrapper<Customer> customerQueryWrapper = new QueryWrapper<>();
+        customerQueryWrapper.eq("openid", openid);
+        Customer customer = customerMapper.selectOne(customerQueryWrapper);
+        if (null == customer) {
+            responseBean.addError(Constant.NOT_USER, "用户不存在!");
+            return responseBean;
+        }
+
+        responseBean.addSuccess(customer);
+        return responseBean;
+    }
 }