diff --git a/hiver-admin/src/main/resources/application.yml b/hiver-admin/src/main/resources/application.yml
index b423c524..dde87d6f 100644
--- a/hiver-admin/src/main/resources/application.yml
+++ b/hiver-admin/src/main/resources/application.yml
@@ -25,8 +25,8 @@ spring:
     timeout-per-shutdown-phase: 10S
   # 数据源
   datasource:
-    url: jdbc:mysql://154.8.162.157:3306/hiver_shop?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true&allowMultiQueries=true
-#    url: jdbc:mysql://8.140.198.243:3306/hiver_shop?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true&allowMultiQueries=true
+#    url: jdbc:mysql://154.8.162.157:3306/hiver_shop?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true&allowMultiQueries=true
+    url: jdbc:mysql://8.140.198.243:3306/hiver_shop?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true&allowMultiQueries=true
     username: reddoor
     # Jasypt加密 可到common-utils中找到JasyptUtil加解密工具类生成加密结果 格式为ENC(加密结果) 以下解密结果为123456
     password: ENC(Zla4U4+yRLPhicvuX2TmiEgxEpzP4dk8BHzFDEtiEhwLQIIaftZrrEUJZce6efoe)
@@ -67,8 +67,8 @@ spring:
       ddl-auto: update
   # Redis 若设有密码自行添加配置password
   redis:
-    host: 154.8.162.157
-#    host: 8.140.198.243
+#    host: 154.8.162.157
+    host: 8.140.198.243
     password: reddoor168
     # 数据库索引 默认0
     database: 1
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/warehouse/constant/WarehouseConstant.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/warehouse/constant/WarehouseConstant.java
new file mode 100644
index 00000000..5d79178e
--- /dev/null
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/warehouse/constant/WarehouseConstant.java
@@ -0,0 +1,20 @@
+package cc.hiver.mall.warehouse.constant;
+
+/**
+ * 仓库常量
+ *
+ * @author 王富康
+ * @date 2024/8/3
+ */
+public class WarehouseConstant {
+
+    /**
+     * 是否启用：0：是；1：否
+     */
+    String[] IS_USE = {"0","1"};
+
+    /**
+     * 店铺状态：0：共用；1：按需分配
+     */
+    String[] WAREHOUSE_STATUS = {"0","1"};
+}
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/warehouse/controller/WarehouseController.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/warehouse/controller/WarehouseController.java
new file mode 100644
index 00000000..d2256aaa
--- /dev/null
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/warehouse/controller/WarehouseController.java
@@ -0,0 +1,119 @@
+package cc.hiver.mall.warehouse.controller;
+
+import cc.hiver.core.common.utils.ResultUtil;
+import cc.hiver.core.common.vo.Result;
+import cc.hiver.mall.warehouse.entity.Warehouse;
+import cc.hiver.mall.warehouse.service.WarehouseService;
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+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.RestController;
+
+import java.util.List;
+
+@Slf4j
+@RestController
+@Api(tags = "仓库接口")
+@RequestMapping("/hiver/warehouse/")
+@Transactional
+public class WarehouseController {
+
+    @Autowired
+    private WarehouseService warehouseService;
+
+    /**
+     * 新增仓库
+     *
+     * @param warehouse
+     * @return Result
+     * @author 王富康
+     * @date 2024/8/3
+     */
+    @RequestMapping(value = "/addWarehouse", method = RequestMethod.POST)
+    public Result addWarehouse(@RequestBody Warehouse warehouse) {
+        if (StringUtils.isEmpty(warehouse.getWarehouseName())) {
+            return ResultUtil.error("仓库名称不能为空");
+        }
+        if (StringUtils.isEmpty(warehouse.getShopOwnerId())) {
+            return ResultUtil.error("店主id不能为空");
+        }
+        try {
+            warehouse = warehouseService.addWarehouse(warehouse);
+            return new ResultUtil<Warehouse>().setData(warehouse, "新增仓库成功");
+        } catch (Exception e) {
+            log.error("新增仓库失败", e);
+            return ResultUtil.error("新增仓库失败");
+        }
+    }
+
+    /**
+     * 修改仓库信息
+     *
+     * @param warehouse
+     * @return Result
+     * @author 王富康
+     * @date 2024/8/3
+     */
+    @RequestMapping(value = "/updateWarehouse", method = RequestMethod.POST)
+    public Result updateWarehouse(@RequestBody Warehouse warehouse) {
+        if (StringUtils.isEmpty(warehouse.getWarehouseName())) {
+            return ResultUtil.error("仓库名称不能为空");
+        }
+        if (StringUtils.isEmpty(warehouse.getShopOwnerId())) {
+            return ResultUtil.error("店主id不能为空");
+        }
+        try {
+            warehouse = warehouseService.updateWarehouse(warehouse);
+            return new ResultUtil<Warehouse>().setData(warehouse, "修改仓库成功");
+        } catch (Exception e) {
+            log.error("修改仓库失败", e);
+            return ResultUtil.error("修改仓库失败");
+        }
+    }
+
+    /**
+     * 删除仓库
+     *
+     * @param id
+     * @return Result
+     * @author 王富康
+     * @date 2024/8/3
+     */
+    @RequestMapping(value = "/deleteWarehouse", method = RequestMethod.POST)
+    public Result deleteWarehouse(String id) {
+        try {
+            boolean b = warehouseService.deleteWarehouse(id);
+            if (b) {
+                return ResultUtil.success("删除仓库成功");
+            } else {
+                return ResultUtil.error("删除仓库失败");
+            }
+        } catch (Exception e) {
+            log.error("删除仓库失败", e);
+            return ResultUtil.error("删除仓库失败");
+        }
+
+    }
+
+    // 根据店主id查询仓库信息
+    @RequestMapping(value = "/getWarehouseByShopOwnerId", method = RequestMethod.POST)
+    public Result getWarehouseByShopOwnerId(String shopOwnerId) {
+        if (StringUtils.isEmpty(shopOwnerId)) {
+            return ResultUtil.error("店主id不能为空");
+        }
+        try {
+            List<Warehouse> warehouseList = warehouseService.getWarehouseByShopOwnerId(shopOwnerId);
+            return new ResultUtil<List<Warehouse>>().setData(warehouseList, "查询仓库信息成功");
+        } catch (Exception e) {
+            log.error("查询仓库信息失败", e);
+            return ResultUtil.error("查询仓库信息失败");
+        }
+    }
+
+
+}
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/warehouse/controller/WarehouseShopController.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/warehouse/controller/WarehouseShopController.java
new file mode 100644
index 00000000..394c430c
--- /dev/null
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/warehouse/controller/WarehouseShopController.java
@@ -0,0 +1,101 @@
+package cc.hiver.mall.warehouse.controller;
+
+import cc.hiver.core.common.utils.ResultUtil;
+import cc.hiver.core.common.vo.Result;
+import cc.hiver.mall.warehouse.entity.WarehouseShop;
+import cc.hiver.mall.warehouse.service.WarehouseShopService;
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+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.RestController;
+
+import java.util.List;
+
+@Slf4j
+@RestController
+@Api(tags = "仓库-店铺关联接口")
+@RequestMapping("/hiver/warehouseShop/")
+@Transactional
+public class WarehouseShopController {
+
+    @Autowired
+    private WarehouseShopService warehouseShopService;
+
+    /**
+     * 添加仓库-店铺关联
+     *
+     * @param warehouseShop
+     * @return Result
+     * @author 王富康
+     * @date 2024/8/3
+     */
+    @RequestMapping(value = "/addWarehouseShop", method = RequestMethod.POST)
+    public Result addWarehouseShop(@RequestBody WarehouseShop warehouseShop) {
+        // 仓库id不能为空
+        if (StringUtils.isEmpty(warehouseShop.getWarehouseId())) {
+            return ResultUtil.error("仓库id不能为空");
+        }
+        try {
+            warehouseShopService.addWarehouseShop(warehouseShop);
+            return ResultUtil.success("添加仓库-店铺关联成功");
+        } catch (Exception e) {
+            log.error("添加仓库-店铺关联失败", e);
+            return ResultUtil.error("添加仓库-店铺关联失败");
+        }
+    }
+
+    /**
+     * 删除仓库-店铺关联
+     *
+     * @param id
+     * @return Result
+     * @author 王富康
+     * @date 2024/8/3
+     */
+    @RequestMapping(value = "/deleteWarehouseShop", method = RequestMethod.POST)
+    public Result deleteWarehouseShop(String id) {
+        try {
+            warehouseShopService.deleteWarehouseShop(id);
+            return ResultUtil.success("删除仓库-店铺关联成功");
+        } catch (Exception e) {
+            log.error("删除仓库-店铺关联失败", e);
+            return ResultUtil.error("删除仓库-店铺关联失败");
+        }
+    }
+
+    // 根据仓库id获取关联的店铺信息
+    @RequestMapping(value = "/getWarehouseShopByWarehouseId", method = RequestMethod.POST)
+    public Result getWarehouseShopByWarehouseId(String warehouseId) {
+        if(StringUtils.isEmpty(warehouseId)){
+            return ResultUtil.error("仓库id不能为空");
+        }
+        try {
+            List<WarehouseShop> warehouseShopList = warehouseShopService.getWarehouseShopByWarehouseId(warehouseId);
+            return new ResultUtil<List<WarehouseShop>>().setData(warehouseShopList);
+        } catch (Exception e) {
+            log.error("查询仓库-店铺关联失败", e);
+            return ResultUtil.error("查询仓库-店铺关联失败");
+        }
+    }
+
+    // 查询当前店铺下的仓库信息
+    @RequestMapping(value = "/getWarehouseShopByShopId", method = RequestMethod.POST)
+    public Result getWarehouseShopByShopId(String shopId) {
+        if(StringUtils.isEmpty(shopId)){
+            return ResultUtil.error("店铺id不能为空");
+        }
+        try {
+            List<WarehouseShop> warehouseShopList = warehouseShopService.getWarehouseShopByShopId(shopId);
+            return new ResultUtil<List<WarehouseShop>>().setData(warehouseShopList);
+        }catch (Exception e){
+            log.error("查询仓库-店铺关联失败", e);
+            return ResultUtil.error("查询仓库-店铺关联失败");
+        }
+    }
+
+}
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/warehouse/entity/Warehouse.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/warehouse/entity/Warehouse.java
new file mode 100644
index 00000000..f59df6ec
--- /dev/null
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/warehouse/entity/Warehouse.java
@@ -0,0 +1,38 @@
+package cc.hiver.mall.warehouse.entity;
+
+import cc.hiver.core.base.HiverBaseEntity;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "仓库表")
+@TableName(value = "t_warehouse", autoResultMap = true)
+public class Warehouse  extends HiverBaseEntity {
+
+    @ApiModelProperty(value = "仓库名称")
+    private String warehouseName;
+
+    @ApiModelProperty(value = "仓库地址")
+    private String warehouseAddress;
+
+    @ApiModelProperty(value = "店铺状态：0：共用；1：按需分配")
+    private Integer warehouseStatus;
+
+    @ApiModelProperty(value = "是否启用：0：是；1：否")
+    private Integer isUse;
+
+    @ApiModelProperty(value = "店主id")
+    private String shopOwnerId;
+
+    @ApiModelProperty(value = "店主名称")
+    private String shopOwnerName;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    @ApiModelProperty(value = "排序")
+    private Integer sort;
+
+}
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/warehouse/entity/WarehouseShop.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/warehouse/entity/WarehouseShop.java
new file mode 100644
index 00000000..29ff3134
--- /dev/null
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/warehouse/entity/WarehouseShop.java
@@ -0,0 +1,37 @@
+package cc.hiver.mall.warehouse.entity;
+
+import cc.hiver.core.base.HiverBaseEntity;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "仓库-店铺关联表")
+@TableName(value = "t_warehouse_shop", autoResultMap = true)
+public class WarehouseShop extends HiverBaseEntity {
+
+    @ApiModelProperty(value = "店主id")
+    private String shopOwnerId;
+
+    @ApiModelProperty(value = "店主名称")
+    private String shopOwnerName;
+
+    @ApiModelProperty(value = "仓库id")
+    private String warehouseId;
+
+    @ApiModelProperty(value = "仓库名称")
+    private String warehouseName;
+
+    @ApiModelProperty(value = "仓库地址")
+    private String warehouseAddress;
+
+    @ApiModelProperty(value = "店铺id")
+    private String shopId;
+
+    @ApiModelProperty(value = "店铺名称")
+    private String shopName;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+}
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/warehouse/mapper/WarehouseMappper.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/warehouse/mapper/WarehouseMappper.java
new file mode 100644
index 00000000..f0658cf8
--- /dev/null
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/warehouse/mapper/WarehouseMappper.java
@@ -0,0 +1,17 @@
+package cc.hiver.mall.warehouse.mapper;
+
+import cc.hiver.mall.warehouse.entity.Warehouse;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface WarehouseMappper extends BaseMapper<Warehouse> {
+    Warehouse addWarehouse(@Param("warehouse") Warehouse warehouse);
+
+    Warehouse updateWarehouse(@Param("warehouse") Warehouse warehouse);
+
+    int deleteWarehouse(@Param("id")  String id);
+
+    List<Warehouse> getWarehouseByShopOwnerId(@Param("shopOwnerId") String shopOwnerId);
+}
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/warehouse/mapper/WarehouseShopMapper.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/warehouse/mapper/WarehouseShopMapper.java
new file mode 100644
index 00000000..38250395
--- /dev/null
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/warehouse/mapper/WarehouseShopMapper.java
@@ -0,0 +1,17 @@
+package cc.hiver.mall.warehouse.mapper;
+
+import cc.hiver.mall.warehouse.entity.WarehouseShop;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface WarehouseShopMapper extends BaseMapper<WarehouseShop> {
+    void addWarehouseShop(@Param("warehouseShop") WarehouseShop warehouseShop);
+
+    void deleteWarehouseShop(@Param("id") String id);
+
+    List<WarehouseShop> getWarehouseShopByWarehouseId(@Param("warehouseId") String warehouseId);
+
+    List<WarehouseShop> getWarehouseShopByShopId(@Param("shopId") String shopId);
+}
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/warehouse/service/WarehouseService.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/warehouse/service/WarehouseService.java
new file mode 100644
index 00000000..920fcaba
--- /dev/null
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/warehouse/service/WarehouseService.java
@@ -0,0 +1,15 @@
+package cc.hiver.mall.warehouse.service;
+
+import cc.hiver.mall.warehouse.entity.Warehouse;
+
+import java.util.List;
+
+public interface WarehouseService {
+    Warehouse addWarehouse(Warehouse warehouse);
+
+    Warehouse updateWarehouse(Warehouse warehouse);
+
+    boolean deleteWarehouse(String id);
+
+    List<Warehouse> getWarehouseByShopOwnerId(String shopOwnerId);
+}
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/warehouse/service/WarehouseShopService.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/warehouse/service/WarehouseShopService.java
new file mode 100644
index 00000000..3f6264b0
--- /dev/null
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/warehouse/service/WarehouseShopService.java
@@ -0,0 +1,16 @@
+package cc.hiver.mall.warehouse.service;
+
+import cc.hiver.mall.warehouse.entity.WarehouseShop;
+
+import java.util.List;
+
+public interface WarehouseShopService {
+
+    void addWarehouseShop(WarehouseShop warehouseShop);
+
+    void deleteWarehouseShop(String id);
+
+    List<WarehouseShop> getWarehouseShopByWarehouseId(String warehouseId);
+
+    List<WarehouseShop> getWarehouseShopByShopId(String shopId);
+}
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/warehouse/service/impl/WarehouseServiceImpl.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/warehouse/service/impl/WarehouseServiceImpl.java
new file mode 100644
index 00000000..cd6ef9e8
--- /dev/null
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/warehouse/service/impl/WarehouseServiceImpl.java
@@ -0,0 +1,37 @@
+package cc.hiver.mall.warehouse.service.impl;
+
+import cc.hiver.mall.warehouse.entity.Warehouse;
+import cc.hiver.mall.warehouse.mapper.WarehouseMappper;
+import cc.hiver.mall.warehouse.service.WarehouseService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class WarehouseServiceImpl implements WarehouseService {
+
+    @Autowired
+    private WarehouseMappper warehouseMappper;
+
+    @Override
+    public Warehouse addWarehouse(Warehouse warehouse) {
+        return warehouseMappper.addWarehouse(warehouse);
+    }
+
+    @Override
+    public Warehouse updateWarehouse(Warehouse warehouse) {
+        return warehouseMappper.updateWarehouse(warehouse);
+    }
+
+    @Override
+    public boolean deleteWarehouse(String id) {
+        final int i = warehouseMappper.deleteWarehouse(id);
+        return i > 0;
+    }
+
+    @Override
+    public List<Warehouse> getWarehouseByShopOwnerId(String shopOwnerId) {
+        return warehouseMappper.getWarehouseByShopOwnerId(shopOwnerId);
+    }
+}
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/warehouse/service/impl/WarehouseShopServiceImpl.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/warehouse/service/impl/WarehouseShopServiceImpl.java
new file mode 100644
index 00000000..124dece9
--- /dev/null
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/warehouse/service/impl/WarehouseShopServiceImpl.java
@@ -0,0 +1,36 @@
+package cc.hiver.mall.warehouse.service.impl;
+
+import cc.hiver.mall.warehouse.entity.WarehouseShop;
+import cc.hiver.mall.warehouse.mapper.WarehouseShopMapper;
+import cc.hiver.mall.warehouse.service.WarehouseShopService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class WarehouseShopServiceImpl implements WarehouseShopService {
+
+    @Autowired
+    private WarehouseShopMapper warehouseShopMapper;
+
+    @Override
+    public void addWarehouseShop(WarehouseShop warehouseShop) {
+        warehouseShopMapper.addWarehouseShop(warehouseShop);
+    }
+
+    @Override
+    public void deleteWarehouseShop(String id) {
+        warehouseShopMapper.deleteWarehouseShop(id);
+    }
+
+    @Override
+    public List<WarehouseShop> getWarehouseShopByWarehouseId(String warehouseId) {
+        return warehouseShopMapper.getWarehouseShopByWarehouseId(warehouseId);
+    }
+
+    @Override
+    public List<WarehouseShop> getWarehouseShopByShopId(String shopId) {
+        return warehouseShopMapper.getWarehouseShopByShopId(shopId);
+    }
+}
diff --git a/hiver-modules/hiver-mall/src/main/resources/mapper/WarehouseMappper.xml b/hiver-modules/hiver-mall/src/main/resources/mapper/WarehouseMappper.xml
new file mode 100644
index 00000000..adc0c790
--- /dev/null
+++ b/hiver-modules/hiver-mall/src/main/resources/mapper/WarehouseMappper.xml
@@ -0,0 +1,77 @@
+<?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="cc.hiver.mall.warehouse.mapper.WarehouseMappper">
+    <resultMap id="BaseResultMap" type="cc.hiver.mall.warehouse.entity.Warehouse">
+        <id column="id" jdbcType="VARCHAR" property="id" />
+        <result column="create_by" jdbcType="VARCHAR" property="createBy" />
+        <result column="create_by_name" jdbcType="VARCHAR" property="createByName" />
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+        <result column="del_flag" jdbcType="INTEGER" property="delFlag" />
+        <result column="update_by" jdbcType="VARCHAR" property="updateBy" />
+        <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+        <result column="warehouse_name" jdbcType="VARCHAR" property="warehouseName" />
+        <result column="warehouse_address" jdbcType="VARCHAR" property="warehouseAddress" />
+        <result column="warehouse_status" jdbcType="INTEGER" property="warehouseStatus" />
+        <result column="is_use" jdbcType="INTEGER" property="isUse" />
+        <result column="shop_owner_id" jdbcType="VARCHAR" property="shopOwnerId" />
+        <result column="shop_owner_name" jdbcType="VARCHAR" property="shopOwnerName" />
+        <result column="remark" jdbcType="VARCHAR" property="remark" />
+        <result column="sort" jdbcType="INTEGER" property="sort" />
+    </resultMap>
+    <sql id="Base_Column_List">
+        id, create_by,create_by_name, create_time, del_flag, update_by, update_time,
+            warehouse_name, warehouse_address, warehouse_status, is_use, shop_owner_id,
+            shop_owner_name, remark, sort
+    </sql>
+
+    <insert id="addWarehouse" parameterType="cc.hiver.mall.warehouse.entity.Warehouse">
+        insert into t_warehouse
+            (id, create_by, create_by_name, create_time, del_flag, update_by, update_time,
+             warehouse_name, warehouse_address, warehouse_status, is_use, shop_owner_id,
+             shop_owner_name, remark, sort)
+        values (#{warehouse.id,jdbcType=VARCHAR}, #{warehouse.createBy,jdbcType=VARCHAR},#{warehouse.createByName,jdbcType=VARCHAR},
+                #{warehouse.createTime,jdbcType=TIMESTAMP}, #{warehouse.delFlag,jdbcType=INTEGER}, #{warehouse.updateBy,jdbcType=VARCHAR},
+                #{warehouse.updateTime,jdbcType=TIMESTAMP}, #{warehouse.warehouseName,jdbcType=VARCHAR}, #{warehouse.warehouseAddress,jdbcType=VARCHAR},
+                #{warehouse.warehouseStatus,jdbcType=INTEGER}, #{warehouse.isUse,jdbcType=INTEGER}, #{warehouse.shopOwnerId,jdbcType},
+                #{warehouse.shopOwnerName,jdbcType=VARCHAR}, #{warehouse.remark,jdbcType=VARCHAR}, #{warehouse.sort,jdbcType=INTEGER})
+    </insert>
+
+    <update id="updateWarehouse" parameterType="cc.hiver.mall.warehouse.entity.Warehouse">
+        update t_warehouse
+        <set>
+            <if test="warehouse.delFlag != null">
+                del_flag = #{warehouse.delFlag},
+            </if>
+            <if test="warehouse.updateBy != null">
+                update_by = #{warehouse.updateBy},
+            </if>
+            <if test="warehouse.updateTime != null">
+                update_time = #{warehouse.updateTime},
+            </if>
+            <if test="warehouse.warehouseName != null">
+                warehouse_name = #{warehouse.warehouseName},
+            </if>
+            <if test="warehouse.warehouseAddress != null">
+                warehouse_address = #{warehouse.warehouseAddress},
+            </if>
+            <if test="warehouse.remark != null">
+                remark = #{warehouse.remark},
+            </if>
+            <if test="warehouse.sort != null">
+                sort = #{warehouse.sort},
+            </if>
+        </set>
+        where id = #{warehouse.id,jdbcType=VARCHAR}
+    </update>
+
+    <update id="deleteWarehouse" parameterType="java.lang.String">
+        update t_warehouse set del_flag = 1 where id = #{id}
+    </update>
+
+    <select id="getWarehouseByShopOwnerId" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from t_warehouse
+        where shop_owner_id = #{shopOwnerId}
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/hiver-modules/hiver-mall/src/main/resources/mapper/WarehouseShopMappper.xml b/hiver-modules/hiver-mall/src/main/resources/mapper/WarehouseShopMappper.xml
new file mode 100644
index 00000000..42e418e0
--- /dev/null
+++ b/hiver-modules/hiver-mall/src/main/resources/mapper/WarehouseShopMappper.xml
@@ -0,0 +1,61 @@
+<?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="cc.hiver.mall.warehouse.mapper.WarehouseShopMappper">
+    <resultMap id="BaseResultMap" type="cc.hiver.mall.warehouse.entity.WarehouseShop">
+        <id column="id" jdbcType="VARCHAR" property="id" />
+        <result column="create_by" jdbcType="VARCHAR" property="createBy" />
+        <result column="create_by_name" jdbcType="VARCHAR" property="createByName" />
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+        <result column="del_flag" jdbcType="INTEGER" property="delFlag" />
+        <result column="update_by" jdbcType="VARCHAR" property="updateBy" />
+        <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+        <result column="shop_owner_id" jdbcType="VARCHAR" property="shopOwnerId" />
+        <result column="shop_owner_name" jdbcType="VARCHAR" property="shopOwnerName" />
+        <result column="warehouse_id" jdbcType="VARCHAR" property="warehouseId" />
+        <result column="warehouse_name" jdbcType="VARCHAR" property="warehouseName" />
+        <result column="warehouse_address" jdbcType="VARCHAR" property="warehouseAddress" />
+        <result column="shop_id" jdbcType="VARCHAR" property="shopId" />
+        <result column="shop_name" jdbcType="VARCHAR" property="shopName" />
+        <result column="remark" jdbcType="VARCHAR" property="remark" />
+
+    </resultMap>
+    <sql id="Base_Column_List">
+        id, create_by,create_by_name, create_time, del_flag, update_by, update_time,
+        shop_owner_id, shop_owner_name, warehouse_id, warehouse_name, warehouse_address,
+        shop_id, shop_name, remark
+    </sql>
+    <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List" />
+        from t_warehouse_shop
+        where id = #{id,jdbcType=VARCHAR}
+    </select>
+    <insert id="addWarehouseShop" parameterType="cc.hiver.mall.warehouse.entity.WarehouseShop">
+        insert into t_warehouse_shop (id, create_by, create_by_name, create_time, del_flag, update_by, update_time,
+        shop_owner_id, shop_owner_name, warehouse_id, warehouse_name, warehouse_address,
+        shop_id, shop_name, remark)
+        values (#{id,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR},#{createByName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
+                #{delFlag,jdbcType=INTEGER}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
+                #{shopOwnerId,jdbcType=VARCHAR}, #{shopOwnerName,jdbcType=VARCHAR}, #{warehouseId,jdbcType=VARCHAR},
+                #{warehouseName,jdbcType=VARCHAR}, #{warehouseAddress,jdbcType=VARCHAR},
+                #{shopId,jdbcType=VARCHAR}, #{shopName,jdbcType=VARCHAR}, #{remark,jdbc})
+    </insert>
+
+    <delete id="deleteWarehouseShop" parameterType="java.lang.String">
+        delete from t_warehouse_shop where id = #{id,jdbcType=VARCHAR}
+    </delete>
+
+    <select id="getWarehouseShopByShopId" parameterType="java.lang.String" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List" />
+        from t_warehouse_shop
+        where shop_id = #{shopId,jdbcType=VARCHAR}
+    </select>
+
+    <select id="getWarehouseShopByWarehouseId" parameterType="java.lang.String" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List" />
+        from t_warehouse_shop
+        where warehouse_id = #{warehouseId,jdbcType=VARCHAR}
+    </select>
+</mapper>
\ No newline at end of file