czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

切换店铺 无权限问题

Browse Source 
角色模板 关闭却新增问题
会员加入 时间
This commit is contained in:
wangw
2025-12-15 14:57:55 +08:00
parent bf1a4fbff7
commit 8dd6dfcd49
5 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cash-api/market-server/src/main/java/com/czg/controller/user/UDrainageConfigController.java
View File

@@ -1,17 +1,16 @@
package com.czg.controller.user;
import com.czg.annotation.SaAdminCheckPermission;
import com.czg.market.dto.MkDrainageConfigDTO;
import com.czg.market.service.MkDrainageConfigService;
import com.czg.market.vo.MkDrainageConfigVO;
import com.czg.resp.CzgResult;
import com.czg.sa.StpKit;
import jakarta.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
/**
* 私域引流配置
* 用户端/私域引流配置
* @author Administrator
*/
@RestController

5
cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AuthorizationServiceImpl.java
View File

@@ -208,7 +208,8 @@ public class AuthorizationServiceImpl implements AuthorizationService {
Long headId = StpKit.USER.getHeadId();
long shopId = StpKit.USER.getLoginIdAsLong();
ShopInfo currentInfo = shopInfoService.getById(shopId);
if (headId != null && currentInfo.getIsHeadShop() != YesNoEnum.YES.value()) {
// if (headId != null && currentInfo.getIsHeadShop() != YesNoEnum.YES.value()) {
if (currentInfo.getIsHeadShop() != YesNoEnum.YES.value()) {
throw new CzgException("登录账号无权限切换");
}
@@ -217,7 +218,7 @@ public class AuthorizationServiceImpl implements AuthorizationService {
throw new CzgException("用户不存在");
}
ShopInfo shopInfo = shopInfoService.getById(sysUser.getId());
ShopInfo shopInfo = shopInfoService.getById(sysUserId);
if (shopInfo == null) {
throw new CzgException("店铺信息不存在");
}

2
cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleServiceImpl.java
View File

@@ -251,7 +251,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
@Override
@Transactional
public Boolean saveByTemplate(long shopId, RoleSaveTemplateDTO dto) {
roleTemplateService.list(new QueryWrapper().eq(SysRoleTemplate::getPid, dto.getId())).forEach(item -> {
roleTemplateService.list(new QueryWrapper().eq(SysRoleTemplate::getPid, dto.getId()).eq(SysRoleTemplate::getIsEnable, 1)).forEach(item -> {
SysRole role = getById(item.getRoleId());
role.setShopId(shopId);
role.setCreateUserId(shopId);

3
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ChatCouponServiceImpl.java
View File

@@ -79,14 +79,13 @@ public class ChatCouponServiceImpl extends ServiceImpl<ChatCouponMapper, ChatCou
@Override
public Page<ChatCouponVO> pageChatCoupon(Long shopId, Integer page, Integer size, Integer status) {
Page<ChatCouponVO> pages = pageAs(Page.of(page, size),
return pageAs(Page.of(page, size),
QueryWrapper.create()
.eq(ChatCoupon::getShopId, shopId)
.eq(ChatCoupon::getStatus, status)
.orderBy(ChatCoupon::getStatus).asc()
.orderBy(ChatCoupon::getId).desc(),
ChatCouponVO.class);
return pages;
}
/**

2
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java
View File

@@ -41,6 +41,7 @@ import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;
@@ -518,6 +519,7 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
shopUser.setMemberCircleReward(memberOrder.getReward());
shopUser.setIsVip(1);
shopUser.setOpenType("PAY");
shopUser.setJoinTime(LocalDateTime.now());
if (memberOrder.getReward() != null) {
//购买开通
deliver(shopUser, TableValueConstant.MemberExpFlow.Type.PAY, memberOrder.getAmount(), memberOrder.getReward(), memberOrderId);