From 32cac3558b10c1cb10de2cea48da34d06e6ebf57 Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Sat, 9 May 2026 11:49:21 +0800 Subject: [PATCH] =?UTF-8?q?feat:bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SysUserServiceImpl.java | 22 ++++++++----- .../wallet/api/entity/WalletManageEntity.java | 4 +-- .../api/entity/mch/MchManageEntity.java | 31 ++++++++++++++++++- .../impl/WalletTransactionServiceImpl.java | 2 -- .../resources/mapper/mch/MchManageMapper.xml | 24 +------------- 5 files changed, 47 insertions(+), 36 deletions(-) diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserServiceImpl.java b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserServiceImpl.java index 02eee569c..65240c555 100644 --- a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserServiceImpl.java +++ b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserServiceImpl.java @@ -810,17 +810,25 @@ public class SysUserServiceImpl extends ServiceImpl impl sysUser.setProcessStatus(TaskCheckStatusEnum.RESULT.getCode()); sysUser.setProcessTime(LocalDateTime.now()); sysUser.setStaffingType(UserStaffingTypeEnum.NONE_STAFFING.getType()); + // 把用户放到默认部门 + Long defaultDeptIdLong = null; + String defaultDeptId = ParamResolver.getStr("DEFAULT_DEPT"); + try { + defaultDeptIdLong = Long.parseLong(defaultDeptId); + } catch (Exception e) { + } + if (ObjectUtil.isNotEmpty(defaultDeptIdLong)) { + sysUser.setDeptId(defaultDeptIdLong); + } baseMapper.insert(sysUser); - // 如果角色为空，赋默认角色 if (CollUtil.isEmpty(userDto.getRole())) { - // 获取默认角色编码 - String defaultRole = ParamResolver.getStr("USER_DEFAULT_ROLE"); - // 默认角色 - SysRole sysRole = sysRoleService.getOne(Wrappers.lambdaQuery().eq(SysRole::getRoleCode, defaultRole)); - userDto.setRole(Collections.singletonList(sysRole.getRoleId())); + List roleList = sysRoleService.list(); + String walletAutoCreate = ParamResolver.getStr("WALLET_AUTO_CREATE"); + String userDefaultRole = ParamResolver.getStr("USER_DEFAULT_ROLE"); + List roleIds = roleList.stream().filter(v -> ObjectUtil.equals(v.getRoleCode(), walletAutoCreate) || ObjectUtil.equals(v.getRoleCode(), userDefaultRole)).map(SysRole::getRoleId).toList(); + userDto.setRole(roleIds); } - // 插入用户角色关系表 userDto.getRole().stream().map(roleId -> { SysUserRole userRole = new SysUserRole(); diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/WalletManageEntity.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/WalletManageEntity.java index a05fe259d..db1d3afd5 100644 --- a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/WalletManageEntity.java +++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/WalletManageEntity.java @@ -11,9 +11,6 @@ import java.time.LocalDateTime; /** * 钱包管理 - * - * @author dzc - * @date 2024-12-30 09:06:35 */ @Builder @AllArgsConstructor @@ -95,6 +92,7 @@ public class WalletManageEntity extends Model { /** * 饭卡绑定状态 + * * @see WalleCardStatusEnum */ @Schema(description = "饭卡绑定状态") diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/mch/MchManageEntity.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/mch/MchManageEntity.java index d18f5feb5..05b3f0100 100644 --- a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/mch/MchManageEntity.java +++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/mch/MchManageEntity.java @@ -2,6 +2,7 @@ package com.bsd.pjcloud.wallet.api.entity.mch; import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -17,7 +18,7 @@ import java.time.LocalDateTime; */ @Data @TenantTable -@TableName("mch_manage") +@TableName(value = "mch_manage", autoResultMap = true) @EqualsAndHashCode(callSuper = true) @Schema(description = "商户管理") public class MchManageEntity extends Model { @@ -159,6 +160,13 @@ public class MchManageEntity extends Model { @Schema(description = "分店数量") private Long mchCount; + /** + * 功能范围 + */ + @Schema(description = "功能范围") + @TableField(typeHandler = JacksonTypeHandler.class) + private FunctionScope functionScope; + /** * 创建人 */ @@ -200,4 +208,25 @@ public class MchManageEntity extends Model { */ @Schema(description = "租户ID") private Long tenantId; + + @Data + public static class FunctionScope { + + /** + * 是否启用报餐 + */ + private Boolean orderingFoodEnable; + + /** + * 是否启用订餐 + */ + private Boolean tableReservation; + + /** + * 是否启用外卖 + */ + private Boolean takeOutEnable; + + } + } \ No newline at end of file diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletTransactionServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletTransactionServiceImpl.java index 571450d51..1fd67d0ae 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletTransactionServiceImpl.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletTransactionServiceImpl.java @@ -24,10 +24,8 @@ import com.bsd.pjcloud.common.core.util.CollectionUtils; import com.bsd.pjcloud.common.core.util.R; import com.bsd.pjcloud.common.data.datascope.DataScope; import com.bsd.pjcloud.common.data.datascope.PjcloudDefaultDataScopeHandle; -import com.bsd.pjcloud.hard.api.constant.HardTypeEnum; import com.bsd.pjcloud.wallet.api.constant.WalletBizEnum; import com.bsd.pjcloud.wallet.api.constant.WalletTypeEnum; -import com.bsd.pjcloud.wallet.api.constant.mch.WalletMchSupType; import com.bsd.pjcloud.wallet.api.dto.MchManageDto; import com.bsd.pjcloud.wallet.api.dto.WalletManageDto; import com.bsd.pjcloud.wallet.api.dto.WalletTransactionDto; diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/mch/MchManageMapper.xml b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/mch/MchManageMapper.xml index d8304eb83..f8bb1fc71 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/mch/MchManageMapper.xml +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/mch/MchManageMapper.xml @@ -2,29 +2,6 @@ - - - - - - - - - - - - - - - - - - - - - - - select a.id, @@ -49,6 +26,7 @@ a.discounts_price, a.cooperation_status, a.mch_count, + a.function_scope, a.create_by, a.create_time, a.update_by,