修改代码

pz-admin/src/main/java/com/pz/web/controller/system/StoreGoodsCategoryController.java

+package com.pz.web.controller.system;
+
+import java.util.List;
+import java.util.Arrays;
+import java.util.Optional;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.pz.system.domain.StoreInfo;
+import com.pz.system.mapper.StoreInfoMapper;
+import com.pz.system.service.IStoreInfoService;
+import lombok.RequiredArgsConstructor;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.*;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import com.pz.common.annotation.RepeatSubmit;
+import com.pz.common.annotation.Log;
+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.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.vo.StoreGoodsCategoryVo;
+import com.pz.system.domain.bo.StoreGoodsCategoryBo;
+import com.pz.system.service.IStoreGoodsCategoryService;
+import com.pz.common.core.page.TableDataInfo;
+
+/**
+ * 商品分类
+ *
+ * @author ruoyi
+ * @date 2023-09-12
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/system/goodsCategory")
+public class StoreGoodsCategoryController extends BaseController {
+
+    private final IStoreGoodsCategoryService iStoreGoodsCategoryService;
+
+    private final StoreInfoMapper storeInfoMapper;
+
+    /**
+     * 查询商品分类列表
+     */
+    @SaCheckPermission("system:goodsCategory:list")
+    @GetMapping("/list")
+    public TableDataInfo<StoreGoodsCategoryVo> list(StoreGoodsCategoryBo bo, PageQuery pageQuery) {
+        Optional.ofNullable(storeInfoMapper.selectOne(Wrappers.<StoreInfo>lambdaQuery().eq(StoreInfo::getUid, getUserId())))
+            .ifPresent(storeInfo -> bo.setStoreId(storeInfo.getId()));
+        return iStoreGoodsCategoryService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出商品分类列表
+     */
+    @SaCheckPermission("system:goodsCategory:export")
+    @Log(title = "商品分类", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(StoreGoodsCategoryBo bo, HttpServletResponse response) {
+        List<StoreGoodsCategoryVo> list = iStoreGoodsCategoryService.queryList(bo);
+        ExcelUtil.exportExcel(list, "商品分类", StoreGoodsCategoryVo.class, response);
+    }
+
+    /**
+     * 获取商品分类详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("system:goodsCategory:query")
+    @GetMapping("/{id}")
+    public R<StoreGoodsCategoryVo> getInfo(@NotNull(message = "主键不能为空")
+                                           @PathVariable Integer id) {
+        return R.ok(iStoreGoodsCategoryService.queryById(id));
+    }
+
+    /**
+     * 新增商品分类
+     */
+    @SaCheckPermission("system:goodsCategory:add")
+    @Log(title = "商品分类", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody StoreGoodsCategoryBo bo) {
+        return toAjax(iStoreGoodsCategoryService.insertByBo(bo));
+    }
+
+    /**
+     * 修改商品分类
+     */
+    @SaCheckPermission("system:goodsCategory:edit")
+    @Log(title = "商品分类", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody StoreGoodsCategoryBo bo) {
+        return toAjax(iStoreGoodsCategoryService.updateByBo(bo));
+    }
+
+    /**
+     * 删除商品分类
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("system:goodsCategory:remove")
+    @Log(title = "商品分类", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Integer[] ids) {
+        return toAjax(iStoreGoodsCategoryService.deleteWithValidByIds(Arrays.asList(ids), true));
+    }
+}

pz-admin/src/main/java/com/pz/web/controller/system/StoreGoodsTagController.java

+package com.pz.web.controller.system;
+
+import java.util.List;
+import java.util.Arrays;
+import java.util.Optional;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.pz.system.domain.StoreInfo;
+import com.pz.system.mapper.StoreInfoMapper;
+import lombok.RequiredArgsConstructor;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import com.pz.common.annotation.RepeatSubmit;
+import com.pz.common.annotation.Log;
+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.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.vo.StoreGoodsTagVo;
+import com.pz.system.domain.bo.StoreGoodsTagBo;
+import com.pz.system.service.IStoreGoodsTagService;
+import com.pz.common.core.page.TableDataInfo;
+
+/**
+ * 商品标签
+ *
+ * @author ruoyi
+ * @date 2023-09-12
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/system/goodsTag")
+public class StoreGoodsTagController extends BaseController {
+
+    private final IStoreGoodsTagService iStoreGoodsTagService;
+
+    private final StoreInfoMapper storeInfoMapper;
+    /**
+     * 查询商品标签列表
+     */
+    @SaCheckPermission("system:goodsTag:list")
+    @GetMapping("/list")
+    public TableDataInfo<StoreGoodsTagVo> list(StoreGoodsTagBo bo, PageQuery pageQuery) {
+        Optional.ofNullable(storeInfoMapper.selectOne(Wrappers.<StoreInfo>lambdaQuery().eq(StoreInfo::getUid, getUserId())))
+            .ifPresent(storeInfo -> bo.setStoreId(storeInfo.getId()));
+        return iStoreGoodsTagService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出商品标签列表
+     */
+    @SaCheckPermission("system:goodsTag:export")
+    @Log(title = "商品标签", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(StoreGoodsTagBo bo, HttpServletResponse response) {
+        List<StoreGoodsTagVo> list = iStoreGoodsTagService.queryList(bo);
+        ExcelUtil.exportExcel(list, "商品标签", StoreGoodsTagVo.class, response);
+    }
+
+    /**
+     * 获取商品标签详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("system:goodsTag:query")
+    @GetMapping("/{id}")
+    public R<StoreGoodsTagVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Integer id) {
+        return R.ok(iStoreGoodsTagService.queryById(id));
+    }
+
+    /**
+     * 新增商品标签
+     */
+    @SaCheckPermission("system:goodsTag:add")
+    @Log(title = "商品标签", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody StoreGoodsTagBo bo) {
+        return toAjax(iStoreGoodsTagService.insertByBo(bo));
+    }
+
+    /**
+     * 修改商品标签
+     */
+    @SaCheckPermission("system:goodsTag:edit")
+    @Log(title = "商品标签", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody StoreGoodsTagBo bo) {
+        return toAjax(iStoreGoodsTagService.updateByBo(bo));
+    }
+
+    /**
+     * 删除商品标签
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("system:goodsTag:remove")
+    @Log(title = "商品标签", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Integer[] ids) {
+        return toAjax(iStoreGoodsTagService.deleteWithValidByIds(Arrays.asList(ids), true));
+    }
+}

pz-admin/src/main/java/com/pz/web/controller/system/StoreIncomeController.java

@@ -2,10 +2,16 @@ package com.pz.web.controller.system;
 
 import java.util.List;
 import java.util.Arrays;
+import java.util.Optional;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.pz.system.domain.StoreInfo;
+import com.pz.system.mapper.StoreInfoMapper;
 import lombok.RequiredArgsConstructor;
+
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.*;
+
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
@@ -37,12 +43,16 @@ public class StoreIncomeController extends BaseController {
 
     private final IStoreIncomeService iStoreIncomeService;
 
+    private final StoreInfoMapper storeInfoMapper;
+
     /**
      * 查询商城提现审批列表
      */
     @SaCheckPermission("system:storeIncome:list")
     @GetMapping("/list")
     public TableDataInfo<StoreIncomeVo> list(StoreIncomeBo bo, PageQuery pageQuery) {
+        Optional.ofNullable(storeInfoMapper.selectOne(Wrappers.<StoreInfo>lambdaQuery().eq(StoreInfo::getUid, getUserId())))
+            .ifPresent(storeInfo -> bo.setStoreId(storeInfo.getId()));
         return iStoreIncomeService.queryPageList(bo, pageQuery);
     }
 
@@ -65,7 +75,7 @@ public class StoreIncomeController extends BaseController {
     @SaCheckPermission("system:storeIncome:query")
     @GetMapping("/{id}")
     public R<StoreIncomeVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable Integer id) {
+                                    @PathVariable Integer id) {
         return R.ok(iStoreIncomeService.queryById(id));
     }
 
@@ -77,6 +87,8 @@ public class StoreIncomeController extends BaseController {
     @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody StoreIncomeBo bo) {
+        Optional.ofNullable(storeInfoMapper.selectOne(Wrappers.<StoreInfo>lambdaQuery().eq(StoreInfo::getUid, getUserId())))
+            .ifPresent(storeInfo -> bo.setStoreId(storeInfo.getId()));
         return toAjax(iStoreIncomeService.insertByBo(bo));
     }
 

pz-system/src/main/java/com/pz/system/domain/StoreGoodsCategory.java

+package com.pz.system.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.pz.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+
+/**
+ * 商品分类对象 store_goods_category
+ *
+ * @author ruoyi
+ * @date 2023-09-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("store_goods_category")
+public class StoreGoodsCategory extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     *
+     */
+    @TableId(value = "id")
+    private Integer id;
+    /**
+     *
+     */
+    private Integer storeId;
+    /**
+     * 分类名称
+     */
+    private String title;
+    /**
+     * 排序
+     */
+    private Integer order;
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    @TableLogic
+    private String delFlag;
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

pz-system/src/main/java/com/pz/system/domain/StoreGoodsTag.java

+package com.pz.system.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.pz.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+
+/**
+ * 商品标签对象 store_goods_tag
+ *
+ * @author ruoyi
+ * @date 2023-09-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("store_goods_tag")
+public class StoreGoodsTag extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     *
+     */
+    @TableId(value = "id")
+    private Integer id;
+    /**
+     *
+     */
+    private Integer storeId;
+    /**
+     * 标签
+     */
+    private String title;
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    @TableLogic
+    private String delFlag;
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

pz-system/src/main/java/com/pz/system/domain/StoreInfo.java

@@ -26,7 +26,7 @@ public class StoreInfo extends BaseEntity {
     /**
      *
      */
-    private Integer storeId;
+    private Integer uid;
     /**
      *
      */

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

@@ -69,5 +69,6 @@ public class DbghOrderBo extends BaseEntity {
      */
     private String remark;
 
+    private String orderSn;
 
 }

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

@@ -119,5 +119,5 @@ public class DbmyOrderBo extends BaseEntity {
      */
     private String remark;
 
-
+    private String orderSn;
 }

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

@@ -104,5 +104,5 @@ public class DbwzOrderBo extends BaseEntity {
      */
     private String remark;
 
-
+    private String orderSn;
 }

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

+package com.pz.system.domain.bo;
+
+import com.pz.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import javax.validation.constraints.*;
+
+
+/**
+ * 商品分类业务对象 store_goods_category
+ *
+ * @author ruoyi
+ * @date 2023-09-12
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class StoreGoodsCategoryBo extends BaseEntity {
+
+    /**
+     *
+     */
+    private Integer id;
+
+    /**
+     *
+     */
+    private Integer storeId;
+
+    /**
+     * 分类名称
+     */
+    private String title;
+
+    /**
+     * 排序
+     */
+    private Integer order;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

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

+package com.pz.system.domain.bo;
+
+import com.pz.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import javax.validation.constraints.*;
+
+
+/**
+ * 商品标签业务对象 store_goods_tag
+ *
+ * @author ruoyi
+ * @date 2023-09-12
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class StoreGoodsTagBo extends BaseEntity {
+
+    /**
+     *
+     */
+    private Integer id;
+
+    /**
+     *
+     */
+    private Integer storeId;
+
+    /**
+     * 标签
+     */
+    private String title;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

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

@@ -55,6 +55,4 @@ public class StoreIncomeBo extends BaseEntity {
      * 备注
      */
     private String remark;
-
-
 }

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

@@ -25,7 +25,7 @@ public class StoreInfoBo extends BaseEntity {
     /**
      *
      */
-    private Integer storeId;
+    private Integer uid;
 
     /**
      *

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

@@ -88,4 +88,6 @@ public class StoreOrderBo extends BaseEntity {
      * 商户名称
      */
     private String title;
+
+    private Long userId;
 }

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

@@ -74,5 +74,5 @@ public class ZqghOrderBo extends BaseEntity {
      */
     private String remark;
 
-
+    private String orderSn;
 }

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

@@ -84,5 +84,5 @@ public class ZyphOrderBo extends BaseEntity {
      */
     private String remark;
 
-
+    private String orderSn;
 }

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

@@ -6,6 +6,8 @@ import com.pz.common.annotation.ExcelDictFormat;
 import com.pz.common.convert.ExcelDictConvert;
 import lombok.Data;
 
+import java.util.Date;
+
 
 /**
  * 支付订单视图对象 payment_record
@@ -20,7 +22,7 @@ public class PaymentRecordVo {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
     @ExcelProperty(value = "")
     private Integer id;
@@ -61,5 +63,8 @@ public class PaymentRecordVo {
     @ExcelProperty(value = "备注")
     private String remark;
 
+    private String userName;
+
+    private Date createTime;
 
 }

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

@@ -38,6 +38,7 @@ public class StoreAdminOrderVo implements Serializable {
      */
     private String sName;
 
+    private Integer addressId;
     /**
      * 用户名称
      */
@@ -57,4 +58,6 @@ public class StoreAdminOrderVo implements Serializable {
      * 创建时间
      */
     private Date createTime;
+
+    private UserAddressVo userAddressVo;
 }

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

+package com.pz.system.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.pz.common.annotation.ExcelDictFormat;
+import com.pz.common.convert.ExcelDictConvert;
+import lombok.Data;
+
+
+/**
+ * 商品分类视图对象 store_goods_category
+ *
+ * @author ruoyi
+ * @date 2023-09-12
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class StoreGoodsCategoryVo {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+    @ExcelProperty(value = "")
+    private Integer id;
+
+    /**
+     * 
+     */
+    @ExcelProperty(value = "")
+    private Integer storeId;
+
+    /**
+     * 分类名称
+     */
+    @ExcelProperty(value = "分类名称")
+    private String title;
+
+    /**
+     * 排序
+     */
+    @ExcelProperty(value = "排序")
+    private Integer order;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+
+}

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

+package com.pz.system.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.pz.common.annotation.ExcelDictFormat;
+import com.pz.common.convert.ExcelDictConvert;
+import lombok.Data;
+
+
+/**
+ * 商品标签视图对象 store_goods_tag
+ *
+ * @author ruoyi
+ * @date 2023-09-12
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class StoreGoodsTagVo {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+    @ExcelProperty(value = "")
+    private Integer id;
+
+    /**
+     * 
+     */
+    @ExcelProperty(value = "")
+    private Integer storeId;
+
+    /**
+     * 标签
+     */
+    @ExcelProperty(value = "标签")
+    private String title;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+
+}

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

@@ -30,8 +30,7 @@ public class StoreInfoVo extends BaseEntity {
      *
      */
     @ExcelProperty(value = "")
-    private Integer storeId;
-
+    private Integer uid;
     /**
      * 商户名称
      */

pz-system/src/main/java/com/pz/system/mapper/StoreGoodsCategoryMapper.java

+package com.pz.system.mapper;
+
+import com.pz.system.domain.StoreGoodsCategory;
+import com.pz.system.domain.vo.StoreGoodsCategoryVo;
+import com.pz.common.core.mapper.BaseMapperPlus;
+
+/**
+ * 商品分类Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-09-12
+ */
+public interface StoreGoodsCategoryMapper extends BaseMapperPlus<StoreGoodsCategoryMapper, StoreGoodsCategory, StoreGoodsCategoryVo> {
+
+}

pz-system/src/main/java/com/pz/system/mapper/StoreGoodsTagMapper.java

+package com.pz.system.mapper;
+
+import com.pz.system.domain.StoreGoodsTag;
+import com.pz.system.domain.vo.StoreGoodsTagVo;
+import com.pz.common.core.mapper.BaseMapperPlus;
+
+/**
+ * 商品标签Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-09-12
+ */
+public interface StoreGoodsTagMapper extends BaseMapperPlus<StoreGoodsTagMapper, StoreGoodsTag, StoreGoodsTagVo> {
+
+}

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

+package com.pz.system.service;
+
+import com.pz.system.domain.StoreGoodsCategory;
+import com.pz.system.domain.vo.StoreGoodsCategoryVo;
+import com.pz.system.domain.bo.StoreGoodsCategoryBo;
+import com.pz.common.core.page.TableDataInfo;
+import com.pz.common.core.domain.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 商品分类Service接口
+ *
+ * @author ruoyi
+ * @date 2023-09-12
+ */
+public interface IStoreGoodsCategoryService {
+
+    /**
+     * 查询商品分类
+     */
+    StoreGoodsCategoryVo queryById(Integer id);
+
+    /**
+     * 查询商品分类列表
+     */
+    TableDataInfo<StoreGoodsCategoryVo> queryPageList(StoreGoodsCategoryBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询商品分类列表
+     */
+    List<StoreGoodsCategoryVo> queryList(StoreGoodsCategoryBo bo);
+
+    /**
+     * 新增商品分类
+     */
+    Boolean insertByBo(StoreGoodsCategoryBo bo);
+
+    /**
+     * 修改商品分类
+     */
+    Boolean updateByBo(StoreGoodsCategoryBo bo);
+
+    /**
+     * 校验并批量删除商品分类信息
+     */
+    Boolean deleteWithValidByIds(Collection<Integer> ids, Boolean isValid);
+}

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

+package com.pz.system.service;
+
+import com.pz.system.domain.StoreGoodsTag;
+import com.pz.system.domain.vo.StoreGoodsTagVo;
+import com.pz.system.domain.bo.StoreGoodsTagBo;
+import com.pz.common.core.page.TableDataInfo;
+import com.pz.common.core.domain.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 商品标签Service接口
+ *
+ * @author ruoyi
+ * @date 2023-09-12
+ */
+public interface IStoreGoodsTagService {
+
+    /**
+     * 查询商品标签
+     */
+    StoreGoodsTagVo queryById(Integer id);
+
+    /**
+     * 查询商品标签列表
+     */
+    TableDataInfo<StoreGoodsTagVo> queryPageList(StoreGoodsTagBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询商品标签列表
+     */
+    List<StoreGoodsTagVo> queryList(StoreGoodsTagBo bo);
+
+    /**
+     * 新增商品标签
+     */
+    Boolean insertByBo(StoreGoodsTagBo bo);
+
+    /**
+     * 修改商品标签
+     */
+    Boolean updateByBo(StoreGoodsTagBo bo);
+
+    /**
+     * 校验并批量删除商品标签信息
+     */
+    Boolean deleteWithValidByIds(Collection<Integer> ids, Boolean isValid);
+}

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

@@ -7,6 +7,7 @@ import com.pz.common.core.domain.PageQuery;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.pz.system.mapper.SysUserMapper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import com.pz.system.domain.bo.PaymentRecordBo;
@@ -32,11 +33,13 @@ public class PaymentRecordServiceImpl implements IPaymentRecordService {
 
     private final PaymentRecordMapper baseMapper;
 
+    private final SysUserMapper sysUserMapper;
+
     /**
      * 查询支付订单
      */
     @Override
-    public PaymentRecordVo queryById(Integer id){
+    public PaymentRecordVo queryById(Integer id) {
         return baseMapper.selectVoById(id);
     }
 
@@ -49,7 +52,12 @@ public class PaymentRecordServiceImpl implements IPaymentRecordService {
         Page<PaymentRecordVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
         Optional.ofNullable(result.getRecords())
             .ifPresent(paymentRecordVos -> {
-
+                paymentRecordVos.forEach(paymentRecordVo -> {
+                    Optional.ofNullable(sysUserMapper.selectUserById(paymentRecordVo.getUid()))
+                        .ifPresent(sysUser -> {
+                            paymentRecordVo.setUserName(sysUser.getUserName());
+                        });
+                });
             });
         return TableDataInfo.build(result);
     }
@@ -101,7 +109,7 @@ public class PaymentRecordServiceImpl implements IPaymentRecordService {
     /**
      * 保存前的数据校验
      */
-    private void validEntityBeforeSave(PaymentRecord entity){
+    private void validEntityBeforeSave(PaymentRecord entity) {
         //TODO 做一些数据校验,如唯一约束
     }
 
@@ -110,7 +118,7 @@ public class PaymentRecordServiceImpl implements IPaymentRecordService {
      */
     @Override
     public Boolean deleteWithValidByIds(Collection<Integer> ids, Boolean isValid) {
-        if(isValid){
+        if (isValid) {
             //TODO 做一些业务上的校验,判断是否需要校验
         }
         return baseMapper.deleteBatchIds(ids) > 0;

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

+package com.pz.system.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.pz.common.core.page.TableDataInfo;
+import com.pz.common.core.domain.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import com.pz.system.domain.bo.StoreGoodsCategoryBo;
+import com.pz.system.domain.vo.StoreGoodsCategoryVo;
+import com.pz.system.domain.StoreGoodsCategory;
+import com.pz.system.mapper.StoreGoodsCategoryMapper;
+import com.pz.system.service.IStoreGoodsCategoryService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 商品分类Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2023-09-12
+ */
+@RequiredArgsConstructor
+@Service
+public class StoreGoodsCategoryServiceImpl implements IStoreGoodsCategoryService {
+
+    private final StoreGoodsCategoryMapper baseMapper;
+
+    /**
+     * 查询商品分类
+     */
+    @Override
+    public StoreGoodsCategoryVo queryById(Integer id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询商品分类列表
+     */
+    @Override
+    public TableDataInfo<StoreGoodsCategoryVo> queryPageList(StoreGoodsCategoryBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<StoreGoodsCategory> lqw = buildQueryWrapper(bo);
+        Page<StoreGoodsCategoryVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询商品分类列表
+     */
+    @Override
+    public List<StoreGoodsCategoryVo> queryList(StoreGoodsCategoryBo bo) {
+        LambdaQueryWrapper<StoreGoodsCategory> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<StoreGoodsCategory> buildQueryWrapper(StoreGoodsCategoryBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<StoreGoodsCategory> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getStoreId() != null, StoreGoodsCategory::getStoreId, bo.getStoreId());
+        lqw.eq(StringUtils.isNotBlank(bo.getTitle()), StoreGoodsCategory::getTitle, bo.getTitle());
+        lqw.eq(bo.getOrder() != null, StoreGoodsCategory::getOrder, bo.getOrder());
+        return lqw;
+    }
+
+    /**
+     * 新增商品分类
+     */
+    @Override
+    public Boolean insertByBo(StoreGoodsCategoryBo bo) {
+        StoreGoodsCategory add = BeanUtil.toBean(bo, StoreGoodsCategory.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改商品分类
+     */
+    @Override
+    public Boolean updateByBo(StoreGoodsCategoryBo bo) {
+        StoreGoodsCategory update = BeanUtil.toBean(bo, StoreGoodsCategory.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(StoreGoodsCategory entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 批量删除商品分类
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Integer> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+}

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

+package com.pz.system.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.pz.common.core.page.TableDataInfo;
+import com.pz.common.core.domain.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import com.pz.system.domain.bo.StoreGoodsTagBo;
+import com.pz.system.domain.vo.StoreGoodsTagVo;
+import com.pz.system.domain.StoreGoodsTag;
+import com.pz.system.mapper.StoreGoodsTagMapper;
+import com.pz.system.service.IStoreGoodsTagService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 商品标签Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2023-09-12
+ */
+@RequiredArgsConstructor
+@Service
+public class StoreGoodsTagServiceImpl implements IStoreGoodsTagService {
+
+    private final StoreGoodsTagMapper baseMapper;
+
+    /**
+     * 查询商品标签
+     */
+    @Override
+    public StoreGoodsTagVo queryById(Integer id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询商品标签列表
+     */
+    @Override
+    public TableDataInfo<StoreGoodsTagVo> queryPageList(StoreGoodsTagBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<StoreGoodsTag> lqw = buildQueryWrapper(bo);
+        Page<StoreGoodsTagVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询商品标签列表
+     */
+    @Override
+    public List<StoreGoodsTagVo> queryList(StoreGoodsTagBo bo) {
+        LambdaQueryWrapper<StoreGoodsTag> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<StoreGoodsTag> buildQueryWrapper(StoreGoodsTagBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<StoreGoodsTag> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getStoreId() != null, StoreGoodsTag::getStoreId, bo.getStoreId());
+        lqw.eq(StringUtils.isNotBlank(bo.getTitle()), StoreGoodsTag::getTitle, bo.getTitle());
+        return lqw;
+    }
+
+    /**
+     * 新增商品标签
+     */
+    @Override
+    public Boolean insertByBo(StoreGoodsTagBo bo) {
+        StoreGoodsTag add = BeanUtil.toBean(bo, StoreGoodsTag.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改商品标签
+     */
+    @Override
+    public Boolean updateByBo(StoreGoodsTagBo bo) {
+        StoreGoodsTag update = BeanUtil.toBean(bo, StoreGoodsTag.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(StoreGoodsTag entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 批量删除商品标签
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Integer> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+}

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

@@ -72,7 +72,7 @@ public class StoreInfoServiceImpl implements IStoreInfoService {
     private LambdaQueryWrapper<StoreInfo> buildQueryWrapper(StoreInfoBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<StoreInfo> lqw = Wrappers.lambdaQuery();
-        lqw.eq(bo.getStoreId() != null, StoreInfo::getStoreId, bo.getStoreId());
+        lqw.eq(bo.getUid() != null, StoreInfo::getUid, bo.getUid());
         lqw.like(StringUtils.isNotBlank(bo.getName()), StoreInfo::getName, bo.getName());
         lqw.eq(bo.getCityId() != null, StoreInfo::getCityId, bo.getCityId());
         lqw.eq(StringUtils.isNotBlank(bo.getTel()), StoreInfo::getTel, bo.getTel());

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

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.pz.system.domain.vo.StoreAdminOrderVo;
 import com.pz.system.mapper.CityMapper;
 import com.pz.system.mapper.TotalOrderMapper;
+import com.pz.system.mapper.UserAddressMapper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import com.pz.system.domain.bo.StoreOrderBo;
@@ -39,6 +40,8 @@ public class StoreOrderServiceImpl implements IStoreOrderService {
 
     private final CityMapper cityMapper;
 
+    private final UserAddressMapper userAddressMapper;
+
     /**
      * 查询商城订单
      */
@@ -53,6 +56,11 @@ public class StoreOrderServiceImpl implements IStoreOrderService {
     @Override
     public TableDataInfo<StoreAdminOrderVo> queryPageList(StoreOrderBo bo, PageQuery pageQuery) {
         Page<StoreAdminOrderVo> result = baseMapper.findStoreAdminOrderVoPage(pageQuery.build(), bo);
+        Optional.ofNullable(result.getRecords()).ifPresent(storeAdminOrderVos -> {
+            storeAdminOrderVos.forEach(storeAdminOrderVo -> {
+                storeAdminOrderVo.setUserAddressVo(userAddressMapper.selectVoById(storeAdminOrderVo.getAddressId()));
+            });
+        });
         return TableDataInfo.build(result);
     }
 

pz-system/src/main/resources/mapper/system/DbghOrderMapper.xml

@@ -46,9 +46,9 @@
         LEFT JOIN department AS d ON d.id = yyod.did
         LEFT JOIN services AS s ON s.id = tlo.service_id
         LEFT JOIN employees AS e ON e.id = tlo.em_id
-<!--        <if test="bo.orderSn != null and bo.orderSn != ''">-->
-<!--            where tlo.order_sn LIKE CONCAT('%', #{bo.orderSn}, '%')-->
-<!--        </if>-->
+        <if test="bo.orderSn != null and bo.orderSn != ''">
+            where tlo.order_sn LIKE CONCAT('%', #{bo.orderSn}, '%')
+        </if>
     </select>
 
     <select id="selectSonOrderInfoByTotalId" resultType="com.pz.merchant.domain.vo.SonOrderVo">

pz-system/src/main/resources/mapper/system/DbmyOrderMapper.xml

@@ -50,6 +50,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 LEFT JOIN city AS c ON c.id = tlo.city_id
                 LEFT JOIN services AS s ON s.id = tlo.service_id
                 LEFT JOIN employees AS e ON e.id = tlo.em_id
+        <if test="bo.orderSn != null and bo.orderSn != ''">
+            where tlo.order_sn LIKE CONCAT('%', #{bo.orderSn}, '%')
+        </if>
     </select>
 
     <select id="selectSonOrderInfoByTotalId" resultType="com.pz.merchant.domain.vo.SonOrderVo">

pz-system/src/main/resources/mapper/system/StoreIncomeMapper.xml

@@ -24,6 +24,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="bo.storeName != null and bo.storeName != ''">
             where sin.name LIKE CONCAT('%', #{bo.storeName}, '%')
         </if>
+        <if test="bo.storeId != null">
+            where si.store_id = #{storeId}
+        </if>
     </select>
 
 

pz-system/src/main/resources/mapper/system/StoreOrderMapper.xml

 <?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">
+    PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+    "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.pz.system.mapper.StoreOrderMapper">
 
     <resultMap type="com.pz.system.domain.StoreOrder" id="StoreOrderResult">
@@ -26,25 +26,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
     <select id="findStoreAdminOrderVoPage" resultType="com.pz.system.domain.vo.StoreAdminOrderVo">
         SELECT
-            c.NAME AS cityName,
-            sg.title AS title,
-            so.num AS num,
-            tao.pay_money payMoney,
-            si.name AS sName,
-            su.user_name AS userName,
-            so.`status` AS orderStatus,
-            so.create_time AS createTime,
-            tao.status as toStatus
+        c.NAME AS cityName,
+        sg.title AS title,
+        so.num AS num,
+        tao.pay_money payMoney,
+        si.name AS sName,
+        su.user_name AS userName,
+        so.`status` AS orderStatus,
+        so.create_time AS createTime,
+        tao.status as toStatus,
+        so.address_id addressId
         FROM
-            store_order AS so
-                LEFT JOIN total_order AS tao ON tao.id = so.order_id
-                LEFT JOIN city AS c ON c.id = tao.city_id
-                LEFT JOIN store_info AS si ON si.id = so.store_id
-                LEFT JOIN store_goods AS sg ON sg.id = so.goods_id
-                LEFT JOIN sys_user AS su ON su.user_id = tao.uid
-        <if test="bo.title != null and bo.title != ''">
-            where sg.title LIKE CONCAT('%', #{bo.title}, '%')
-        </if>
+        store_order AS so
+        LEFT JOIN total_order AS tao ON tao.id = so.order_id
+        LEFT JOIN city AS c ON c.id = tao.city_id
+        LEFT JOIN store_info AS si ON si.id = so.store_id
+        LEFT JOIN store_goods AS sg ON sg.id = so.goods_id
+        LEFT JOIN sys_user AS su ON su.user_id = tao.uid
+        <where>
+            <if test="bo.title != null and bo.title != ''">
+                and sg.title LIKE CONCAT('%', #{bo.title}, '%')
+            </if>
+            <if test="bo.userId != null">
+                and si.uid = #{bo.userId}
+            </if>
+        </where>
     </select>
 
 

pz-system/src/main/resources/mapper/system/ZqghOrderMapper.xml

@@ -47,9 +47,9 @@
         LEFT JOIN department AS d ON d.id = yyod.did
         LEFT JOIN doctor AS s ON s.id = yyod.doctor_id
         LEFT JOIN sys_user as su on su.user_id = tlo.uid
-        <!--        <if test="bo.orderSn != null and bo.orderSn != ''">-->
-        <!--            where tlo.order_sn LIKE CONCAT('%', #{bo.orderSn}, '%')-->
-        <!--        </if>-->
+                <if test="bo.orderSn != null and bo.orderSn != ''">
+                    where tlo.order_sn LIKE CONCAT('%', #{bo.orderSn}, '%')
+                </if>
     </select>
 
 

pz-system/src/main/resources/mapper/system/ZyphOrderMapper.xml

@@ -52,9 +52,9 @@
         LEFT JOIN department AS d ON d.id = yyod.did
         LEFT JOIN services AS s ON s.id = tlo.service_id
         LEFT JOIN employees AS e ON e.id = tlo.em_id
-        <!--        <if test="bo.orderSn != null and bo.orderSn != ''">-->
-        <!--            where tlo.order_sn LIKE CONCAT('%', #{bo.orderSn}, '%')-->
-        <!--        </if>-->
+                <if test="bo.orderSn != null and bo.orderSn != ''">
+                    where tlo.order_sn LIKE CONCAT('%', #{bo.orderSn}, '%')
+                </if>
     </select>
 
     <select id="selectSonOrderInfoByTotalId" resultType="com.pz.merchant.domain.vo.SonOrderVo">