fix

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/mall/TopStoreCategoryController.java

@@ -0,0 +1,92 @@
+package com.zhongzheng.controller.mall;
+
+import java.util.List;
+import java.util.Arrays;
+
+import com.zhongzheng.modules.top.mall.bo.TopStoreCategoryAddBo;
+import com.zhongzheng.modules.top.mall.bo.TopStoreCategoryEditBo;
+import com.zhongzheng.modules.top.mall.bo.TopStoreCategoryQueryBo;
+import com.zhongzheng.modules.top.mall.service.ITopStoreCategoryService;
+import com.zhongzheng.modules.top.mall.vo.TopStoreCategoryVo;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.common.utils.poi.ExcelUtil;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 店铺类目IDController
+ *
+ * @author ruoyi
+ * @date 2023-05-26
+ */
+@Api(value = "店铺类目ID控制器", tags = {"店铺类目ID管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/mall/category")
+public class TopStoreCategoryController extends BaseController {
+
+    private final ITopStoreCategoryService iTopStoreCategoryService;
+
+    /**
+     * 查询店铺类目ID列表
+     */
+    @ApiOperation("查询店铺类目ID列表")
+    @PreAuthorize("@ss.hasPermi('system:category:list')")
+    @GetMapping("/list")
+    public TableDataInfo<TopStoreCategoryVo> list(TopStoreCategoryQueryBo bo) {
+        startPage();
+        List<TopStoreCategoryVo> list = iTopStoreCategoryService.queryList(bo);
+        return getDataTable(list);
+    }
+
+
+
+    /**
+     * 获取店铺类目ID详细信息
+     */
+    @ApiOperation("获取店铺类目ID详细信息")
+    @PreAuthorize("@ss.hasPermi('system:category:query')")
+    @GetMapping("/{catId}")
+    public AjaxResult<TopStoreCategoryVo> getInfo(@PathVariable("catId" ) Long catId) {
+        return AjaxResult.success(iTopStoreCategoryService.queryById(catId));
+    }
+
+    /**
+     * 新增店铺类目ID
+     */
+    @ApiOperation("新增店铺类目ID")
+    @PreAuthorize("@ss.hasPermi('system:category:add')")
+    @Log(title = "店铺类目ID", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody TopStoreCategoryAddBo bo) {
+        return toAjax(iTopStoreCategoryService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改店铺类目ID
+     */
+    @ApiOperation("修改店铺类目ID")
+    @PreAuthorize("@ss.hasPermi('system:category:edit')")
+    @Log(title = "店铺类目ID", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public AjaxResult<Void> edit(@RequestBody TopStoreCategoryEditBo bo) {
+        return toAjax(iTopStoreCategoryService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+
+}

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/mall/TopStoreController.java

@@ -98,23 +98,9 @@ public class TopStoreController extends BaseController {
     }
 
 
-    @ApiOperation("商户恢复密码")
-    @PreAuthorize("@ss.hasPermi('system:store:edit')")
-    @Log(title = "商户恢复密码", businessType = BusinessType.UPDATE)
-    @PostMapping("/restorePwd")
-    public AjaxResult<Void> restorePwd(@RequestBody TopStoreEditBo bo) {
-        return toAjax(iTopStoreService.restorePwd(bo) ? 1 : 0);
-    }
 
-    @ApiOperation("商户修改密码")
-    @PreAuthorize("@ss.hasPermi('system:store:edit')")
-    @Log(title = "商户修改密码", businessType = BusinessType.UPDATE)
-    @PostMapping("/updatePwd")
-    public AjaxResult<Void> updatePwd(@RequestBody TopStoreEditBo bo) {
-        return toAjax(iTopStoreService.updatePwd(bo) ? 1 : 0);
-    }
 
-    @ApiOperation("商户批量删除")
+    @ApiOperation("店铺批量删除")
     @PreAuthorize("@ss.hasPermi('system:store:edit')")
     @Log(title = "商户批量删除", businessType = BusinessType.UPDATE)
     @PostMapping("/batchRemove")
@@ -122,14 +108,7 @@ public class TopStoreController extends BaseController {
         return toAjax(iTopStoreService.batchRemove(bo) ? 1 : 0);
     }
 
-    @ApiOperation("商户店铺管理列表导出")
-    @PreAuthorize("@ss.hasPermi('system:store:list')")
-    @GetMapping("/listExport")
-    public AjaxResult<List<TopStoreExportVo>> listExport(TopStoreQueryBo bo) {
-        List<TopStoreExportVo> list = iTopStoreService.listExport(bo);
-        ExcelUtil<TopStoreExportVo> util = new ExcelUtil<TopStoreExportVo>(TopStoreExportVo.class);
-        return util.exportExcel(list, "合作商户列表");
-    }
+
 
     @ApiOperation("获取积分规则配置详情")
     @GetMapping(value = "/configKey/pointsRule")

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/mall/bo/TopStoreAddBo.java

@@ -12,7 +12,7 @@ import java.util.Date;
  * 商户店铺管理添加对象 top_store
  *
  * @author hjl
- * @date 2023-05-18
+ * @date 2023-05-25
  */
 @Data
 @ApiModel("商户店铺管理添加对象")
@@ -21,24 +21,15 @@ public class TopStoreAddBo {
     /** 店铺名称 */
     @ApiModelProperty("店铺名称")
     private String storeName;
-    /** 手机号码 */
-    @ApiModelProperty("手机号码")
-    private String telphone;
-    /** 用户名 */
-   /* @ApiModelProperty("用户名")
-    private String userName;*/
-    /** 密码 */
-   /* @ApiModelProperty("密码")
-    private String password;*/
-    /** 联系人 */
-    @ApiModelProperty("联系人")
-    private String contacts;
-    /** 初始密码 */
-    @ApiModelProperty("初始密码")
-    private String initPwd;
+    /** 店铺地址 */
+    @ApiModelProperty("店铺地址")
+    private String address;
     /** 0 未启用 1启用 -1删除 */
     @ApiModelProperty("0 未启用 1启用 -1删除")
     private Integer status;
+    /** 合作商户ID */
+    @ApiModelProperty("合作商户ID")
+    private Long merId;
     /** 创建时间 */
     @ApiModelProperty("创建时间")
     private Long createTime;
@@ -48,8 +39,4 @@ public class TopStoreAddBo {
     /** 备注 */
     @ApiModelProperty("备注")
     private String remark;
-
-    private String tenantId;
-    @ApiModelProperty("店铺账号")
-    private String storeAccount;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/mall/bo/TopStoreCategoryAddBo.java

@@ -0,0 +1,42 @@
+package com.zhongzheng.modules.top.mall.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 店铺类目ID添加对象 top_store_category
+ *
+ * @author ruoyi
+ * @date 2023-05-26
+ */
+@Data
+@ApiModel("店铺类目ID添加对象")
+public class TopStoreCategoryAddBo {
+
+    /** 类目名称 */
+    @ApiModelProperty("类目名称")
+    private String catName;
+    /** 店铺ID */
+    @ApiModelProperty("店铺ID")
+    private Long storeId;
+    /** 合作商户ID */
+    @ApiModelProperty("合作商户ID")
+    private Long merId;
+    /** 父ID */
+    @ApiModelProperty("父ID")
+    private Long parentId;
+    /** 0 未启用 1启用 -1删除 */
+    @ApiModelProperty("0 未启用 1启用 -1删除")
+    private Integer status;
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    private Long createTime;
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long updateTime;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/mall/bo/TopStoreCategoryEditBo.java

@@ -0,0 +1,49 @@
+package com.zhongzheng.modules.top.mall.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 店铺类目ID编辑对象 top_store_category
+ *
+ * @author ruoyi
+ * @date 2023-05-26
+ */
+@Data
+@ApiModel("店铺类目ID编辑对象")
+public class TopStoreCategoryEditBo {
+
+    /** 类目ID */
+    @ApiModelProperty("类目ID")
+    private Long catId;
+
+    /** 类目名称 */
+    @ApiModelProperty("类目名称")
+    private String catName;
+
+    /** 店铺ID */
+    @ApiModelProperty("店铺ID")
+    private Long storeId;
+
+    /** 合作商户ID */
+    @ApiModelProperty("合作商户ID")
+    private Long merId;
+
+    /** 父ID */
+    @ApiModelProperty("父ID")
+    private Long parentId;
+
+    /** 0 未启用 1启用 -1删除 */
+    @ApiModelProperty("0 未启用 1启用 -1删除")
+    private Integer status;
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long updateTime;
+
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/mall/bo/TopStoreCategoryQueryBo.java

@@ -0,0 +1,54 @@
+package com.zhongzheng.modules.top.mall.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.HashMap;
+
+import com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 店铺类目ID分页查询对象 top_store_category
+ *
+ * @author ruoyi
+ * @date 2023-05-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("店铺类目ID分页查询对象")
+public class TopStoreCategoryQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 类目名称 */
+	@ApiModelProperty("类目名称")
+	private String catName;
+	/** 店铺ID */
+	@ApiModelProperty("店铺ID")
+	private Long storeId;
+	/** 合作商户ID */
+	@ApiModelProperty("合作商户ID")
+	private Long merId;
+	/** 父ID */
+	@ApiModelProperty("父ID")
+	private Long parentId;
+	/** 0 未启用 1启用 -1删除 */
+	@ApiModelProperty("0 未启用 1启用 -1删除")
+	private Integer status;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/mall/bo/TopStoreEditBo.java

@@ -12,7 +12,7 @@ import java.util.List;
  * 商户店铺管理编辑对象 top_store
  *
  * @author hjl
- * @date 2023-05-18
+ * @date 2023-05-25
  */
 @Data
 @ApiModel("商户店铺管理编辑对象")
@@ -26,30 +26,19 @@ public class TopStoreEditBo {
     @ApiModelProperty("店铺名称")
     private String storeName;
 
-    /** 手机号码 */
-    @ApiModelProperty("手机号码")
-    private String telphone;
-
-    /** 用户名 */
-    /*@ApiModelProperty("用户名")
-    private String userName;*/
-
-    /** 密码 */
-    @ApiModelProperty("密码")
-    private String password;
-
-    /** 联系人 */
-    @ApiModelProperty("联系人")
-    private String contacts;
-
-    /** 初始密码 */
-    @ApiModelProperty("初始密码")
-    private String initPwd;
+    /** 店铺地址 */
+    @ApiModelProperty("店铺地址")
+    private String address;
 
     /** 0 未启用 1启用 -1删除 */
     @ApiModelProperty("0 未启用 1启用 -1删除")
     private Integer status;
 
+
+    /** 合作商户ID */
+    @ApiModelProperty("合作商户ID")
+    private Long merId;
+
     /** $column.columnComment */
     @ApiModelProperty("$column.columnComment")
     private Long updateTime;
@@ -57,7 +46,7 @@ public class TopStoreEditBo {
     /** 备注 */
     @ApiModelProperty("备注")
     private String remark;
-    @ApiModelProperty("批量店铺ID")
-    private List<Long> storeIds;
 
+    @ApiModelProperty("店铺ID")
+    private List<Long> storeIds;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/mall/bo/TopStoreQueryBo.java

@@ -16,7 +16,7 @@ import com.zhongzheng.common.core.domain.BaseEntity;
  * 商户店铺管理分页查询对象 top_store
  *
  * @author hjl
- * @date 2023-05-18
+ * @date 2023-05-25
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -40,22 +40,13 @@ public class TopStoreQueryBo extends BaseEntity {
 	/** 店铺名称 */
 	@ApiModelProperty("店铺名称")
 	private String storeName;
-	/** 手机号码 */
-	@ApiModelProperty("手机号码")
-	private String telphone;
-	/** 用户名 */
-	@ApiModelProperty("用户名")
-	private String userName;
-	/** 密码 */
-	@ApiModelProperty("密码")
-	private String password;
-	/** 联系人 */
-	@ApiModelProperty("联系人")
-	private String contacts;
-	/** 初始密码 */
-	@ApiModelProperty("初始密码")
-	private String initPwd;
+	/** 店铺地址 */
+	@ApiModelProperty("店铺地址")
+	private String address;
 	/** 0 未启用 1启用 -1删除 */
 	@ApiModelProperty("0 未启用 1启用 -1删除")
 	private List<Integer> status;
+	/** 合作商户ID */
+	@ApiModelProperty("合作商户ID")
+	private Long merId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/mall/domain/TopStore.java

@@ -1,7 +1,6 @@
 package com.zhongzheng.modules.top.mall.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
@@ -14,7 +13,7 @@ import com.zhongzheng.common.annotation.Excel;
  * 商户店铺管理对象 top_store
  *
  * @author hjl
- * @date 2023-05-18
+ * @date 2023-05-25
  */
 @Data
 @NoArgsConstructor
@@ -29,18 +28,12 @@ private static final long serialVersionUID=1L;
     private Long storeId;
     /** 店铺名称 */
     private String storeName;
-    /** 手机号码 */
-    private String telphone;
-    /** 用户名 */
-    private String userName;
-    /** 密码 */
-    private String password;
-    /** 联系人 */
-    private String contacts;
-    /** 初始密码 */
-    private String initPwd;
+    /** 店铺地址 */
+    private String address;
     /** 0 未启用 1启用 -1删除 */
     private Integer status;
+    /** 合作商户ID */
+    private Long merId;
     /** 创建时间 */
     @TableField(fill = FieldFill.INSERT)
     private Long createTime;
@@ -51,6 +44,4 @@ private static final long serialVersionUID=1L;
     private String remark;
 
     private String tenantId;
-
-    private String storeAccount;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/mall/domain/TopStoreCategory.java

@@ -0,0 +1,45 @@
+package com.zhongzheng.modules.top.mall.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.zhongzheng.common.annotation.Excel;
+
+/**
+ * 店铺类目ID对象 top_store_category
+ *
+ * @author ruoyi
+ * @date 2023-05-26
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("top_store_category")
+public class TopStoreCategory implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** 类目ID */
+    @TableId(value = "cat_id")
+    private Long catId;
+    /** 类目名称 */
+    private String catName;
+    /** 店铺ID */
+    private Long storeId;
+    /** 合作商户ID */
+    private Long merId;
+    /** 父ID */
+    private Long parentId;
+    /** 0 未启用 1启用 -1删除 */
+    private Integer status;
+    /** 创建时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** $column.columnComment */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/mall/mapper/TopStoreCategoryMapper.java

@@ -0,0 +1,15 @@
+package com.zhongzheng.modules.top.mall.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.top.mall.domain.TopStoreCategory;
+
+/**
+ * 店铺类目IDMapper接口
+ *
+ * @author ruoyi
+ * @date 2023-05-26
+ */
+public interface TopStoreCategoryMapper extends BaseMapper<TopStoreCategory> {
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/mall/mapper/TopStoreMapper.java

@@ -7,7 +7,7 @@ import com.zhongzheng.modules.top.mall.domain.TopStore;
  * 商户店铺管理Mapper接口
  *
  * @author hjl
- * @date 2023-05-18
+ * @date 2023-05-25
  */
 public interface TopStoreMapper extends BaseMapper<TopStore> {
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/mall/service/ITopStoreCategoryService.java

@@ -0,0 +1,53 @@
+package com.zhongzheng.modules.top.mall.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.top.mall.bo.TopStoreCategoryAddBo;
+import com.zhongzheng.modules.top.mall.bo.TopStoreCategoryEditBo;
+import com.zhongzheng.modules.top.mall.bo.TopStoreCategoryQueryBo;
+import com.zhongzheng.modules.top.mall.domain.TopStoreCategory;
+import com.zhongzheng.modules.top.mall.vo.TopStoreCategoryVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 店铺类目IDService接口
+ *
+ * @author ruoyi
+ * @date 2023-05-26
+ */
+public interface ITopStoreCategoryService extends IService<TopStoreCategory> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	TopStoreCategoryVo queryById(Long catId);
+
+	/**
+	 * 查询列表
+	 */
+	List<TopStoreCategoryVo> queryList(TopStoreCategoryQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入店铺类目ID
+	 * @param bo 店铺类目ID新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(TopStoreCategoryAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改店铺类目ID
+	 * @param bo 店铺类目ID编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(TopStoreCategoryEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/mall/service/ITopStoreService.java

@@ -2,12 +2,11 @@ package com.zhongzheng.modules.top.mall.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhongzheng.modules.system.bo.SysTenantBadBillConfigBo;
+import com.zhongzheng.modules.top.mall.bo.TopMerchantEditBo;
 import com.zhongzheng.modules.top.mall.bo.TopStoreAddBo;
 import com.zhongzheng.modules.top.mall.bo.TopStoreEditBo;
 import com.zhongzheng.modules.top.mall.bo.TopStoreQueryBo;
 import com.zhongzheng.modules.top.mall.domain.TopStore;
-import com.zhongzheng.modules.top.mall.vo.TopStoreExportVo;
 import com.zhongzheng.modules.top.mall.vo.TopStoreVo;
 import com.zhongzheng.modules.top.user.vo.TopSysPointsRuleVo;
 
@@ -18,7 +17,7 @@ import java.util.List;
  * 商户店铺管理Service接口
  *
  * @author hjl
- * @date 2023-05-18
+ * @date 2023-05-25
  */
 public interface ITopStoreService extends IService<TopStore> {
 	/**
@@ -32,8 +31,6 @@ public interface ITopStoreService extends IService<TopStore> {
 	 */
 	List<TopStoreVo> queryList(TopStoreQueryBo bo);
 
-	List<TopStoreExportVo> listExport(TopStoreQueryBo bo);
-
 	/**
 	 * 根据新增业务对象插入商户店铺管理
 	 * @param bo 商户店铺管理新增业务对象
@@ -56,15 +53,9 @@ public interface ITopStoreService extends IService<TopStore> {
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
 
-	Boolean restorePwd(TopStoreEditBo bo);
-
-	Boolean updatePwd(TopStoreEditBo bo);
-
-
 	Boolean batchRemove(TopStoreEditBo bo);
 
 	TopSysPointsRuleVo getPointsRuleConfig();
 
 	boolean updatePointsRuleConfig(TopSysPointsRuleVo bo);
-
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/mall/service/impl/TopStoreCategoryServiceImpl.java

@@ -0,0 +1,104 @@
+package com.zhongzheng.modules.top.mall.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.top.mall.bo.TopStoreCategoryAddBo;
+import com.zhongzheng.modules.top.mall.bo.TopStoreCategoryEditBo;
+import com.zhongzheng.modules.top.mall.bo.TopStoreCategoryQueryBo;
+import com.zhongzheng.modules.top.mall.domain.TopStoreCategory;
+import com.zhongzheng.modules.top.mall.mapper.TopStoreCategoryMapper;
+import com.zhongzheng.modules.top.mall.service.ITopStoreCategoryService;
+import com.zhongzheng.modules.top.mall.vo.TopStoreCategoryVo;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.Page;
+
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 店铺类目IDService业务层处理
+ *
+ * @author ruoyi
+ * @date 2023-05-26
+ */
+@Service
+public class TopStoreCategoryServiceImpl extends ServiceImpl<TopStoreCategoryMapper, TopStoreCategory> implements ITopStoreCategoryService {
+
+    @Override
+    public TopStoreCategoryVo queryById(Long catId){
+        TopStoreCategory db = this.baseMapper.selectById(catId);
+        return BeanUtil.toBean(db, TopStoreCategoryVo.class);
+    }
+
+    @Override
+    public List<TopStoreCategoryVo> queryList(TopStoreCategoryQueryBo bo) {
+        LambdaQueryWrapper<TopStoreCategory> lqw = Wrappers.lambdaQuery();
+        lqw.like(StrUtil.isNotBlank(bo.getCatName()), TopStoreCategory::getCatName, bo.getCatName());
+        lqw.eq(bo.getStoreId() != null, TopStoreCategory::getStoreId, bo.getStoreId());
+        lqw.eq(bo.getMerId() != null, TopStoreCategory::getMerId, bo.getMerId());
+        lqw.eq(bo.getParentId() != null, TopStoreCategory::getParentId, bo.getParentId());
+        lqw.eq(bo.getStatus() != null, TopStoreCategory::getStatus, bo.getStatus());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<TopStoreCategoryVo> entity2Vo(Collection<TopStoreCategory> collection) {
+        List<TopStoreCategoryVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, TopStoreCategoryVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<TopStoreCategory> page = (Page<TopStoreCategory>)collection;
+            Page<TopStoreCategoryVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(TopStoreCategoryAddBo bo) {
+        TopStoreCategory add = BeanUtil.toBean(bo, TopStoreCategory.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(TopStoreCategoryEditBo bo) {
+        TopStoreCategory update = BeanUtil.toBean(bo, TopStoreCategory.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(TopStoreCategory entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/mall/service/impl/TopStoreServiceImpl.java

@@ -9,7 +9,6 @@ import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.SecurityUtils;
 import com.zhongzheng.common.utils.SnowflakeIdUtils;
-import com.zhongzheng.modules.grade.domain.ClassGradeUser;
 import com.zhongzheng.modules.top.mall.bo.TopActionLogAddBo;
 import com.zhongzheng.modules.top.mall.bo.TopStoreAddBo;
 import com.zhongzheng.modules.top.mall.bo.TopStoreEditBo;
@@ -17,11 +16,10 @@ import com.zhongzheng.modules.top.mall.bo.TopStoreQueryBo;
 import com.zhongzheng.modules.top.mall.domain.TopStore;
 import com.zhongzheng.modules.top.mall.mapper.TopStoreMapper;
 import com.zhongzheng.modules.top.mall.service.ITopActionLogService;
+import com.zhongzheng.modules.top.mall.service.ITopMerchantService;
 import com.zhongzheng.modules.top.mall.service.ITopStoreService;
-import com.zhongzheng.modules.top.mall.vo.TopStoreExportVo;
+import com.zhongzheng.modules.top.mall.vo.TopMerchantVo;
 import com.zhongzheng.modules.top.mall.vo.TopStoreVo;
-import com.zhongzheng.modules.top.order.domain.TopOrderRecNote;
-import com.zhongzheng.modules.top.order.vo.TopOldOrderCompanyExportVo;
 import com.zhongzheng.modules.top.user.domain.TopSysConfig;
 import com.zhongzheng.modules.top.user.service.ITopSysConfigService;
 import com.zhongzheng.modules.top.user.vo.TopSysPointsRuleVo;
@@ -32,7 +30,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.Page;
 
-import java.util.ArrayList;
+
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -42,7 +40,7 @@ import java.util.stream.Collectors;
  * 商户店铺管理Service业务层处理
  *
  * @author hjl
- * @date 2023-05-18
+ * @date 2023-05-25
  */
 @Service
 public class TopStoreServiceImpl extends ServiceImpl<TopStoreMapper, TopStore> implements ITopStoreService {
@@ -53,11 +51,12 @@ public class TopStoreServiceImpl extends ServiceImpl<TopStoreMapper, TopStore> i
     @Autowired
     private ITopActionLogService iTopActionLogService;
 
+    @Autowired
+    private ITopMerchantService iTopMerchantService;
+
     @Override
     public TopStoreVo queryById(Long storeId){
         TopStore db = this.baseMapper.selectById(storeId);
-        db.setPassword(null);
-        db.setInitPwd(null);
         return BeanUtil.toBean(db, TopStoreVo.class);
     }
 
@@ -65,30 +64,15 @@ public class TopStoreServiceImpl extends ServiceImpl<TopStoreMapper, TopStore> i
     public List<TopStoreVo> queryList(TopStoreQueryBo bo) {
         LambdaQueryWrapper<TopStore> lqw = Wrappers.lambdaQuery();
         lqw.like(StrUtil.isNotBlank(bo.getStoreName()), TopStore::getStoreName, bo.getStoreName());
-        lqw.eq(StrUtil.isNotBlank(bo.getTelphone()), TopStore::getTelphone, bo.getTelphone());
-        lqw.like(StrUtil.isNotBlank(bo.getUserName()), TopStore::getUserName, bo.getUserName());
-        lqw.eq(StrUtil.isNotBlank(bo.getPassword()), TopStore::getPassword, bo.getPassword());
-        lqw.eq(StrUtil.isNotBlank(bo.getContacts()), TopStore::getContacts, bo.getContacts());
-        lqw.eq(StrUtil.isNotBlank(bo.getInitPwd()), TopStore::getInitPwd, bo.getInitPwd());
+        lqw.eq(StrUtil.isNotBlank(bo.getAddress()), TopStore::getAddress, bo.getAddress());
         lqw.in(bo.getStatus() != null, TopStore::getStatus, bo.getStatus());
-        return entity2Vo(this.list(lqw));
-    }
-
-    @Override
-    public List<TopStoreExportVo> listExport(TopStoreQueryBo bo) {
-        List<TopStoreExportVo> exportVoList = new ArrayList<>();
-        List<TopStoreVo> list =  queryList(bo);
+        lqw.eq(bo.getMerId() != null, TopStore::getMerId, bo.getMerId());
+        List<TopStoreVo> list = entity2Vo(this.list(lqw));
         for(TopStoreVo vo : list){
-            TopStoreExportVo exportVo = BeanUtil.toBean(vo, TopStoreExportVo.class);
-            exportVo.setCreateTime(DateUtils.timestampToDate(vo.getCreateTime()));
-            if(vo.getStatus()==1){
-                exportVo.setStatus("启用");
-            }
-            if(vo.getStatus()==0){
-                exportVo.setStatus("禁用");
-            }
+            TopMerchantVo merchantVo = iTopMerchantService.queryById(vo.getMerId());
+            vo.setMerName(merchantVo.getMerName());
         }
-        return exportVoList;
+        return list;
     }
 
     /**
@@ -113,48 +97,31 @@ public class TopStoreServiceImpl extends ServiceImpl<TopStoreMapper, TopStore> i
 
     @Override
     public Boolean insertByAddBo(TopStoreAddBo bo) {
-        if (getOne(new LambdaQueryWrapper<TopStore>().eq(TopStore::getStoreName, bo.getStoreName()).last("limit 1")) != null) {
-            throw new CustomException("该商户名已被注册");
+        if(Validator.isEmpty(bo.getMerId())||Validator.isEmpty(bo.getStoreName())){
+            throw new CustomException("参数缺失");
         }
-        if (getOne(new LambdaQueryWrapper<TopStore>().eq(TopStore::getTelphone, bo.getTelphone()).last("limit 1")) != null) {
-            throw new CustomException("该手机号已被注册");
+        if (getOne(new LambdaQueryWrapper<TopStore>().eq(TopStore::getStoreName, bo.getStoreName()).eq(TopStore::getMerId, bo.getMerId()).last("limit 1")) != null) {
+            throw new CustomException("该店铺名已被使用");
         }
         TopStore add = BeanUtil.toBean(bo, TopStore.class);
         validEntityBeforeSave(add);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
-        String pwd =  add.getTelphone().substring(add.getTelphone().length() - 6);
-        add.setUserName("manager");
-        add.setPassword(pwd);
-        add.setInitPwd(add.getPassword());
-        add.setPassword(SecurityUtils.encryptPassword(add.getPassword()));
         add.setTenantId("867735392558919680");//初始按祥粤创建
         SnowflakeIdUtils idWorker = new SnowflakeIdUtils(3, 1);
-        add.setStoreAccount(String.valueOf(idWorker.nextId()));
         return this.save(add);
     }
 
     @Override
     public Boolean updateByEditBo(TopStoreEditBo bo) {
-        if(Validator.isEmpty(bo.getStoreId())){
+        if(Validator.isEmpty(bo.getStoreId())||Validator.isEmpty(bo.getMerId())){
             throw new CustomException("参数错误");
         }
         if(Validator.isNotEmpty(bo.getStoreName())){
-            if (getOne(new LambdaQueryWrapper<TopStore>().ne(TopStore::getStoreId, bo.getStoreId()).eq(TopStore::getStoreName, bo.getStoreName()).last("limit 1")) != null) {
-                throw new CustomException("该商户名称已被注册");
+            if (getOne(new LambdaQueryWrapper<TopStore>().ne(TopStore::getStoreId, bo.getStoreId()).eq(TopStore::getMerId, bo.getMerId()).eq(TopStore::getStoreName, bo.getStoreName()).last("limit 1")) != null) {
+                throw new CustomException("该店铺名已被使用");
             }
         }
-        if(Validator.isNotEmpty(bo.getTelphone())){
-            TopStore topStore = getOne(new LambdaQueryWrapper<TopStore>().eq(TopStore::getStoreId, bo.getStoreId()));
-            if(!topStore.getTelphone().equals(bo.getTelphone())){
-                if (getOne(new LambdaQueryWrapper<TopStore>().ne(TopStore::getStoreId, bo.getStoreId()).eq(TopStore::getTelphone, bo.getTelphone()).last("limit 1")) != null) {
-                    throw new CustomException("该手机号码已被注册");
-                }
-                String pwd =  bo.getTelphone().substring(bo.getTelphone().length() - 6);
-                bo.setInitPwd(pwd);
-            }
-        }
-
         TopStore update = BeanUtil.toBean(bo, TopStore.class);
         validEntityBeforeSave(update);
         update.setUpdateTime(DateUtils.getNowTime());
@@ -178,32 +145,6 @@ public class TopStoreServiceImpl extends ServiceImpl<TopStoreMapper, TopStore> i
         return this.removeByIds(ids);
     }
 
-    @Override
-    public Boolean restorePwd(TopStoreEditBo bo) {
-        if(Validator.isEmpty(bo.getStoreId())){
-            throw new CustomException("参数错误");
-        }
-        TopStore store = getOne(new LambdaQueryWrapper<TopStore>().eq(TopStore::getStoreId, bo.getStoreId()).last("limit 1"));
-        LambdaUpdateWrapper<TopStore> objectLambdaUpdateWrapper = Wrappers.lambdaUpdate();
-        objectLambdaUpdateWrapper.eq(TopStore::getStoreId, bo.getStoreId());
-        objectLambdaUpdateWrapper.set(TopStore::getPassword, SecurityUtils.encryptPassword(store.getInitPwd()));
-        objectLambdaUpdateWrapper.set(TopStore::getUpdateTime, DateUtils.getNowTime());
-        return this.update(null, objectLambdaUpdateWrapper);
-    }
-
-    @Override
-    public Boolean updatePwd(TopStoreEditBo bo) {
-        if(Validator.isEmpty(bo.getStoreId())||Validator.isEmpty(bo.getPassword())){
-            throw new CustomException("参数错误");
-        }
-        TopStoreVo storeVo = queryById(bo.getStoreId());
-        LambdaUpdateWrapper<TopStore> objectLambdaUpdateWrapper = Wrappers.lambdaUpdate();
-        objectLambdaUpdateWrapper.eq(TopStore::getStoreId, bo.getStoreId());
-        objectLambdaUpdateWrapper.set(TopStore::getPassword, SecurityUtils.encryptPassword(bo.getPassword()));
-        objectLambdaUpdateWrapper.set(TopStore::getUpdateTime, DateUtils.getNowTime());
-        return this.update(null, objectLambdaUpdateWrapper);
-    }
-
     @Override
     public Boolean batchRemove(TopStoreEditBo bo) {
         if(Validator.isNotEmpty(bo.getStoreIds())){

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/mall/vo/TopStoreCategoryVo.java

@@ -0,0 +1,47 @@
+package com.zhongzheng.modules.top.mall.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 店铺类目ID视图对象 mall_package
+ *
+ * @author ruoyi
+ * @date 2023-05-26
+ */
+@Data
+@ApiModel("店铺类目ID视图对象")
+public class TopStoreCategoryVo {
+	private static final long serialVersionUID = 1L;
+
+	/** 类目ID */
+	@ApiModelProperty("类目ID")
+	private Long catId;
+
+	/** 类目名称 */
+	@Excel(name = "类目名称")
+	@ApiModelProperty("类目名称")
+	private String catName;
+	/** 店铺ID */
+	@Excel(name = "店铺ID")
+	@ApiModelProperty("店铺ID")
+	private Long storeId;
+	/** 合作商户ID */
+	@Excel(name = "合作商户ID")
+	@ApiModelProperty("合作商户ID")
+	private Long merId;
+	/** 父ID */
+	@Excel(name = "父ID")
+	@ApiModelProperty("父ID")
+	private Long parentId;
+	/** 0 未启用 1启用 -1删除 */
+	@Excel(name = "0 未启用 1启用 -1删除")
+	@ApiModelProperty("0 未启用 1启用 -1删除")
+	private Integer status;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/mall/vo/TopStoreVo.java

@@ -13,7 +13,7 @@ import java.util.Date;
  * 商户店铺管理视图对象 mall_package
  *
  * @author hjl
- * @date 2023-05-18
+ * @date 2023-05-25
  */
 @Data
 @ApiModel("商户店铺管理视图对象")
@@ -28,37 +28,23 @@ public class TopStoreVo {
 	@Excel(name = "店铺名称")
 	@ApiModelProperty("店铺名称")
 	private String storeName;
-	/** 手机号码 */
-	@Excel(name = "手机号码")
-	@ApiModelProperty("手机号码")
-	private String telphone;
-	/** 用户名 */
-	@Excel(name = "用户名")
-	@ApiModelProperty("用户名")
-	private String userName;
-	/** 密码 */
-	@Excel(name = "密码")
-	@ApiModelProperty("密码")
-	private String password;
-	/** 联系人 */
-	@Excel(name = "联系人")
-	@ApiModelProperty("联系人")
-	private String contacts;
-	/** 初始密码 */
-	@Excel(name = "初始密码")
-	@ApiModelProperty("初始密码")
-	private String initPwd;
+	/** 店铺地址 */
+	@Excel(name = "店铺地址")
+	@ApiModelProperty("店铺地址")
+	private String address;
 	/** 0 未启用 1启用 -1删除 */
 	@Excel(name = "0 未启用 1启用 -1删除")
 	@ApiModelProperty("0 未启用 1启用 -1删除")
 	private Integer status;
+	/** 合作商户ID */
+	@Excel(name = "合作商户ID")
+	@ApiModelProperty("合作商户ID")
+	private Long merId;
 	/** 备注 */
 	@Excel(name = "备注")
 	@ApiModelProperty("备注")
 	private String remark;
-
-	private String tenantId;
-
+	@ApiModelProperty("商户名称")
+	private String merName;
 	private Long createTime;
-
 }

zhongzheng-system/src/main/resources/mapper/modules/top/TopStoreCategoryMapper.xml

@@ -0,0 +1,19 @@
+<?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="com.zhongzheng.modules.top.mall.mapper.TopStoreCategoryMapper">
+
+    <resultMap type="com.zhongzheng.modules.top.mall.domain.TopStoreCategory" id="TopStoreCategoryResult">
+        <result property="catId" column="cat_id"/>
+        <result property="catName" column="cat_name"/>
+        <result property="storeId" column="store_id"/>
+        <result property="merId" column="mer_id"/>
+        <result property="parentId" column="parent_id"/>
+        <result property="status" column="status"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+
+</mapper>

zhongzheng-system/src/main/resources/mapper/modules/top/TopStoreMapper.xml

@@ -7,12 +7,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="com.zhongzheng.modules.top.mall.domain.TopStore" id="TopStoreResult">
         <result property="storeId" column="store_id"/>
         <result property="storeName" column="store_name"/>
-        <result property="telphone" column="telphone"/>
-        <result property="userName" column="user_name"/>
-        <result property="password" column="password"/>
-        <result property="contacts" column="contacts"/>
-        <result property="initPwd" column="init_pwd"/>
+        <result property="address" column="address"/>
         <result property="status" column="status"/>
+        <result property="merId" column="mer_id"/>
         <result property="createTime" column="create_time"/>
         <result property="updateTime" column="update_time"/>
         <result property="remark" column="remark"/>