fix

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

@@ -0,0 +1,112 @@
+package com.zhongzheng.controller.mall;
+
+import java.util.List;
+import java.util.Arrays;
+
+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.service.ITopStoreService;
+import com.zhongzheng.modules.top.mall.vo.TopStoreVo;
+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;
+
+/**
+ * 商户店铺管理Controller
+ *
+ * @author hjl
+ * @date 2023-05-18
+ */
+@Api(value = "商户店铺管理控制器", tags = {"商户店铺管理管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/mall/store")
+public class TopStoreController extends BaseController {
+
+    private final ITopStoreService iTopStoreService;
+
+    /**
+     * 查询商户店铺管理列表
+     */
+    @ApiOperation("查询商户店铺管理列表")
+    @PreAuthorize("@ss.hasPermi('system:store:list')")
+    @GetMapping("/list")
+    public TableDataInfo<TopStoreVo> list(TopStoreQueryBo bo) {
+        startPage();
+        List<TopStoreVo> list = iTopStoreService.queryList(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出商户店铺管理列表
+     */
+    @ApiOperation("导出商户店铺管理列表")
+    @PreAuthorize("@ss.hasPermi('system:store:export')")
+    @Log(title = "商户店铺管理", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult<TopStoreVo> export(TopStoreQueryBo bo) {
+        List<TopStoreVo> list = iTopStoreService.queryList(bo);
+        ExcelUtil<TopStoreVo> util = new ExcelUtil<TopStoreVo>(TopStoreVo.class);
+        return util.exportExcel(list, "商户店铺管理");
+    }
+
+    /**
+     * 获取商户店铺管理详细信息
+     */
+    @ApiOperation("获取商户店铺管理详细信息")
+    @PreAuthorize("@ss.hasPermi('system:store:query')")
+    @GetMapping("/{storeId}")
+    public AjaxResult<TopStoreVo> getInfo(@PathVariable("storeId" ) Long storeId) {
+        return AjaxResult.success(iTopStoreService.queryById(storeId));
+    }
+
+    /**
+     * 新增商户店铺管理
+     */
+    @ApiOperation("新增商户店铺管理")
+    @PreAuthorize("@ss.hasPermi('system:store:add')")
+    @Log(title = "商户店铺管理", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody TopStoreAddBo bo) {
+        return toAjax(iTopStoreService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改商户店铺管理
+     */
+    @ApiOperation("修改商户店铺管理")
+    @PreAuthorize("@ss.hasPermi('system:store:edit')")
+    @Log(title = "商户店铺管理", businessType = BusinessType.UPDATE)
+    @PutMapping()
+    public AjaxResult<Void> edit(@RequestBody TopStoreEditBo bo) {
+        return toAjax(iTopStoreService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除商户店铺管理
+     */
+    @ApiOperation("删除商户店铺管理")
+    @PreAuthorize("@ss.hasPermi('system:store:remove')")
+    @Log(title = "商户店铺管理" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{storeIds}")
+    public AjaxResult<Void> remove(@PathVariable Long[] storeIds) {
+        return toAjax(iTopStoreService.deleteWithValidByIds(Arrays.asList(storeIds), true) ? 1 : 0);
+    }
+}

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

@@ -0,0 +1,51 @@
+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;
+
+
+
+/**
+ * 商户店铺管理添加对象 top_store
+ *
+ * @author hjl
+ * @date 2023-05-18
+ */
+@Data
+@ApiModel("商户店铺管理添加对象")
+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;
+    /** 0 未启用 1启用 -1删除 */
+    @ApiModelProperty("0 未启用 1启用 -1删除")
+    private Integer status;
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    private Long createTime;
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long updateTime;
+    /** 备注 */
+    @ApiModelProperty("备注")
+    private String remark;
+}

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

@@ -0,0 +1,60 @@
+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;
+
+
+/**
+ * 商户店铺管理编辑对象 top_store
+ *
+ * @author hjl
+ * @date 2023-05-18
+ */
+@Data
+@ApiModel("商户店铺管理编辑对象")
+public class TopStoreEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long storeId;
+
+    /** 店铺名称 */
+    @ApiModelProperty("店铺名称")
+    private String storeName;
+
+    /** 手机号码 */
+    @ApiModelProperty("手机号码")
+    private String telphone;
+
+    /** 用户名 */
+    @ApiModelProperty("用户名")
+    private String userName;
+
+    /** 密码 */
+    @ApiModelProperty("密码")
+    private String password;
+
+    /** 联系人 */
+    @ApiModelProperty("联系人")
+    private String contacts;
+
+    /** 初始密码 */
+    @ApiModelProperty("初始密码")
+    private String initPwd;
+
+    /** 0 未启用 1启用 -1删除 */
+    @ApiModelProperty("0 未启用 1启用 -1删除")
+    private Integer status;
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long updateTime;
+
+    /** 备注 */
+    @ApiModelProperty("备注")
+    private String remark;
+
+}

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

@@ -0,0 +1,60 @@
+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;
+
+/**
+ * 商户店铺管理分页查询对象 top_store
+ *
+ * @author hjl
+ * @date 2023-05-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("商户店铺管理分页查询对象")
+public class TopStoreQueryBo 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 storeName;
+	/** 手机号码 */
+	@ApiModelProperty("手机号码")
+	private String telphone;
+	/** 用户名 */
+	@ApiModelProperty("用户名")
+	private String userName;
+	/** 密码 */
+	@ApiModelProperty("密码")
+	private String password;
+	/** 联系人 */
+	@ApiModelProperty("联系人")
+	private String contacts;
+	/** 初始密码 */
+	@ApiModelProperty("初始密码")
+	private String initPwd;
+	/** 0 未启用 1启用 -1删除 */
+	@ApiModelProperty("0 未启用 1启用 -1删除")
+	private Integer status;
+}

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

@@ -0,0 +1,51 @@
+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;
+
+/**
+ * 商户店铺管理对象 top_store
+ *
+ * @author hjl
+ * @date 2023-05-18
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("top_store")
+public class TopStore implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "store_id")
+    private Long storeId;
+    /** 店铺名称 */
+    private String storeName;
+    /** 手机号码 */
+    private String telphone;
+    /** 用户名 */
+    private String userName;
+    /** 密码 */
+    private String password;
+    /** 联系人 */
+    private String contacts;
+    /** 初始密码 */
+    private String initPwd;
+    /** 0 未启用 1启用 -1删除 */
+    private Integer status;
+    /** 创建时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** $column.columnComment */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+    /** 备注 */
+    private String remark;
+}

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

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.top.mall.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.top.mall.domain.TopStore;
+
+/**
+ * 商户店铺管理Mapper接口
+ *
+ * @author hjl
+ * @date 2023-05-18
+ */
+public interface TopStoreMapper extends BaseMapper<TopStore> {
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/mall/service/ITopStoreService.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.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.TopStoreVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 商户店铺管理Service接口
+ *
+ * @author hjl
+ * @date 2023-05-18
+ */
+public interface ITopStoreService extends IService<TopStore> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	TopStoreVo queryById(Long storeId);
+
+	/**
+	 * 查询列表
+	 */
+	List<TopStoreVo> queryList(TopStoreQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入商户店铺管理
+	 * @param bo 商户店铺管理新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(TopStoreAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改商户店铺管理
+	 * @param bo 商户店铺管理编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(TopStoreEditBo 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/impl/TopStoreServiceImpl.java

@@ -0,0 +1,105 @@
+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.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.mapper.TopStoreMapper;
+import com.zhongzheng.modules.top.mall.service.ITopStoreService;
+import com.zhongzheng.modules.top.mall.vo.TopStoreVo;
+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;
+
+/**
+ * 商户店铺管理Service业务层处理
+ *
+ * @author hjl
+ * @date 2023-05-18
+ */
+@Service
+public class TopStoreServiceImpl extends ServiceImpl<TopStoreMapper, TopStore> implements ITopStoreService {
+
+    @Override
+    public TopStoreVo queryById(Long storeId){
+        TopStore db = this.baseMapper.selectById(storeId);
+        return BeanUtil.toBean(db, TopStoreVo.class);
+    }
+
+    @Override
+    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(bo.getStatus() != null, TopStore::getStatus, bo.getStatus());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<TopStoreVo> entity2Vo(Collection<TopStore> collection) {
+        List<TopStoreVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, TopStoreVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<TopStore> page = (Page<TopStore>)collection;
+            Page<TopStoreVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(TopStoreAddBo bo) {
+        TopStore add = BeanUtil.toBean(bo, TopStore.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(TopStoreEditBo bo) {
+        TopStore update = BeanUtil.toBean(bo, TopStore.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(TopStore 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/vo/TopStoreVo.java

@@ -0,0 +1,59 @@
+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;
+
+
+
+/**
+ * 商户店铺管理视图对象 mall_package
+ *
+ * @author hjl
+ * @date 2023-05-18
+ */
+@Data
+@ApiModel("商户店铺管理视图对象")
+public class TopStoreVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long storeId;
+
+	/** 店铺名称 */
+	@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;
+	/** 0 未启用 1启用 -1删除 */
+	@Excel(name = "0 未启用 1启用 -1删除")
+	@ApiModelProperty("0 未启用 1启用 -1删除")
+	private Integer status;
+	/** 备注 */
+	@Excel(name = "备注")
+	@ApiModelProperty("备注")
+	private String remark;
+}

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

@@ -0,0 +1,22 @@
+<?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.TopStoreMapper">
+
+    <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="status" column="status"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
+    </resultMap>
+
+
+</mapper>