ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/SysUserFallbackFactory.java
@@ -88,6 +88,11 @@ public R delShopUser(Integer objectId, Integer roleType) { return R.fail("删除门店管理员账号失败：" + cause.getMessage()); } @Override public R delSysUserById(Long userId) { return R.fail("根据id删除管理员账户失败：" + cause.getMessage()); } }; } } ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/UserShopClientFallbackFactory.java
@@ -24,6 +24,16 @@ public R saveUserShop(UserShop userShop) { return R.fail("保存门店用户关系数据失败：" + cause.getMessage()); } @Override public R delUserShop(UserShop userShop) { return R.fail("删除后台账号和门店关系数据失败：" + cause.getMessage()); } @Override public R delShopAllUserShop(Integer shopId) { return R.fail("删除门店所有后台账号和门店关系数据失败：" + cause.getMessage()); } }; } } ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java
@@ -114,6 +114,13 @@ */ @PostMapping("/user/user/delShopUser") R delShopUser(@RequestParam("objectId") Integer objectId, @RequestParam("roleType") Integer roleType); /** * 根据id删除管理员账户 * @param userId * @return */ @PostMapping("/user/delSysUserById") R delSysUserById(@RequestParam("userId") Long userId); } ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/UserShopClient.java
@@ -7,6 +7,7 @@ import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; import java.util.List; @@ -34,4 +35,20 @@ */ @PostMapping("/userShop/saveUserShop") R saveUserShop(@RequestBody UserShop userShop); /** * 删除后台账号和门店关系数据 * @param userShop * @return */ @PostMapping("/userShop/delUserShop") R delUserShop(@RequestBody UserShop userShop); /** * 删除门店所有后台账号和门店关系数据 * @param shopId * @return */ @PostMapping("/userShop/delShopAllUserShop") R delShopAllUserShop(@RequestParam("shopId") Integer shopId); } ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
@@ -717,4 +717,11 @@ .last("LIMIT 1")); return R.ok(user); } @PostMapping("/delSysUserById") public R delSysUserById(@RequestParam("userId") Long userId){ userService.deleteUserById(userId); return R.ok(); } } ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/UserShopController.java
@@ -1,13 +1,11 @@ package com.ruoyi.system.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.ruoyi.common.core.domain.R; import com.ruoyi.system.api.model.UserShop; import com.ruoyi.system.service.UserShopService; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.List; @@ -56,4 +54,28 @@ userShopService.save(userShop); return R.ok(); } /** * 删除后台账号和门店关系数据 * @param userShop * @return */ @PostMapping("/delUserShop") public R delUserShop(@RequestBody UserShop userShop){ userShopService.remove(new LambdaQueryWrapper<UserShop>().eq(UserShop::getUserId, userShop.getUserId()).eq(UserShop::getShopId, userShop.getShopId())); return R.ok(); } /** * 删除门店所有关系数据 * @param shopId * @return */ @PostMapping("/delShopAllUserShop") public R delShopAllUserShop(@RequestParam("shopId") Integer shopId){ userShopService.remove(new LambdaQueryWrapper<UserShop>().eq(UserShop::getShopId, shopId)); return R.ok(); } } ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
@@ -23,7 +23,7 @@ * @param sysUser 用户信息 * @return 用户信息集合信息 */ public List<SysUser> selectUserList(SysUser sysUser); List<SysUser> selectUserList(SysUser sysUser); /** * 根据条件分页查询已配用户角色列表 @@ -31,7 +31,7 @@ * @param user 用户信息 * @return 用户信息集合信息 */ public List<SysUser> selectAllocatedList(SysUser user); List<SysUser> selectAllocatedList(SysUser user); /** * 根据条件分页查询未分配用户角色列表 @@ -39,7 +39,7 @@ * @param user 用户信息 * @return 用户信息集合信息 */ public List<SysUser> selectUnallocatedList(SysUser user); List<SysUser> selectUnallocatedList(SysUser user); /** * 通过用户名查询用户 @@ -47,7 +47,7 @@ * @param userName 用户名 * @return 用户对象信息 */ public SysUser selectUserByUserName(String userName); SysUser selectUserByUserName(String userName); /** * 通过用户ID查询用户 @@ -55,7 +55,7 @@ * @param userId 用户ID * @return 用户对象信息 */ public SysUser selectUserById(Long userId); SysUser selectUserById(Long userId); /** * 新增用户信息 @@ -63,7 +63,7 @@ * @param user 用户信息 * @return 结果 */ public int insertUser(SysUser user); int insertUser(SysUser user); /** * 修改用户信息 @@ -71,7 +71,7 @@ * @param user 用户信息 * @return 结果 */ public int updateUser(SysUser user); int updateUser(SysUser user); /** * 修改用户头像 @@ -80,7 +80,7 @@ * @param avatar 头像地址 * @return 结果 */ public int updateUserAvatar(@Param("userName") String userName, @Param("avatar") String avatar); int updateUserAvatar(@Param("userName") String userName, @Param("avatar") String avatar); /** * 重置用户密码 @@ -89,7 +89,7 @@ * @param password 密码 * @return 结果 */ public int resetUserPwd(@Param("userName") String userName, @Param("password") String password); int resetUserPwd(@Param("userName") String userName, @Param("password") String password); /** * 通过用户ID删除用户 @@ -97,7 +97,7 @@ * @param userId 用户ID * @return 结果 */ public int deleteUserById(Long userId); int deleteUserById(Long userId); /** * 批量删除用户信息 @@ -105,7 +105,7 @@ * @param userIds 需要删除的用户ID * @return 结果 */ public int deleteUserByIds(Long[] userIds); int deleteUserByIds(Long[] userIds); /** * 校验用户名称是否唯一 @@ -113,7 +113,7 @@ * @param userName 用户名称 * @return 结果 */ public SysUser checkUserNameUnique(String userName); SysUser checkUserNameUnique(String userName); /** * 校验手机号码是否唯一 @@ -121,7 +121,7 @@ * @param phonenumber 手机号码 * @return 结果 */ public SysUser checkPhoneUnique(String phonenumber); SysUser checkPhoneUnique(String phonenumber); @@ -131,7 +131,7 @@ * @param email 用户邮箱 * @return 结果 */ public SysUser checkEmailUnique(String email); SysUser checkEmailUnique(String email); List<SysUser> getList(@Param("pageInfo") PageInfo<SysUser> pageInfo, @Param("req") GetSysUserList getSysUserList);
@@ -22,7 +22,7 @@ * @param user 用户信息 * @return 用户信息集合信息 */ public List<SysUser> selectUserList(SysUser user); List<SysUser> selectUserList(SysUser user); /** * 根据条件分页查询已分配用户角色列表 @@ -30,7 +30,7 @@ * @param user 用户信息 * @return 用户信息集合信息 */ public List<SysUser> selectAllocatedList(SysUser user); List<SysUser> selectAllocatedList(SysUser user); /** * 根据条件分页查询未分配用户角色列表 @@ -38,7 +38,7 @@ * @param user 用户信息 * @return 用户信息集合信息 */ public List<SysUser> selectUnallocatedList(SysUser user); List<SysUser> selectUnallocatedList(SysUser user); /** * 通过用户名查询用户 @@ -46,7 +46,7 @@ * @param userName 用户名 * @return 用户对象信息 */ public SysUser selectUserByUserName(String userName); SysUser selectUserByUserName(String userName); /** * 通过用户ID查询用户 @@ -54,7 +54,7 @@ * @param userId 用户ID * @return 用户对象信息 */ public SysUser selectUserById(Long userId); SysUser selectUserById(Long userId); /** * 根据用户ID查询用户所属角色组 @@ -62,7 +62,7 @@ * @param userName 用户名 * @return 结果 */ public String selectUserRoleGroup(String userName); String selectUserRoleGroup(String userName); /** * 根据用户ID查询用户所属岗位组 @@ -70,7 +70,7 @@ * @param userName 用户名 * @return 结果 */ public String selectUserPostGroup(String userName); String selectUserPostGroup(String userName); /** * 校验用户名称是否唯一 @@ -78,7 +78,7 @@ * @param user 用户信息 * @return 结果 */ public boolean checkUserNameUnique(SysUser user); boolean checkUserNameUnique(SysUser user); /** * 校验手机号码是否唯一 @@ -86,7 +86,7 @@ * @param user 用户信息 * @return 结果 */ public boolean checkPhoneUnique(SysUser user); boolean checkPhoneUnique(SysUser user); /** * 校验email是否唯一 @@ -94,21 +94,21 @@ * @param user 用户信息 * @return 结果 */ public boolean checkEmailUnique(SysUser user); boolean checkEmailUnique(SysUser user); /** * 校验用户是否允许操作 * * @param user 用户信息 */ public void checkUserAllowed(SysUser user); void checkUserAllowed(SysUser user); /** * 校验用户是否有数据权限 * * @param userId 用户id */ public void checkUserDataScope(Long userId); void checkUserDataScope(Long userId); /** * 新增用户信息 @@ -116,7 +116,7 @@ * @param user 用户信息 * @return 结果 */ public int insertUser(SysUser user); int insertUser(SysUser user); /** * 注册用户信息 @@ -124,7 +124,7 @@ * @param user 用户信息 * @return 结果 */ public boolean registerUser(SysUser user); boolean registerUser(SysUser user); /** * 修改用户信息 @@ -132,7 +132,7 @@ * @param user 用户信息 * @return 结果 */ public int updateUser(SysUser user); int updateUser(SysUser user); /** * 用户授权角色 @@ -140,7 +140,7 @@ * @param userId 用户ID * @param roleIds 角色组 */ public void insertUserAuth(Long userId, Long[] roleIds); void insertUserAuth(Long userId, Long[] roleIds); /** * 修改用户状态 @@ -148,7 +148,7 @@ * @param user 用户信息 * @return 结果 */ public int updateUserStatus(SysUser user); int updateUserStatus(SysUser user); /** * 修改用户基本信息 @@ -156,7 +156,7 @@ * @param user 用户信息 * @return 结果 */ public int updateUserProfile(SysUser user); int updateUserProfile(SysUser user); /** * 修改用户头像 @@ -165,7 +165,7 @@ * @param avatar 头像地址 * @return 结果 */ public boolean updateUserAvatar(String userName, String avatar); boolean updateUserAvatar(String userName, String avatar); /** * 重置用户密码 @@ -173,7 +173,7 @@ * @param user 用户信息 * @return 结果 */ public int resetPwd(SysUser user); int resetPwd(SysUser user); /** * 重置用户密码 @@ -182,7 +182,7 @@ * @param password 密码 * @return 结果 */ public int resetUserPwd(String userName, String password); int resetUserPwd(String userName, String password); /** * 通过用户ID删除用户 @@ -190,7 +190,7 @@ * @param userId 用户ID * @return 结果 */ public int deleteUserById(Long userId); int deleteUserById(Long userId); /** * 批量删除用户信息 @@ -198,7 +198,7 @@ * @param userIds 需要删除的用户ID * @return 结果 */ public int deleteUserByIds(Long[] userIds); int deleteUserByIds(Long[] userIds); /** * 导入用户数据 @@ -208,7 +208,7 @@ * @param operName 操作用户 * @return 结果 */ public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName); String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName); PageInfo<SysUser> getList(PageInfo<SysUser> pageInfo, GetSysUserList getSysUserList);
@@ -465,12 +465,10 @@ } long count = userShopService.count(new LambdaQueryWrapper<UserShop>().eq(UserShop::getUserId, user.getUserId())); if(0 == count){ user.setDelFlag("2"); userMapper.updateById(user); userMapper.deleteUserById(user.getUserId()); } }else{ user.setDelFlag("2"); userMapper.updateById(user); userMapper.deleteUserById(user.getUserId()); } } return 0; ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
@@ -23,6 +23,7 @@ import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.utils.bean.BeanUtils; import com.ruoyi.common.core.web.page.PageInfo; import com.ruoyi.common.redis.annotation.DistributedLock; import com.ruoyi.common.security.service.TokenService; import com.ruoyi.order.feignClient.OrderClient; import com.ruoyi.order.feignClient.RemoteOrderGoodsClient; ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java
@@ -22,6 +22,7 @@ import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.core.web.page.PageInfo; import com.ruoyi.common.redis.annotation.DistributedLock; import com.ruoyi.common.redis.service.RedisService; import com.ruoyi.common.security.service.TokenService; import com.ruoyi.other.api.domain.*; ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
@@ -131,8 +131,8 @@ @ApiImplicitParams({ @ApiImplicitParam(value = "订单id", name = "id", required = true, dataType = "String"), }) @GetMapping("/writeOff/{id}/{shopId}/{technicianId}") public R<Void> writeOff(@PathVariable("id") String id, @PathVariable("shopId") Integer shopId, @PathVariable("technicianId") Integer technicianId){ @GetMapping("/writeOff/{id}/{shopId}") public R<Void> writeOff(@PathVariable("id") String id, @PathVariable("shopId") Integer shopId, Integer technicianId){ orderService.writeOff(id, shopId, technicianId); return R.ok(); } ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -332,17 +332,10 @@ RefundPass one = refundPassService.lambdaQuery().eq(RefundPass::getOrderId, orderPageListVo.getId()).one(); orderPageListVo.setRefundPassId(null != one ? one.getId().toString() : null); List<OrderGood> orderGoods = orderGoodMapper.selectList(new LambdaQueryWrapper<OrderGood>() .eq(OrderGood::getOrderId, orderPageListVo.getId())); BigDecimal servuceShopCharges = BigDecimal.ZERO; BigDecimal boundShopCharges = BigDecimal.ZERO; for (OrderGood orderGood : orderGoods) { if(orderPageListVo.getShopId().equals(orderPageList.getShopId())){ servuceShopCharges = servuceShopCharges.add(orderGood.getServuceShopCharges()); } boundShopCharges = boundShopCharges.add(orderGood.getBoundShopCharges()); } orderPageListVo.setGetCommission(servuceShopCharges.add(boundShopCharges)); // 平台分佣 List<ShopBalanceStatement> data = shopBalanceStatementClient.getShopBalanceStatementList(Arrays.asList(1, 2, 3), Long.valueOf(orderPageListVo.getId())).getData(); BigDecimal reduce = data.stream().map(ShopBalanceStatement::getVariableAmount).reduce(BigDecimal.ZERO, BigDecimal::add); orderPageListVo.setGetCommission(reduce); } return pageInfo.setRecords(list); } ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java
@@ -152,11 +152,12 @@ if(sysUser.getRoleType() == 2){ share.setObjectId(sysUser.getObjectId().longValue()); } if (sysUser.getRoleType() == 1){ share.setAuditStatus(ShareAuditStatus.SUCCESS.getCode()); }else{ share.setAuditStatus(ShareAuditStatus.WAIT.getCode()); } // if (sysUser.getRoleType() == 1){ // share.setAuditStatus(ShareAuditStatus.SUCCESS.getCode()); // }else{ // share.setAuditStatus(ShareAuditStatus.WAIT.getCode()); // } share.setAuditStatus(ShareAuditStatus.WAIT.getCode()); share.setDelFlag(0); shareService.save(share); return R.ok(); ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
@@ -45,6 +45,8 @@ import java.util.*; import java.util.stream.Collectors; import static javax.swing.UIManager.get; /** * <p> * 前端控制器 @@ -214,7 +216,6 @@ } Shop shop = shopService.getById(id); shop.setDelFlag(1); shopService.updateById(shop); // 查询有没有门店绑定这个被删除的门店 List<Shop> shops = shopService.lambdaQuery().eq(Shop::getPid, shop.getId()).list(); @@ -293,6 +294,7 @@ appUser.setUserType(1); appUserClient.editAppUserById(appUser); } //删除原店长关系数据 AppUserShop appUserShop = new AppUserShop(); appUserShop.setAppUserId(appUser.getId()); appUserShop.setShopId(shop.getId()); @@ -309,29 +311,38 @@ appUser.setUserType(2); appUserClient.editAppUserById(appUser); //修改管理员 shop.setAppUserId(appUser.getId()); shopService.updateById(shop); //删除门店用户店铺关系数据 UserShop userShop = new UserShop(); userShop.setShopId(shop.getId()); userShop.setRoleType(1); List<UserShop> data = userShopClient.getUserShop(userShop).getData(); if(data.size() > 0){ UserShop userShop1 = data.get(0); userShopClient.delUserShop(userShop1); userShop = new UserShop(); userShop.setUserId(userShop1.getUserId()); data = userShopClient.getUserShop(userShop).getData(); if(data.size() == 0){ sysUserClient.delSysUserById(userShop1.getUserId()); } } //添加门店后台账号和门店关系数据 SysUser sysUser = sysUserClient.queryUserByUserName(phone).getData(); if(null != sysUser){ UserShop userShop = new UserShop(); userShop = new UserShop(); userShop.setUserId(sysUser.getUserId()); userShop.setShopId(shop.getId()); userShop.setRoleType(1); List<UserShop> data = userShopClient.getUserShop(userShop).getData(); if(null == data || data.size() == 0){ userShop = new UserShop(); userShop.setUserId(sysUser.getUserId()); userShop.setShopId(shop.getId()); userShop.setRoleType(1); userShop.setRoleId(2L); userShop.setNickName(sysUser.getNickName()); userShop.setCreateTime(LocalDateTime.now()); userShopClient.saveUserShop(userShop); } userShop.setRoleId(2L); userShop.setNickName(sysUser.getNickName()); userShop.setCreateTime(LocalDateTime.now()); userShopClient.saveUserShop(userShop); }else{ //添加管理后台账号 SysUser user = new SysUser(); @@ -349,7 +360,7 @@ user.setCreateTime(new Date()); Long userId = sysUserClient.saveShopUser(user).getData(); UserShop userShop = new UserShop(); userShop = new UserShop(); userShop.setUserId(userId); userShop.setShopId(shop.getId()); userShop.setRoleType(1); ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java
@@ -165,21 +165,33 @@ }); } } //手动处理分页 // 手动处理分页 PageInfo<GoodsVO> pageInfo = new PageInfo<>(); pageInfo.setSize(search.getPageSize()); pageInfo.setTotal(list.size()); Integer pageSize = search.getPageSize(); Integer pageNum = (search.getPageCurr() - 1) * pageSize; if(list.size() >= (pageNum + 1) * pageSize){ list = list.subList(pageNum, pageNum + pageSize); }else if(pageNum < list.size() && list.size() < (pageNum + 1) * pageSize){ list = list.subList(pageNum, list.size()); }else{ list = new ArrayList<>(); int pageSize = search.getPageSize(); int pageCurr = search.getPageCurr(); // 计算起始索引 int pageNum = (pageCurr - 1) * pageSize; // 检查 pageNum 是否合法 if (pageNum < 0 || pageNum >= list.size()) { // 如果 pageNum 不合法，返回空列表 pageInfo.setRecords(new ArrayList<>()); return pageInfo; } return pageInfo.setRecords(list); // 计算结束索引 int endIndex = Math.min(pageNum + pageSize, list.size()); // 获取分页数据 List<GoodsVO> pageList = list.subList(pageNum, endIndex); // 设置分页结果 pageInfo.setRecords(pageList); return pageInfo; } @Override @@ -394,9 +406,10 @@ area.setProvinceCode(goodsArea.getProvinceCode()); area.setCityCode(goodsArea.getCityCode()); area.setDistrictsCode(goodsArea.getDistrictsCode()); if(null != area.getSellingPrice() || null != area.getIntegral()){ goodsAreaList2.add(area); } // if(null != area.getSellingPrice() || null != area.getIntegral()){ // goodsAreaList2.add(area); // } goodsAreaList2.add(area); } goodsAreaService.saveBatch(goodsAreaList2); } ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopPointServiceImpl.java
@@ -50,18 +50,13 @@ public ShopPointStatistics statistics(IPage<ShopPoint> page, ShopPoint shopPoint) { Long userid = tokenService.getLoginUser().getUserid(); SysUser sysUser = sysUserClient.getSysUser(userid).getData(); List<Shop> shopList = shopService.list(new LambdaQueryWrapper<Shop>() .eq(Shop::getAppUserId,sysUser.getObjectId())); Integer sPoint = 0; Integer shopCommissionPoint = 0; Integer subShopCommissionPoint = 0; for (Shop shop : shopList) { sPoint += shop.getServerPoint(); shopCommissionPoint += shop.getSharePoint(); subShopCommissionPoint += shop.getLowerLevelSharePoint(); } Shop shop = shopService.getById(sysUser.getObjectId()); sPoint += shop.getServerPoint(); shopCommissionPoint += shop.getSharePoint(); subShopCommissionPoint += shop.getLowerLevelSharePoint(); ShopPointStatistics shopPointStatistics = new ShopPointStatistics(); shopPointStatistics.setTotalPoint(sPoint + shopCommissionPoint + subShopCommissionPoint); shopPointStatistics.setShopPoint(sPoint);
