Merge remote-tracking branch 'origin/master' into master

src/main/java/com/shigongli/controller/TaHousePersonController.java

@@ -5,6 +5,14 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.shigongli.common.BaseController;
 import com.shigongli.common.ResponseBean;
+import com.shigongli.common.StringUtils;
+import com.shigongli.constants.StatusConstant;
+import com.shigongli.entity.TaHouseOrder;
+import com.shigongli.entity.TaHouseSetting;
+import com.shigongli.entity.TaPerson;
+import com.shigongli.service.ITaHouseOrderService;
+import com.shigongli.service.ITaHouseSettingService;
+import com.shigongli.vo.HousePersonParams;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -20,6 +28,10 @@ import com.shigongli.service.ITaHousePersonService;
 import com.shigongli.entity.TaHousePerson;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * <p>
     * 住房人 前端控制器
@@ -39,6 +51,12 @@ public class TaHousePersonController extends BaseController {
     @Autowired
     public ITaHousePersonService iTaHousePersonService;
 
+    @Autowired
+    ITaHouseOrderService iTaHouseOrderService;
+
+    @Autowired
+    ITaHouseSettingService iTaHouseSettingService;
+
 
     /**
      * 分页查询列表
@@ -46,13 +64,14 @@ public class TaHousePersonController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taHousePerson",method= RequestMethod.GET)
+    @RequestMapping(value="/ma/taHousePerson",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean taHousePersonList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+                                          @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
 
 		    IPage<TaHousePerson> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaHousePerson> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("status", StatusConstant.NORMAL);
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaHousePerson> result = iTaHousePersonService.page(pg, queryWrapper);
@@ -60,16 +79,68 @@ public class TaHousePersonController extends BaseController {
     }
 
     /**
-     * 保存对象
-     * @param taHousePerson 实体对象
+     * 保存入住人
+     * @param housePersonParams 实体对象
      * @return
      */
-    @RequestMapping(value="/taHousePerson",method= RequestMethod.POST)
+    @RequestMapping(value="/ma/taHousePerson",method= RequestMethod.POST)
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
-    public ResponseBean taHousePersonAdd(@ApiParam("保存内容") @RequestBody TaHousePerson taHousePerson) throws Exception{
+    public ResponseBean taHousePersonAdd(@ApiParam("保存内容") @RequestBody HousePersonParams housePersonParams,
+                                         HttpServletRequest request) throws Exception{
+
+        if (null == housePersonParams) {
+            return ResponseBean.error("请设置入住人员信息", ResponseBean.ERROR_MISSING_PARAMS);
+        }
+
+        if (StringUtils.isEmpty(housePersonParams.getHouseId()) || StringUtils.isEmpty(housePersonParams.getOrderId())) {
+            return ResponseBean.error("请设置房源或订单信息", ResponseBean.ERROR_MISSING_PARAMS);
+        }
+
+        if (null == housePersonParams.getPersonList() || housePersonParams.getPersonList().size() < 1) {
+            return ResponseBean.error("请设置入住人员信息", ResponseBean.ERROR_MISSING_PARAMS);
+        }
+
+        // 订单
+        TaHouseOrder taHouseOrder = iTaHouseOrderService.getById(housePersonParams.getOrderId());
+        if (null == taHouseOrder) {
+            return ResponseBean.error("校验订单信息出错", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        if (!StringUtils.isEmpty(taHouseOrder.getPersonId())) {
+            return ResponseBean.error("该分享房源已经存在入住信息", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        // 设置
+        TaHouseSetting taHouseSetting = iTaHouseSettingService.getById(taHouseOrder.getSettingId());
+        if (null == taHouseSetting) {
+            return ResponseBean.error("校验房源配置出错", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        // 填写的入住人员数量必须与设置的人数一致
+        if (housePersonParams.getPersonList().size() != taHouseSetting.getPersonNum()) {
+            return ResponseBean.error("填写入住人员数量出错", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        // 更新订单
+        TaPerson taPerson = getPerson(request);
+        taHouseOrder.setPersonId(taPerson.getPersonId());
+        taHouseOrder.setStatus(StatusConstant.NORMAL);
+        iTaHouseOrderService.updateById(taHouseOrder);
+
+        // 插入入住人
+        List<TaHousePerson> taHousePersonList = new ArrayList<>();
+        for (HousePersonParams.Person person: housePersonParams.getPersonList()) {
+            TaHousePerson taHousePerson = new TaHousePerson();
+            taHousePerson.setHouseId(housePersonParams.getHouseId());
+            taHousePerson.setOrderId(housePersonParams.getOrderId());
+            taHousePerson.setPhone(person.getPhone());
+            taHousePerson.setName(person.getName());
+            taHousePerson.setStatus(StatusConstant.NORMAL);
+            taHousePersonList.add(taHousePerson);
+        }
 
-        if (iTaHousePersonService.save(taHousePerson)){
-            return ResponseBean.success(taHousePerson);
+        if (iTaHousePersonService.saveBatch(taHousePersonList)){
+            return ResponseBean.success(taHousePersonList);
         }else {
             return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
         }

src/main/java/com/shigongli/controller/TaHouseSettingController.java

@@ -5,6 +5,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.shigongli.common.BaseController;
 import com.shigongli.common.ResponseBean;
+import com.shigongli.common.StringUtils;
+import com.shigongli.constants.StatusConstant;
+import com.shigongli.entity.TaHouseOrder;
+import com.shigongli.service.ITaHouseOrderService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -39,6 +43,9 @@ public class TaHouseSettingController extends BaseController {
     @Autowired
     public ITaHouseSettingService iTaHouseSettingService;
 
+    @Autowired
+    ITaHouseOrderService iTaHouseOrderService;
+
 
     /**
      * 分页查询列表
@@ -64,11 +71,31 @@ public class TaHouseSettingController extends BaseController {
      * @param taHouseSetting 实体对象
      * @return
      */
-    @RequestMapping(value="/taHouseSetting",method= RequestMethod.POST)
+    @RequestMapping(value="/ma/taHouseSetting",method= RequestMethod.POST)
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
     public ResponseBean taHouseSettingAdd(@ApiParam("保存内容") @RequestBody TaHouseSetting taHouseSetting) throws Exception{
+        if (null == taHouseSetting) {
+            return ResponseBean.error("填写房源设置出错", ResponseBean.ERROR_MISSING_PARAMS);
+        }
+
+        if (null == taHouseSetting.getPersonNum() || taHouseSetting.getPersonNum() < 1) {
+            return ResponseBean.error("房源入住人数至少1人", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        if (StringUtils.isEmpty(taHouseSetting.getHouseId())) {
+            return ResponseBean.error("填写选择房源", ResponseBean.ERROR_MISSING_PARAMS);
+        }
 
         if (iTaHouseSettingService.save(taHouseSetting)){
+
+            // 生成订单
+            TaHouseOrder taHouseOrder = new TaHouseOrder();
+            taHouseOrder.setSettingId(taHouseSetting.getSettingId());
+            taHouseOrder.setStatus(StatusConstant.READY);
+            taHouseOrder.setOrderId(iTaHouseOrderService.getNextOrderId());
+            iTaHouseOrderService.save(taHouseOrder);
+            taHouseSetting.setTaHouseOrder(taHouseOrder);
+
             return ResponseBean.success(taHouseSetting);
         }else {
             return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);

src/main/java/com/shigongli/controller/TaHouseSurroundController.java

@@ -20,6 +20,8 @@ import com.shigongli.service.ITaHouseSurroundService;
 import com.shigongli.entity.TaHouseSurround;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * <p>
     * 房源周边 前端控制器
@@ -41,7 +43,7 @@ public class TaHouseSurroundController extends BaseController {
 
 
     /**
-     * 分页查询列表
+     * 分页查询房源周边, 不传房源则代表所有周边
      * @param pageNum
      * @param pageSize
      * @return
@@ -58,16 +60,16 @@ public class TaHouseSurroundController extends BaseController {
     }
 
     /**
-     * 保存对象
+     * 保存房源周边
      * @param taHouseSurround 实体对象
      * @return
      */
-    @RequestMapping(value="/taHouseSurround",method= RequestMethod.POST)
+    @RequestMapping(value="/ma/taHouseSurround",method= RequestMethod.POST)
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
-    public ResponseBean taHouseSurroundAdd(@ApiParam("保存内容") @RequestBody TaHouseSurround taHouseSurround) throws Exception{
+    public ResponseBean taHouseSurroundAdd(@ApiParam("保存内容") @RequestBody List<TaHouseSurround> taHouseSurroundList) throws Exception{
 
-        if (iTaHouseSurroundService.save(taHouseSurround)){
-            return ResponseBean.success(taHouseSurround);
+        if (iTaHouseSurroundService.saveBatch(taHouseSurroundList)){
+            return ResponseBean.success(taHouseSurroundList);
         }else {
             return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
         }

src/main/java/com/shigongli/controller/TaMateTagGroupController.java

@@ -54,10 +54,11 @@ public class TaMateTagGroupController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/mp/taMateTagGroup",method= RequestMethod.GET)
+    @RequestMapping(value="/{client}/taMateTagGroup",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taMateTagGroupList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+    public ResponseBean taMateTagGroupList(@ApiParam(value = "客户端", allowableValues = "mp,ma") @PathVariable("client") String client,
+                                           @ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                           @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
 
         IPage<TaMateTagGroup> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<TaMateTagGroup> queryWrapper = new QueryWrapper<>();

src/main/java/com/shigongli/controller/TaMetaImageTagController.java

@@ -51,9 +51,10 @@ public class TaMetaImageTagController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/mp/taMetaImageTag",method= RequestMethod.GET)
+    @RequestMapping(value="/{client}/taMetaImageTag",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taMetaImageTagList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+    public ResponseBean taMetaImageTagList(@ApiParam(value = "客户端", allowableValues = "ma,mp") @RequestParam(value ="client") String client,
+                                           @ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                            @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                            @ApiParam("标签ID") @RequestParam(value ="tagIds") String tagIds) throws Exception{
 

src/main/java/com/shigongli/entity/TaHouseSetting.java

@@ -2,6 +2,8 @@ package com.shigongli.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
@@ -27,7 +29,7 @@ public class TaHouseSetting implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "设置ID")
-    @TableId(value = "setting_id", type = IdType.INPUT)
+    @TableId(value = "setting_id", type = IdType.UUID)
     private String settingId;
 
     @ApiModelProperty(value = "房源")
@@ -48,5 +50,6 @@ public class TaHouseSetting implements Serializable {
     @ApiModelProperty(value = "创建时间")
     private LocalDateTime createDate;
 
-
+    @TableField(exist = false)
+    private TaHouseOrder taHouseOrder;
 }

src/main/java/com/shigongli/service/ITaHouseOrderService.java

@@ -13,4 +13,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITaHouseOrderService extends IService<TaHouseOrder> {
 
+    String getNextOrderId();
 }

src/main/java/com/shigongli/service/impl/TaHouseOrderServiceImpl.java

@@ -6,6 +6,10 @@ import com.shigongli.service.ITaHouseOrderService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.util.Random;
+
 /**
  * <p>
  * 房源订单 服务实现类
@@ -17,4 +21,11 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaHouseOrderServiceImpl extends ServiceImpl<TaHouseOrderMapper, TaHouseOrder> implements ITaHouseOrderService {
 
+    @Override
+    public String getNextOrderId() {
+        long sec = LocalDateTime.now().atZone(ZoneId.systemDefault()).toEpochSecond();
+        String randNum = String.format("%02d", new Random().nextInt(99));
+
+        return sec + "-" + randNum;
+    }
 }

src/main/java/com/shigongli/vo/HousePersonParams.java

@@ -0,0 +1,33 @@
+package com.shigongli.vo;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@ApiModel(description = "报存入住人员参数")
+@Data
+public class HousePersonParams {
+
+    @ApiModelProperty("订单号")
+    String orderId;
+
+    @ApiModelProperty("房源ID")
+    String houseId;
+
+    @ApiModelProperty("入住人列表")
+    List<Person> personList;
+
+    @ApiModel(description = "入住人员")
+    @Data
+    public static class Person {
+
+        @ApiModelProperty("姓名")
+        String name;
+
+        @ApiModelProperty("手机号")
+        String phone;
+    }
+}