feats

src/main/java/com/yunzhi/shigongli/controller/TaHotelController.java

@@ -7,6 +7,9 @@ import com.yunzhi.shigongli.common.BaseController;
 import com.yunzhi.shigongli.common.Constants;
 import com.yunzhi.shigongli.common.ResponseBean;
 import com.yunzhi.shigongli.common.StringUtils;
+import com.yunzhi.shigongli.entity.TaHotelAccount;
+import com.yunzhi.shigongli.entity.TaPerson;
+import com.yunzhi.shigongli.service.ITaHotelAccountService;
 import com.yunzhi.shigongli.vo.HotelListVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -23,7 +26,10 @@ import com.yunzhi.shigongli.service.ITaHotelService;
 import com.yunzhi.shigongli.entity.TaHotel;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 
 /**
  * <p>
@@ -44,6 +50,9 @@ public class TaHotelController extends BaseController {
     @Autowired
     public ITaHotelService iTaHotelService;
 
+    @Autowired
+    public ITaHotelAccountService iTaHotelAccountService;
+
 
     /**
      * 分页查询列表
@@ -140,4 +149,67 @@ public class TaHotelController extends BaseController {
     public ResponseBean getWxDetail(@ApiParam("对象ID") @PathVariable String id) throws Exception{
         return ResponseBean.success(iTaHotelService.getById(id));
     }
+
+    /**
+     * 民宿小程序首页
+     */
+    @RequestMapping(value="/wx/hotel/manage/index",method= RequestMethod.GET)
+    @ApiOperation(value="民宿小程序首页", notes = "民宿小程序首页", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean getWxManageIndex() throws Exception{
+        TaPerson taPerson = getCurrentPerson();
+        if (!Constants.TARGET_HOTEL.equals(taPerson.getPersonRole())) {
+            return ResponseBean.error("请先进行人员身份绑定", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        // 获取所有的民宿信息
+        List<TaHotel> hotelList = iTaHotelService.getListByPerson(taPerson);
+        if (null == hotelList || hotelList.size() < 1) {
+            return ResponseBean.error("数据异常, 未找到关联民宿", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        // 默认获取第一个店铺信息
+        TaHotel taHotel = hotelList.get(0);
+        TaHotelAccount taHotelAccount = iTaHotelAccountService.getAccountInfoBy(taHotel.getHotelId());
+
+        Map<String, Object> result = new HashMap<>();
+        result.put("hotelList", hotelList);
+        result.put("hotel", taHotel);
+        result.put("account", taHotelAccount);
+
+        return ResponseBean.success(result);
+    }
+
+    /**
+     * 民宿小程序首页
+     */
+    @RequestMapping(value="/wx/hotel/manage/{id}",method= RequestMethod.GET)
+    @ApiOperation(value="民宿小程序首页", notes = "民宿小程序首页", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean getWxManageHotel(@ApiParam("民宿ID") @PathVariable String id) throws Exception{
+        TaPerson taPerson = getCurrentPerson();
+        if (!Constants.TARGET_HOTEL.equals(taPerson.getPersonRole())) {
+            return ResponseBean.error("请先进行人员身份绑定", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        // 获取所有的民宿信息
+        List<TaHotel> hotelList = iTaHotelService.getListByPerson(taPerson);
+        if (null == hotelList || hotelList.size() < 1) {
+            return ResponseBean.error("数据异常, 未找到关联民宿", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        Optional<TaHotel> first = hotelList.stream().filter(x -> x.getHotelId().equals(id)).findFirst();
+        if (!first.isPresent()) {
+            return ResponseBean.error("数据异常, 未找到关联民宿", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        // 默认获取第一个店铺信息
+        TaHotel taHotel = first.get();
+        TaHotelAccount taHotelAccount = iTaHotelAccountService.getAccountInfoBy(taHotel.getHotelId());
+
+        Map<String, Object> result = new HashMap<>();
+        result.put("hotel", taHotel);
+        result.put("account", taHotelAccount);
+
+        return ResponseBean.success(result);
+    }
+
 }

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

@@ -4,7 +4,13 @@ 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.yunzhi.shigongli.common.BaseController;
+import com.yunzhi.shigongli.common.Constants;
 import com.yunzhi.shigongli.common.ResponseBean;
+import com.yunzhi.shigongli.common.StringUtils;
+import com.yunzhi.shigongli.entity.TaHotelWorker;
+import com.yunzhi.shigongli.entity.TaPersonRole;
+import com.yunzhi.shigongli.entity.TaShopWorker;
+import com.yunzhi.shigongli.service.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -16,10 +22,12 @@ 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 com.yunzhi.shigongli.service.ITaPersonService;
 import com.yunzhi.shigongli.entity.TaPerson;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * <p>
     * 小程序人员表 前端控制器
@@ -39,6 +47,15 @@ public class TaPersonController extends BaseController {
     @Autowired
     public ITaPersonService iTaPersonService;
 
+    @Autowired
+    public ITaPersonRoleService iTaPersonRoleService;
+
+    @Autowired
+    public ITaShopWorkerService iTaShopWorkerService;
+
+    @Autowired
+    public ITaHotelWorkerService iTaHotelWorkerService;
+
 
     /**
      * 分页查询列表
@@ -58,6 +75,78 @@ public class TaPersonController extends BaseController {
             IPage<TaPerson> result = iTaPersonService.page(pg, queryWrapper);
             return ResponseBean.success(result);
     }
+
+
+    /**
+     * 绑定人员身份
+     * @param targetType
+     * @return
+     */
+    @RequestMapping(value="/wx/person-role/{targetType}",method= RequestMethod.POST)
+    @ApiOperation(value="绑定人员身份", notes = "绑定人员身份", httpMethod = "POST", response = ResponseBean.class)
+    public ResponseBean savePersonRole(@ApiParam("身份类型") @PathVariable String targetType) throws Exception{
+        TaPerson taPerson = getCurrentPerson();
+        if (StringUtils.isEmpty(taPerson.getPhone())) {
+            return ResponseBean.error("请先授权手机号", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        taPerson.setPersonRole(targetType);
+
+        // 绑定普通用户身份不需要操作任何内容
+        if ("normal".equals(targetType)) {
+            iTaPersonService.updateById(taPerson);
+            return ResponseBean.success(taPerson);
+        }
+
+        TaPersonRole taPersonRole = iTaPersonRoleService.getPersonRole(taPerson, targetType);
+        if (null != taPersonRole) {
+            if (Constants.STATUS_NORMAL.equals(taPersonRole.getStatus())) {
+                iTaPersonService.updateById(taPerson);
+
+                return ResponseBean.success(taPersonRole);
+            } else {
+                return ResponseBean.error("绑定数据异常, 请联系管理人员", ResponseBean.ERROR_ILLEGAL_PARAMS);
+            }
+        }
+
+        List<String> targetTypeList = new ArrayList<String>(){{
+            add(Constants.TARGET_SHOP);
+            add(Constants.TARGET_HOTEL);
+        }};
+        if (!targetTypeList.contains(targetType)) {
+            return ResponseBean.error("暂不支持的身份类型", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        taPersonRole = new TaPersonRole();
+        taPersonRole.setPersonId(taPerson.getPersonId());
+        taPersonRole.setTargetType(targetType);
+        taPersonRole.setStatus(Constants.STATUS_NORMAL);
+
+        // 如果是商铺
+        if (Constants.TARGET_SHOP.equals(targetType)) {
+            List<TaShopWorker> shopWorkers = iTaShopWorkerService.getByPhone(taPerson.getPhone());
+            if (null == shopWorkers || shopWorkers.size() < 1) {
+                return ResponseBean.error("未找到有效的身份对应信息", ResponseBean.ERROR_ILLEGAL_PARAMS);
+            }
+            iTaShopWorkerService.updateByPerson(taPerson);
+        }
+
+        // 如果是商铺
+        if (Constants.TARGET_HOTEL.equals(targetType)) {
+            List<TaHotelWorker> shopWorkers = iTaHotelWorkerService.getByPhone(taPerson.getPhone());
+            if (null == shopWorkers || shopWorkers.size() < 1) {
+                return ResponseBean.error("未找到有效的身份对应信息", ResponseBean.ERROR_ILLEGAL_PARAMS);
+            }
+            iTaHotelWorkerService.updateByPerson(taPerson);
+        }
+
+        iTaPersonRoleService.save(taPersonRole);
+        iTaPersonService.updateById(taPerson);
+
+        return ResponseBean.success(taPerson);
+    }
+
+
 //
 //    /**
 //     * 保存对象

src/main/java/com/yunzhi/shigongli/controller/TaShopWorkerController.java

@@ -7,10 +7,14 @@ import com.yunzhi.shigongli.common.BaseController;
 import com.yunzhi.shigongli.common.Constants;
 import com.yunzhi.shigongli.common.ResponseBean;
 import com.yunzhi.shigongli.common.StringUtils;
+import com.yunzhi.shigongli.entity.TaPerson;
+import com.yunzhi.shigongli.entity.TaPersonRole;
 import com.yunzhi.shigongli.entity.TaShopWorker;
+import com.yunzhi.shigongli.service.ITaPersonRoleService;
 import com.yunzhi.shigongli.service.ITaShopWorkerService;
 import com.yunzhi.shigongli.vo.ShopWorkerListVO;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.slf4j.Logger;
@@ -37,6 +41,9 @@ public class TaShopWorkerController extends BaseController {
     @Autowired
     public ITaShopWorkerService iTaShopWorkerService;
 
+    @Autowired
+    public ITaPersonRoleService iTaPersonRoleService;
+
 
     /**
      * 分页查询列表
@@ -113,4 +120,20 @@ public class TaShopWorkerController extends BaseController {
     public ResponseBean taShopWorkerGet(@ApiParam("对象ID") @PathVariable String id) throws Exception{
         return ResponseBean.success(iTaShopWorkerService.getById(id));
     }
+
+    @RequestMapping(value = "/wx/shop/manager/index", method= RequestMethod.GET)
+    @ApiOperation(value = "微信商铺端详情", notes = "微信商铺端详情", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean getWxShopManager() throws Exception {
+        TaPerson taPerson = getCurrentPerson();
+
+        // 校验是否店主
+        TaPersonRole taPersonRole = iTaPersonRoleService.getPersonRole(taPerson, Constants.TARGET_SHOP);
+        if (null == taPersonRole) {
+            return ResponseBean.error("当前人员非店主", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        return ResponseBean.success(null);
+
+    }
+
 }

src/main/java/com/yunzhi/shigongli/entity/TaHotelAccount.java

@@ -3,6 +3,8 @@ package com.yunzhi.shigongli.entity;
 import java.math.BigDecimal;
 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;
@@ -43,6 +45,10 @@ public class TaHotelAccount implements Serializable {
     @ApiModelProperty(value = "已结佣金;单位分")
     private Integer paidCharges;
 
+    @ApiModelProperty(value = "创建日期")
     private LocalDateTime createDate;
 
+    @ApiModelProperty(value = "当前区间金额")
+    @TableField(exist = false)
+    private Integer currentCharges;
 }

src/main/java/com/yunzhi/shigongli/entity/TaPersonRole.java

@@ -40,6 +40,9 @@ public class TaPersonRole implements Serializable {
     @ApiModelProperty(value = "是否管理员")
     private Integer isManager;
 
+    @ApiModelProperty(value = "状态")
+    private Integer status;
+
     @ApiModelProperty(value = "映射类型")
     private String targetType;
 

src/main/java/com/yunzhi/shigongli/mapper/TaHotelAccountLogMapper.java

@@ -1,8 +1,12 @@
 package com.yunzhi.shigongli.mapper;
 
+import com.yunzhi.shigongli.entity.TaHotelAccount;
 import com.yunzhi.shigongli.entity.TaHotelAccountLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -14,5 +18,5 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface TaHotelAccountLogMapper extends BaseMapper<TaHotelAccountLog> {
-
+    Integer sumChargesBy(@Param("accountId") String accountId, @Param("from") LocalDateTime from, @Param("to") LocalDateTime to);
 }

src/main/java/com/yunzhi/shigongli/mapper/TaHotelMapper.java

@@ -7,6 +7,8 @@ import com.yunzhi.shigongli.vo.HotelListVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 民宿 Mapper 接口
@@ -19,4 +21,6 @@ import org.apache.ibatis.annotations.Param;
 public interface TaHotelMapper extends BaseMapper<TaHotel> {
 
     IPage<HotelListVO> getVOListBy(IPage<TaHotel> pg, @Param("hotelName") String hotelName);
+
+    List<TaHotel> getListByPerson(@Param("personId") String personId);
 }

src/main/java/com/yunzhi/shigongli/mapper/TaHotelWorkerMapper.java

@@ -3,6 +3,7 @@ package com.yunzhi.shigongli.mapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.shigongli.entity.TaHotelWorker;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yunzhi.shigongli.entity.TaPerson;
 import com.yunzhi.shigongli.vo.HotelWorkerListVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -19,4 +20,6 @@ import org.apache.ibatis.annotations.Param;
 public interface TaHotelWorkerMapper extends BaseMapper<TaHotelWorker> {
 
     IPage<HotelWorkerListVO> getPagedListBy(IPage<HotelWorkerListVO> pg, @Param("hotelId") String hotelId);
+
+    int updateByPerson(@Param("person") TaPerson taPerson);
 }

src/main/java/com/yunzhi/shigongli/mapper/TaShopWorkerMapper.java

@@ -2,6 +2,7 @@ package com.yunzhi.shigongli.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yunzhi.shigongli.entity.TaPerson;
 import com.yunzhi.shigongli.entity.TaShopWorker;
 import com.yunzhi.shigongli.vo.ShopWorkerListVO;
 import org.apache.ibatis.annotations.Mapper;
@@ -19,4 +20,6 @@ import org.apache.ibatis.annotations.Param;
 public interface TaShopWorkerMapper extends BaseMapper<TaShopWorker> {
 
     IPage<ShopWorkerListVO> getPagedListBy(IPage<ShopWorkerListVO> pg, @Param("shopId") String shopId);
+
+    int updateByPerson(@Param("person") TaPerson taPerson);
 }

src/main/java/com/yunzhi/shigongli/service/ITaHotelAccountService.java

@@ -18,4 +18,6 @@ public interface ITaHotelAccountService extends IBaseService<TaHotelAccount> {
     TaHotelAccount getByHotel(String hotelId);
 
     boolean commissionSettlement(TaHotelAccount taHotelAccount, Integer charges) throws Exception;
+
+    TaHotelAccount getAccountInfoBy(String hotelId);
 }

src/main/java/com/yunzhi/shigongli/service/ITaHotelService.java

@@ -2,6 +2,7 @@ package com.yunzhi.shigongli.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.shigongli.entity.TaHotel;
+import com.yunzhi.shigongli.entity.TaPerson;
 import com.yunzhi.shigongli.vo.HotelListVO;
 
 import java.util.List;
@@ -21,4 +22,6 @@ public interface ITaHotelService extends IBaseService<TaHotel> {
     boolean createNew(TaHotel taHotel) throws Exception;
 
     IPage<HotelListVO> getVOListBy(IPage<TaHotel> pg, String hotelName);
+
+    List<TaHotel> getListByPerson(TaPerson taPerson);
 }

src/main/java/com/yunzhi/shigongli/service/ITaHotelWorkerService.java

@@ -2,8 +2,11 @@ package com.yunzhi.shigongli.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.shigongli.entity.TaHotelWorker;
+import com.yunzhi.shigongli.entity.TaPerson;
 import com.yunzhi.shigongli.vo.HotelWorkerListVO;
 
+import java.util.List;
+
 
 /**
  * <p>
@@ -16,4 +19,8 @@ import com.yunzhi.shigongli.vo.HotelWorkerListVO;
 public interface ITaHotelWorkerService extends IBaseService<TaHotelWorker> {
 
     IPage<HotelWorkerListVO> getPagedListBy(IPage<HotelWorkerListVO> pg, String hotelId);
+
+    List<TaHotelWorker> getByPhone(String phone);
+
+    void updateByPerson(TaPerson taPerson) throws Exception;
 }

src/main/java/com/yunzhi/shigongli/service/ITaPersonRoleService.java

@@ -1,5 +1,6 @@
 package com.yunzhi.shigongli.service;
 
+import com.yunzhi.shigongli.entity.TaPerson;
 import com.yunzhi.shigongli.entity.TaPersonRole;
 
 import java.util.List;
@@ -16,4 +17,6 @@ import java.util.List;
 public interface ITaPersonRoleService extends IBaseService<TaPersonRole> {
 
     List<TaPersonRole> getListByPerson(String personId);
+
+    TaPersonRole getPersonRole(TaPerson taPerson, String targetType);
 }

src/main/java/com/yunzhi/shigongli/service/ITaShopWorkerService.java

@@ -2,9 +2,12 @@ package com.yunzhi.shigongli.service;
 
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yunzhi.shigongli.entity.TaPerson;
 import com.yunzhi.shigongli.entity.TaShopWorker;
 import com.yunzhi.shigongli.vo.ShopWorkerListVO;
 
+import java.util.List;
+
 /**
  * <p>
  * 民宿员工 服务类
@@ -16,4 +19,8 @@ import com.yunzhi.shigongli.vo.ShopWorkerListVO;
 public interface ITaShopWorkerService extends IBaseService<TaShopWorker> {
 
     IPage<ShopWorkerListVO> getPagedListBy(IPage<ShopWorkerListVO> pg, String shopId);
+
+    List<TaShopWorker> getByPhone(String phone);
+
+    void updateByPerson(TaPerson taPerson) throws Exception;
 }

src/main/java/com/yunzhi/shigongli/service/impl/TaHotelAccountServiceImpl.java

@@ -2,6 +2,7 @@ package com.yunzhi.shigongli.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yunzhi.shigongli.common.Constants;
+import com.yunzhi.shigongli.common.DateUtils;
 import com.yunzhi.shigongli.entity.TaHotelAccount;
 import com.yunzhi.shigongli.entity.TaHotelAccountLog;
 import com.yunzhi.shigongli.mapper.TaHotelAccountLogMapper;
@@ -77,4 +78,21 @@ public class TaHotelAccountServiceImpl extends BaseServiceImpl<TaHotelAccountMap
 
         return true;
     }
+
+    @Override
+    public TaHotelAccount getAccountInfoBy(String hotelId) {
+        TaHotelAccount account = getByHotel(hotelId);
+
+        LocalDateTime now = LocalDateTime.now();
+        String curMonth = DateUtils.toString(now, "yyyy-MM");
+        LocalDateTime from = DateUtils.from(curMonth + "-01", "yyyy-MM-dd");
+
+        Integer charges = taHotelAccountLogMapper.sumChargesBy(account.getAccountId(), from, now);
+        if (null == charges) {
+            charges = 0;
+        }
+        account.setCurrentCharges(charges);
+
+        return account;
+    }
 }

src/main/java/com/yunzhi/shigongli/service/impl/TaHotelServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.shigongli.common.Constants;
 import com.yunzhi.shigongli.entity.TaHotel;
 import com.yunzhi.shigongli.entity.TaHotelAccount;
+import com.yunzhi.shigongli.entity.TaPerson;
 import com.yunzhi.shigongli.mapper.TaHotelAccountMapper;
 import com.yunzhi.shigongli.mapper.TaHotelMapper;
 import com.yunzhi.shigongli.service.ITaHotelService;
@@ -58,4 +59,9 @@ public class TaHotelServiceImpl extends BaseServiceImpl<TaHotelMapper, TaHotel>
     public IPage<HotelListVO> getVOListBy(IPage<TaHotel> pg, String hotelName) {
         return hotelMapper.getVOListBy(pg, hotelName);
     }
+
+    @Override
+    public List<TaHotel> getListByPerson(TaPerson taPerson) {
+        return hotelMapper.getListByPerson(taPerson.getPersonId());
+    }
 }

src/main/java/com/yunzhi/shigongli/service/impl/TaHotelWorkerServiceImpl.java

@@ -1,7 +1,10 @@
 package com.yunzhi.shigongli.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yunzhi.shigongli.common.Constants;
 import com.yunzhi.shigongli.entity.TaHotelWorker;
+import com.yunzhi.shigongli.entity.TaPerson;
 import com.yunzhi.shigongli.mapper.TaHotelWorkerMapper;
 import com.yunzhi.shigongli.service.ITaHotelWorkerService;
 
@@ -9,6 +12,8 @@ import com.yunzhi.shigongli.vo.HotelWorkerListVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 民宿员工 服务实现类
@@ -27,4 +32,18 @@ public class TaHotelWorkerServiceImpl extends BaseServiceImpl<TaHotelWorkerMappe
     public IPage<HotelWorkerListVO> getPagedListBy(IPage<HotelWorkerListVO> pg, String hotelId) {
         return hotelWorkerMapper.getPagedListBy(pg, hotelId);
     }
+
+    @Override
+    public List<TaHotelWorker> getByPhone(String phone) {
+        LambdaQueryWrapper<TaHotelWorker> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(TaHotelWorker::getPhone, phone);
+        queryWrapper.gt(TaHotelWorker::getStatus, Constants.STATUS_DELETED);
+
+        return list(queryWrapper);
+    }
+
+    @Override
+    public void updateByPerson(TaPerson taPerson) throws Exception {
+        hotelWorkerMapper.updateByPerson(taPerson);
+    }
 }

src/main/java/com/yunzhi/shigongli/service/impl/TaPersonRoleServiceImpl.java

@@ -1,6 +1,8 @@
 package com.yunzhi.shigongli.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.yunzhi.shigongli.common.Constants;
+import com.yunzhi.shigongli.entity.TaPerson;
 import com.yunzhi.shigongli.entity.TaPersonRole;
 import com.yunzhi.shigongli.mapper.TaPersonRoleMapper;
 import com.yunzhi.shigongli.service.ITaPersonRoleService;
@@ -26,4 +28,14 @@ public class TaPersonRoleServiceImpl extends BaseServiceImpl<TaPersonRoleMapper,
 
         return list(queryWrapper);
     }
+
+    @Override
+    public TaPersonRole getPersonRole(TaPerson taPerson, String targetType) {
+        LambdaQueryWrapper<TaPersonRole> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(TaPersonRole::getPersonId, taPerson.getPersonId());
+        queryWrapper.eq(TaPersonRole::getTargetType, targetType);
+        queryWrapper.gt(TaPersonRole::getStatus, Constants.STATUS_DELETED);
+
+        return getOne(queryWrapper);
+    }
 }

src/main/java/com/yunzhi/shigongli/service/impl/TaShopWorkerServiceImpl.java

@@ -1,7 +1,10 @@
 package com.yunzhi.shigongli.service.impl;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yunzhi.shigongli.common.Constants;
+import com.yunzhi.shigongli.entity.TaPerson;
 import com.yunzhi.shigongli.entity.TaShopWorker;
 import com.yunzhi.shigongli.mapper.TaShopWorkerMapper;
 import com.yunzhi.shigongli.service.ITaShopWorkerService;
@@ -9,6 +12,8 @@ import com.yunzhi.shigongli.vo.ShopWorkerListVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 民宿员工 服务实现类
@@ -27,4 +32,18 @@ public class TaShopWorkerServiceImpl extends BaseServiceImpl<TaShopWorkerMapper,
     public IPage<ShopWorkerListVO> getPagedListBy(IPage<ShopWorkerListVO> pg, String shopId) {
         return shopWorkerMapper.getPagedListBy(pg, shopId);
     }
+
+    @Override
+    public List<TaShopWorker> getByPhone(String phone) {
+        LambdaQueryWrapper<TaShopWorker> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(TaShopWorker::getPhone, phone);
+        queryWrapper.gt(TaShopWorker::getStatus, Constants.STATUS_DELETED);
+
+        return list(queryWrapper);
+    }
+
+    @Override
+    public void updateByPerson(TaPerson taPerson) throws Exception {
+        shopWorkerMapper.updateByPerson(taPerson);
+    }
 }

src/main/java/com/yunzhi/shigongli/service/impl/TaTouristServiceImpl.java

@@ -50,7 +50,7 @@ public class TaTouristServiceImpl extends BaseServiceImpl<TaTouristMapper, TaTou
         // 图片
         if (null != taTourist.getImageList()) {
             for (TaImage image: taTourist.getImageList()) {
-                image.setTargetType(Constants.TARGET_SHOP);
+                image.setTargetType(Constants.TARGET_TOURIST);
                 image.setTargetId(taTourist.getTouristId());
                 imagesMapper.insert(image);
             }
@@ -59,7 +59,7 @@ public class TaTouristServiceImpl extends BaseServiceImpl<TaTouristMapper, TaTou
         // 分类标签
         if (null != taTourist.getTypeList()) {
             for (TaTargetType type: taTourist.getTypeList()) {
-                type.setTargetType(Constants.TARGET_SHOP);
+                type.setTargetType(Constants.TARGET_TOURIST);
                 type.setTargetId(taTourist.getTouristId());
                 targetTypeMapper.insert(type);
             }

src/main/resources/mapper/TaHotelAccountLogMapper.xml

@@ -2,4 +2,13 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yunzhi.shigongli.mapper.TaHotelAccountLogMapper">
 
+    <select id="sumChargesBy" resultType="java.lang.Integer">
+        SELECT
+            sum( s.amount )
+        FROM
+            ta_hotel_account_log s
+        WHERE
+            s.account_id = #{accountId}
+          AND ( s.create_date BETWEEN #{from} AND #{to} )
+    </select>
 </mapper>

src/main/resources/mapper/TaHotelMapper.xml

@@ -20,4 +20,15 @@
         ORDER BY
             t.create_date DESC
     </select>
+    <select id="getListByPerson" resultType="com.yunzhi.shigongli.entity.TaHotel">
+        SELECT
+            t.*
+        FROM
+            ta_hotel t
+        WHERE
+            EXISTS ( SELECT * FROM ta_hotel_worker s WHERE s.hotel_id = t.hotel_id AND s.person_id = #{personId} AND s.`status` = 1 )
+          AND t.`status` = 1
+        ORDER BY
+            t.create_date DESC
+    </select>
 </mapper>

src/main/resources/mapper/TaHotelWorkerMapper.xml

@@ -1,6 +1,12 @@
 <?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.yunzhi.shigongli.mapper.TaHotelWorkerMapper">
+    <update id="updateByPerson">
+        UPDATE ta_hotel_worker t
+        SET t.person_id = #{person.personId}
+        WHERE
+            t.phone = #{person.phone}
+    </update>
 
     <select id="getPagedListBy" resultType="com.yunzhi.shigongli.vo.HotelWorkerListVO">
         SELECT

src/main/resources/mapper/TaShopWorkerMapper.xml

@@ -1,6 +1,12 @@
 <?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.yunzhi.shigongli.mapper.TaShopWorkerMapper">
+    <update id="updateByPerson">
+        UPDATE ta_shop_worker t
+        SET t.person_id = #{person.personId}
+        WHERE
+            t.phone = #{person.phone}
+    </update>
 
     <select id="getPagedListBy" resultType="com.yunzhi.shigongli.vo.ShopWorkerListVO">
         SELECT