submit

zhongzheng-admin-store/src/main/java/com/zhongzheng/controller/store/StoreController.java

@@ -44,6 +44,15 @@ public class StoreController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 查询商户店铺管理列表
+     */
+    @ApiOperation("查询商户店铺管理列表")
+    @GetMapping("/list/all")
+    public AjaxResult<List<TopStoreVo>> listAll(TopStoreQueryBo bo) {
+        return AjaxResult.success(iTopStoreService.queryList(bo));
+    }
+
 
 
     /**

zhongzheng-admin-store/src/main/java/com/zhongzheng/controller/system/StoreUserController.java

@@ -10,16 +10,14 @@ import com.zhongzheng.common.core.controller.BaseController;
 import com.zhongzheng.common.core.domain.AjaxResult;
 import com.zhongzheng.common.core.domain.entity.store.StoreRole;
 import com.zhongzheng.common.core.domain.entity.store.StoreUser;
+import com.zhongzheng.common.core.domain.model.StoreLoginUser;
 import com.zhongzheng.common.core.page.TableDataInfo;
 import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.SecurityUtils;
 import com.zhongzheng.common.utils.ServletUtils;
-import com.zhongzheng.common.utils.ToolsUtils;
 import com.zhongzheng.framework.web.service.StoreTokenService;
 import com.zhongzheng.modules.store.service.IStoreRoleService;
 import com.zhongzheng.modules.store.service.IStoreUserService;
-import com.zhongzheng.common.core.domain.model.StoreLoginUser;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
@@ -109,9 +107,9 @@ public class StoreUserController extends BaseController {
         {
             return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，手机号码已存在");
         }
-        if(!ToolsUtils.verifPwd(user.getPassword())){
-            throw new CustomException("密码应由8-16位数字、大小写字母、符号组成");
-        }
+//        if(!ToolsUtils.verifStorePwd(user.getPassword())){
+//            throw new CustomException("密码应由8-16位数字组成");
+//        }
         user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
         return toAjax(storeUserService.insertUser(user));
     }
@@ -160,9 +158,9 @@ public class StoreUserController extends BaseController {
                 }
 
             }
-            if(!ToolsUtils.verifPwd(user.getPassword())){
-                throw new CustomException("密码应由8-16位数字、大小写字母、符号组成");
-            }
+//            if(!ToolsUtils.verifPwd(user.getPassword())){
+//                throw new CustomException("密码应由8-16位数字、大小写字母、符号组成");
+//            }
             user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
         }
         int result = storeUserService.updateUser(user);
@@ -187,5 +185,18 @@ public class StoreUserController extends BaseController {
         storeUserService.checkUserAllowed(user);
         return toAjax(storeUserService.updateUserStatus(user));
     }
+
+
+    @ApiOperation("合作商户恢复密码")
+    @PostMapping("/restorePwd")
+    public AjaxResult<Void> restorePwd(@RequestBody SysUserEditBo bo) {
+        return toAjax(storeUserService.restorePwd(bo) ? 1 : 0);
+    }
+
+    @ApiOperation("批量删除")
+    @PostMapping("/delete")
+    public AjaxResult<Void> batchDelete(@RequestBody SysUserEditBo bo) {
+        return toAjax(storeUserService.batchDelete(bo) ? 1 : 0);
+    }
     
 }

zhongzheng-common/src/main/java/com/zhongzheng/common/core/bo/SysUserEditBo.java

@@ -12,6 +12,7 @@ import lombok.Data;
 import javax.validation.constraints.Email;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
+import java.util.List;
 
 /**
  * 用户对象 SysUserEditBo
@@ -30,6 +31,9 @@ public class SysUserEditBo
     @ApiModelProperty("用户编号")
     private Long userId;
 
+    @ApiModelProperty("用户编号")
+    private List<Long> userIds;
+
     /** 部门ID */
     @Excel(name = "部门编号", type = Type.IMPORT)
     @ApiModelProperty("部门编号")

zhongzheng-common/src/main/java/com/zhongzheng/common/core/domain/entity/store/StoreRole.java

@@ -1,5 +1,6 @@
 package com.zhongzheng.common.core.domain.entity.store;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -39,7 +40,7 @@ private static final long serialVersionUID=1L;
     /** 数据范围（1：全部数据权限 2：自定数据权限 3：本部门数据权限 4：本部门及以下数据权限 5：本人数据权限 6业务层次数据权限） */
     private String dataScope;
     /** 部门树选择项是否关联显示 */
-    private Integer deptCheckStrictly;
+//    private Integer deptCheckStrictly;
     /** 角色状态（1正常 0停用） */
     private String status;
     /** 删除标志（0代表存在 2代表删除） */
@@ -51,6 +52,14 @@ private static final long serialVersionUID=1L;
     /** 创建时间 */
     @TableField(fill = FieldFill.INSERT)
     private Date createTime;
+
+    public Long getCreateTimeStr() {
+        return ObjectUtil.isNotNull(this.createTime) ? this.createTime.getTime()/1000:0L;
+    }
+
+    @TableField(exist = false)
+    private Long createTimeStr;
+
     /** 更新者 */
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private String updateBy;

zhongzheng-common/src/main/java/com/zhongzheng/common/core/domain/entity/store/StoreUser.java

@@ -1,5 +1,6 @@
 package com.zhongzheng.common.core.domain.entity.store;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -73,6 +74,14 @@ private static final long serialVersionUID=1L;
     @TableField(exist = false)
     private List<StoreRole> roles;
 
+    /** 店铺名称 */
+    @TableField(exist = false)
+    private String storeName;
+
+    /** 角色名称 */
+    @TableField(exist = false)
+    private String roleName;
+
     public StoreUser(Long userId)
     {
         this.userId = userId;
@@ -80,7 +89,10 @@ private static final long serialVersionUID=1L;
 
     public boolean isAdmin()
     {
-        return this.administrator != 0;
+        if (ObjectUtil.isNotNull(this.administrator)){
+            return this.administrator != 0;
+        }
+        return false;
     }
 
 

zhongzheng-common/src/main/java/com/zhongzheng/common/utils/ToolsUtils.java

@@ -2,14 +2,9 @@ package com.zhongzheng.common.utils;
 
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
-import com.aliyun.dysmsapi20170525.models.SendSmsRequest;
-import com.aliyun.dysmsapi20170525.models.SendSmsResponse;
-import com.aliyun.teaopenapi.models.Config;
 import com.google.zxing.common.BitMatrix;
-import com.zhongzheng.common.core.domain.AjaxResult;
 import com.zhongzheng.common.exception.CustomException;
 import io.micrometer.core.lang.NonNull;
-import net.sf.jsqlparser.expression.LongValue;
 
 import java.awt.image.BufferedImage;
 import java.io.*;
@@ -19,8 +14,6 @@ import java.security.NoSuchAlgorithmException;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
 
 public class ToolsUtils {
 
@@ -365,6 +358,16 @@ public class ToolsUtils {
         }
     }
 
+    public static boolean verifStorePwd(String passWord) {
+        if(Validator.isEmpty(passWord)){
+            return false;
+        }
+        if(passWord.length()<8||passWord.length()>18){
+            return false;
+        }
+        return true;
+    }
+
     public static String getTenantId() {
         String TenantId = ServletUtils.getRequest().getHeader("TenantId");
         if(!StrUtil.isNotBlank(TenantId)||TenantId==null){

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/StoreUserServiceImpl.java

@@ -3,19 +3,24 @@ package com.zhongzheng.framework.web.service;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Validator;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zhongzheng.common.constant.Constants;
 import com.zhongzheng.common.constant.UserConstants;
+import com.zhongzheng.common.core.bo.SysUserEditBo;
 import com.zhongzheng.common.core.domain.entity.store.StoreRole;
 import com.zhongzheng.common.core.domain.entity.store.StoreUser;
 import com.zhongzheng.common.core.domain.entity.store.StoreUserRole;
+import com.zhongzheng.common.core.domain.model.StoreLoginUser;
 import com.zhongzheng.common.core.redis.RedisCache;
 import com.zhongzheng.common.enums.UserStatus;
 import com.zhongzheng.common.exception.BaseException;
 import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.type.EncryptHandler;
 import com.zhongzheng.common.utils.AES;
+import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.SecurityUtils;
 import com.zhongzheng.modules.store.mapper.StoreUserMapper;
 import com.zhongzheng.modules.store.mapper.StoreUserRoleMapper;
@@ -23,7 +28,6 @@ import com.zhongzheng.modules.store.service.IStoreRoleService;
 import com.zhongzheng.modules.store.service.IStoreUserService;
 import com.zhongzheng.modules.user.bo.UserAppAccountLoginBo;
 import com.zhongzheng.modules.user.bo.UserAppSmsLoginBo;
-import com.zhongzheng.common.core.domain.model.StoreLoginUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -60,7 +64,6 @@ public class StoreUserServiceImpl extends ServiceImpl<StoreUserMapper, StoreUser
     public List<StoreUser> selectUserList(StoreUser user) {
         List<StoreUser> sysUsers = baseMapper.selectUserList(user);
         for (StoreUser sysUser : sysUsers) {
-
             List<StoreUserRole> StoreUserRoles = StoreUserRoleMapper.selectList(new LambdaQueryWrapper<StoreUserRole>().eq(StoreUserRole::getUserId, sysUser.getUserId()));
             if (CollectionUtils.isNotEmpty(StoreUserRoles)){
                 List<Long> collect = StoreUserRoles.stream().map(StoreUserRole::getRoleId).collect(Collectors.toList());
@@ -69,12 +72,12 @@ public class StoreUserServiceImpl extends ServiceImpl<StoreUserMapper, StoreUser
                 if (CollectionUtils.isNotEmpty(sysRoles)){
                     List<StoreRole> collect1 = sysRoles.stream().map(x -> BeanUtil.toBean(x, StoreRole.class)).collect(Collectors.toList());
                     sysUser.setRoles(collect1);
+                    sysUser.setRoleName(sysRoles.stream().map(StoreRole::getRoleName).collect(Collectors.joining(",")));
                 }
             }else {
                 sysUser.setRoleIds(new ArrayList<>());
                 sysUser.setRoles(new ArrayList<>());
             }
-
         }
         return sysUsers;
     }
@@ -166,6 +169,31 @@ public class StoreUserServiceImpl extends ServiceImpl<StoreUserMapper, StoreUser
         return baseMapper.updateById(user);
     }
 
+    @Override
+    public boolean restorePwd(SysUserEditBo bo) {
+        if(Validator.isEmpty(bo.getUserId())){
+            throw new CustomException("参数错误");
+        }
+        StoreUser store = getOne(new LambdaQueryWrapper<StoreUser>().eq(StoreUser::getUserId, bo.getUserId()).last("limit 1"));
+        LambdaUpdateWrapper<StoreUser> objectLambdaUpdateWrapper = Wrappers.lambdaUpdate();
+        objectLambdaUpdateWrapper.eq(StoreUser::getUserId, bo.getUserId());
+        objectLambdaUpdateWrapper.set(StoreUser::getPassword,
+                SecurityUtils.encryptPassword(store.getTelphone().substring(store.getTelphone().length()-7,store.getTelphone().length()-1)));
+        objectLambdaUpdateWrapper.set(StoreUser::getUpdateTime, DateUtils.getNowTime());
+        return this.update(null, objectLambdaUpdateWrapper);
+    }
+
+    @Override
+    public boolean batchDelete(SysUserEditBo bo) {
+        if (CollectionUtils.isEmpty(bo.getUserIds())){
+            throw new CustomException("参数有误");
+        }
+        // todo 删除校验
+        return update(new LambdaUpdateWrapper<StoreUser>()
+        .in(StoreUser::getUserId,bo.getUserIds())
+        .set(StoreUser::getStatus,-1));
+    }
+
     @Override
     public StoreUser queryByUnionId(String unionId) {
         StoreUser user = getOne(new LambdaQueryWrapper<StoreUser>()

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/service/impl/GoodsCategoryServiceImpl.java

@@ -14,6 +14,11 @@ import com.zhongzheng.modules.goods.domain.GoodsCategory;
 import com.zhongzheng.modules.goods.mapper.GoodsCategoryMapper;
 import com.zhongzheng.modules.goods.service.IGoodsCategoryService;
 import com.zhongzheng.modules.goods.vo.GoodsCategoryVo;
+import com.zhongzheng.modules.top.mall.domain.TopMerchant;
+import com.zhongzheng.modules.top.mall.domain.TopStore;
+import com.zhongzheng.modules.top.mall.service.ITopMerchantService;
+import com.zhongzheng.modules.top.mall.service.ITopStoreService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -30,6 +35,11 @@ import java.util.stream.Collectors;
 @Service
 public class GoodsCategoryServiceImpl extends ServiceImpl<GoodsCategoryMapper, GoodsCategory> implements IGoodsCategoryService {
 
+    @Autowired
+    private ITopStoreService topStoreService;
+    @Autowired
+    private ITopMerchantService topMerchantService;
+
     @Override
     public List<GoodsCategoryVo> queryList(GoodsCategoryQueryBo bo) {
         bo.setStatusList(Arrays.asList(0,1));
@@ -39,6 +49,10 @@ public class GoodsCategoryServiceImpl extends ServiceImpl<GoodsCategoryMapper, G
             return new ArrayList<>();
         }
         categoryVos.forEach(item -> {
+            TopStore store = topStoreService.getById(item.getStoreId());
+            item.setStoreName(store.getStoreName());
+            TopMerchant merchant = topMerchantService.getById(item.getMerId());
+            item.setMerName(merchant.getMerName());
             //获取子集
             categoryChildren(item);
         });
@@ -47,11 +61,21 @@ public class GoodsCategoryServiceImpl extends ServiceImpl<GoodsCategoryMapper, G
 
 
     private void categoryChildren(GoodsCategoryVo item) {
-        List<GoodsCategory> list = list(new LambdaQueryWrapper<GoodsCategory>().eq(GoodsCategory::getParentId, item.getCategoryId()));
+        List<GoodsCategory> list = list(new LambdaQueryWrapper<GoodsCategory>()
+                .eq(GoodsCategory::getParentId, item.getCategoryId())
+                .in(GoodsCategory::getStatus,Arrays.asList(0,1)));
         if (CollectionUtils.isEmpty(list)){
             return;
         }
-        item.setChildren(list.stream().map(x -> BeanUtil.toBean(x,GoodsCategoryVo.class)).collect(Collectors.toList()));
+        List<GoodsCategoryVo> categoryVos = list.stream().map(x ->{
+            GoodsCategoryVo goodsCategoryVo = BeanUtil.toBean(x, GoodsCategoryVo.class);
+            TopStore store = topStoreService.getById(item.getStoreId());
+            goodsCategoryVo.setStoreName(store.getStoreName());
+            TopMerchant merchant = topMerchantService.getById(item.getMerId());
+            goodsCategoryVo.setMerName(merchant.getMerName());
+            return goodsCategoryVo;
+        }).collect(Collectors.toList());
+        item.setChildren(categoryVos);
         item.getChildren().forEach(categoryVo -> {
             categoryChildren(categoryVo);
         });

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/vo/GoodsCategoryVo.java

@@ -43,6 +43,10 @@ private static final long serialVersionUID=1L;
     private Long storeId;
     @ApiModelProperty("商户ID")
     private Long merId;
+    @ApiModelProperty("店铺ID")
+    private String storeName;
+    @ApiModelProperty("商户ID")
+    private String merName;
 
     @ApiModelProperty("子类目")
     private List<GoodsCategoryVo> children;

zhongzheng-system/src/main/java/com/zhongzheng/modules/store/service/IStoreUserService.java

@@ -2,6 +2,7 @@ package com.zhongzheng.modules.store.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.common.core.bo.SysUserEditBo;
 import com.zhongzheng.common.core.domain.entity.store.StoreUser;
 import com.zhongzheng.modules.user.bo.UserAppAccountLoginBo;
 import com.zhongzheng.modules.user.bo.UserAppSmsLoginBo;
@@ -82,4 +83,8 @@ public interface IStoreUserService extends IService<StoreUser> {
      * @return 结果
      */
     int updateUserStatus(StoreUser user);
+
+    boolean restorePwd(SysUserEditBo bo);
+
+    boolean batchDelete(SysUserEditBo bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/store/service/impl/StoreRoleServiceImpl.java

@@ -181,6 +181,7 @@ public class StoreRoleServiceImpl extends ServiceImpl<StoreRoleMapper, StoreRole
     @Override
     @Transactional
     public int insertRole(StoreRole role) {
+        role.setCreateTime(new Date());
         // 新增角色信息
         baseMapper.insert(role);
         return insertRoleMenu(role);

zhongzheng-system/src/main/java/com/zhongzheng/modules/store/vo/StoreRoleVo.java

@@ -1,11 +1,9 @@
 package com.zhongzheng.modules.store.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;
 
 
 
@@ -52,6 +50,8 @@ public class StoreRoleVo {
 	@Excel(name = "角色状态" , readConverterExp = "1=正常,0=停用")
 	@ApiModelProperty("角色状态（1正常 0停用）")
 	private String status;
+	@ApiModelProperty("商户ID")
+	private Long merId;
 	/** 备注 */
 	@Excel(name = "备注")
 	@ApiModelProperty("备注")
@@ -60,8 +60,6 @@ public class StoreRoleVo {
 	@Excel(name = "店铺ID")
 	@ApiModelProperty("店铺ID")
 	private Long storeId;
-	/** 商户ID */
-	@Excel(name = "商户ID")
-	@ApiModelProperty("商户ID")
-	private Long merId;
+
+	private Long createTime;
 }

zhongzheng-system/src/main/resources/mapper/modules/goods/GoodsCategoryMapper.xml

@@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="queryList" parameterType="com.zhongzheng.modules.goods.bo.GoodsCategoryQueryBo" resultType="com.zhongzheng.modules.goods.vo.GoodsCategoryVo">
         select * from goods_category where 1=1
+
         <if test="parentId != null">
             AND parent_id = #{parentId}
         </if>

zhongzheng-system/src/main/resources/mapper/modules/store/StoreUserMapper.xml

@@ -29,41 +29,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectUserList" parameterType="com.zhongzheng.common.core.domain.entity.store.StoreUser" resultType="com.zhongzheng.common.core.domain.entity.store.StoreUser">
-        select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.sex,
-        u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, u.code from
+        select u.*,s.store_name from
         store_user u
         <if test="roleName != null and roleName != ''">
             left join store_user_role ur on ur.user_id = u.user_id
             left join store_role r on ur.role_id = r.role_id
         </if>
-        where u.del_flag = '0'
-        <if test="roleName != null and roleName != ''">
-            AND r.role_name = #{roleName}
-        </if>
+        left join top_store s on u.store_id = s.store_id
+        where u.del_flag = '0' and  u.`status` != -1
         <if test="userName != null and userName != ''">
             AND u.user_name like concat('%', #{userName}, '%')
         </if>
-        <if test="status != null and status != ''">
-            AND u.status = #{status}
-        </if>
-        <if test="phonenumber != null and phonenumber != ''">
-            AND u.phonenumber like concat('%', #{phonenumber}, '%')
-        </if>
-        <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-            AND date_format(u.create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
-        </if>
-        <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-            AND date_format(u.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+        <if test="storeId != null and storeId != ''">
+            AND u.store_id = #{storeId}
         </if>
-        <if test="statusArray != null and statusArray.size()!=0 ">
-            AND u.status in
-            <foreach collection="statusArray" item="item" index="index" open="(" close=")" separator=",">
-                #{item}
-            </foreach>
+        <if test="telphone != null and telphone != ''">
+            AND u.telphone like concat('%', #{telphone}, '%')
         </if>
         order by u.create_time desc
-        <!-- 数据范围过滤 -->
-        ${params.dataScope}
     </select>
 
 </mapper>