From f4e55c1c2ad1da4db20335a90063f5acbc5ba812 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Fri, 7 Mar 2025 17:23:12 +0800 Subject: [PATCH 1/3] =?UTF-8?q?dubbo=20service=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../account/service/impl/CallQueueServiceImpl.java | 4 +--- .../account/service/impl/CallTableServiceImpl.java | 11 ++++++----- .../service/impl/PlatformDictTypeServiceImpl.java | 6 ++---- .../service/impl/PointsBasicSettingServiceImpl.java | 2 -- .../account/service/impl/PrintMachineServiceImpl.java | 8 +++----- .../account/service/impl/ShopInfoServiceImpl.java | 2 -- .../account/service/impl/ShopUserServiceImpl.java | 7 ++++--- .../order/service/impl/OrderDetailServiceImpl.java | 4 +--- .../order/service/impl/OrderInfoRpcServiceImpl.java | 2 -- .../product/service/impl/ProdSkuServiceImpl.java | 2 -- .../product/service/impl/ProductRpcServiceImpl.java | 2 -- .../product/service/impl/ProductServiceImpl.java | 2 -- 12 files changed, 17 insertions(+), 35 deletions(-) diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/CallQueueServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/CallQueueServiceImpl.java index 797dfae42..e9206fc30 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/CallQueueServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/CallQueueServiceImpl.java @@ -1,11 +1,10 @@ package com.czg.service.account.service.impl; -import com.mybatisflex.spring.service.impl.ServiceImpl; import com.czg.account.entity.CallQueue; import com.czg.account.service.CallQueueService; import com.czg.service.account.mapper.CallQueueMapper; +import com.mybatisflex.spring.service.impl.ServiceImpl; import org.apache.dubbo.config.annotation.DubboService; -import org.springframework.stereotype.Service; /** * 叫号排号队列表 服务层实现。 @@ -13,7 +12,6 @@ import org.springframework.stereotype.Service; * @author zs * @since 2025-02-21 */ -@Service @DubboService public class CallQueueServiceImpl extends ServiceImpl implements CallQueueService{ diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/CallTableServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/CallTableServiceImpl.java index 6bed1c95b..092367d2a 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/CallTableServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/CallTableServiceImpl.java @@ -12,6 +12,7 @@ import com.czg.config.RedisCst; import com.czg.exception.ApiNotPrintException; import com.czg.resp.CzgResult; import com.czg.service.account.mapper.CallQueueMapper; +import com.czg.service.account.mapper.CallTableMapper; import com.czg.service.account.util.FunUtil; import com.czg.system.dto.SysParamsDTO; import com.czg.system.service.SysParamsService; @@ -20,15 +21,16 @@ import com.czg.utils.PageUtil; import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.spring.service.impl.ServiceImpl; -import com.czg.service.account.mapper.CallTableMapper; import jakarta.annotation.Resource; import org.apache.dubbo.config.annotation.DubboReference; import org.apache.dubbo.config.annotation.DubboService; import org.springframework.data.redis.core.StringRedisTemplate; -import org.springframework.stereotype.Service; import java.io.ByteArrayOutputStream; -import java.util.*; +import java.util.ArrayList; +import java.util.Base64; +import java.util.Collections; +import java.util.List; import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; @@ -38,10 +40,9 @@ import java.util.stream.Collectors; * @author zs * @since 2025-02-21 */ -@Service @DubboService public class CallTableServiceImpl extends ServiceImpl implements CallTableService { -// @DubboReference + @DubboReference private SysParamsService sysParamsService; @Resource diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PlatformDictTypeServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PlatformDictTypeServiceImpl.java index 207c421da..ceff95136 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PlatformDictTypeServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PlatformDictTypeServiceImpl.java @@ -1,11 +1,10 @@ package com.czg.service.account.service.impl; -import com.czg.service.account.mapper.PlatformDictTypeMapper; -import com.mybatisflex.spring.service.impl.ServiceImpl; import com.czg.account.entity.PlatformDictType; import com.czg.account.service.PlatformDictTypeService; +import com.czg.service.account.mapper.PlatformDictTypeMapper; +import com.mybatisflex.spring.service.impl.ServiceImpl; import org.apache.dubbo.config.annotation.DubboService; -import org.springframework.stereotype.Service; /** * 平台配置类型 服务层实现。 @@ -14,7 +13,6 @@ import org.springframework.stereotype.Service; * @since 2025-02-28 */ @DubboService -@Service public class PlatformDictTypeServiceImpl extends ServiceImpl implements PlatformDictTypeService{ } diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PointsBasicSettingServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PointsBasicSettingServiceImpl.java index 7ddd3c997..266624b2f 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PointsBasicSettingServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PointsBasicSettingServiceImpl.java @@ -5,7 +5,6 @@ import com.czg.account.service.PointsBasicSettingService; import com.czg.service.account.mapper.PointsBasicSettingMapper; import com.mybatisflex.spring.service.impl.ServiceImpl; import org.apache.dubbo.config.annotation.DubboService; -import org.springframework.stereotype.Service; /** * 积分基本设置 服务层实现。 @@ -13,7 +12,6 @@ import org.springframework.stereotype.Service; * @author ww * @since 2025-02-20 */ -@Service @DubboService public class PointsBasicSettingServiceImpl extends ServiceImpl implements PointsBasicSettingService{ diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PrintMachineServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PrintMachineServiceImpl.java index 351407986..0b1736465 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PrintMachineServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PrintMachineServiceImpl.java @@ -5,14 +5,13 @@ import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; import com.czg.account.dto.print.PrinterAddDTO; import com.czg.account.dto.print.PrinterEditDTO; -import com.czg.exception.ApiNotPrintException; -import com.mybatisflex.core.query.QueryWrapper; -import com.mybatisflex.spring.service.impl.ServiceImpl; import com.czg.account.entity.PrintMachine; import com.czg.account.service.PrintMachineService; +import com.czg.exception.ApiNotPrintException; import com.czg.service.account.mapper.PrintMachineMapper; +import com.mybatisflex.core.query.QueryWrapper; +import com.mybatisflex.spring.service.impl.ServiceImpl; import org.apache.dubbo.config.annotation.DubboService; -import org.springframework.stereotype.Service; /** * 打印机设备 服务层实现。 @@ -20,7 +19,6 @@ import org.springframework.stereotype.Service; * @author zs * @since 2025-02-20 */ -@Service @DubboService public class PrintMachineServiceImpl extends ServiceImpl implements PrintMachineService{ 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 7c0d60237..9a4f067e2 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 @@ -28,7 +28,6 @@ import org.apache.dubbo.config.annotation.DubboService; import org.springframework.cache.annotation.CacheConfig; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; -import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.io.Serializable; @@ -41,7 +40,6 @@ import java.util.stream.Collectors; * @author Administrator */ @DubboService -@Service @CacheConfig(cacheNames = "shopInfo") public class ShopInfoServiceImpl extends ServiceImpl implements ShopInfoService { @Resource 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 8f7e1c426..6b82a1f99 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 @@ -6,7 +6,10 @@ import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.StrUtil; import com.czg.account.dto.shopuser.*; import com.czg.account.entity.*; -import com.czg.account.service.*; +import com.czg.account.service.ShopActivateCouponRecordService; +import com.czg.account.service.ShopUserFlowService; +import com.czg.account.service.ShopUserService; +import com.czg.account.service.UserInfoService; import com.czg.config.RedisCst; import com.czg.exception.ApiNotPrintException; import com.czg.resp.CzgResult; @@ -25,7 +28,6 @@ import com.mybatisflex.spring.service.impl.ServiceImpl; import jakarta.annotation.Resource; import org.apache.dubbo.config.annotation.DubboReference; import org.apache.dubbo.config.annotation.DubboService; -import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; @@ -39,7 +41,6 @@ import java.math.RoundingMode; * @since 2025-02-08 */ @DubboService -@Service public class ShopUserServiceImpl extends ServiceImpl implements ShopUserService { @DubboReference private SysParamsService sysParamsService; diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderDetailServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderDetailServiceImpl.java index 99b0d7745..7fb3a04f8 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderDetailServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderDetailServiceImpl.java @@ -1,11 +1,10 @@ package com.czg.service.order.service.impl; -import com.mybatisflex.spring.service.impl.ServiceImpl; import com.czg.order.entity.OrderDetail; import com.czg.order.service.OrderDetailService; import com.czg.service.order.mapper.OrderDetailMapper; +import com.mybatisflex.spring.service.impl.ServiceImpl; import org.apache.dubbo.config.annotation.DubboService; -import org.springframework.stereotype.Service; import java.util.List; @@ -15,7 +14,6 @@ import java.util.List; * @author ww * @since 2025-02-13 */ -@Service @DubboService public class OrderDetailServiceImpl extends ServiceImpl implements OrderDetailService{ diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoRpcServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoRpcServiceImpl.java index 8050aa3cc..97bdc642a 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoRpcServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoRpcServiceImpl.java @@ -20,7 +20,6 @@ import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboReference; import org.apache.dubbo.config.annotation.DubboService; -import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; @@ -33,7 +32,6 @@ import java.util.*; * @since 2025-02-28 11:29 */ @DubboService -@Service @Slf4j public class OrderInfoRpcServiceImpl implements OrderInfoRpcService { diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProdSkuServiceImpl.java b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProdSkuServiceImpl.java index ae51e2245..d7c40967c 100644 --- a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProdSkuServiceImpl.java +++ b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProdSkuServiceImpl.java @@ -5,7 +5,6 @@ import com.czg.product.service.ProdSkuService; import com.czg.service.product.mapper.ProdSkuMapper; import com.mybatisflex.spring.service.impl.ServiceImpl; import org.apache.dubbo.config.annotation.DubboService; -import org.springframework.stereotype.Service; /** * 商品SKU @@ -13,7 +12,6 @@ import org.springframework.stereotype.Service; * @author Tankaikai tankaikai@aliyun.com * @since 1.0 2025-02-16 */ -@Service @DubboService public class ProdSkuServiceImpl extends ServiceImpl implements ProdSkuService { diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProductRpcServiceImpl.java b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProductRpcServiceImpl.java index 608e0414d..12bf5270c 100644 --- a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProductRpcServiceImpl.java +++ b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProductRpcServiceImpl.java @@ -25,7 +25,6 @@ import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboService; import org.springframework.cache.annotation.CacheEvict; -import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; @@ -40,7 +39,6 @@ import java.util.Map; * @since 2025-03-01 10:19 */ @Slf4j -@Service @DubboService public class ProductRpcServiceImpl implements ProductRpcService { diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProductServiceImpl.java b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProductServiceImpl.java index df08e0a5d..ea4397b88 100644 --- a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProductServiceImpl.java +++ b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProductServiceImpl.java @@ -35,7 +35,6 @@ import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboService; import org.springframework.cache.annotation.CacheEvict; -import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; @@ -57,7 +56,6 @@ import static com.czg.product.entity.table.ShopProdUnitTableDef.SHOP_PROD_UNIT; */ @Slf4j @AllArgsConstructor -@Service @DubboService public class ProductServiceImpl extends ServiceImpl implements ProductService { From 6027ed2a37839244ef0672c39ec4989d9934de92 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Fri, 7 Mar 2025 17:27:18 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../czg/service/account/service/impl/ShopCouponServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopCouponServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopCouponServiceImpl.java index c2ce2cb9e..cead24afd 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopCouponServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopCouponServiceImpl.java @@ -49,7 +49,7 @@ public class ShopCouponServiceImpl extends ServiceImpl Date: Fri, 7 Mar 2025 17:34:25 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E5=89=8D=E7=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cash-api/account-server/src/main/resources/logback.xml | 4 ++-- cash-api/order-server/src/main/resources/logback.xml | 4 ++-- cash-api/product-server/src/main/resources/logback.xml | 4 ++-- cash-api/system-server/src/main/resources/logback.xml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cash-api/account-server/src/main/resources/logback.xml b/cash-api/account-server/src/main/resources/logback.xml index e57ecdebd..9637e200d 100644 --- a/cash-api/account-server/src/main/resources/logback.xml +++ b/cash-api/account-server/src/main/resources/logback.xml @@ -2,9 +2,9 @@ account-server - + - + diff --git a/cash-api/order-server/src/main/resources/logback.xml b/cash-api/order-server/src/main/resources/logback.xml index 00f674de3..3efadaca9 100644 --- a/cash-api/order-server/src/main/resources/logback.xml +++ b/cash-api/order-server/src/main/resources/logback.xml @@ -2,9 +2,9 @@ order-server - + - + diff --git a/cash-api/product-server/src/main/resources/logback.xml b/cash-api/product-server/src/main/resources/logback.xml index 6daa8cd4c..7c962d6e4 100644 --- a/cash-api/product-server/src/main/resources/logback.xml +++ b/cash-api/product-server/src/main/resources/logback.xml @@ -2,9 +2,9 @@ product-server - + - + diff --git a/cash-api/system-server/src/main/resources/logback.xml b/cash-api/system-server/src/main/resources/logback.xml index a1d04ed90..5a70fc3ad 100644 --- a/cash-api/system-server/src/main/resources/logback.xml +++ b/cash-api/system-server/src/main/resources/logback.xml @@ -2,9 +2,9 @@ system-server - + - +