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

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

@@ -6,8 +6,10 @@ import com.shigongli.common.*;
 import com.shigongli.constants.StatusConstant;
 import com.shigongli.entity.SysUser;
 import com.shigongli.entity.TaPerson;
+import com.shigongli.entity.TaShopKeeper;
 import com.shigongli.service.ISysUserService;
 import com.shigongli.service.ITaPersonService;
+import com.shigongli.service.ITaShopKeeperService;
 import me.chanjar.weixin.mp.api.WxMpService;
 import me.chanjar.weixin.mp.bean.result.WxMpOAuth2AccessToken;
 import me.chanjar.weixin.mp.bean.result.WxMpUser;
@@ -20,6 +22,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 
@@ -33,6 +36,9 @@ public class LoginController extends BaseController {
     @Autowired
     ITaPersonService iTaPersonService;
 
+    @Autowired
+    ITaShopKeeperService iTaShopKeeperService;
+
     @Autowired
     WxUtils wxUtils;
 
@@ -90,6 +96,11 @@ public class LoginController extends BaseController {
         }
         taPerson.setSessionKey(sessionInfo.getSessionKey());
 
+        List<TaShopKeeper> shopKeeperList = iTaShopKeeperService.getByPerson(taPerson.getPersonId());
+        if (null != shopKeeperList && shopKeeperList.size() > 0) {
+            taPerson.setShopKeeperList(shopKeeperList);
+        }
+
         // 生成 token
         Map<String, Object> claims = new HashMap<>();
         claims.put("userId", taPerson.getPersonId());

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

@@ -5,8 +5,11 @@ 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.TaPerson;
+import com.shigongli.entity.TaShopKeeper;
+import com.shigongli.service.ITaShopKeeperService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -23,6 +26,7 @@ import com.shigongli.entity.TaHouse;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 
 /**
  * <p>
@@ -43,6 +47,9 @@ public class TaHouseController extends BaseController {
     @Autowired
     public ITaHouseService iTaHouseService;
 
+    @Autowired
+    ITaShopKeeperService iTaShopKeeperService;
+
 //
 //    /**
 //     * 分页查询列表
@@ -94,11 +101,36 @@ public class TaHouseController extends BaseController {
      */
     @RequestMapping(value="/ma/taHouse",method= RequestMethod.POST)
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
-    public ResponseBean taHouseAdd(@ApiParam("保存内容") @RequestBody TaHouse taHouse) throws Exception{
+    public ResponseBean taHouseAdd(@ApiParam("保存内容") @RequestBody TaHouse taHouse,
+                                   HttpServletRequest request) throws Exception{
+        TaPerson taPerson = getPerson(request);
+        List<TaShopKeeper> shopKeeperList = iTaShopKeeperService.getByPerson(taPerson.getPersonId());
+        if (null == shopKeeperList || shopKeeperList.size() < 1) {
+            return ResponseBean.error("您无权新增房源", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        if (!StringUtils.isEmpty(taHouse.getShopId())) {
+            boolean found = false;
+            for (TaShopKeeper keeper: shopKeeperList) {
+                if (taHouse.getShopId().equals(keeper.getShopId())) {
+                    found = true;
+                }
+            }
+
+            if (!found) {
+                return ResponseBean.error("您无权新增房源, 或房源所属民宿出错", ResponseBean.ERROR_UNAVAILABLE);
+            }
+        } else {
+            if (shopKeeperList.size() > 1) {
+                return ResponseBean.error("请设置房源所属民宿", ResponseBean.ERROR_UNAVAILABLE);
+            }
+
+            taHouse.setShopId(shopKeeperList.get(0).getShopId());
+        }
 
         if (iTaHouseService.save(taHouse)){
             return ResponseBean.success(taHouse);
-        }else {
+        } else {
             return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
         }
     }
@@ -131,6 +163,9 @@ public class TaHouseController extends BaseController {
     public ResponseBean taHouseUpdate(@ApiParam("对象ID") @PathVariable String id,
                                         @ApiParam("更新内容") @RequestBody TaHouse taHouse) throws Exception{
 
+        // 不允许修改所属民宿
+        taHouse.setShopId(null);
+
         if (iTaHouseService.updateById(taHouse)){
             return ResponseBean.success(iTaHouseService.getById(id));
         }else {

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

@@ -6,6 +6,7 @@ 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.shigongli.common.*;
+import com.shigongli.entity.TaShopKeeper;
 import com.shigongli.service.ITaShopKeeperService;
 import com.shigongli.vo.AuthPhoneParams;
 import io.swagger.annotations.Api;
@@ -21,6 +22,7 @@ import com.shigongli.entity.TaPerson;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -70,6 +72,12 @@ public class TaPersonController extends BaseController {
         // 绑定店主
         iTaShopKeeperService.bindPerson(taPerson);
 
+        // 关联的店主一起返回
+        List<TaShopKeeper> shopKeeperList = iTaShopKeeperService.getByPerson(taPerson.getPersonId());
+        if (null != shopKeeperList && shopKeeperList.size() > 0) {
+            taPerson.setShopKeeperList(shopKeeperList);
+        }
+
         return ResponseBean.success(taPerson);
     }
 

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

@@ -6,6 +6,8 @@ import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
+import java.util.List;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -58,4 +60,7 @@ public class TaPerson implements Serializable {
 
     @TableField(exist = false)
     private String sessionKey;
+
+    @TableField(exist = false)
+    private List<TaShopKeeper> shopKeeperList;
 }

src/main/java/com/shigongli/entity/TaShopKeeper.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;
@@ -48,5 +50,6 @@ public class TaShopKeeper implements Serializable {
     @ApiModelProperty(value = "创建时间")
     private LocalDateTime createDate;
 
-
+    @TableField(exist = false)
+    private TaShop taShop;
 }

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

@@ -19,4 +19,6 @@ public interface ITaShopKeeperService extends IService<TaShopKeeper> {
     void bindPerson(TaPerson taPerson);
 
     List<TaShopKeeper> getByPhone(String phone);
+
+    List<TaShopKeeper> getByPerson(String personId);
 }

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

@@ -1,12 +1,16 @@
 package com.shigongli.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.shigongli.common.StringUtils;
 import com.shigongli.constants.StatusConstant;
 import com.shigongli.entity.TaPerson;
+import com.shigongli.entity.TaShop;
 import com.shigongli.entity.TaShopKeeper;
 import com.shigongli.mapper.TaShopKeeperMapper;
 import com.shigongli.service.ITaShopKeeperService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.shigongli.service.ITaShopService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -22,6 +26,9 @@ import java.util.List;
 @Service
 public class TaShopKeeperServiceImpl extends ServiceImpl<TaShopKeeperMapper, TaShopKeeper> implements ITaShopKeeperService {
 
+    @Autowired
+    ITaShopService iTaShopService;
+
     @Override
     public void bindPerson(TaPerson taPerson) {
         List<TaShopKeeper> shopKeeperList = getByPhone(taPerson.getPhone());
@@ -44,4 +51,24 @@ public class TaShopKeeperServiceImpl extends ServiceImpl<TaShopKeeperMapper, TaS
 
         return list(queryWrapper);
     }
+
+    @Override
+    public List<TaShopKeeper> getByPerson(String personId) {
+        if (StringUtils.isEmpty(personId)) {
+            return null;
+        }
+
+        QueryWrapper<TaShopKeeper> queryWrapper = new QueryWrapper<TaShopKeeper>()
+                .eq("person_id", personId)
+                .eq("status", StatusConstant.NORMAL);
+
+        List<TaShopKeeper> list = list(queryWrapper);
+        if (null != list && list.size() > 0) {
+            for (TaShopKeeper keeper: list) {
+                keeper.setTaShop(iTaShopService.getById(keeper.getShopId()));
+            }
+        }
+
+        return list;
+    }
 }