调整结构和细节逻辑。

hiver-admin/pom.xml

@@ -45,7 +45,7 @@
         </dependency>
         <dependency>
             <groupId>cc.hiver</groupId>
-            <artifactId>hiver-shop</artifactId>
+            <artifactId>hiver-mall</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
         <!-- 数据库连接池 -->

hiver-admin/test-output/test-report.html

@@ -35,7 +35,7 @@
 <a href="#"><span class="badge badge-primary">Hiver</span></a>
 </li>
 <li class="m-r-10">
-<a href="#"><span class="badge badge-primary">七月 09, 2023 12:54:01</span></a>
+<a href="#"><span class="badge badge-primary">七月 30, 2023 16:13:08</span></a>
 </li>
 </ul>
 </div>
@@ -84,7 +84,7 @@
           <div class="test-detail">
             <span class="meta text-white badge badge-sm"></span>
             <p class="name">passTest</p>
-            <p class="text-sm"><span>12:54:02 下午</span> / <span>0.009 secs</span></p>
+            <p class="text-sm"><span>16:13:08 下午</span> / <span>0.012 secs</span></p>
           </div>
           <div class="test-contents d-none">
 <div class="detail-head">
@@ -92,9 +92,9 @@
 <div class="info">
 <div class='float-right'><span class='badge badge-default'>#test-id=1</span></div>
 <h5 class="test-status text-pass">passTest</h5>
-<span class='badge badge-success'>07.09.2023 12:54:02</span>
-<span class='badge badge-danger'>07.09.2023 12:54:02</span>
-<span class='badge badge-default'>0.009 secs</span>
+<span class='badge badge-success'>07.30.2023 16:13:08</span>
+<span class='badge badge-danger'>07.30.2023 16:13:08</span>
+<span class='badge badge-default'>0.012 secs</span>
 </div>
 <div class="m-t-10 m-l-5"></div>
 </div>
@@ -104,7 +104,7 @@
   <tbody>
       <tr class="event-row">
         <td><span class="badge log pass-bg">Pass</span></td>
-        <td>12:54:02</td>
+        <td>16:13:08</td>
         <td>
           Test passed
         </td>
@@ -128,13 +128,13 @@
 <div class="col-md-3">
 <div class="card"><div class="card-body">
 <p class="m-b-0">Started</p>
-<h3>七月 09, 2023 12:54:01</h3>
+<h3>七月 30, 2023 16:13:08</h3>
 </div></div>
 </div>
 <div class="col-md-3">
 <div class="card"><div class="card-body">
 <p class="m-b-0">Ended</p>
-<h3>七月 09, 2023 12:54:02</h3>
+<h3>七月 30, 2023 16:13:08</h3>
 </div></div>
 </div>
 <div class="col-md-3">

hiver-core/src/main/java/cc/hiver/core/base/HiverBaseMallEntity.java

@@ -0,0 +1,68 @@
+package cc.hiver.core.base;
+
+import cc.hiver.core.common.constant.CommonConstant;
+import cc.hiver.core.common.utils.SnowFlakeUtil;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.data.annotation.CreatedBy;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.annotation.LastModifiedBy;
+import org.springframework.data.annotation.LastModifiedDate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.persistence.EntityListeners;
+import javax.persistence.Id;
+import javax.persistence.MappedSuperclass;
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@MappedSuperclass
+@EntityListeners(AuditingEntityListener.class)
+@JsonIgnoreProperties(value = {"hibernateLazyInitializer", "handler", "fieldHandler"})
+public abstract class HiverBaseMallEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @TableId
+    @ApiModelProperty(value = "唯一标识")
+    private String id = SnowFlakeUtil.nextId().toString();
+
+    @ApiModelProperty("店铺id")
+    private String mallId;
+
+    @ApiModelProperty("办公区域")
+    private String region;
+
+    @ApiModelProperty(value = "创建者")
+    @CreatedBy
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+
+    @CreatedDate
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "更新者")
+    @LastModifiedBy
+    @TableField(fill = FieldFill.UPDATE)
+    private String updateBy;
+
+    @LastModifiedDate
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新时间")
+    @TableField(fill = FieldFill.UPDATE)
+    private Date updateTime;
+
+    @ApiModelProperty(value = "删除标志 默认0")
+    private Integer delFlag = CommonConstant.STATUS_NORMAL;
+}

hiver-core/src/main/java/cc/hiver/core/common/constant/CommonConstant.java

@@ -125,4 +125,14 @@ public interface CommonConstant {
      * 部门负责人类型 副负责人
      */
     Integer HEADER_TYPE_VICE = 1;
+
+    /**
+     * 是
+     */
+    Integer STATUS_YES = 1;
+
+    /**
+     * 否
+     */
+    Integer STATUS_NO = 0;
 }

hiver-core/src/main/java/cc/hiver/core/common/constant/ShopConstant.java → hiver-core/src/main/java/cc/hiver/core/common/constant/MallConstant.java

@@ -5,7 +5,7 @@ package cc.hiver.core.common.constant;
  *
  * @author Yazhi Li
  */
-public interface ShopConstant {
+public interface MallConstant {
     /**
      * 上架
      */
@@ -17,12 +17,12 @@ public interface ShopConstant {
     Integer GOODS_PULL_ON_SALE = -1;
 
     /**
-     * 通用规格
+     * 销售单处理中
      */
-    Integer GOODS_ATTRIBUTE_COMMON = 0;
+    Integer SALES_ORDER_PROCESS = 0;
 
     /**
-     * 定制规格
+     * 销售单临时保存
      */
-    Integer GOODS_ATTRIBUTE_CUSTOM = 1;
+    Integer SALES_ORDER_SAVED = 1;
 }

hiver-modules/hiver-shop/pom.xml → hiver-modules/hiver-mall/pom.xml

@@ -8,6 +8,6 @@
         <version>1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <name>商铺模块</name>
-    <artifactId>hiver-shop</artifactId>
+    <name>商城模块</name>
+    <artifactId>hiver-mall</artifactId>
 </project>

hiver-modules/hiver-shop/src/main/java/cc/hiver/shop/controller/AddressController.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/AddressController.java

@@ -1,11 +1,12 @@
-package cc.hiver.shop.controller;
+package cc.hiver.mall.controller;
 
 import cc.hiver.core.common.utils.ResultUtil;
 import cc.hiver.core.common.vo.Result;
-import cc.hiver.shop.entity.Address;
-import cc.hiver.shop.service.AddressService;
+import cc.hiver.mall.entity.Address;
+import cc.hiver.mall.service.mybatis.IAddressService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
@@ -20,41 +21,47 @@ import java.util.List;
 @Transactional
 public class AddressController {
     @Autowired
-    private AddressService addressService;
+    private IAddressService addressService;
 
     @RequestMapping(value = "/getAll/{memberId}", method = RequestMethod.GET)
     @ApiOperation(value = "根据会员id获得收货地址列表")
-    public Result getAllByMemberId(@PathVariable String memberId) {
-        List<Address> list = addressService.findAllByMemberId(memberId);
+    public Result getAllByMemberId(@ApiParam("会员ID") @PathVariable String memberId) {
+        List<Address> list = addressService.listCurrentMemberAddresses(memberId);
         return ResultUtil.data(list);
     }
 
-    @RequestMapping(value = "/get/{id}", method = RequestMethod.GET)
+    @RequestMapping(value = "/{addressId}", method = RequestMethod.GET)
     @ApiOperation(value = "通过id获取")
-    public Result<Address> get(@PathVariable String id) {
-        Address data = addressService.findById(id);
+    public Result<Address> get(@ApiParam("地址ID") @PathVariable String addressId) {
+        Address data = addressService.getById(addressId);
         return new ResultUtil<Address>().setData(data);
     }
 
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiOperation(value = "保存数据")
-    public Result<Address> save(Address entity) {
-        Address address = addressService.save(entity);
-        return new ResultUtil<Address>().setData(address);
+    public Result addAddress(Address entity) {
+        boolean result = addressService.addAddress(entity);
+        if(result)
+            return ResultUtil.success("添加成功");
+        else
+            return ResultUtil.error("添加失败");
     }
 
     @RequestMapping(value = "/edit", method = RequestMethod.POST)
     @ApiOperation(value = "更新数据")
-    public Result<Address> edit(Address entity) {
-        Address address = addressService.update(entity);
-        return new ResultUtil<Address>().setData(address);
+    public Result updateAddress(Address entity) {
+        boolean result = addressService.updateAddress(entity);
+        if(result)
+            return ResultUtil.success("更新成功");
+        else
+            return ResultUtil.error("更新失败");
     }
 
     @RequestMapping(value = "/delByIds", method = RequestMethod.POST)
     @ApiOperation(value = "批量通过ids删除")
     public Result delByIds(@RequestParam String[] ids) {
         for (String id : ids) {
-            addressService.delete(id);
+            addressService.removeById(id);
         }
         return ResultUtil.success("批量通过id删除数据成功");
     }

hiver-modules/hiver-shop/src/main/java/cc/hiver/shop/controller/CustomAddressController.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/CustomAddressController.java

@@ -1,12 +1,12 @@
-package cc.hiver.shop.controller;
+package cc.hiver.mall.controller;
 
 import cc.hiver.core.common.utils.PageUtil;
 import cc.hiver.core.common.utils.ResultUtil;
 import cc.hiver.core.common.vo.PageVo;
 import cc.hiver.core.common.vo.Result;
-import cc.hiver.shop.entity.CustomAddress;
-import cc.hiver.shop.service.CustomAddressService;
-import cc.hiver.shop.dto.CustomAddressQueryCriteria;
+import cc.hiver.mall.entity.CustomAddress;
+import cc.hiver.mall.service.CustomAddressService;
+import cc.hiver.mall.pojo.query.CustomAddressQueryCriteria;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/GoodsBrandController.java

@@ -0,0 +1,20 @@
+package cc.hiver.mall.controller;
+
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 商品品牌控制器
+ *
+ * @author Yazhi Li
+ */
+@Slf4j
+@RestController
+@Api(tags = "商品品牌接口")
+@RequestMapping(value = "/hiver/app/brand/")
+@Transactional
+public class GoodsBrandController {
+}

hiver-modules/hiver-shop/src/main/java/cc/hiver/shop/controller/GoodsCategoryController.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/GoodsCategoryController.java

@@ -1,10 +1,10 @@
-package cc.hiver.shop.controller;
+package cc.hiver.mall.controller;
 
 import cc.hiver.core.common.constant.CommonConstant;
 import cc.hiver.core.common.utils.ResultUtil;
 import cc.hiver.core.common.vo.Result;
-import cc.hiver.shop.entity.GoodsCategory;
-import cc.hiver.shop.service.GoodsCategoryService;
+import cc.hiver.mall.entity.GoodsCategory;
+import cc.hiver.mall.service.GoodsCategoryService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -27,7 +27,6 @@ public class GoodsCategoryController {
     @ApiOperation(value = "通过parentId获取")
     public Result<List<GoodsCategory>> getByParentId(@PathVariable String parentId) {
         List<GoodsCategory> list = goodsCategoryService.findByParentIdOrderBySortOrder(parentId);
-        setInfo(list);
         return new ResultUtil<List<GoodsCategory>>().setData(list);
     }
 
@@ -46,16 +45,4 @@ public class GoodsCategoryController {
         }
         return ResultUtil.success("批量通过id删除数据成功");
     }
-
-    public void setInfo(List<GoodsCategory> list) {
-        // lambda表达式
-        list.forEach(item -> {
-            if (!CommonConstant.PARENT_ID.equals(item.getParentId())) {
-                GoodsCategory parent = goodsCategoryService.get(item.getParentId());
-                item.setParentTitle(parent.getCategoryName());
-            } else {
-                item.setParentTitle("一级分类");
-            }
-        });
-    }
 }

hiver-modules/hiver-shop/src/main/java/cc/hiver/shop/controller/GoodsController.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/GoodsController.java

@@ -1,6 +1,6 @@
-package cc.hiver.shop.controller;
+package cc.hiver.mall.controller;
 
-import cc.hiver.shop.service.GoodsService;
+import cc.hiver.mall.service.GoodsService;
 import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

hiver-modules/hiver-shop/src/main/java/cc/hiver/shop/controller/GoodsStockController.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/GoodsStockController.java

@@ -1,11 +1,11 @@
-package cc.hiver.shop.controller;
+package cc.hiver.mall.controller;
 
 import cc.hiver.core.common.utils.ResultUtil;
 import cc.hiver.core.common.vo.Result;
-import cc.hiver.shop.entity.GoodsInStock;
-import cc.hiver.shop.entity.GoodsStock;
-import cc.hiver.shop.service.GoodsInStockService;
-import cc.hiver.shop.service.GoodsStockService;
+import cc.hiver.mall.entity.GoodsInStock;
+import cc.hiver.mall.entity.GoodsStock;
+import cc.hiver.mall.service.GoodsInStockService;
+import cc.hiver.mall.service.GoodsStockService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;

hiver-modules/hiver-shop/src/main/java/cc/hiver/shop/controller/MallController.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/MallController.java

@@ -1,12 +1,12 @@
-package cc.hiver.shop.controller;
+package cc.hiver.mall.controller;
 
 import cc.hiver.core.common.utils.ResultUtil;
 import cc.hiver.core.common.vo.Result;
-import cc.hiver.shop.entity.Mall;
-import cc.hiver.shop.entity.UserMall;
-import cc.hiver.shop.service.MallService;
-import cc.hiver.shop.service.UserMallService;
-import cc.hiver.shop.service.mybatis.IMallService;
+import cc.hiver.mall.entity.Mall;
+import cc.hiver.mall.entity.UserMall;
+import cc.hiver.mall.service.MallService;
+import cc.hiver.mall.service.UserMallService;
+import cc.hiver.mall.service.mybatis.IMallService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;

hiver-modules/hiver-shop/src/main/java/cc/hiver/shop/controller/PopularUrlController.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/PopularUrlController.java

@@ -1,11 +1,11 @@
-package cc.hiver.shop.controller;
+package cc.hiver.mall.controller;
 
 import cc.hiver.core.common.utils.ResultUtil;
 import cc.hiver.core.common.vo.Result;
-import cc.hiver.shop.dto.PopularUrlDto;
-import cc.hiver.shop.entity.PopularUrlGoods;
-import cc.hiver.shop.service.PopularUrlGoodsService;
-import cc.hiver.shop.service.PopularUrlService;
+import cc.hiver.mall.pojo.dto.PopularUrlDto;
+import cc.hiver.mall.entity.PopularUrlGoods;
+import cc.hiver.mall.service.PopularUrlGoodsService;
+import cc.hiver.mall.service.PopularUrlService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -32,7 +32,7 @@ public class PopularUrlController {
     @ApiOperation(value = "创建分享链接")
     public Result<String> create(PopularUrlDto entity) {
         popularUrlService.save(entity.getUrl());
-        for(PopularUrlGoods good : entity.getGoods()) {
+        for(PopularUrlGoods good : entity.getGoodsList()) {
             popularUrlGoodsService.save(good);
         }
         return ResultUtil.data(entity.getUrl().getUrl());
@@ -43,7 +43,7 @@ public class PopularUrlController {
     public Result<PopularUrlDto> get(@PathVariable String id) {
         PopularUrlDto data = new PopularUrlDto();
         data.setUrl(popularUrlService.get(id));
-        data.setGoods(popularUrlGoodsService.findAllByUrlId(id));
+        data.setGoodsList(popularUrlGoodsService.findAllByUrlId(id));
         return new ResultUtil<PopularUrlDto>().setData(data);
     }
 }

hiver-modules/hiver-shop/src/main/java/cc/hiver/shop/controller/RoleSettingController.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/RoleSettingController.java

@@ -1,6 +1,6 @@
-package cc.hiver.shop.controller;
+package cc.hiver.mall.controller;
 
-import cc.hiver.shop.service.RoleSettingService;
+import cc.hiver.mall.service.RoleSettingService;
 import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

hiver-modules/hiver-shop/src/main/java/cc/hiver/shop/controller/UserClockInController.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/UserClockInController.java

@@ -1,9 +1,9 @@
-package cc.hiver.shop.controller;
+package cc.hiver.mall.controller;
 
 import cc.hiver.core.common.utils.ResultUtil;
 import cc.hiver.core.common.vo.Result;
-import cc.hiver.shop.entity.UserClockIn;
-import cc.hiver.shop.service.UserClockInService;
+import cc.hiver.mall.entity.UserClockIn;
+import cc.hiver.mall.service.UserClockInService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;

hiver-modules/hiver-shop/src/main/java/cc/hiver/shop/dao/CustomAddressDao.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/CustomAddressDao.java

@@ -1,7 +1,7 @@
-package cc.hiver.shop.dao;
+package cc.hiver.mall.dao;
 
 import cc.hiver.core.base.HiverBaseDao;
-import cc.hiver.shop.entity.CustomAddress;
+import cc.hiver.mall.entity.CustomAddress;
 
 public interface CustomAddressDao extends HiverBaseDao<CustomAddress, String> {
 }

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/GoodsAttributeDao.java

@@ -0,0 +1,7 @@
+package cc.hiver.mall.dao;
+
+import cc.hiver.core.base.HiverBaseDao;
+import cc.hiver.mall.entity.GoodsAttribute;
+
+public interface GoodsAttributeDao extends HiverBaseDao<GoodsAttribute, String> {
+}

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/GoodsBrandDao.java

@@ -0,0 +1,7 @@
+package cc.hiver.mall.dao;
+
+import cc.hiver.core.base.HiverBaseDao;
+import cc.hiver.mall.entity.GoodsBrand;
+
+public interface GoodsBrandDao extends HiverBaseDao<GoodsBrand, String> {
+}

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/GoodsCategoryAttributeDao.java

@@ -0,0 +1,7 @@
+package cc.hiver.mall.dao;
+
+import cc.hiver.core.base.HiverBaseDao;
+import cc.hiver.mall.entity.GoodsCategoryAttribute;
+
+public interface GoodsCategoryAttributeDao extends HiverBaseDao<GoodsCategoryAttribute, String> {
+}

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/GoodsCategoryBrandDao.java

@@ -0,0 +1,7 @@
+package cc.hiver.mall.dao;
+
+import cc.hiver.core.base.HiverBaseDao;
+import cc.hiver.mall.entity.GoodsCategoryBrand;
+
+public interface GoodsCategoryBrandDao extends HiverBaseDao<GoodsCategoryBrand, String> {
+}

hiver-modules/hiver-shop/src/main/java/cc/hiver/shop/dao/GoodsCategoryDao.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/GoodsCategoryDao.java

@@ -1,7 +1,7 @@
-package cc.hiver.shop.dao;
+package cc.hiver.mall.dao;
 
 import cc.hiver.core.base.HiverBaseDao;
-import cc.hiver.shop.entity.GoodsCategory;
+import cc.hiver.mall.entity.GoodsCategory;
 
 import java.util.List;
 

hiver-modules/hiver-shop/src/main/java/cc/hiver/shop/dao/GoodsDao.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/GoodsDao.java

@@ -1,7 +1,7 @@
-package cc.hiver.shop.dao;
+package cc.hiver.mall.dao;
 
 import cc.hiver.core.base.HiverBaseDao;
-import cc.hiver.shop.entity.Goods;
+import cc.hiver.mall.entity.Goods;
 
 public interface GoodsDao extends HiverBaseDao<Goods, String> {
 }

hiver-modules/hiver-shop/src/main/java/cc/hiver/shop/dao/GoodsInStockDao.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/GoodsInStockDao.java

@@ -1,7 +1,7 @@
-package cc.hiver.shop.dao;
+package cc.hiver.mall.dao;
 
 import cc.hiver.core.base.HiverBaseDao;
-import cc.hiver.shop.entity.GoodsInStock;
+import cc.hiver.mall.entity.GoodsInStock;
 
 public interface GoodsInStockDao extends HiverBaseDao<GoodsInStock, String> {
 }

hiver-modules/hiver-shop/src/main/java/cc/hiver/shop/dao/GoodsStockDao.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/GoodsStockDao.java

@@ -1,7 +1,7 @@
-package cc.hiver.shop.dao;
+package cc.hiver.mall.dao;
 
 import cc.hiver.core.base.HiverBaseDao;
-import cc.hiver.shop.entity.GoodsStock;
+import cc.hiver.mall.entity.GoodsStock;
 
 public interface GoodsStockDao extends HiverBaseDao<GoodsStock, String> {
 }

hiver-modules/hiver-shop/src/main/java/cc/hiver/shop/dao/MallDao.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/MallDao.java

@@ -1,7 +1,7 @@
-package cc.hiver.shop.dao;
+package cc.hiver.mall.dao;
 
 import cc.hiver.core.base.HiverBaseDao;
-import cc.hiver.shop.entity.Mall;
+import cc.hiver.mall.entity.Mall;
 
 public interface MallDao extends HiverBaseDao<Mall, String> {
 }

hiver-modules/hiver-shop/src/main/java/cc/hiver/shop/dao/PopularUrlDao.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/PopularUrlDao.java

@@ -1,7 +1,7 @@
-package cc.hiver.shop.dao;
+package cc.hiver.mall.dao;
 
 import cc.hiver.core.base.HiverBaseDao;
-import cc.hiver.shop.entity.PopularUrl;
+import cc.hiver.mall.entity.PopularUrl;
 
 public interface PopularUrlDao extends HiverBaseDao<PopularUrl, String> {
 }

hiver-modules/hiver-shop/src/main/java/cc/hiver/shop/dao/PopularUrlGoodsDao.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/PopularUrlGoodsDao.java

@@ -1,7 +1,7 @@
-package cc.hiver.shop.dao;
+package cc.hiver.mall.dao;
 
 import cc.hiver.core.base.HiverBaseDao;
-import cc.hiver.shop.entity.PopularUrlGoods;
+import cc.hiver.mall.entity.PopularUrlGoods;
 
 import java.util.List;
 

hiver-modules/hiver-shop/src/main/java/cc/hiver/shop/dao/RoleSettingDao.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/RoleSettingDao.java

@@ -1,7 +1,7 @@
-package cc.hiver.shop.dao;
+package cc.hiver.mall.dao;
 
 import cc.hiver.core.base.HiverBaseDao;
-import cc.hiver.shop.entity.RoleSetting;
+import cc.hiver.mall.entity.RoleSetting;
 
 public interface RoleSettingDao extends HiverBaseDao<RoleSetting, String> {
 }

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/SalesOrderDao.java

@@ -0,0 +1,7 @@
+package cc.hiver.mall.dao;
+
+import cc.hiver.core.base.HiverBaseDao;
+import cc.hiver.mall.entity.SalesOrder;
+
+public interface SalesOrderDao extends HiverBaseDao<SalesOrder, String> {
+}

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/SalesOrderItemDao.java

@@ -0,0 +1,7 @@
+package cc.hiver.mall.dao;
+
+import cc.hiver.core.base.HiverBaseDao;
+import cc.hiver.mall.entity.SalesOrderItem;
+
+public interface SalesOrderItemDao extends HiverBaseDao<SalesOrderItem, String> {
+}

hiver-modules/hiver-shop/src/main/java/cc/hiver/shop/dao/UserClockInDao.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/UserClockInDao.java

@@ -1,7 +1,7 @@
-package cc.hiver.shop.dao;
+package cc.hiver.mall.dao;
 
 import cc.hiver.core.base.HiverBaseDao;
-import cc.hiver.shop.entity.UserClockIn;
+import cc.hiver.mall.entity.UserClockIn;
 
 public interface UserClockInDao extends HiverBaseDao<UserClockIn, String> {
 }

hiver-modules/hiver-shop/src/main/java/cc/hiver/shop/dao/UserMallDao.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/UserMallDao.java

@@ -1,7 +1,7 @@
-package cc.hiver.shop.dao;
+package cc.hiver.mall.dao;
 
 import cc.hiver.core.base.HiverBaseDao;
-import cc.hiver.shop.entity.UserMall;
+import cc.hiver.mall.entity.UserMall;
 
 public interface UserMallDao extends HiverBaseDao<UserMall, String> {
     void deleteAllByMallId(String mallId);

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/AddressMapper.java

@@ -0,0 +1,16 @@
+package cc.hiver.mall.dao.mapper;
+
+import cc.hiver.mall.entity.Address;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+@Mapper
+public interface AddressMapper extends BaseMapper<Address> {
+    @Select("<script>" +
+            " SELECT m.* from t_address m where m.member_id =#{memberId} " +
+            "</script>")
+    List<Address> listByMemberId(String memberId);
+}

hiver-modules/hiver-shop/src/main/java/cc/hiver/shop/dao/mapper/MallMapper.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/MallMapper.java

@@ -1,6 +1,6 @@
-package cc.hiver.shop.dao.mapper;
+package cc.hiver.mall.dao.mapper;
 
-import cc.hiver.shop.entity.Mall;
+import cc.hiver.mall.entity.Mall;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;

hiver-modules/hiver-shop/src/main/java/cc/hiver/shop/entity/Address.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/Address.java

@@ -1,4 +1,4 @@
-package cc.hiver.shop.entity;
+package cc.hiver.mall.entity;
 
 import cc.hiver.core.base.HiverBaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -21,30 +21,24 @@ import javax.persistence.Table;
 public class Address extends HiverBaseEntity {
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(value = "收货人")
-    private String consignee;
+    @ApiModelProperty(value = "会员ID")
+    private String memberId;
 
-    @ApiModelProperty(value = "收货电话")
-    private String receivingMobile;
+    @ApiModelProperty(value = "'收货人姓名")
+    private String consigneeName;
 
-    @ApiModelProperty(value = "收货公司")
-    private String receivingCompany;
+    @ApiModelProperty(value = "收货人联系方式")
+    private String consigneeMobile;
 
-    @ApiModelProperty(value = "收货区域")
-    private String receivingArea;
+    @ApiModelProperty(value = "收货人所属区域")
+    private String consigneeArea;
 
-    @ApiModelProperty(value = "收货地址")
+    @ApiModelProperty(value = "详细地址")
     private String address;
 
-    @ApiModelProperty(value = "邮政编码")
+    @ApiModelProperty(value = "邮编")
     private String zipCode;
 
-    @ApiModelProperty(value = "会员id")
-    private String memberId;
-
-    @ApiModelProperty(value = "默认地址")
-    private Integer defaultAddress;
-
-    @ApiModelProperty(value = "收货注释")
-    private String note;
+    @ApiModelProperty(value = "是否默认地址")
+    private Integer defaulted;
 }

hiver-modules/hiver-shop/src/main/java/cc/hiver/shop/entity/CustomAddress.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/CustomAddress.java

@@ -1,4 +1,4 @@
-package cc.hiver.shop.entity;
+package cc.hiver.mall.entity;
 
 import cc.hiver.core.base.HiverBaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -21,30 +21,24 @@ import javax.persistence.Table;
 public class CustomAddress extends HiverBaseEntity {
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(value = "收货人")
-    private String consignee;
+    @ApiModelProperty(value = "用户ID")
+    private String userId;
+
+    @ApiModelProperty(value = "收货人姓名")
+    private String consigneeName;
 
-    @ApiModelProperty(value = "收货电话")
-    private String receivingMobile;
+    @ApiModelProperty(value = "收货人联系方式")
+    private String consigneeMobile;
 
-    @ApiModelProperty(value = "收货公司")
-    private String receivingCompany;
+    @ApiModelProperty(value = "收货人公司")
+    private String consigneeCompany;
 
-    @ApiModelProperty(value = "收货区域")
-    private String receivingArea;
+    @ApiModelProperty(value = "收货人所属区域")
+    private String consigneeArea;
 
-    @ApiModelProperty(value = "收货地址")
+    @ApiModelProperty(value = "详细地址")
     private String address;
 
-    @ApiModelProperty(value = "邮政编码")
+    @ApiModelProperty(value = "邮编")
     private String zipCode;
-
-    @ApiModelProperty(value = "用户id")
-    private String userId;
-
-    @ApiModelProperty(value = "会员id 0表示未注册用户 1已注册用户对应id")
-    private String memberId;
-
-    @ApiModelProperty(value = "客户简介")
-    private String intro;
 }

hiver-modules/hiver-shop/src/main/java/cc/hiver/shop/entity/Goods.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/Goods.java

@@ -1,7 +1,7 @@
-package cc.hiver.shop.entity;
+package cc.hiver.mall.entity;
 
-import cc.hiver.core.base.HiverBaseEntity;
-import cc.hiver.core.common.constant.ShopConstant;
+import cc.hiver.core.base.HiverBaseMallEntity;
+import cc.hiver.core.common.constant.MallConstant;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -21,38 +21,17 @@ import java.math.BigDecimal;
 @Table(name = "t_goods")
 @TableName("t_goods")
 @ApiModel(value = "商品表")
-public class Goods extends HiverBaseEntity {
+public class Goods extends HiverBaseMallEntity {
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(value = "商品编号")
-    private String goodsNo;
-
-    @ApiModelProperty(value = "商品二维码")
-    private String goodsBarcode;
-
     @ApiModelProperty(value = "商品名称")
-    private String goodsTitle;
+    private String name;
 
-    @ApiModelProperty(value = "分类id")
+    @ApiModelProperty(value = "商品类型ID")
     private String categoryId;
 
-    @ApiModelProperty(value = "规格类型")
-    private Integer attributeType = ShopConstant.GOODS_ATTRIBUTE_COMMON;
-
-    @ApiModelProperty(value = "规格列表")
-    private String attributeList;
-
-    @ApiModelProperty(value = "商品描述")
-    private String intro;
-
-    @ApiModelProperty(value = "商品详情")
-    private String detail;
-
-    @ApiModelProperty(value = "库存")
-    private Integer stock = 0;
-
-    @ApiModelProperty(value = "是否启用 0上架 -1下架")
-    private Integer status = ShopConstant.GOODS_PUT_ON_SALE;
+    @ApiModelProperty(value = "商品品牌ID")
+    private String brandId;
 
     @ApiModelProperty(value = "采购价")
     @Column(precision = 10, scale = 2)
@@ -66,12 +45,27 @@ public class Goods extends HiverBaseEntity {
     @Column(precision = 10, scale = 2)
     private BigDecimal wholesalePrice = new BigDecimal(0);
 
-    @ApiModelProperty(value = "商铺id")
-    private String mallId;
+    @ApiModelProperty(value = "销量")
+    private Integer sales;
+
+    @ApiModelProperty(value = "商品主图")
+    private String picUrl;
 
     @ApiModelProperty(value = "视频地址")
-    private String videoPath;
+    private String videoUrl;
+
+    @ApiModelProperty(value = "商品图册")
+    private String album;
+
+    @ApiModelProperty(value = "单位")
+    private String unit;
+
+    @ApiModelProperty(value = "商品简介")
+    private String description;
 
-    @ApiModelProperty("办公区域")
-    private String region;
+    @ApiModelProperty(value = "商品详情")
+    private String detail;
+
+    @ApiModelProperty(value = "是否启用 0上架 -1下架")
+    private Integer status = MallConstant.GOODS_PUT_ON_SALE;
 }

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/GoodsAttribute.java

@@ -0,0 +1,41 @@
+package cc.hiver.mall.entity;
+
+import cc.hiver.core.base.HiverBaseMallEntity;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "t_goods_attribute")
+@TableName("t_goods_attribute")
+@ApiModel(value = "商品属性/规格表")
+public class GoodsAttribute extends HiverBaseMallEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "商品ID")
+    private String goodsId;
+
+    @ApiModelProperty(value = "属性ID")
+    private String attributeId;
+
+    @ApiModelProperty(value = "属性名称")
+    private String name;
+
+    @ApiModelProperty(value = "属性值")
+    private String value;
+
+    @ApiModelProperty(value = "类型(1:规格;2:属性;)")
+    private Integer type;
+
+    @ApiModelProperty(value = "规格图片")
+    private String picUrl;
+}

hiver-modules/hiver-shop/src/main/java/cc/hiver/shop/entity/GoodsAttributeKey.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/GoodsBrand.java

@@ -1,6 +1,6 @@
-package cc.hiver.shop.entity;
+package cc.hiver.mall.entity;
 
-import cc.hiver.core.base.HiverBaseEntity;
+import cc.hiver.core.base.HiverBaseMallEntity;
 import cc.hiver.core.common.constant.CommonConstant;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
@@ -18,17 +18,17 @@ import java.math.BigDecimal;
 @Entity
 @DynamicInsert
 @DynamicUpdate
-@Table(name = "t_goods_attribute_key")
-@TableName("t_goods_attribute_key")
-@ApiModel(value = "商品规格主键表")
-public class GoodsAttributeKey extends HiverBaseEntity {
+@Table(name = "t_goods_brand")
+@TableName("t_goods_brand")
+@ApiModel(value = "商品品牌表")
+public class GoodsBrand extends HiverBaseMallEntity {
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(value = "分类id")
-    private String categoryId;
+    @ApiModelProperty(value = "品牌名称")
+    private String name;
 
-    @ApiModelProperty(value = "属性名")
-    private String attributeKey;
+    @ApiModelProperty(value = "LOGO图片")
+    private String logoUrl;
 
     @ApiModelProperty(value = "排序值")
     @Column(precision = 10, scale = 2)
@@ -36,10 +36,4 @@ public class GoodsAttributeKey extends HiverBaseEntity {
 
     @ApiModelProperty(value = "是否启用 0启用 -1禁用")
     private Integer status = CommonConstant.STATUS_NORMAL;
-
-    @ApiModelProperty(value = "商铺id")
-    private String mallId;
-
-    @ApiModelProperty("办公区域")
-    private String region;
 }

hiver-modules/hiver-shop/src/main/java/cc/hiver/shop/entity/GoodsCategory.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/GoodsCategory.java

@@ -1,8 +1,7 @@
-package cc.hiver.shop.entity;
+package cc.hiver.mall.entity;
 
-import cc.hiver.core.base.HiverBaseEntity;
+import cc.hiver.core.base.HiverBaseMallEntity;
 import cc.hiver.core.common.constant.CommonConstant;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -13,7 +12,6 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
-import javax.persistence.Transient;
 import java.math.BigDecimal;
 
 @Data
@@ -23,18 +21,21 @@ import java.math.BigDecimal;
 @Table(name = "t_goods_category")
 @TableName("t_goods_category")
 @ApiModel(value = "商品分类表")
-public class GoodsCategory extends HiverBaseEntity {
+public class GoodsCategory extends HiverBaseMallEntity {
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(value = "分类名称")
-    private String categoryName;
+    @ApiModelProperty(value = "商品分类名称")
+    private String name;
 
-    @ApiModelProperty(value = "父id")
+    @ApiModelProperty(value = "父级ID")
     @Column(nullable = false)
     private String parentId;
 
-    @ApiModelProperty(value = "是否为父节点(含子节点) 默认false")
-    private Boolean isParent = false;
+    @ApiModelProperty(value = "层级")
+    private Integer level;
+
+    @ApiModelProperty(value = "图标地址")
+    private String iconUrl;
 
     @ApiModelProperty(value = "排序值")
     @Column(precision = 10, scale = 2)
@@ -42,15 +43,4 @@ public class GoodsCategory extends HiverBaseEntity {
 
     @ApiModelProperty(value = "是否启用 0启用 -1禁用")
     private Integer status = CommonConstant.STATUS_NORMAL;
-
-    @Transient
-    @TableField(exist = false)
-    @ApiModelProperty(value = "父节点名称")
-    private String parentTitle;
-
-    @ApiModelProperty(value = "商铺id")
-    private String mallId;
-
-    @ApiModelProperty("办公区域")
-    private String region;
 }

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/GoodsCategoryAttribute.java

@@ -0,0 +1,32 @@
+package cc.hiver.mall.entity;
+
+import cc.hiver.core.base.HiverBaseMallEntity;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "t_goods_category_attribute")
+@TableName("t_goods_category_attribute")
+@ApiModel(value = "商品属性表")
+public class GoodsCategoryAttribute extends HiverBaseMallEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "分类ID")
+    private String categoryId;
+
+    @ApiModelProperty(value = "属性名称")
+    private String name;
+
+    @ApiModelProperty(value = "类型(1:规格;2:属性;)")
+    private Integer type;
+}

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/GoodsCategoryBrand.java

@@ -0,0 +1,27 @@
+package cc.hiver.mall.entity;
+
+import cc.hiver.core.base.HiverBaseMallEntity;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "t_goods_category_brand")
+@TableName("t_goods_category_brand")
+@ApiModel(value = "商品品牌表")
+public class GoodsCategoryBrand extends HiverBaseMallEntity {
+    @ApiModelProperty(value = "分类ID")
+    private String categoryId;
+
+    @ApiModelProperty(value = "品牌ID")
+    private String brandId;
+}

hiver-modules/hiver-shop/src/main/java/cc/hiver/shop/entity/GoodsInStock.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/GoodsInStock.java

@@ -1,6 +1,6 @@
-package cc.hiver.shop.entity;
+package cc.hiver.mall.entity;
 
-import cc.hiver.core.base.HiverBaseEntity;
+import cc.hiver.core.base.HiverBaseMallEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -18,7 +18,7 @@ import javax.persistence.Table;
 @Table(name = "t_goods_in_stock")
 @TableName("t_goods_in_stock")
 @ApiModel(value = "商品入库表")
-public class GoodsInStock extends HiverBaseEntity {
+public class GoodsInStock extends HiverBaseMallEntity {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "在库商品id")
@@ -26,10 +26,4 @@ public class GoodsInStock extends HiverBaseEntity {
 
     @ApiModelProperty(value = "入库数量")
     private Integer num;
-
-    @ApiModelProperty(value = "商铺id")
-    private String mallId;
-
-    @ApiModelProperty("办公区域")
-    private String region;
 }

hiver-modules/hiver-shop/src/main/java/cc/hiver/shop/entity/GoodsStock.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/GoodsStock.java

@@ -1,7 +1,6 @@
-package cc.hiver.shop.entity;
+package cc.hiver.mall.entity;
 
-import cc.hiver.core.base.HiverBaseEntity;
-import cc.hiver.core.common.constant.ShopConstant;
+import cc.hiver.core.base.HiverBaseMallEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -21,20 +20,20 @@ import java.math.BigDecimal;
 @Table(name = "t_goods_stock")
 @TableName("t_goods_stock")
 @ApiModel(value = "商品库存表")
-public class GoodsStock extends HiverBaseEntity {
+public class GoodsStock extends HiverBaseMallEntity {
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(value = "商品id")
-    private String goodsId;
+    @ApiModelProperty(value = "商品编码")
+    private String sn;
 
-    @ApiModelProperty(value = "商品规格")
-    private String goodsSpecs;
+    @ApiModelProperty(value = "商品ID")
+    private String goodsId;
 
-    @ApiModelProperty(value = "库存")
-    private Integer stock = 0;
+    @ApiModelProperty(value = "商品名称")
+    private String name;
 
-    @ApiModelProperty(value = "是否启用 0上架 -1下架")
-    private Integer status = ShopConstant.GOODS_PUT_ON_SALE;
+    @ApiModelProperty(value = "商品规格值，以英文逗号(,)分割")
+    private String specIds;
 
     @ApiModelProperty(value = "采购价")
     @Column(precision = 10, scale = 2)
@@ -48,9 +47,12 @@ public class GoodsStock extends HiverBaseEntity {
     @Column(precision = 10, scale = 2)
     private BigDecimal wholesalePrice = new BigDecimal(0);
 
-    @ApiModelProperty(value = "商铺id")
-    private String mallId;
+    @ApiModelProperty(value = "库存数量")
+    private Integer stock = 0;
+
+    @ApiModelProperty(value = "锁定库存数量")
+    private Integer lockedStock = 0;
 
-    @ApiModelProperty("办公区域")
-    private String region;
+    @ApiModelProperty(value = "商品图片")
+    private String picUrl;
 }

hiver-modules/hiver-shop/src/main/java/cc/hiver/shop/entity/Mall.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/Mall.java

@@ -1,6 +1,6 @@
-package cc.hiver.shop.entity;
+package cc.hiver.mall.entity;
 
-import cc.hiver.core.base.HiverBaseEntity;
+import cc.hiver.core.base.HiverBaseMallEntity;
 import cc.hiver.core.common.constant.CommonConstant;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
@@ -21,17 +21,17 @@ import java.math.BigDecimal;
 @Table(name = "t_mall")
 @TableName("t_mall")
 @ApiModel(value = "商铺表")
-public class Mall extends HiverBaseEntity {
+public class Mall extends HiverBaseMallEntity {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "商铺名称")
-    private String title;
+    private String name;
 
-    @ApiModelProperty(value = "商铺介绍")
-    private String intro;
+    @ApiModelProperty(value = "商铺简介")
+    private String description;
 
     @ApiModelProperty(value = "商铺图片")
-    private String img;
+    private String picUrl;
 
     @ApiModelProperty(value = "排序值")
     @Column(precision = 10, scale = 2)
@@ -40,9 +40,6 @@ public class Mall extends HiverBaseEntity {
     @ApiModelProperty(value = "是否启用 0启用 -1禁用")
     private Integer status = CommonConstant.STATUS_NORMAL;
 
-    @ApiModelProperty(value = "默认店铺")
-    private Integer defaultMall;
-
-    @ApiModelProperty("办公区域")
-    private String region;
+    @ApiModelProperty(value = "是否默认商铺")
+    private Integer defaulted;
 }

hiver-modules/hiver-shop/src/main/java/cc/hiver/shop/entity/PopularUrl.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/PopularUrl.java

@@ -1,4 +1,4 @@
-package cc.hiver.shop.entity;
+package cc.hiver.mall.entity;
 
 import cc.hiver.core.base.HiverBaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;

hiver-modules/hiver-shop/src/main/java/cc/hiver/shop/entity/PopularUrlGoods.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/PopularUrlGoods.java

@@ -1,4 +1,4 @@
-package cc.hiver.shop.entity;
+package cc.hiver.mall.entity;
 
 import cc.hiver.core.base.HiverBaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -8,10 +8,8 @@ import lombok.Data;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
-import java.math.BigDecimal;
 
 @Data
 @Entity
@@ -26,21 +24,6 @@ public class PopularUrlGoods extends HiverBaseEntity {
     @ApiModelProperty(value = "链接id")
     private String urlId;
 
-    @ApiModelProperty(value = "商铺id")
-    private String mallId;
-
     @ApiModelProperty(value = "商品id")
     private String goodsId;
-
-    @ApiModelProperty(value = "采购价")
-    @Column(precision = 10, scale = 2)
-    private BigDecimal purchasePrice = new BigDecimal(0);
-
-    @ApiModelProperty(value = "市场价")
-    @Column(precision = 10, scale = 2)
-    private BigDecimal price = new BigDecimal(0);
-
-    @ApiModelProperty(value = "批发价")
-    @Column(precision = 10, scale = 2)
-    private BigDecimal wholesalePrice = new BigDecimal(0);
 }

hiver-modules/hiver-shop/src/main/java/cc/hiver/shop/entity/RoleSetting.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/RoleSetting.java

@@ -1,4 +1,4 @@
-package cc.hiver.shop.entity;
+package cc.hiver.mall.entity;
 
 import cc.hiver.core.base.HiverBaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/SalesOrder.java

@@ -0,0 +1,56 @@
+package cc.hiver.mall.entity;
+
+import cc.hiver.core.base.HiverBaseEntity;
+import cc.hiver.core.common.constant.MallConstant;
+import cc.hiver.core.common.utils.SnowFlakeUtil;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.math.BigDecimal;
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "t_sales_order")
+@TableName("t_sales_order")
+@ApiModel(value = "销售单主表")
+public class SalesOrder extends HiverBaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "销售单号")
+    private String sn = "SN" + SnowFlakeUtil.nextId().toString();
+
+    @ApiModelProperty(value = "用户ID")
+    private String userId;
+
+    @ApiModelProperty(value = "收货人姓名")
+    private String consigneeName;
+
+    @ApiModelProperty(value = "收货人联系方式")
+    private String consigneeMobile;
+
+    @ApiModelProperty(value = "收货人公司")
+    private String consigneeCompany;
+
+    @ApiModelProperty(value = "收货人所属区域")
+    private String consigneeArea;
+
+    @ApiModelProperty(value = "详细地址")
+    private String address;
+
+    @ApiModelProperty(value = "邮编")
+    private String zipCode;
+
+    @ApiModelProperty(value = "是否启用 0处理中 1已保存")
+    private Integer status = MallConstant.SALES_ORDER_PROCESS;
+
+    @ApiModelProperty(value = "订单总额")
+    private BigDecimal totalAmount = new BigDecimal(0);
+}

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/SalesOrderItem.java

@@ -0,0 +1,51 @@
+package cc.hiver.mall.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;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.math.BigDecimal;
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "t_sales_order_item")
+@TableName("t_sales_order_item")
+@ApiModel(value = "销售单详细表")
+public class SalesOrderItem extends HiverBaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "销售单主表id")
+    private String salesOrderId;
+
+    @ApiModelProperty(value = "商品编号")
+    private String sn;
+
+    @ApiModelProperty(value = "商品名称")
+    private String name;
+
+    @ApiModelProperty(value = "商品ID")
+    private String goodsId;
+
+    @ApiModelProperty(value = "商品规格值，以英文逗号(,)分割")
+    private String specIds;
+
+    @ApiModelProperty(value = "商品图片")
+    private String picUrl;
+
+    @ApiModelProperty(value = "商品单价")
+    private BigDecimal price = new BigDecimal(0);
+
+    @ApiModelProperty(value = "商品数量")
+    private Integer count = 0;
+
+    @ApiModelProperty(value = "商品总价")
+    private BigDecimal totalAmount = new BigDecimal(0);
+}

hiver-modules/hiver-shop/src/main/java/cc/hiver/shop/entity/UserClockIn.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/UserClockIn.java

@@ -1,4 +1,4 @@
-package cc.hiver.shop.entity;
+package cc.hiver.mall.entity;
 
 import cc.hiver.core.common.utils.SnowFlakeUtil;
 import com.baomidou.mybatisplus.annotation.FieldFill;

hiver-modules/hiver-shop/src/main/java/cc/hiver/shop/entity/UserMall.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/UserMall.java

@@ -1,4 +1,4 @@
-package cc.hiver.shop.entity;
+package cc.hiver.mall.entity;
 
 import cc.hiver.core.base.HiverBaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/pojo/dto/CategoryAttributeDto.java

@@ -0,0 +1,38 @@
+package cc.hiver.mall.pojo.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@Data
+@ApiModel("属性表单")
+public class CategoryAttributeDto {
+    @ApiModelProperty("分类ID")
+    @NotNull
+    private Long categoryId;
+
+
+    @ApiModelProperty("属性类型（1：规格；2：属性）")
+    @NotNull
+    private Integer type;
+
+    @ApiModelProperty("属性集合")
+    @NotEmpty
+    private List<Attribute> attributes;
+
+    @Data
+    public static class Attribute {
+
+        @ApiModelProperty("属性ID")
+        private Long id;
+
+        @ApiModelProperty("属性名称")
+        @NotBlank
+        private String name;
+    }
+}

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/pojo/dto/PopularUrlDto.java

@@ -0,0 +1,19 @@
+package cc.hiver.mall.pojo.dto;
+
+import cc.hiver.mall.entity.PopularUrl;
+import cc.hiver.mall.entity.PopularUrlGoods;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+@Data
+@Accessors(chain = true)
+public class PopularUrlDto {
+    @ApiModelProperty(value = "热销链接主表")
+    private PopularUrl url;
+
+    @ApiModelProperty(value = "热销商品列表")
+    private List<PopularUrlGoods> goodsList;
+}

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/pojo/dto/SalesOrderDto.java

@@ -0,0 +1,19 @@
+package cc.hiver.mall.pojo.dto;
+
+import cc.hiver.mall.entity.SalesOrder;
+import cc.hiver.mall.entity.SalesOrderItem;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+@Data
+@Accessors(chain = true)
+public class SalesOrderDto {
+    @ApiModelProperty("销售单主表")
+    private SalesOrder order;
+
+    @ApiModelProperty(value = "销售单列表")
+    private List<SalesOrderItem> orderItems;
+}

hiver-modules/hiver-shop/src/main/java/cc/hiver/shop/dto/CustomAddressQueryCriteria.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/pojo/query/CustomAddressQueryCriteria.java

@@ -1,4 +1,4 @@
-package cc.hiver.shop.dto;
+package cc.hiver.mall.pojo.query;
 
 import cc.hiver.core.common.annotation.Query;
 import lombok.Data;

hiver-modules/hiver-shop/src/main/java/cc/hiver/shop/service/CustomAddressService.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/service/CustomAddressService.java

@@ -1,8 +1,8 @@
-package cc.hiver.shop.service;
+package cc.hiver.mall.service;
 
 import cc.hiver.core.base.HiverBaseService;
-import cc.hiver.shop.entity.CustomAddress;
-import cc.hiver.shop.dto.CustomAddressQueryCriteria;
+import cc.hiver.mall.entity.CustomAddress;
+import cc.hiver.mall.pojo.query.CustomAddressQueryCriteria;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/service/GoodsAttributeService.java

@@ -0,0 +1,7 @@
+package cc.hiver.mall.service;
+
+import cc.hiver.core.base.HiverBaseService;
+import cc.hiver.mall.entity.GoodsAttribute;
+
+public interface GoodsAttributeService extends HiverBaseService<GoodsAttribute, String> {
+}

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/service/GoodsBrandService.java

@@ -0,0 +1,12 @@
+package cc.hiver.mall.service;
+
+import cc.hiver.core.base.HiverBaseService;
+import cc.hiver.mall.entity.GoodsBrand;
+
+/**
+ * 商品品牌服务接口
+ *
+ * @author Yazhi Li
+ */
+public interface GoodsBrandService extends HiverBaseService<GoodsBrand, String> {
+}

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/service/GoodsCategoryAttributeService.java

@@ -0,0 +1,7 @@
+package cc.hiver.mall.service;
+
+import cc.hiver.core.base.HiverBaseService;
+import cc.hiver.mall.entity.GoodsCategoryAttribute;
+
+public interface GoodsCategoryAttributeService extends HiverBaseService<GoodsCategoryAttribute, String> {
+}

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/service/GoodsCategoryBrandService.java

@@ -0,0 +1,7 @@
+package cc.hiver.mall.service;
+
+import cc.hiver.core.base.HiverBaseService;
+import cc.hiver.mall.entity.GoodsCategoryBrand;
+
+public interface GoodsCategoryBrandService extends HiverBaseService<GoodsCategoryBrand, String> {
+}

hiver-modules/hiver-shop/src/main/java/cc/hiver/shop/service/GoodsCategoryService.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/service/GoodsCategoryService.java

@@ -1,7 +1,7 @@
-package cc.hiver.shop.service;
+package cc.hiver.mall.service;
 
 import cc.hiver.core.base.HiverBaseService;
-import cc.hiver.shop.entity.GoodsCategory;
+import cc.hiver.mall.entity.GoodsCategory;
 
 import java.util.List;
 

hiver-modules/hiver-shop/src/main/java/cc/hiver/shop/service/GoodsInStockService.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/service/GoodsInStockService.java

@@ -1,7 +1,7 @@
-package cc.hiver.shop.service;
+package cc.hiver.mall.service;
 
 import cc.hiver.core.base.HiverBaseService;
-import cc.hiver.shop.entity.GoodsInStock;
+import cc.hiver.mall.entity.GoodsInStock;
 
 public interface GoodsInStockService extends HiverBaseService<GoodsInStock, String> {
 }

hiver-modules/hiver-shop/src/main/java/cc/hiver/shop/service/GoodsService.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/service/GoodsService.java

@@ -1,7 +1,7 @@
-package cc.hiver.shop.service;
+package cc.hiver.mall.service;
 
 import cc.hiver.core.base.HiverBaseService;
-import cc.hiver.shop.entity.Goods;
+import cc.hiver.mall.entity.Goods;
 
 public interface GoodsService extends HiverBaseService<Goods, String> {
 }

hiver-modules/hiver-shop/src/main/java/cc/hiver/shop/service/GoodsStockService.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/service/GoodsStockService.java

@@ -1,7 +1,7 @@
-package cc.hiver.shop.service;
+package cc.hiver.mall.service;
 
 import cc.hiver.core.base.HiverBaseService;
-import cc.hiver.shop.entity.GoodsStock;
+import cc.hiver.mall.entity.GoodsStock;
 
 public interface GoodsStockService extends HiverBaseService<GoodsStock, String> {
 }

hiver-modules/hiver-shop/src/main/java/cc/hiver/shop/service/MallService.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/service/MallService.java

@@ -1,7 +1,7 @@
-package cc.hiver.shop.service;
+package cc.hiver.mall.service;
 
 import cc.hiver.core.base.HiverBaseService;
-import cc.hiver.shop.entity.Mall;
+import cc.hiver.mall.entity.Mall;
 
 public interface MallService extends HiverBaseService<Mall, String> {
 }

hiver-modules/hiver-shop/src/main/java/cc/hiver/shop/service/PopularUrlGoodsService.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/service/PopularUrlGoodsService.java

@@ -1,7 +1,7 @@
-package cc.hiver.shop.service;
+package cc.hiver.mall.service;
 
 import cc.hiver.core.base.HiverBaseService;
-import cc.hiver.shop.entity.PopularUrlGoods;
+import cc.hiver.mall.entity.PopularUrlGoods;
 
 import java.util.List;
 

hiver-modules/hiver-shop/src/main/java/cc/hiver/shop/service/PopularUrlService.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/service/PopularUrlService.java

@@ -1,7 +1,7 @@
-package cc.hiver.shop.service;
+package cc.hiver.mall.service;
 
 import cc.hiver.core.base.HiverBaseService;
-import cc.hiver.shop.entity.PopularUrl;
+import cc.hiver.mall.entity.PopularUrl;
 
 public interface PopularUrlService extends HiverBaseService<PopularUrl, String> {
 }

hiver-modules/hiver-shop/src/main/java/cc/hiver/shop/service/RoleSettingService.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/service/RoleSettingService.java

@@ -1,7 +1,7 @@
-package cc.hiver.shop.service;
+package cc.hiver.mall.service;
 
 import cc.hiver.core.base.HiverBaseService;
-import cc.hiver.shop.entity.RoleSetting;
+import cc.hiver.mall.entity.RoleSetting;
 
 public interface RoleSettingService extends HiverBaseService<RoleSetting, String> {
 }

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/service/SalesOrderItemService.java

@@ -0,0 +1,7 @@
+package cc.hiver.mall.service;
+
+import cc.hiver.core.base.HiverBaseService;
+import cc.hiver.mall.entity.SalesOrderItem;
+
+public interface SalesOrderItemService extends HiverBaseService<SalesOrderItem, String> {
+}

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/service/SalesOrderService.java

@@ -0,0 +1,7 @@
+package cc.hiver.mall.service;
+
+import cc.hiver.core.base.HiverBaseService;
+import cc.hiver.mall.entity.SalesOrder;
+
+public interface SalesOrderService extends HiverBaseService<SalesOrder, String> {
+}

hiver-modules/hiver-shop/src/main/java/cc/hiver/shop/service/UserClockInService.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/service/UserClockInService.java

@@ -1,7 +1,7 @@
-package cc.hiver.shop.service;
+package cc.hiver.mall.service;
 
 import cc.hiver.core.base.HiverBaseService;
-import cc.hiver.shop.entity.UserClockIn;
+import cc.hiver.mall.entity.UserClockIn;
 
 public interface UserClockInService extends HiverBaseService<UserClockIn, String> {
 }

hiver-modules/hiver-shop/src/main/java/cc/hiver/shop/service/UserMallService.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/service/UserMallService.java

@@ -1,7 +1,7 @@
-package cc.hiver.shop.service;
+package cc.hiver.mall.service;
 
 import cc.hiver.core.base.HiverBaseService;
-import cc.hiver.shop.entity.UserMall;
+import cc.hiver.mall.entity.UserMall;
 
 public interface UserMallService extends HiverBaseService<UserMall, String> {
     void deleteAllByMallId(String mallId);

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/service/mybatis/IAddressService.java

@@ -0,0 +1,31 @@
+package cc.hiver.mall.service.mybatis;
+
+import cc.hiver.mall.entity.Address;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+public interface IAddressService extends IService<Address> {
+    /**
+     * 新增地址
+     *
+     * @param entity
+     * @return
+     */
+    boolean addAddress(Address entity);
+
+    /**
+     * 修改地址
+     *
+     * @param entity
+     * @return
+     */
+    boolean updateAddress(Address entity);
+
+    /**
+     * 获取当前登录会员的地址列表
+     *
+     * @return
+     */
+    List<Address> listCurrentMemberAddresses(String memberId);
+}

hiver-modules/hiver-shop/src/main/java/cc/hiver/shop/service/mybatis/IMallService.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/service/mybatis/IMallService.java

@@ -1,6 +1,6 @@
-package cc.hiver.shop.service.mybatis;
+package cc.hiver.mall.service.mybatis;
 
-import cc.hiver.shop.entity.Mall;
+import cc.hiver.mall.entity.Mall;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.apache.ibatis.annotations.Param;
 

hiver-modules/hiver-shop/src/main/java/cc/hiver/shop/serviceimpl/CustomAddressServiceImpl.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/CustomAddressServiceImpl.java

@@ -1,11 +1,11 @@
-package cc.hiver.shop.serviceimpl;
+package cc.hiver.mall.serviceimpl;
 
 import cc.hiver.core.base.HiverBaseDao;
 import cc.hiver.core.common.utils.QueryHelp;
-import cc.hiver.shop.dao.CustomAddressDao;
-import cc.hiver.shop.entity.CustomAddress;
-import cc.hiver.shop.service.CustomAddressService;
-import cc.hiver.shop.dto.CustomAddressQueryCriteria;
+import cc.hiver.mall.dao.CustomAddressDao;
+import cc.hiver.mall.entity.CustomAddress;
+import cc.hiver.mall.service.CustomAddressService;
+import cc.hiver.mall.pojo.query.CustomAddressQueryCriteria;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/GoodsAttributeServiceImpl.java

@@ -0,0 +1,23 @@
+package cc.hiver.mall.serviceimpl;
+
+import cc.hiver.core.base.HiverBaseDao;
+import cc.hiver.mall.dao.GoodsAttributeDao;
+import cc.hiver.mall.entity.GoodsAttribute;
+import cc.hiver.mall.service.GoodsAttributeService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Slf4j
+@Service
+@Transactional
+public class GoodsAttributeServiceImpl implements GoodsAttributeService {
+    @Autowired
+    private GoodsAttributeDao goodsAttributeDao;
+
+    @Override
+    public HiverBaseDao<GoodsAttribute, String> getRepository() {
+        return goodsAttributeDao;
+    }
+}

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/GoodsBrandServiceImpl.java

@@ -0,0 +1,23 @@
+package cc.hiver.mall.serviceimpl;
+
+import cc.hiver.core.base.HiverBaseDao;
+import cc.hiver.mall.dao.GoodsBrandDao;
+import cc.hiver.mall.entity.GoodsBrand;
+import cc.hiver.mall.service.GoodsBrandService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Slf4j
+@Service
+@Transactional
+public class GoodsBrandServiceImpl implements GoodsBrandService {
+    @Autowired
+    private GoodsBrandDao goodsBrandDao;
+
+    @Override
+    public HiverBaseDao<GoodsBrand, String> getRepository() {
+        return goodsBrandDao;
+    }
+}

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/GoodsCategoryAttributeServiceImpl.java

@@ -0,0 +1,23 @@
+package cc.hiver.mall.serviceimpl;
+
+import cc.hiver.core.base.HiverBaseDao;
+import cc.hiver.mall.dao.GoodsCategoryAttributeDao;
+import cc.hiver.mall.entity.GoodsCategoryAttribute;
+import cc.hiver.mall.service.GoodsCategoryAttributeService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Slf4j
+@Service
+@Transactional
+public class GoodsCategoryAttributeServiceImpl implements GoodsCategoryAttributeService {
+    @Autowired
+    private GoodsCategoryAttributeDao goodsCategoryAttributeDao;
+
+    @Override
+    public HiverBaseDao<GoodsCategoryAttribute, String> getRepository() {
+        return goodsCategoryAttributeDao;
+    }
+}

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/GoodsCategoryBrandServiceImpl.java

@@ -0,0 +1,23 @@
+package cc.hiver.mall.serviceimpl;
+
+import cc.hiver.core.base.HiverBaseDao;
+import cc.hiver.mall.dao.GoodsCategoryBrandDao;
+import cc.hiver.mall.entity.GoodsCategoryBrand;
+import cc.hiver.mall.service.GoodsCategoryBrandService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Slf4j
+@Service
+@Transactional
+public class GoodsCategoryBrandServiceImpl implements GoodsCategoryBrandService {
+    @Autowired
+    private GoodsCategoryBrandDao goodsCategoryBrandDao;
+
+    @Override
+    public HiverBaseDao<GoodsCategoryBrand, String> getRepository() {
+        return goodsCategoryBrandDao;
+    }
+}

hiver-modules/hiver-shop/src/main/java/cc/hiver/shop/serviceimpl/GoodsCategoryServiceImpl.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/GoodsCategoryServiceImpl.java

@@ -1,9 +1,9 @@
-package cc.hiver.shop.serviceimpl;
+package cc.hiver.mall.serviceimpl;
 
 import cc.hiver.core.base.HiverBaseDao;
-import cc.hiver.shop.dao.GoodsCategoryDao;
-import cc.hiver.shop.entity.GoodsCategory;
-import cc.hiver.shop.service.GoodsCategoryService;
+import cc.hiver.mall.dao.GoodsCategoryDao;
+import cc.hiver.mall.entity.GoodsCategory;
+import cc.hiver.mall.service.GoodsCategoryService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

hiver-modules/hiver-shop/src/main/java/cc/hiver/shop/serviceimpl/GoodsInStockServiceImpl.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/GoodsInStockServiceImpl.java

@@ -1,9 +1,9 @@
-package cc.hiver.shop.serviceimpl;
+package cc.hiver.mall.serviceimpl;
 
 import cc.hiver.core.base.HiverBaseDao;
-import cc.hiver.shop.dao.GoodsInStockDao;
-import cc.hiver.shop.entity.GoodsInStock;
-import cc.hiver.shop.service.GoodsInStockService;
+import cc.hiver.mall.dao.GoodsInStockDao;
+import cc.hiver.mall.entity.GoodsInStock;
+import cc.hiver.mall.service.GoodsInStockService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

hiver-modules/hiver-shop/src/main/java/cc/hiver/shop/serviceimpl/GoodsServiceImpl.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/GoodsServiceImpl.java

@@ -1,9 +1,9 @@
-package cc.hiver.shop.serviceimpl;
+package cc.hiver.mall.serviceimpl;
 
 import cc.hiver.core.base.HiverBaseDao;
-import cc.hiver.shop.dao.GoodsDao;
-import cc.hiver.shop.entity.Goods;
-import cc.hiver.shop.service.GoodsService;
+import cc.hiver.mall.dao.GoodsDao;
+import cc.hiver.mall.entity.Goods;
+import cc.hiver.mall.service.GoodsService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

hiver-modules/hiver-shop/src/main/java/cc/hiver/shop/serviceimpl/GoodsStockServiceImpl.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/GoodsStockServiceImpl.java

@@ -1,9 +1,9 @@
-package cc.hiver.shop.serviceimpl;
+package cc.hiver.mall.serviceimpl;
 
 import cc.hiver.core.base.HiverBaseDao;
-import cc.hiver.shop.dao.GoodsStockDao;
-import cc.hiver.shop.entity.GoodsStock;
-import cc.hiver.shop.service.GoodsStockService;
+import cc.hiver.mall.dao.GoodsStockDao;
+import cc.hiver.mall.entity.GoodsStock;
+import cc.hiver.mall.service.GoodsStockService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

hiver-modules/hiver-shop/src/main/java/cc/hiver/shop/serviceimpl/MallServiceImpl.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/MallServiceImpl.java

@@ -1,9 +1,9 @@
-package cc.hiver.shop.serviceimpl;
+package cc.hiver.mall.serviceimpl;
 
 import cc.hiver.core.base.HiverBaseDao;
-import cc.hiver.shop.dao.MallDao;
-import cc.hiver.shop.entity.Mall;
-import cc.hiver.shop.service.MallService;
+import cc.hiver.mall.dao.MallDao;
+import cc.hiver.mall.entity.Mall;
+import cc.hiver.mall.service.MallService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

hiver-modules/hiver-shop/src/main/java/cc/hiver/shop/serviceimpl/PopularUrlGoodsServiceImpl.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/PopularUrlGoodsServiceImpl.java

@@ -1,9 +1,9 @@
-package cc.hiver.shop.serviceimpl;
+package cc.hiver.mall.serviceimpl;
 
 import cc.hiver.core.base.HiverBaseDao;
-import cc.hiver.shop.dao.PopularUrlGoodsDao;
-import cc.hiver.shop.entity.PopularUrlGoods;
-import cc.hiver.shop.service.PopularUrlGoodsService;
+import cc.hiver.mall.dao.PopularUrlGoodsDao;
+import cc.hiver.mall.entity.PopularUrlGoods;
+import cc.hiver.mall.service.PopularUrlGoodsService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

hiver-modules/hiver-shop/src/main/java/cc/hiver/shop/serviceimpl/PopularUrlServiceImpl.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/PopularUrlServiceImpl.java

@@ -1,9 +1,9 @@
-package cc.hiver.shop.serviceimpl;
+package cc.hiver.mall.serviceimpl;
 
 import cc.hiver.core.base.HiverBaseDao;
-import cc.hiver.shop.dao.PopularUrlDao;
-import cc.hiver.shop.entity.PopularUrl;
-import cc.hiver.shop.service.PopularUrlService;
+import cc.hiver.mall.dao.PopularUrlDao;
+import cc.hiver.mall.entity.PopularUrl;
+import cc.hiver.mall.service.PopularUrlService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

hiver-modules/hiver-shop/src/main/java/cc/hiver/shop/serviceimpl/RoleSettingServiceImpl.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/RoleSettingServiceImpl.java

@@ -1,9 +1,9 @@
-package cc.hiver.shop.serviceimpl;
+package cc.hiver.mall.serviceimpl;
 
 import cc.hiver.core.base.HiverBaseDao;
-import cc.hiver.shop.dao.RoleSettingDao;
-import cc.hiver.shop.entity.RoleSetting;
-import cc.hiver.shop.service.RoleSettingService;
+import cc.hiver.mall.dao.RoleSettingDao;
+import cc.hiver.mall.entity.RoleSetting;
+import cc.hiver.mall.service.RoleSettingService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/SalesOrderItemServiceImpl.java

@@ -0,0 +1,23 @@
+package cc.hiver.mall.serviceimpl;
+
+import cc.hiver.core.base.HiverBaseDao;
+import cc.hiver.mall.dao.SalesOrderItemDao;
+import cc.hiver.mall.entity.SalesOrderItem;
+import cc.hiver.mall.service.SalesOrderItemService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Slf4j
+@Service
+@Transactional
+public class SalesOrderItemServiceImpl implements SalesOrderItemService {
+    @Autowired
+    private SalesOrderItemDao salesOrderItemDao;
+
+    @Override
+    public HiverBaseDao<SalesOrderItem, String> getRepository() {
+        return salesOrderItemDao;
+    }
+}

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/SalesOrderServiceImpl.java

@@ -0,0 +1,23 @@
+package cc.hiver.mall.serviceimpl;
+
+import cc.hiver.core.base.HiverBaseDao;
+import cc.hiver.mall.dao.SalesOrderDao;
+import cc.hiver.mall.entity.SalesOrder;
+import cc.hiver.mall.service.SalesOrderService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Slf4j
+@Service
+@Transactional
+public class SalesOrderServiceImpl implements SalesOrderService {
+    @Autowired
+    private SalesOrderDao salesOrderDao;
+
+    @Override
+    public HiverBaseDao<SalesOrder, String> getRepository() {
+        return salesOrderDao;
+    }
+}

hiver-modules/hiver-shop/src/main/java/cc/hiver/shop/serviceimpl/UserClockInServiceImpl.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/UserClockInServiceImpl.java

@@ -1,9 +1,9 @@
-package cc.hiver.shop.serviceimpl;
+package cc.hiver.mall.serviceimpl;
 
 import cc.hiver.core.base.HiverBaseDao;
-import cc.hiver.shop.dao.UserClockInDao;
-import cc.hiver.shop.entity.UserClockIn;
-import cc.hiver.shop.service.UserClockInService;
+import cc.hiver.mall.dao.UserClockInDao;
+import cc.hiver.mall.entity.UserClockIn;
+import cc.hiver.mall.service.UserClockInService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

hiver-modules/hiver-shop/src/main/java/cc/hiver/shop/serviceimpl/UserMallServiceImpl.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/UserMallServiceImpl.java

@@ -1,9 +1,9 @@
-package cc.hiver.shop.serviceimpl;
+package cc.hiver.mall.serviceimpl;
 
 import cc.hiver.core.base.HiverBaseDao;
-import cc.hiver.shop.dao.UserMallDao;
-import cc.hiver.shop.entity.UserMall;
-import cc.hiver.shop.service.UserMallService;
+import cc.hiver.mall.dao.UserMallDao;
+import cc.hiver.mall.entity.UserMall;
+import cc.hiver.mall.service.UserMallService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/IAddressServiceImpl.java

@@ -0,0 +1,63 @@
+package cc.hiver.mall.serviceimpl.mybatis;
+
+import cc.hiver.core.common.constant.CommonConstant;
+import cc.hiver.mall.dao.mapper.AddressMapper;
+import cc.hiver.mall.entity.Address;
+import cc.hiver.mall.service.mybatis.IAddressService;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+@Service
+public class IAddressServiceImpl extends ServiceImpl<AddressMapper, Address> implements IAddressService {
+    @Override
+    @Transactional
+    public boolean addAddress(Address entity) {
+        boolean result = this.save(entity);
+        if (result) {
+            if (CommonConstant.STATUS_YES.equals(entity.getDefaulted())) {
+                this.update(new LambdaUpdateWrapper<Address>()
+                        .eq(Address::getMemberId, entity.getMemberId())
+                        .eq(Address::getDefaulted, 1)
+                        .ne(Address::getId, entity.getId())
+                        .set(Address::getDefaulted, 0));
+            }
+        }
+        return result;
+    }
+
+    @Override
+    public boolean updateAddress(Address entity) {
+        boolean result = this.updateById(entity);
+        if (result) {
+            // 修改其他默认地址为非默认
+            if (CommonConstant.STATUS_YES.equals(entity.getDefaulted())) {
+                this.update(new LambdaUpdateWrapper<Address>()
+                        .eq(Address::getMemberId, entity.getMemberId())
+                        .eq(Address::getDefaulted, 1)
+                        .ne(Address::getId, entity.getId())
+                        .set(Address::getDefaulted, 0)
+                );
+            }
+        }
+        return result;
+    }
+
+    @Override
+    public List<Address> listCurrentMemberAddresses(String memberId) {
+        List<Address> umsAddressList = this.list(new LambdaQueryWrapper<Address>()
+                .eq(Address::getMemberId, memberId)
+                .orderByDesc(Address::getDefaulted) // 默认地址排在首位
+        );
+        List<Address> memberAddressList = Optional.ofNullable(umsAddressList).orElse(new ArrayList<>()).stream()
+                .collect(Collectors.toList());
+        return memberAddressList;
+    }
+}

hiver-modules/hiver-shop/src/main/java/cc/hiver/shop/serviceimpl/mybatis/IMallServiceImpl.java → hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/IMallServiceImpl.java

@@ -1,8 +1,8 @@
-package cc.hiver.shop.serviceimpl.mybatis;
+package cc.hiver.mall.serviceimpl.mybatis;
 
-import cc.hiver.shop.dao.mapper.MallMapper;
-import cc.hiver.shop.entity.Mall;
-import cc.hiver.shop.service.mybatis.IMallService;
+import cc.hiver.mall.dao.mapper.MallMapper;
+import cc.hiver.mall.entity.Mall;
+import cc.hiver.mall.service.mybatis.IMallService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

hiver-modules/hiver-shop/src/main/resources/mapper/MallMapper.xml → hiver-modules/hiver-mall/src/main/resources/mapper/MallMapper.xml

@@ -1,7 +1,7 @@
 <?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.shop.dao.mapper.MallMapper">
-    <select id="findByUserId" resultType="cc.hiver.shop.entity.Mall">
+<mapper namespace="cc.hiver.mall.dao.mapper.MallMapper">
+    <select id="findByUserId" resultType="cc.hiver.mall.entity.Mall">
         SELECT DISTINCT m.*
         FROM t_mall m
                  LEFT JOIN t_user_mall um ON m.id = um.mall_id

hiver-modules/hiver-shop/src/main/java/cc/hiver/shop/controller/GoodsAttributeController.java

@@ -1,89 +0,0 @@
-package cc.hiver.shop.controller;
-
-import cc.hiver.core.common.utils.ResultUtil;
-import cc.hiver.core.common.vo.Result;
-import cc.hiver.shop.entity.GoodsAttributeKey;
-import cc.hiver.shop.entity.GoodsAttributeValue;
-import cc.hiver.shop.entity.Mall;
-import cc.hiver.shop.service.GoodsAttributeKeyService;
-import cc.hiver.shop.service.GoodsAttributeValueService;
-import cc.hiver.shop.service.MallService;
-import cc.hiver.shop.dto.GoodsAttributeDto;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-@Slf4j
-@RestController
-@Api(tags = "商品规格接口")
-@RequestMapping(value = "/hiver/app/goodsAttribute/")
-@Transactional
-public class GoodsAttributeController {
-    @Autowired
-    private GoodsAttributeKeyService goodsAttributeKeyService;
-
-    @Autowired
-    private GoodsAttributeValueService goodsAttributeValueService;
-
-    @Autowired
-    private MallService mallService;
-
-    @RequestMapping(value = "/save", method = RequestMethod.POST)
-    @ApiOperation(value = "保存数据")
-    public Result save(GoodsAttributeDto entity) {
-        GoodsAttributeKey attributeKey = new GoodsAttributeKey();
-        attributeKey.setMallId(entity.getMallId());
-        attributeKey.setCategoryId(entity.getCategoryId());
-        attributeKey.setAttributeKey(entity.getAttributeKey());
-        Mall mall = mallService.findById(entity.getMallId());
-        if(mall == null) {
-            return ResultUtil.error("商铺不存在");
-        }
-        attributeKey.setRegion(mall.getRegion());
-        GoodsAttributeKey goodsAttributeKey = goodsAttributeKeyService.save(attributeKey);
-        for(String value : entity.getAttributeValues()) {
-            GoodsAttributeValue goodsAttributeValue = new GoodsAttributeValue();
-            goodsAttributeValue.setAttributeId(goodsAttributeKey.getId());
-            goodsAttributeValue.setAttributeValue(value);
-            goodsAttributeValueService.save(goodsAttributeValue);
-        }
-        return ResultUtil.success();
-    }
-
-    @RequestMapping(value = "/edit", method = RequestMethod.POST)
-    @ApiOperation(value = "更新数据")
-    public Result edit(GoodsAttributeDto entity) {
-        GoodsAttributeKey goodsAttributeKey = goodsAttributeKeyService.findById(entity.getId());
-        goodsAttributeKey.setAttributeKey(entity.getAttributeKey());
-        List<GoodsAttributeValue> values = goodsAttributeValueService.findAllByAttributeId(entity.getId());
-        goodsAttributeValueService.delete(values);
-        for(String v : entity.getAttributeValues()) {
-            GoodsAttributeValue goodsAttributeValue = new GoodsAttributeValue();
-            goodsAttributeValue.setAttributeId(entity.getId());
-            goodsAttributeValue.setAttributeValue(v);
-            goodsAttributeValueService.save(goodsAttributeValue);
-        }
-        return ResultUtil.success();
-    }
-
-    @RequestMapping(value = "/delByIds", method = RequestMethod.POST)
-    @ApiOperation(value = "批量通过ids删除")
-    public Result delByIds(@RequestParam String[] ids) {
-        for (String id : ids) {
-            List<GoodsAttributeValue> values = goodsAttributeValueService.getAll();
-            for(GoodsAttributeValue value : values) {
-                goodsAttributeValueService.delete(value);
-            }
-            goodsAttributeKeyService.delete(id);
-        }
-        return ResultUtil.success("批量通过id删除数据成功");
-    }
-}

hiver-modules/hiver-shop/src/main/java/cc/hiver/shop/controller/ShoppingCartController.java

@@ -1,38 +0,0 @@
-package cc.hiver.shop.controller;
-
-import cc.hiver.core.common.utils.ResultUtil;
-import cc.hiver.core.common.vo.Result;
-import cc.hiver.shop.entity.ShoppingCart;
-import cc.hiver.shop.service.ShoppingCartGoodsService;
-import cc.hiver.shop.service.ShoppingCartService;
-import cc.hiver.shop.dto.SalesSlipDto;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-@Slf4j
-@RestController
-@Api(tags = "购物车接口")
-@RequestMapping(value = "/hiver/app/shoppingCart/")
-@Transactional
-public class ShoppingCartController {
-    @Autowired
-    private ShoppingCartService shoppingCartService;
-
-    @Autowired
-    private ShoppingCartGoodsService shoppingCartGoodsService;
-
-    @RequestMapping(value = "/create", method = RequestMethod.POST)
-    @ApiOperation(value = "创建销售单")
-    public Result<SalesSlipDto> create(ShoppingCart entity) {
-        ShoppingCart shoppingCart = shoppingCartService.save(entity);
-        SalesSlipDto salesSlip = new SalesSlipDto();
-        salesSlip.setShoppingCart(shoppingCart);
-        return new ResultUtil<SalesSlipDto>().setData(salesSlip);
-    }
-}

hiver-modules/hiver-shop/src/main/java/cc/hiver/shop/dao/AddressDao.java

@@ -1,10 +0,0 @@
-package cc.hiver.shop.dao;
-
-import cc.hiver.core.base.HiverBaseDao;
-import cc.hiver.shop.entity.Address;
-
-import java.util.List;
-
-public interface AddressDao extends HiverBaseDao<Address, String> {
-    List<Address> findAllByMemberId(String memberId);
-}

hiver-modules/hiver-shop/src/main/java/cc/hiver/shop/dao/GoodsAttributeKeyDao.java

@@ -1,7 +0,0 @@
-package cc.hiver.shop.dao;
-
-import cc.hiver.core.base.HiverBaseDao;
-import cc.hiver.shop.entity.GoodsAttributeKey;
-
-public interface GoodsAttributeKeyDao extends HiverBaseDao<GoodsAttributeKey, String> {
-}