czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
张松
2025-03-07 17:56:44 +08:00
parent c40257a099 6af4340745
commit dab5aa62f7
17 changed files with 26 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cash-api/account-server/src/main/resources/logback.xml
View File

@@ -2,9 +2,9 @@
<configuration scan="true" scanPeriod="30 seconds" debug="false">
<contextName>account-server</contextName>
<property name="log.charset" value="utf-8" />
<property name="log.pattern" value="[account-server] %yellow(%d{yyyy-MM-dd HH:mm:ss.SSS}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %msg%n" />
<property name="log.pattern" value="%yellow(%d{yyyy-MM-dd HH:mm:ss.SSS}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %msg%n" />
<!--写入文件格式-->
<property name="p_file" value="[account-server] %d | [%thread] %-5level %c [%L] - %msg %n"/>
<property name="p_file" value="%d | [%thread] %-5level %c [%L] - %msg %n"/>
<!--输出到控制台-->
<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
<encoder>

4
cash-api/order-server/src/main/resources/logback.xml
View File

@@ -2,9 +2,9 @@
<configuration scan="true" scanPeriod="30 seconds" debug="false">
<contextName>order-server</contextName>
<property name="log.charset" value="utf-8" />
<property name="log.pattern" value="[order-server] %yellow(%d{yyyy-MM-dd HH:mm:ss.SSS}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %msg%n" />
<property name="log.pattern" value="%yellow(%d{yyyy-MM-dd HH:mm:ss.SSS}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %msg%n" />
<!--写入文件格式-->
<property name="p_file" value="[order-server] %d | [%thread] %-5level %c [%L] - %msg %n"/>
<property name="p_file" value="%d | [%thread] %-5level %c [%L] - %msg %n"/>
<!--输出到控制台-->
<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
<encoder>

4
cash-api/product-server/src/main/resources/logback.xml
View File

@@ -2,9 +2,9 @@
<configuration scan="true" scanPeriod="30 seconds" debug="false">
<contextName>product-server</contextName>
<property name="log.charset" value="utf-8" />
<property name="log.pattern" value="[product-server] %yellow(%d{yyyy-MM-dd HH:mm:ss.SSS}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %msg%n" />
<property name="log.pattern" value="%yellow(%d{yyyy-MM-dd HH:mm:ss.SSS}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %msg%n" />
<!--写入文件格式-->
<property name="p_file" value="[product-server] %d | [%thread] %-5level %c [%L] - %msg %n"/>
<property name="p_file" value="%d | [%thread] %-5level %c [%L] - %msg %n"/>
<!--输出到控制台-->
<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
<encoder>

4
cash-api/system-server/src/main/resources/logback.xml
View File

@@ -2,9 +2,9 @@
<configuration scan="true" scanPeriod="30 seconds" debug="false">
<contextName>system-server</contextName>
<property name="log.charset" value="utf-8" />
<property name="log.pattern" value="[system-server] %yellow(%d{yyyy-MM-dd HH:mm:ss.SSS}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %msg%n" />
<property name="log.pattern" value="%yellow(%d{yyyy-MM-dd HH:mm:ss.SSS}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %msg%n" />
<!--写入文件格式-->
<property name="p_file" value="[system-server] %d | [%thread] %-5level %c [%L] - %msg %n"/>
<property name="p_file" value="%d | [%thread] %-5level %c [%L] - %msg %n"/>
<!--输出到控制台-->
<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
<encoder>

4
cash-service/account-service/src/main/java/com/czg/service/account/service/impl/CallQueueServiceImpl.java
View File

@@ -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<CallQueueMapper, CallQueue> implements CallQueueService{

11
cash-service/account-service/src/main/java/com/czg/service/account/service/impl/CallTableServiceImpl.java
View File

@@ -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<CallTableMapper, CallTable> implements CallTableService {
// @DubboReference
@DubboReference
private SysParamsService sysParamsService;
@Resource

6
cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PlatformDictTypeServiceImpl.java
View File

@@ -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<PlatformDictTypeMapper, PlatformDictType> implements PlatformDictTypeService{
}

2
cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PointsBasicSettingServiceImpl.java
View File

@@ -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<PointsBasicSettingMapper, PointsBasicSetting> implements PointsBasicSettingService{

8
cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PrintMachineServiceImpl.java
View File

@@ -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<PrintMachineMapper, PrintMachine> implements PrintMachineService{

2
cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopCouponServiceImpl.java
View File

@@ -49,7 +49,7 @@ public class ShopCouponServiceImpl extends ServiceImpl<ShopCouponMapper, ShopCou
private ShopUserService shopUserService;
@Resource
private ShopInfoService shopInfoService;
@DubboReference
@Resource
private ProductService productService;
@Override

2
cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java
View File

@@ -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<ShopInfoMapper, ShopInfo> implements ShopInfoService {
@Resource

7
cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserServiceImpl.java
View File

@@ -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<ShopUserMapper, ShopUser> implements ShopUserService {
@DubboReference
private SysParamsService sysParamsService;

4
cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderDetailServiceImpl.java
View File

@@ -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<OrderDetailMapper, OrderDetail> implements OrderDetailService{

2
cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoRpcServiceImpl.java
View File

@@ -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 {

2
cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProdSkuServiceImpl.java
View File

@@ -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<ProdSkuMapper, ProdSku> implements ProdSkuService {

2
cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProductRpcServiceImpl.java
View File

@@ -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 {

2
cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProductServiceImpl.java
View File

@@ -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<ProductMapper, Product> implements ProductService {