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

huanghongfa

2021-07-22 02f18587bd8860b305e2c688e20465be166bb48c

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopStoreService.java

@@ -1,10 +1,8 @@
package com.panzhihua.service_community.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.shop.PageComShopGoodsDTO;
import com.panzhihua.common.model.dtos.shop.PageComShopStoreDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.shop.ShopGoodsVO;
import com.panzhihua.common.model.vos.shop.ShopStoreVO;
import com.panzhihua.service_community.model.dos.ComShopStoreDO;

@@ -18,9 +16,16 @@
    /**
     * 店铺列表-分页查询
     * @param pageComShopStoreDTO 查询参数
     * @return ComShopStoreVO
     * @return PageShopStoreVO
     */
    R pageStoreList(PageComShopStoreDTO pageComShopStoreDTO);

    /**
     * 根据店铺id查询店铺详情
     * @param comShopStoreDTO   请求参数
     * @return  店铺详情
     */
    R shopStoreDetail(PageComShopStoreDTO comShopStoreDTO);

    /**
     * 保存店铺
@@ -29,6 +34,12 @@
     */
    R saveStore(ShopStoreVO storeVO);

    /**
     * 新增店铺
     * @param storeVO   请求参数
     * @return  新增结果
     */
    R addStore(ShopStoreVO storeVO);

    /**
     * 编辑店铺、启用、禁用
@@ -52,4 +63,17 @@
     * @return
     */
    R getOneInfo(Long id);

    /**
     * 获取用户商铺信息
     * @param userId 用户ID
     * @return
     */
    R getUserStoreInfo(Long userId);
    /**
     * 获取用户商铺信息
     * @param account 用户账号
     * @return
     */
    R getUserStoreInfo(String account);
}