用户端代码提交

pz-applet/src/main/java/com/pz/applet/AppletCarouselController.java

@@ -6,6 +6,7 @@ import com.pz.common.core.domain.R;
 import com.pz.common.core.page.TableDataInfo;
 import com.pz.common.core.page.TableDataInfo;
 import com.pz.system.domain.bo.CarouselBo;
 import com.pz.system.domain.bo.CarouselBo;
 import com.pz.system.domain.vo.CarouselVo;
 import com.pz.system.domain.vo.CarouselVo;
+import com.pz.system.domain.vo.HomeVo;
 import com.pz.system.service.ICarouselService;
 import com.pz.system.service.ICarouselService;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.validation.annotation.Validated;
@@ -26,7 +27,13 @@ import javax.validation.constraints.NotNull;
 public class AppletCarouselController extends BaseController {
 public class AppletCarouselController extends BaseController {
 
 
     private final ICarouselService iCarouselService;
     private final ICarouselService iCarouselService;
-
+    /**
+     * 首页
+     */
+    @GetMapping("/home")
+    public R<HomeVo> getHome() {
+        return R.ok(iCarouselService.selectHome(1));
+    }
     /**
     /**
      * 查询轮播图列表
      * 查询轮播图列表
      */
      */

pz-applet/src/main/java/com/pz/applet/AppletEmployeesController.java

@@ -75,7 +75,7 @@ public class AppletEmployeesController extends BaseController {
     @PostMapping("/add")
     @PostMapping("/add")
     public R<Void> add(@Validated(AddGroup.class) @RequestBody EmployeesCompanyBo bo) {
     public R<Void> add(@Validated(AddGroup.class) @RequestBody EmployeesCompanyBo bo) {
         bo.setUid(1);
         bo.setUid(1);
-        return toAjax(iEmployeesService.insertByBo(bo));
+        return toAjax(iEmployeesService.insertByEmployeesCompanyBo(bo));
     }
     }
 
 
 }
 }

pz-applet/src/main/java/com/pz/applet/AppletStoreApplyController.java

+package com.pz.applet;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.pz.common.annotation.Log;
+import com.pz.common.annotation.RepeatSubmit;
+import com.pz.common.core.controller.BaseController;
+import com.pz.common.core.domain.PageQuery;
+import com.pz.common.core.domain.R;
+import com.pz.common.core.page.TableDataInfo;
+import com.pz.common.core.validate.AddGroup;
+import com.pz.common.core.validate.EditGroup;
+import com.pz.common.enums.BusinessType;
+import com.pz.common.utils.poi.ExcelUtil;
+import com.pz.system.domain.bo.StoreApplyBo;
+import com.pz.system.domain.vo.StoreApplyVo;
+import com.pz.system.service.IStoreApplyService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 商城商户申请
+ *
+ * @author ruoyi
+ * @date 2023-09-10
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/applet/apply")
+public class AppletStoreApplyController extends BaseController {
+
+    private final IStoreApplyService iStoreApplyService;
+
+    /**
+     * 新增商城商户申请
+     */
+    @SaCheckPermission("system:apply:add")
+    @Log(title = "商城商户申请", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody StoreApplyBo bo) {
+        return toAjax(iStoreApplyService.insertByBo(bo));
+    }
+
+
+}

pz-applet/src/main/java/com/pz/applet/AppletStoreGoodsController.java

+package com.pz.applet;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.pz.common.annotation.Log;
+import com.pz.common.annotation.RepeatSubmit;
+import com.pz.common.core.controller.BaseController;
+import com.pz.common.core.domain.PageQuery;
+import com.pz.common.core.domain.R;
+import com.pz.common.core.page.TableDataInfo;
+import com.pz.common.core.validate.AddGroup;
+import com.pz.common.core.validate.EditGroup;
+import com.pz.common.enums.BusinessType;
+import com.pz.common.utils.poi.ExcelUtil;
+import com.pz.system.domain.StoreApply;
+import com.pz.system.domain.bo.StoreGoodsBo;
+import com.pz.system.domain.vo.StoreApplyVo;
+import com.pz.system.domain.vo.StoreGoodsVo;
+import com.pz.system.service.IStoreGoodsService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 商品
+ *
+ * @author ruoyi
+ * @date 2023-09-08
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/applet/goods")
+public class AppletStoreGoodsController extends BaseController {
+
+    private final IStoreGoodsService iStoreGoodsService;
+
+    /**
+     * 商城首页数据
+     */
+    @GetMapping("/shopList")
+    public TableDataInfo<StoreGoodsVo> shopList(StoreGoodsBo bo, PageQuery pageQuery) {
+        return iStoreGoodsService.shopAppShop(bo, pageQuery);
+    }
+    /**
+     * 搜索商品
+     */
+    @GetMapping("/searchShop")
+    public TableDataInfo<StoreGoodsVo> searchShop(StoreGoodsBo bo, PageQuery pageQuery) {
+        return iStoreGoodsService.searchAppShop(bo, pageQuery);
+    }
+
+    /**
+     *  商城商品分类列表
+     */
+    @GetMapping("/shopGoodsClassify")
+    public List<StoreApplyVo> shopGoodsClassify() {
+        return iStoreGoodsService.shopGoodsClassify();
+    }
+
+    /**
+     *  商城商户列表
+     */
+    @GetMapping("/shopCommercial")
+    public TableDataInfo<StoreGoodsVo> shopCommercial(StoreGoodsBo bo, PageQuery pageQuery) {
+        return iStoreGoodsService.queryPageList(bo, pageQuery);
+    }
+
+
+    /**
+     * 商城商品详情
+     *
+     * @param id 主键
+     */
+    @GetMapping("/{id}")
+    public R<StoreGoodsVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Integer id) {
+        return R.ok(iStoreGoodsService.queryAppById(id));
+    }
+
+
+}

pz-applet/src/main/java/com/pz/applet/AppletStoreInfoController.java

+package com.pz.applet;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.pz.common.annotation.Log;
+import com.pz.common.annotation.RepeatSubmit;
+import com.pz.common.core.controller.BaseController;
+import com.pz.common.core.domain.PageQuery;
+import com.pz.common.core.domain.R;
+import com.pz.common.core.page.TableDataInfo;
+import com.pz.common.core.validate.AddGroup;
+import com.pz.common.core.validate.EditGroup;
+import com.pz.common.enums.BusinessType;
+import com.pz.common.utils.poi.ExcelUtil;
+import com.pz.system.domain.bo.StoreInfoBo;
+import com.pz.system.domain.vo.StoreInfoVo;
+import com.pz.system.service.IStoreInfoService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 商城商户
+ *
+ * @author ruoyi
+ * @date 2023-09-08
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/applet/info")
+public class AppletStoreInfoController extends BaseController {
+
+    private final IStoreInfoService iStoreInfoService;
+
+    /**
+     * 查询商户列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo<StoreInfoVo> list(StoreInfoBo bo, PageQuery pageQuery) {
+        return iStoreInfoService.queryPageList(bo, pageQuery);
+    }
+
+
+    /**
+     * 获取商户详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("system:info:query")
+    @GetMapping("/{id}")
+    public R<StoreInfoVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Integer id) {
+        return R.ok(iStoreInfoService.queryById(id));
+    }
+
+    /**
+     * 新增商户
+     */
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody StoreInfoBo bo) {
+        return toAjax(iStoreInfoService.insertByBo(bo));
+    }
+
+    /**
+     * 修改商户
+     */
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody StoreInfoBo bo) {
+        return toAjax(iStoreInfoService.updateByBo(bo));
+    }
+
+    /**
+     * 删除商户
+     *
+     * @param ids 主键串
+     */
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Integer[] ids) {
+        return toAjax(iStoreInfoService.deleteWithValidByIds(Arrays.asList(ids), true));
+    }
+}

pz-system/src/main/java/com/pz/merchant/service/IEmployeesService.java

@@ -46,7 +46,14 @@ public interface IEmployeesService {
     /**
     /**
      * 新增陪诊员
      * 新增陪诊员
      */
      */
-    Boolean insertByBo(EmployeesCompanyBo bo);
+    Boolean insertByBo(EmployeesBo bo);
+
+    /**
+     * 新增陪诊员/商户
+     * @param bo
+     * @return
+     */
+    Boolean insertByEmployeesCompanyBo(EmployeesCompanyBo bo);
 
 
     /**
     /**
      * 修改陪诊员
      * 修改陪诊员

pz-system/src/main/java/com/pz/merchant/service/impl/EmployeesServiceImpl.java

@@ -122,7 +122,18 @@ public class EmployeesServiceImpl implements IEmployeesService {
      * 新增陪诊员/商户
      * 新增陪诊员/商户
      */
      */
     @Override
     @Override
-    public Boolean insertByBo(EmployeesCompanyBo bo) {
+    public Boolean insertByBo(EmployeesBo bo) {
+        Employees add = BeanUtil.toBean(bo, Employees.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    @Override
+    public Boolean insertByEmployeesCompanyBo(EmployeesCompanyBo bo) {
         /**
         /**
          * 陪诊员新增
          * 陪诊员新增
          */
          */

pz-system/src/main/java/com/pz/system/domain/bo/EmployeesCompanyBo.java

@@ -55,6 +55,7 @@ public class EmployeesCompanyBo  extends BaseEntity {
      * 商户或者陪诊员手机
      * 商户或者陪诊员手机
      */
      */
     private String phone;
     private String phone;
+    private String tel;
     /**
     /**
      * 商户地址
      * 商户地址
      */
      */

pz-system/src/main/java/com/pz/system/domain/vo/ArticleVo.java

@@ -81,7 +81,10 @@ public class ArticleVo {
      * 是否收藏
      * 是否收藏
      */
      */
     private boolean isCollect;
     private boolean isCollect;
-
+    /**
+     * 轮播图
+     */
+    private List<String> coverList;
     /**
     /**
      * 评论列表
      * 评论列表
      */
      */

pz-system/src/main/java/com/pz/system/domain/vo/HomeVo.java

+package com.pz.system.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.pz.system.domain.Business;
+import com.pz.system.domain.Carousel;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 首页
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class HomeVo {
+    private static final long serialVersionUID = 1L;
+    /**
+     * 头部公告
+     */
+    private String notice;
+
+    /**
+     * 轮播图数组
+     */
+    private List<Carousel> carousel;
+
+    /**
+     * 业务数组
+     */
+    private List<Business> business;
+
+}

pz-system/src/main/java/com/pz/system/domain/vo/InformationVo.java

@@ -2,10 +2,14 @@ package com.pz.system.domain.vo;
 
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.pz.common.annotation.ExcelDictFormat;
 import com.pz.common.annotation.ExcelDictFormat;
 import com.pz.common.convert.ExcelDictConvert;
 import com.pz.common.convert.ExcelDictConvert;
 import lombok.Data;
 import lombok.Data;
 
 
+import java.util.Date;
+
 
 
 /**
 /**
  * 新闻资讯视图对象 information
  * 新闻资讯视图对象 information
@@ -53,4 +57,10 @@ public class InformationVo {
      * 城市名称
      * 城市名称
      */
      */
     private String cityName;
     private String cityName;
+
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date createTime;
 }
 }

pz-system/src/main/java/com/pz/system/domain/vo/ShopCarouseVo.java

+package com.pz.system.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.pz.system.domain.Carousel;
+import lombok.Data;
+
+/**
+ * 小程序商城首页
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class ShopCarouseVo {
+    private static final long serialVersionUID = 1L;
+
+
+    private Carousel carousel;
+    /**
+     * 商品列表
+     */
+    private StoreGoodsVo list;
+}

pz-system/src/main/java/com/pz/system/domain/vo/StoreApplyVo.java

 package com.pz.system.domain.vo;
 package com.pz.system.domain.vo;
 
 
 import java.util.Date;
 import java.util.Date;
+import java.util.List;
 
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
@@ -117,4 +118,9 @@ public class StoreApplyVo extends BaseEntity {
      */
      */
     @ExcelProperty(value = "")
     @ExcelProperty(value = "")
     private Integer status;
     private Integer status;
+
+    /**
+     * 商品
+     */
+    private List<StoreGoodsVo> storeGoodsVo;
 }
 }

pz-system/src/main/java/com/pz/system/domain/vo/StoreGoodsVo.java

@@ -4,8 +4,11 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.pz.common.annotation.ExcelDictFormat;
 import com.pz.common.annotation.ExcelDictFormat;
 import com.pz.common.convert.ExcelDictConvert;
 import com.pz.common.convert.ExcelDictConvert;
+import com.pz.system.domain.Carousel;
 import lombok.Data;
 import lombok.Data;
 
 
+import java.util.List;
+
 
 
 /**
 /**
  * 商品视图对象 store_goods
  * 商品视图对象 store_goods
@@ -20,7 +23,7 @@ public class StoreGoodsVo {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
     /**
     /**
-     * 
+     *
      */
      */
     @ExcelProperty(value = "")
     @ExcelProperty(value = "")
     private Integer id;
     private Integer id;
@@ -32,7 +35,7 @@ public class StoreGoodsVo {
     private Long cityId;
     private Long cityId;
 
 
     /**
     /**
-     * 
+     *
      */
      */
     @ExcelProperty(value = "")
     @ExcelProperty(value = "")
     private Integer storeId;
     private Integer storeId;
@@ -98,10 +101,10 @@ public class StoreGoodsVo {
     private Integer inventory;
     private Integer inventory;
 
 
     /**
     /**
-     * 
+     *
      */
      */
     @ExcelProperty(value = "")
     @ExcelProperty(value = "")
     private Integer saleNum;
     private Integer saleNum;
 
 
-
+    private List<Carousel> carousel;
 }
 }

pz-system/src/main/java/com/pz/system/service/ICarouselService.java

@@ -5,6 +5,7 @@ import com.pz.system.domain.vo.CarouselVo;
 import com.pz.system.domain.bo.CarouselBo;
 import com.pz.system.domain.bo.CarouselBo;
 import com.pz.common.core.page.TableDataInfo;
 import com.pz.common.core.page.TableDataInfo;
 import com.pz.common.core.domain.PageQuery;
 import com.pz.common.core.domain.PageQuery;
+import com.pz.system.domain.vo.HomeVo;
 
 
 import java.util.Collection;
 import java.util.Collection;
 import java.util.List;
 import java.util.List;
@@ -46,4 +47,6 @@ public interface ICarouselService {
      * 校验并批量删除轮播图信息
      * 校验并批量删除轮播图信息
      */
      */
     Boolean deleteWithValidByIds(Collection<Integer> ids, Boolean isValid);
     Boolean deleteWithValidByIds(Collection<Integer> ids, Boolean isValid);
+
+    HomeVo selectHome(Integer cityId);
 }
 }

pz-system/src/main/java/com/pz/system/service/IStoreGoodsService.java

 package com.pz.system.service;
 package com.pz.system.service;
 
 
 import com.pz.system.domain.StoreGoods;
 import com.pz.system.domain.StoreGoods;
+import com.pz.system.domain.vo.StoreApplyVo;
 import com.pz.system.domain.vo.StoreGoodsVo;
 import com.pz.system.domain.vo.StoreGoodsVo;
 import com.pz.system.domain.bo.StoreGoodsBo;
 import com.pz.system.domain.bo.StoreGoodsBo;
 import com.pz.common.core.page.TableDataInfo;
 import com.pz.common.core.page.TableDataInfo;
@@ -21,6 +22,10 @@ public interface IStoreGoodsService {
      * 查询商品
      * 查询商品
      */
      */
     StoreGoodsVo queryById(Integer id);
     StoreGoodsVo queryById(Integer id);
+    /**
+     * 小程序查询商品
+     */
+    StoreGoodsVo queryAppById(Integer id);
 
 
     /**
     /**
      * 查询商品列表
      * 查询商品列表
@@ -28,6 +33,21 @@ public interface IStoreGoodsService {
     TableDataInfo<StoreGoodsVo> queryPageList(StoreGoodsBo bo, PageQuery pageQuery);
     TableDataInfo<StoreGoodsVo> queryPageList(StoreGoodsBo bo, PageQuery pageQuery);
 
 
     /**
     /**
+     * 商城首页数据
+     */
+    TableDataInfo<StoreGoodsVo> shopAppShop(StoreGoodsBo bo, PageQuery pageQuery);
+
+    /**
+     * 搜索商品
+     */
+    TableDataInfo<StoreGoodsVo> searchAppShop(StoreGoodsBo bo, PageQuery pageQuery);
+
+    /**
+     *查询商品分类
+     */
+    List<StoreApplyVo> shopGoodsClassify();
+
+    /**
      * 查询商品列表
      * 查询商品列表
      */
      */
     List<StoreGoodsVo> queryList(StoreGoodsBo bo);
     List<StoreGoodsVo> queryList(StoreGoodsBo bo);

pz-system/src/main/java/com/pz/system/service/impl/ArticleServiceImpl.java

@@ -182,7 +182,18 @@ public class ArticleServiceImpl implements IArticleService {
 
 
                 // 设置城市名称、点赞数和收藏数
                 // 设置城市名称、点赞数和收藏数
                 articleVos.forEach(articleVo -> {
                 articleVos.forEach(articleVo -> {
-
+                    // 去除方括号
+                    String numbers = articleVo.getCover().substring(1, articleVo.getCover().length() - 1);
+
+                    // 使用逗号分割字符串
+                    String[] numberArray = numbers.split(", ");
+
+                    // 创建 List<Integer> 并将转换后的整数加入列表中
+                    List<String> integerList = new ArrayList<>();
+                    for (String num : numberArray) {
+                        integerList.add(num.trim());
+                    }
+                    articleVo.setCoverList(integerList);
                     // 设置点赞数
                     // 设置点赞数
                     articleVo.setAppreciateNum(appreciateNumMap.getOrDefault(articleVo.getId(), 0));
                     articleVo.setAppreciateNum(appreciateNumMap.getOrDefault(articleVo.getId(), 0));
 
 

pz-system/src/main/java/com/pz/system/service/impl/CarouselServiceImpl.java

@@ -7,13 +7,15 @@ import com.pz.common.core.domain.PageQuery;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.pz.system.mapper.CityMapper;
+import com.pz.system.domain.Notice;
+import com.pz.system.domain.vo.HomeVo;
+import com.pz.system.mapper.*;
+import com.pz.system.service.ISysNoticeService;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import com.pz.system.domain.bo.CarouselBo;
 import com.pz.system.domain.bo.CarouselBo;
 import com.pz.system.domain.vo.CarouselVo;
 import com.pz.system.domain.vo.CarouselVo;
 import com.pz.system.domain.Carousel;
 import com.pz.system.domain.Carousel;
-import com.pz.system.mapper.CarouselMapper;
 import com.pz.system.service.ICarouselService;
 import com.pz.system.service.ICarouselService;
 
 
 import java.util.List;
 import java.util.List;
@@ -35,6 +37,10 @@ public class CarouselServiceImpl implements ICarouselService {
 
 
     private final CityMapper cityMapper;
     private final CityMapper cityMapper;
 
 
+    private final BusinessMapper businessMapper;
+
+    private final NoticeMapper noticeMapper;
+
     /**
     /**
      * 查询轮播图
      * 查询轮播图
      */
      */
@@ -123,4 +129,22 @@ public class CarouselServiceImpl implements ICarouselService {
         }
         }
         return baseMapper.deleteBatchIds(ids) > 0;
         return baseMapper.deleteBatchIds(ids) > 0;
     }
     }
+
+    @Override
+    public HomeVo selectHome(Integer cityId) {
+        HomeVo homeVo = new HomeVo();
+        List<Notice> notices = noticeMapper.selectList();
+        if(null != notices && notices.size() != 0){
+            homeVo.setNotice(notices.get(0).getInfo());
+        }
+        homeVo.setCarousel(baseMapper.selectList(
+            new LambdaQueryWrapper<Carousel>().eq(
+                Carousel::getSite,1
+            ).eq(
+                Carousel::getStatus,1
+            )
+        ));
+        homeVo.setBusiness(businessMapper.selectList());
+        return homeVo;
+    }
 }
 }

pz-system/src/main/java/com/pz/system/service/impl/StoreGoodsServiceImpl.java

@@ -7,6 +7,9 @@ import com.pz.common.core.domain.PageQuery;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.pz.system.domain.StoreApply;
+import com.pz.system.domain.vo.StoreApplyVo;
+import com.pz.system.mapper.StoreApplyMapper;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import com.pz.system.domain.bo.StoreGoodsBo;
 import com.pz.system.domain.bo.StoreGoodsBo;
@@ -31,6 +34,8 @@ public class StoreGoodsServiceImpl implements IStoreGoodsService {
 
 
     private final StoreGoodsMapper baseMapper;
     private final StoreGoodsMapper baseMapper;
 
 
+    private final StoreApplyMapper storeApplyMapper;
+
     /**
     /**
      * 查询商品
      * 查询商品
      */
      */
@@ -40,6 +45,18 @@ public class StoreGoodsServiceImpl implements IStoreGoodsService {
     }
     }
 
 
     /**
     /**
+     * 小程序查询商品
+     */
+    @Override
+    public StoreGoodsVo queryAppById(Integer id){
+        StoreGoodsVo storeGoodsVo = baseMapper.selectVoById(id);
+        StoreGoods storeGoods = new StoreGoods();
+        storeGoods.setId(id);
+        storeGoods.setLookNum(storeGoodsVo.getLookNum() + 1);
+        baseMapper.updateById(storeGoods);
+        return storeGoodsVo;
+    }
+    /**
      * 查询商品列表
      * 查询商品列表
      */
      */
     @Override
     @Override
@@ -49,6 +66,35 @@ public class StoreGoodsServiceImpl implements IStoreGoodsService {
         return TableDataInfo.build(result);
         return TableDataInfo.build(result);
     }
     }
 
 
+    @Override
+    public TableDataInfo<StoreGoodsVo> shopAppShop(StoreGoodsBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<StoreGoods> lqw = buildQueryWrapper(bo);
+        Page<StoreGoodsVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    @Override
+    public TableDataInfo<StoreGoodsVo> searchAppShop(StoreGoodsBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<StoreGoods> lqw = buildQueryWrapper(bo);
+        Page<StoreGoodsVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    @Override
+    public List<StoreApplyVo> shopGoodsClassify() {
+
+        //查询所有商户分类
+        List<StoreApplyVo> storeApplies = storeApplyMapper.selectVoList(
+            new LambdaQueryWrapper<StoreApply>().eq(StoreApply::getStatus,1)
+        );
+        //查询商户下面的商品
+        for (StoreApplyVo storeApply : storeApplies) {
+            storeApply.setStoreGoodsVo(baseMapper.selectVoList(new LambdaQueryWrapper<StoreGoods>()
+                .eq(StoreGoods::getStoreId,storeApply.getId())));
+        }
+        return storeApplies;
+    }
+
     /**
     /**
      * 查询商品列表
      * 查询商品列表
      */
      */