From 40277ae7fb587f89f637364b198754186eb9edef Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Wed, 26 Mar 2025 15:31:45 +0800 Subject: [PATCH] =?UTF-8?q?feat:=09=E5=95=86=E6=88=B7=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/OrderingPreferencesServiceImpl.java | 3 ++- .../common/core/constant/enums/MerchantTypeEnum.java | 2 +- .../bsd/pjcloud/supermarket/controller/SmSpuController.java | 3 ++- .../supermarket/service/impl/SmErpSpuServiceImpl.java | 3 ++- .../com/bsd/pjcloud/wallet/api/feign/RemoteMchService.java | 3 ++- .../bsd/pjcloud/wallet/controller/MchManageController.java | 5 +++-- .../com/bsd/pjcloud/wallet/service/MchManageService.java | 3 ++- .../pjcloud/wallet/service/impl/MchManageServiceImpl.java | 6 ++++-- 8 files changed, 18 insertions(+), 10 deletions(-) diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/OrderingPreferencesServiceImpl.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/OrderingPreferencesServiceImpl.java index 11899d0b0..6ae44ed3e 100644 --- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/OrderingPreferencesServiceImpl.java +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/OrderingPreferencesServiceImpl.java @@ -7,6 +7,7 @@ import com.bsd.pjcloud.admin.api.feign.RemoteUserService; import com.bsd.pjcloud.canteen.dto.UserPageDTO; import com.bsd.pjcloud.canteen.mapper.OrderingPreferencesMapper; import com.bsd.pjcloud.canteen.service.OrderingPreferencesService; +import com.bsd.pjcloud.common.core.constant.enums.MerchantTypeEnum; import com.bsd.pjcloud.common.core.util.R; import com.bsd.pjcloud.common.data.datascope.DataScope; import com.bsd.pjcloud.common.security.service.PjcloudUser; @@ -42,7 +43,7 @@ public class OrderingPreferencesServiceImpl implements OrderingPreferencesServi PjcloudUser user = SecurityUtils.getUser(); Long deptId = user.getDeptId(); - MchManageVo manageVo = remoteMchService.getByDeptId(deptId).getData(); + MchManageVo manageVo = remoteMchService.getByDeptId(deptId, MerchantTypeEnum.SELF_SUPERMARKET).getData(); HardOrderPreferencesDto hardOrderPreferencesDto = new HardOrderPreferencesDto(); //管理员 if (user.getId() != 1L){ diff --git a/pjcloud-common/pjcloud-common-core/src/main/java/com/bsd/pjcloud/common/core/constant/enums/MerchantTypeEnum.java b/pjcloud-common/pjcloud-common-core/src/main/java/com/bsd/pjcloud/common/core/constant/enums/MerchantTypeEnum.java index 21d951643..54797610b 100644 --- a/pjcloud-common/pjcloud-common-core/src/main/java/com/bsd/pjcloud/common/core/constant/enums/MerchantTypeEnum.java +++ b/pjcloud-common/pjcloud-common-core/src/main/java/com/bsd/pjcloud/common/core/constant/enums/MerchantTypeEnum.java @@ -7,8 +7,8 @@ import lombok.RequiredArgsConstructor; @Getter public enum MerchantTypeEnum { CANTEEN("1", "食堂"), - SELF_SUPERMARKET("2", "自营超市"), SUPERMARKET("3", "合作超市"), + SELF_SUPERMARKET("2", "自营超市"), ; /** diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmSpuController.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmSpuController.java index f72d0cb85..e819b1f23 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmSpuController.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmSpuController.java @@ -6,6 +6,7 @@ import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.bsd.pjcloud.common.core.constant.enums.MerchantTypeEnum; import com.bsd.pjcloud.common.core.util.BeanUtils; import com.bsd.pjcloud.common.core.util.R; import com.bsd.pjcloud.common.log.annotation.SysLog; @@ -92,7 +93,7 @@ public class SmSpuController { public R save(@RequestBody SmSpuEntity smSpu) { Long deptId = SecurityUtils.getUser().getDeptId(); //查询商户，设置商户id - R byDeptId = remoteMchService.getByDeptId(deptId); + R byDeptId = remoteMchService.getByDeptId(deptId, MerchantTypeEnum.SELF_SUPERMARKET); MchManageVo data = byDeptId.getData(); if (Objects.isNull(data) || !data.getTypes().contains("2")){ return R.failed("当前用户未绑定超市商户"); diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java index fb6cfe0bb..a28e9d09d 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.bsd.pjcloud.common.core.constant.enums.MerchantTypeEnum; import com.bsd.pjcloud.common.core.util.BeanUtils; import com.bsd.pjcloud.common.core.util.R; import com.bsd.pjcloud.common.data.datascope.DataScope; @@ -511,7 +512,7 @@ public class SmErpSpuServiceImpl extends ServiceImpl smErpSpuImportDtos, BindingResult bindingResult) { Long deptId = SecurityUtils.getUser().getDeptId(); - R mchManageVoR = remoteMchService.getByDeptId(deptId); + R mchManageVoR = remoteMchService.getByDeptId(deptId, MerchantTypeEnum.SELF_SUPERMARKET); if (null==mchManageVoR.getData()){ return R.failed("当前用户未绑定超市商户"); } diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/feign/RemoteMchService.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/feign/RemoteMchService.java index 4f5c90dfa..6077a5b7f 100644 --- a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/feign/RemoteMchService.java +++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/feign/RemoteMchService.java @@ -1,6 +1,7 @@ package com.bsd.pjcloud.wallet.api.feign; import com.bsd.pjcloud.common.core.constant.ServiceNameConstants; +import com.bsd.pjcloud.common.core.constant.enums.MerchantTypeEnum; import com.bsd.pjcloud.common.core.util.R; import com.bsd.pjcloud.common.feign.annotation.NoToken; import com.bsd.pjcloud.wallet.api.vo.MchManageVo; @@ -23,7 +24,7 @@ public interface RemoteMchService { @NoToken @GetMapping("/mch-manage/get-by-dept-id") - R getByDeptId(@RequestParam Long deptId); + R getByDeptId(@RequestParam Long deptId, @RequestParam(required = false) MerchantTypeEnum type); @NoToken @GetMapping("/mch-manage/get-by-dept-ids") diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/MchManageController.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/MchManageController.java index bcf120e28..26243f245 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/MchManageController.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/MchManageController.java @@ -6,6 +6,7 @@ import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.bsd.pjcloud.common.core.constant.enums.MerchantTypeEnum; import com.bsd.pjcloud.common.core.constant.enums.YesNoEnum; import com.bsd.pjcloud.common.core.util.R; import com.bsd.pjcloud.common.log.annotation.SysLog; @@ -60,8 +61,8 @@ public class MchManageController { @Inner @GetMapping("/get-by-dept-id") - public R getByDeptId(@RequestParam Long deptId) { - MchManageVo mchManage = mchManageService.getByDeptId(deptId); + public R> getByDeptId(@RequestParam Long deptId, @RequestParam(required = false) MerchantTypeEnum type) { + List mchManage = mchManageService.getByDeptId(deptId, type); if (ObjectUtil.isEmpty(mchManage)) return R.failed("商户不存在"); return R.ok(mchManage); } diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/MchManageService.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/MchManageService.java index 6b9f0e23d..58070e312 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/MchManageService.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/MchManageService.java @@ -2,6 +2,7 @@ package com.bsd.pjcloud.wallet.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.bsd.pjcloud.common.core.constant.enums.MerchantTypeEnum; import com.bsd.pjcloud.wallet.api.dto.MchManageDto; import com.bsd.pjcloud.wallet.api.entity.MchManageEntity; import com.bsd.pjcloud.wallet.api.vo.MchManageVo; @@ -25,7 +26,7 @@ public interface MchManageService extends IService { List list(MchManageDto dto); - MchManageVo getByDeptId(Long deptId); + List getByDeptId(Long deptId, MerchantTypeEnum type); MchManageVo getFirstMch(List deptIds); diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/MchManageServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/MchManageServiceImpl.java index f57ebdeee..d613c7208 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/MchManageServiceImpl.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/MchManageServiceImpl.java @@ -14,6 +14,7 @@ import com.bsd.pjcloud.admin.api.feign.RemoteFileService; import com.bsd.pjcloud.admin.api.feign.RemoteUserService; import com.bsd.pjcloud.admin.api.utils.DataUtil; import com.bsd.pjcloud.common.core.constant.CacheConstants; +import com.bsd.pjcloud.common.core.constant.enums.MerchantTypeEnum; import com.bsd.pjcloud.common.core.util.BeanUtils; import com.bsd.pjcloud.common.core.util.CollectionUtils; import com.bsd.pjcloud.common.core.util.QRCodeImageGenerator; @@ -191,9 +192,10 @@ public class MchManageServiceImpl extends ServiceImpl() + public List getByDeptId(Long deptId, MerchantTypeEnum type) { + List mchManage = baseMapper.selectList(new LambdaQueryWrapper() .eq(MchManageEntity::getDeptId, deptId) + .eq(ObjectUtil.isNotEmpty(type), MchManageEntity::getTypes, type) ); return BeanUtils.toBean(mchManage, MchManageVo.class); }