From 64cf62b7af4dc51f69a294d24d01cb9bcc1b151a Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Thu, 22 May 2025 15:59:27 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=E9=9D=9E=E9=A3=9F=E5=A0=82=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E4=B8=8D=E8=83=BD=E7=9C=8B=E5=88=B0=E6=89=80=E6=9C=89?= =?UTF-8?q?=E9=A3=9F=E5=A0=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wallet/api/entity/mch/MchManageEntity.java | 6 ++++++ .../wallet/controller/mch/MchManageController.java | 12 +++++++++++- .../bsd/pjcloud/wallet/mapper/MchManageMapper.java | 1 + .../main/resources/mapper/mch/MchManageMapper.xml | 4 ++++ 4 files changed, 22 insertions(+), 1 deletion(-) 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 bf7c33445..d18f5feb5 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 @@ -60,6 +60,12 @@ public class MchManageEntity extends Model { @Schema(description = "店铺类型,逗号分隔") private String types; + /** + * 食堂是否对外营业 + */ + @Schema(description = "食堂是否对外营业") + private String canteenIsOpen; + /** * 分类id */ diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/mch/MchManageController.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/mch/MchManageController.java index 971600fa7..13fe7f10d 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/mch/MchManageController.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/mch/MchManageController.java @@ -108,9 +108,19 @@ public class MchManageController { /* ************************************* start app start ************************************* */ @Operation(summary = "app查询商铺", description = "app查询商铺") @GetMapping("/app/page-join") - @Inner(value = false) + // @Inner(value = false) public R> appPageJoin(@ParameterObject Page page, @ParameterObject MchManageDto dto) { + PjcloudUser user = SecurityUtils.getUser(); dto.setVisibleMobile(YesNoEnum.YES.getCode()); + // 如果是食堂判断用户是否能查看到所有食堂 + if (ObjectUtil.isNotEmpty(user) && ObjectUtil.isNotEmpty(user.getDeptId())) { + if (ObjectUtil.equals(dto.getType(), MerchantTypeEnum.CANTEEN.getType())) { + MchManageVo userCanteen = mchManageService.getFirstMchByDeptId(user.getDeptId(), MerchantTypeEnum.CANTEEN); + if (ObjectUtil.isEmpty(userCanteen)) { + dto.setCanteenIsOpen(YesNoEnum.YES.getCode()); + } + } + } return R.ok(mchManageService.pageJoin(page, dto)); } diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/MchManageMapper.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/MchManageMapper.java index a4afa46e0..72e4ee651 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/MchManageMapper.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/MchManageMapper.java @@ -27,6 +27,7 @@ public interface MchManageMapper extends PjcloudBaseMapper { .eqIfExists(MchManageEntity::getVisibleMobile, dto.getVisibleMobile()) .eqIfExists(MchManageEntity::getParentId, dto.getParentId()) .eqIfExists(MchManageEntity::getCatgoryId, dto.getCatgoryId()) + .eqIfExists(MchManageEntity::getCanteenIsOpen, dto.getCanteenIsOpen()) .eq(dto.getParentIsNull(), MchManageEntity::getParentId, -1L) .likeIfExists(MchManageEntity::getName, dto.getName()) .in(ObjectUtil.isNotEmpty(dto.getDeptIds()), MchManageEntity::getDeptId, dto.getDeptIds()) 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 ad500ee32..a536907d5 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 @@ -33,6 +33,7 @@ a.default_wallet_type_id, a.name, a.types, + a.canteen_is_open, a.catgory_id, a.logo_pic, a.collection_code, @@ -61,6 +62,9 @@ and a.types = #{dto.types} + + and a.canteen_is_open = #{dto.canteenIsOpen} + and a.catgory_id = #{dto.catgoryId} From e244dce601217164d3d5bc11fd7b84029443ee60 Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Thu, 22 May 2025 17:20:51 +0800 Subject: [PATCH 2/2] 11 --- .../impl/SysUserTransactionServiceImpl.java | 6 +++++ .../controller/mch/MchManageController.java | 18 +++++++++------ .../wallet/service/MchManageService.java | 5 ++++ .../impl/mch/MchManageServiceImpl.java | 23 +++++++++++++++++++ 4 files changed, 45 insertions(+), 7 deletions(-) diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserTransactionServiceImpl.java b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserTransactionServiceImpl.java index ea6edc124..d05106f8a 100644 --- a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserTransactionServiceImpl.java +++ b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserTransactionServiceImpl.java @@ -6,6 +6,7 @@ import cn.hutool.core.date.DateTime; import cn.hutool.core.date.LocalDateTimeUtil; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -39,6 +40,8 @@ import com.bsd.pjcloud.wallet.api.feign.RemoteWalletService; import com.bsd.pjcloud.wallet.api.feign.RemoteWalletThirdZyService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.cache.CacheManager; +import org.springframework.security.oauth2.server.authorization.OAuth2AuthorizationService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.context.request.RequestAttributes; @@ -63,6 +66,9 @@ public class SysUserTransactionServiceImpl extends ServiceImpl { * 宁波银行登录 */ String lbLogin(PjcloudUser user); + + /** + * 判断用户是否能查看到所有食堂 + */ + boolean getIsConsumeUser(Long id); } \ No newline at end of file diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/mch/MchManageServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/mch/MchManageServiceImpl.java index 55276868a..d8ee888c7 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/mch/MchManageServiceImpl.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/mch/MchManageServiceImpl.java @@ -8,6 +8,7 @@ import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.bsd.pjcloud.admin.api.dto.UserInfo; import com.bsd.pjcloud.admin.api.entity.SysDept; import com.bsd.pjcloud.admin.api.feign.RemoteDeptService; import com.bsd.pjcloud.admin.api.feign.RemoteFileService; @@ -20,6 +21,7 @@ import com.bsd.pjcloud.common.core.util.CollectionUtils; import com.bsd.pjcloud.common.core.util.QRCodeImageGenerator; import com.bsd.pjcloud.common.core.util.R; import com.bsd.pjcloud.common.data.datascope.DataScope; +import com.bsd.pjcloud.common.data.resolver.ParamResolver; import com.bsd.pjcloud.common.security.service.PjcloudUser; import com.bsd.pjcloud.hard.api.feign.RemoteHardOrderService; import com.bsd.pjcloud.hard.api.utils.Drawing2D; @@ -341,6 +343,27 @@ public class MchManageServiceImpl extends ServiceImpl parentDeptList = remoteDeptService.getParentDeptList(userInfo.getSysUser().getDeptId()).getData(); + if (ObjectUtil.isEmpty(parentDeptList)) { + return false; + } + String consumeDpetId = ParamResolver.getStr("CONSUME_DEPT_ID"); + if (ObjectUtil.isEmpty(consumeDpetId)) { + return false; + } + List parentDeptIds = parentDeptList.stream().map(SysDept::getDeptId).map(String::valueOf).toList(); + return parentDeptIds.contains(consumeDpetId); + } + /** * 更新分店数量 */