From a4d84dfd870f89a02f8d9007edd8c87f261a6ff1 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Fri, 14 Nov 2025 10:07:40 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=98=BE=E5=BC=8F=E6=8A=9B=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/czg/account/service/ShopInfoService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopInfoService.java b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopInfoService.java index 6b174de46..1dad4c6cd 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopInfoService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopInfoService.java @@ -3,6 +3,7 @@ package com.czg.account.service; import com.czg.account.dto.PageDTO; import com.czg.account.dto.shopinfo.*; import com.czg.account.entity.ShopInfo; +import com.czg.exception.CzgException; import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.service.IService; @@ -31,7 +32,7 @@ public interface ShopInfoService extends IService { List findShopBranch(Long shopId); - Long getMainIdByShopId(Long shopId); + Long getMainIdByShopId(Long shopId) throws CzgException; List getByMainIdOrList(Long mainShopId, List shopIdList, String shopName); From 11a3d708c73a1ad6cbdb6a243900494e2bba7e20 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Fri, 14 Nov 2025 10:13:29 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=98=BE=E5=BC=8F=E6=8A=9B=E5=87=BA2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/czg/account/service/ShopInfoService.java | 5 ++++- .../service/account/service/impl/ShopInfoServiceImpl.java | 4 +--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopInfoService.java b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopInfoService.java index 1dad4c6cd..c98237820 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopInfoService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopInfoService.java @@ -7,6 +7,7 @@ import com.czg.exception.CzgException; import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.service.IService; +import java.io.Serializable; import java.math.BigDecimal; import java.util.List; @@ -14,6 +15,8 @@ import java.util.List; * @author Administrator */ public interface ShopInfoService extends IService { + + ShopInfo getById(Serializable id) throws CzgException; Page get(PageDTO pageDTO, String shopName, Integer status, Integer isHeadShop); Page getShopByMainId(PageDTO pageDTO, String shopName, Integer status); @@ -22,7 +25,7 @@ public interface ShopInfoService extends IService { Boolean edit(ShopInfoEditDTO shopInfoEditDTO); - ShopDetailDTO detail(Long id); + ShopDetailDTO detail(Long id) throws CzgException; ShopInfoByCodeDTO getByCode(String tableCode, String lat, String lng, boolean checkState); diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java index f9c151c6d..03bbe6edd 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java @@ -121,8 +121,6 @@ public class ShopInfoServiceImpl extends ServiceImpl i if (isHeadShop != null) { queryWrapper.eq(ShopInfo::getIsHeadShop, isHeadShop); } - CzgResult shopOrderPayBaseUrl = sysParamsService.getParamsByCode("shop_order_pay_base_url"); - CzgResult shopOrderPayBaseUrl2 = sysParamsService.getParamsByCode("ali_account_app_id"); List shopAllList = getMapper().selectListByQuery(query().select(ShopInfo::getId, ShopInfo::getShopName)); Map shopKv = shopAllList.stream().collect(Collectors.toMap(ShopInfo::getId, ShopInfo::getShopName)); @@ -321,7 +319,7 @@ public class ShopInfoServiceImpl extends ServiceImpl i } @Override - public ShopDetailDTO detail(Long id) { + public ShopDetailDTO detail(Long id) throws CzgException { ShopInfo shopInfo = queryChain().eq(ShopInfo::getId, id == null ? StpKit.USER.getShopId() : id).one(); if (shopInfo == null) { throw new CzgException("店铺信息不存在"); From bf349c9024814f6ca7940fc09197980126521b50 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Fri, 14 Nov 2025 13:28:24 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BA=A4=E7=8F=AD=20=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=97=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../account/service/impl/HandoverRecordServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/HandoverRecordServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/HandoverRecordServiceImpl.java index df60d432d..560f7d44d 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/HandoverRecordServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/HandoverRecordServiceImpl.java @@ -85,6 +85,9 @@ public class HandoverRecordServiceImpl extends ServiceImpl Date: Fri, 14 Nov 2025 14:30:02 +0800 Subject: [PATCH 4/4] =?UTF-8?q?pad=20=E5=B8=83=E5=B1=80=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/PadProdController.java | 5 -- .../service/impl/PadProdServiceImpl.java | 3 +- .../mapper/PadProductCategoryDetailMapper.xml | 47 +++++++++++++------ 3 files changed, 34 insertions(+), 21 deletions(-) diff --git a/cash-api/account-server/src/main/java/com/czg/controller/admin/PadProdController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/PadProdController.java index 1c004a6ed..d01493e03 100644 --- a/cash-api/account-server/src/main/java/com/czg/controller/admin/PadProdController.java +++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/PadProdController.java @@ -1,9 +1,7 @@ package com.czg.controller.admin; -import cn.dev33.satoken.annotation.SaCheckPermission; import com.czg.account.dto.pad.*; import com.czg.account.entity.PadLayout; -import com.czg.account.entity.PadProductCategoryDetail; import com.czg.account.service.PadLayoutService; import com.czg.account.service.PadProdService; import com.czg.annotation.SaAdminCheckPermission; @@ -12,12 +10,9 @@ import com.czg.sa.StpKit; import com.czg.utils.PageUtil; import com.mybatisflex.core.paginate.Page; import jakarta.annotation.Resource; -import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import java.util.Map; - /** * pad点餐相关 * @author Administrator diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PadProdServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PadProdServiceImpl.java index d91d183b0..849b4a615 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PadProdServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PadProdServiceImpl.java @@ -107,7 +107,8 @@ public class PadProdServiceImpl implements PadProdService { PadDetailDTO padDetailDTO = new PadDetailDTO(); padDetailDTO.setId(padProductCategory); padDetailDTO.setPadLayoutId(padCategory.getPadLayoutId()); - List productIds = padProductCategoryDetailMapper.selectListByQuery(new QueryWrapper().eq(PadProductCategoryDetail::getPadProductCategoryId, padProductCategory)).stream().map(PadProductCategoryDetail::getProductId).toList(); + List productIds = padProductCategoryDetailMapper.selectListByQuery(new QueryWrapper() + .eq(PadProductCategoryDetail::getPadProductCategoryId, padProductCategory)).stream().map(PadProductCategoryDetail::getProductId).toList(); padDetailDTO.setProductIdList(productIds); if (!productIds.isEmpty()) { List products = productRpcService.listAndLowPrice(shopId, productIds); diff --git a/cash-service/account-service/src/main/resources/mapper/PadProductCategoryDetailMapper.xml b/cash-service/account-service/src/main/resources/mapper/PadProductCategoryDetailMapper.xml index 358721332..378f61180 100644 --- a/cash-service/account-service/src/main/resources/mapper/PadProductCategoryDetailMapper.xml +++ b/cash-service/account-service/src/main/resources/mapper/PadProductCategoryDetailMapper.xml @@ -6,22 +6,39 @@ + +