From 9c9471ffaa600f347e6b97f0904537dfa7fee27a Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Thu, 18 Dec 2025 16:13:48 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=BF=87=E6=BB=A4=20menuId=201=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/account/service/impl/SysRoleServiceImpl.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleServiceImpl.java index 3b22c8a9b..aa16eb2b7 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleServiceImpl.java @@ -152,6 +152,9 @@ public class SysRoleServiceImpl extends ServiceImpl impl // Step 2: 解析 apiInfo 并判断菜单是否已绑定 for (BaseMenu menu : menuList) { + if (menu.getMenuId() == 1L) { + continue; + } // 解析 apiInfo if (StrUtil.isNotBlank(menu.getApiInfo())) { List itemDTOS = JSONArray.parseArray(menu.getApiInfo()) @@ -177,6 +180,9 @@ public class SysRoleServiceImpl extends ServiceImpl impl List matchedMenus = sysMenuService.list(wrapper); for (SysMenu matched : matchedMenus) { + if (matched.getMenuId() == 1L) { + continue; + } long count = sysRolesMenusService.count(new QueryWrapper() .eq("menu_id", matched.getMenuId()) .eq("role_id", roleId) From 936ffd4c58db014c2a67d62d40ba71d95778c955 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Fri, 19 Dec 2025 11:21:41 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=88=86=E5=BA=97=E8=A7=92=E8=89=B2=20?= =?UTF-8?q?=E4=B8=8D=E8=AE=A9=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/czg/controller/admin/RoleController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cash-api/account-server/src/main/java/com/czg/controller/admin/RoleController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/RoleController.java index 0d638b032..67d7fc076 100644 --- a/cash-api/account-server/src/main/java/com/czg/controller/admin/RoleController.java +++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/RoleController.java @@ -101,8 +101,8 @@ public class RoleController { @SaAdminCheckPermission(parentName = "角色管理接口", value = "role:remove", name = "角色删除") @DeleteMapping public CzgResult remove(@RequestBody @Validated RoleRemoveDTO roleRemoveDTO) { - if (roleRemoveDTO.id() == 1L || roleRemoveDTO.id() == 2L) { - return CzgResult.failure("超级管理员角色不可删除"); + if (roleRemoveDTO.id() == 1L || roleRemoveDTO.id() == 2L || roleRemoveDTO.id() == 3L) { + return CzgResult.failure("默认角色不可删除"); } return CzgResult.success(roleService.removeById(roleRemoveDTO.id())); } From 279cdb5047ae0c169d6c0b70b0763d3af1fd2788 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Sat, 20 Dec 2025 15:45:28 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BD=99=E9=A2=9D=E6=94=AF=E4=BB=98-?= =?UTF-8?q?=E8=BF=94=E7=8E=B0=E9=87=91=E9=A2=9D=E4=B8=8D=E5=AF=B9=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=20=E8=B6=85=E7=BA=A7=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E5=85=B3=E9=97=AD=20=E6=8A=98=E6=89=A3=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../account/service/impl/ShopUserServiceImpl.java | 9 +++++++-- .../service/impl/OrderInfoCustomServiceImpl.java | 12 ++++++------ .../service/order/service/impl/PayServiceImpl.java | 6 ++++-- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserServiceImpl.java index 788dbe819..8f4973c92 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserServiceImpl.java @@ -110,9 +110,14 @@ public class ShopUserServiceImpl extends ServiceImpl i MemberLevelConfig memberLevelConfig = memberLevelConfigService.getById(shopUser.getMemberLevelId()); if (memberLevelConfig != null) { shopUser.setMemberName(memberLevelConfig.getName()); - shopUser.setDiscount(memberLevelConfig.getDiscount()); MemberConfigVO configVO = memberConfigService.detail(memberLevelConfig.getShopId()); - shopUser.setIsMemberPrice(configVO.getIsMemberPrice()); + if (configVO.getIsOpen().equals(1L)) { + shopUser.setIsMemberPrice(configVO.getIsMemberPrice()); + shopUser.setDiscount(memberLevelConfig.getDiscount()); + }else { + shopUser.setIsMemberPrice(0); + shopUser.setDiscount(100); + } } } return shopUser; diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java index f17e0699b..98267b439 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java @@ -1248,12 +1248,6 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService { } orderDetailService.updateOrderDetailStatus(orderInfo.getId(), OrderStatusEnums.DONE.getCode()); - if (orderInfo.getUserId() != null) { - ThreadUtil.execAsync(() -> exShopUserInfo(orderInfo)); - } - if (StrUtil.isNotBlank(orderInfo.getTableCode())) { - ThreadUtil.execAsync(() -> exTable(orderInfo)); - } // 保存消息参数（避免闭包中引用的变量被修改） final Long orderId = orderInfo.getId(); final boolean isPrint = orderInfo.getIsPrint() == 1; @@ -1264,6 +1258,12 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService { TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() { @Override public void afterCommit() { + if (orderInfo.getUserId() != null) { + ThreadUtil.execAsync(() -> exShopUserInfo(orderInfo)); + } + if (StrUtil.isNotBlank(orderInfo.getTableCode())) { + ThreadUtil.execAsync(() -> exTable(orderInfo)); + } // 事务成功提交后执行消息发送 String printParam = orderId + "_" + (!"after-pay".equals(payMode) ? 1 : 0) + "_1"; rabbitPublisher.sendOrderPrintMsg(printParam, isPrint); diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java index 6bd50968b..77910f587 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java @@ -58,6 +58,8 @@ import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.transaction.support.TransactionSynchronization; +import org.springframework.transaction.support.TransactionSynchronizationManager; import java.math.BigDecimal; import java.math.RoundingMode; @@ -244,8 +246,8 @@ public class PayServiceImpl implements PayService { orderInfo.setRemark(payParam.getCheckOrderPay().getRemark()); } - log.info("发放经验值"); - memberConfigService.deliver(shopUser, TableValueConstant.MemberExpFlow.Type.COST, orderInfo.getOrderAmount(), null, orderInfo.getId()); +// log.info("发放经验值"); +// memberConfigService.deliver(shopUser, TableValueConstant.MemberExpFlow.Type.COST, orderInfo.getOrderAmount(), null, orderInfo.getId()); Long flowId = shopUserService.updateMoney(shopUserMoneyEditDTO); orderInfoCustomService.upOrderInfo(orderInfo, orderInfo.getOrderAmount(),