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

删除 yes or no 枚举

Browse Source
This commit is contained in:
gong
2025-12-18 20:38:33 +08:00
parent 47f28d7bbb
commit 8ea7ef8c50
18 changed files with 99 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ConsInfoServiceImpl.java
View File

@@ -4,9 +4,9 @@ import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.StrUtil;
import com.czg.account.service.SyncNoticeService;
import com.czg.constants.SystemConstants;
import com.czg.enums.CrudEnum;
import com.czg.enums.StatusEnum;
import com.czg.enums.YesNoEnum;
import com.czg.exception.CzgException;
import com.czg.product.dto.ConsInfoDTO;
import com.czg.product.dto.ProductBriefDTO;
@@ -126,7 +126,7 @@ public class ConsInfoServiceImpl extends ServiceImpl<ConsInfoMapper, ConsInfo> i
entity.setStockNumber(BigDecimal.ZERO);
entity.setStatus(StatusEnum.ENABLED.value());
//entity.setConWarning(BigDecimal.ZERO);
entity.setIsStock(YesNoEnum.NO.value());
entity.setIsStock(SystemConstants.OneZero.ZERO);
entity.setShopId(shopId);
super.save(entity);
dto.setId(entity.getId());

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

@@ -8,7 +8,7 @@ import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.StrUtil;
import com.czg.config.RabbitPublisher;
import com.czg.enums.YesNoEnum;
import com.czg.constants.SystemConstants;
import com.czg.product.dto.ProductStockSubtractDTO;
import com.czg.product.entity.*;
import com.czg.product.enums.InOutItemEnum;
@@ -78,7 +78,7 @@ public class ProductRpcServiceImpl implements ProductRpcService {
continue;
}
// 商品未开启库存
if (product.getIsStock() == YesNoEnum.NO.value()) {
if (product.getIsStock() == SystemConstants.OneZero.ZERO) {
continue;
}
productMapper.updateProductStockNum(dto.getProductId(), dto.getShopId(), "sub", dto.getNum());
@@ -245,11 +245,11 @@ public class ProductRpcServiceImpl implements ProductRpcService {
Product product = productMapper.selectOneById(dto.getProductId());
log.info(">>>>>>>>>>>>>>>>>：入参2：{}", product.getName());
// 商品是否允许退款退货时归还库存
if (product.getIsRefundStock() == YesNoEnum.NO.value()) {
if (SystemConstants.OneZero.ZERO == product.getIsRefundStock()) {
continue;
}
// 商品未开启库存
if (product.getIsStock() == YesNoEnum.NO.value()) {
if (SystemConstants.OneZero.ZERO == product.getIsStock()) {
continue;
}
log.info(">>>>>>>>>>>>>>>>>：入参3：{}", product.getName());

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

@@ -8,8 +8,8 @@ import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONWriter;
import com.czg.constant.CacheConstant;
import com.czg.constants.SystemConstants;
import com.czg.enums.DeleteEnum;
import com.czg.enums.YesNoEnum;
import com.czg.exception.CzgException;
import com.czg.product.dto.ProdConsRelationDTO;
import com.czg.product.dto.ProdSkuDTO;
@@ -104,12 +104,12 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
}
if (StrUtil.isNotEmpty(param.getStatus())) {
if (ProductSaleStatusEnum.SOLD_OUT.getValue().equals(param.getStatus())) {
queryWrapper.eq(Product::getIsSoldStock, YesNoEnum.YES.value());
queryWrapper.eq(Product::getIsSoldStock, SystemConstants.OneZero.ONE);
} else if (ProductSaleStatusEnum.ON_SALE.getValue().equals(param.getStatus())) {
queryWrapper.eq(Product::getIsSoldStock, YesNoEnum.NO.value());
queryWrapper.eq(Product::getIsSale, YesNoEnum.YES.value());
queryWrapper.eq(Product::getIsSoldStock, SystemConstants.OneZero.ZERO);
queryWrapper.eq(Product::getIsSale, SystemConstants.OneZero.ONE);
} else if (ProductSaleStatusEnum.OFF_SALE.getValue().equals(param.getStatus())) {
queryWrapper.eq(Product::getIsSale, YesNoEnum.NO.value());
queryWrapper.eq(Product::getIsSale, SystemConstants.OneZero.ZERO);
}
}
if (param.getShopId() == null) {
@@ -172,7 +172,7 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
@Override
public List<ProductDTO> getProductList(ProductDTO param) {
QueryWrapper queryWrapper = buildFullQueryWrapper(param);
//queryWrapper.eq(Product::getIsSale, YesNoEnum.YES.value());
//queryWrapper.eq(Product::getIsSale, SystemConstants.OneZero.ONE);
List<ProductDTO> records = super.listAs(queryWrapper, ProductDTO.class);
buildProductExtInfo(records);
return records;
@@ -274,15 +274,15 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
*/
private Integer calcIsSaleTime(String days, LocalTime startTime, LocalTime endTime) {
if (StrUtil.isBlank(days) || ObjUtil.isNull(startTime) || ObjUtil.isNull(endTime)) {
return YesNoEnum.NO.value();
return SystemConstants.OneZero.ZERO;
}
String today = getWeekDayEnName();
List<String> dayList = StrUtil.split(days, ",");
LocalTime now = LocalTime.now().withNano(0);
if (CollUtil.contains(dayList, today) && now.isAfter(startTime) && now.isBefore(endTime)) {
return YesNoEnum.YES.value();
return SystemConstants.OneZero.ONE;
}
return YesNoEnum.NO.value();
return SystemConstants.OneZero.ZERO;
}
/**
@@ -349,14 +349,14 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
prodSku.setShopId(entity.getShopId());
prodSku.setProductId(entity.getId());
prodSku.setRealSalesNumber(BigDecimal.ZERO);
prodSku.setIsPauseSale(YesNoEnum.NO.value());
prodSku.setIsGrounding(YesNoEnum.YES.value());
prodSku.setIsPauseSale(SystemConstants.OneZero.ZERO);
prodSku.setIsGrounding(SystemConstants.OneZero.ONE);
prodSku.setIsDel(DeleteEnum.NORMAL.value());
prodSkuList.add(prodSku);
}
prodSkuMapper.insertBatch(prodSkuList);
}
if (entity.getIsStock() == YesNoEnum.NO.value()) {
if (entity.getIsStock() == SystemConstants.OneZero.ZERO) {
return;
}
// 记录商品库存流水
@@ -411,7 +411,7 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
if (!old.getCategoryId().equals(dto.getCategoryId())) {
clearProductCache(entity.getCategoryId());
}
if (ObjUtil.defaultIfNull(dto.getIsStock(), old.getIsStock()) == YesNoEnum.NO.value()) {
if (ObjUtil.defaultIfNull(dto.getIsStock(), old.getIsStock()) == SystemConstants.OneZero.ZERO) {
redisService.del(StrUtil.format(CacheConstant.SHOP_PRODUCT_STOCK, shopId, dto.getId()));
Boolean b = redisService.hasKey(StrUtil.format(CacheConstant.SHOP_PRODUCT_STOCK, shopId, dto.getId()));
log.info("删除商品库存缓存:{}-{}", dto.getId(), b);
@@ -430,8 +430,8 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
prodSku.setShopId(entity.getShopId());
prodSku.setProductId(entity.getId());
prodSku.setRealSalesNumber(BigDecimal.ZERO);
prodSku.setIsPauseSale(YesNoEnum.NO.value());
prodSku.setIsGrounding(YesNoEnum.YES.value());
prodSku.setIsPauseSale(SystemConstants.OneZero.ZERO);
prodSku.setIsGrounding(SystemConstants.OneZero.ONE);
prodSku.setIsDel(DeleteEnum.NORMAL.value());
prodSkuMapper.insert(prodSku);
} else {
@@ -450,7 +450,7 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
.eq(ProdSku::getShopId, shopId)
.update();
}
if (entity.getIsStock() == YesNoEnum.NO.value()) {
if (entity.getIsStock() == SystemConstants.OneZero.ZERO) {
return;
}
// 记录商品库存流水
@@ -488,7 +488,7 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
@Transactional(rollbackFor = Exception.class)
public void updateProductStock(ProductModifyStockParam param) {
Product entity = super.getById(param.getId());
if (entity.getIsStock() == YesNoEnum.NO.value()) {
if (entity.getIsStock() == SystemConstants.OneZero.ZERO) {
throw new CzgException("该商品未开启库存管理，暂不支持修改库存");
}
if (!entity.getShopId().equals(param.getShopId())) {
@@ -571,7 +571,7 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
prodSkuMapper.update(prodSku);
long normalCount = prodSkuMapper.selectCountByQuery(QueryWrapper.create()
.eq(ProdSku::getProductId, prodSku.getProductId())
.eq(ProdSku::getIsGrounding, YesNoEnum.NO.value())
.eq(ProdSku::getIsGrounding, SystemConstants.OneZero.ZERO)
.eq(ProdSku::getIsDel, DeleteEnum.NORMAL.value())
);
if (normalCount == 0) {
@@ -625,7 +625,7 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
prodSkuMapper.update(prodSku);
long normalCount = prodSkuMapper.selectCountByQuery(QueryWrapper.create()
.eq(ProdSku::getProductId, prodSku.getProductId())
.eq(ProdSku::getIsPauseSale, YesNoEnum.NO.value())
.eq(ProdSku::getIsPauseSale, SystemConstants.OneZero.ZERO)
.eq(ProdSku::getIsDel, DeleteEnum.NORMAL.value())
);
if (normalCount == 0) {
@@ -685,7 +685,7 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
if (product == null) {
throw new CzgException("商品不存在");
}
if (product.getIsStock() == YesNoEnum.NO.value()) {
if (product.getIsStock() == SystemConstants.OneZero.ZERO) {
throw new CzgException("商品未开启库存不支持报损操作");
}
// 商品现有库存数量
@@ -761,7 +761,7 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
if (InOutItemEnum.ORDER_IN.value().equals(param.getInOutItem())) {
param.setInOutType(InOutTypeEnum.OUT.value());
param.setInOutItem(InOutItemEnum.ORDER_OUT.value());
param.setIsGreaterZero(YesNoEnum.YES.value());
param.setIsGreaterZero(SystemConstants.OneZero.ONE);
}
return PageUtil.convert(new PageInfo<>(productStockFlowMapper.getProductStockFlowList(param)));
}
@@ -777,7 +777,7 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
Map<Long, Integer> stock = list.stream().collect(Collectors.toMap(Product::getId, Product::getStockNumber));
records.parallelStream().forEach(record -> {
record.setStockNumber(stock.getOrDefault(record.getId(), 0));
if (record.getIsStock() == YesNoEnum.YES.value()) {
if (record.getIsStock() == SystemConstants.OneZero.ONE) {
refreshRedisStock(record.getShopId(), record.getId(), record.getStockNumber());
} else {
redisService.del(StrUtil.format(CacheConstant.SHOP_PRODUCT_STOCK, record.getShopId(), record.getId()));

12
cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopProdUnitServiceImpl.java
View File

@@ -2,8 +2,8 @@ package com.czg.service.product.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.StrUtil;
import com.czg.constants.SystemConstants;
import com.czg.enums.StatusEnum;
import com.czg.enums.YesNoEnum;
import com.czg.exception.CzgException;
import com.czg.product.dto.ShopProdUnitDTO;
import com.czg.product.entity.ShopProdUnit;
@@ -40,7 +40,7 @@ public class ShopProdUnitServiceImpl extends ServiceImpl<ShopProdUnitMapper, Sho
q.eq(ShopProdUnit::getShopId, shopId).or(q1 -> {
q1.eq(ShopProdUnit::getShopId, 1L);
}).or(q2 -> {
q2.eq(ShopProdUnit::getIsSystem, YesNoEnum.YES.value());
q2.eq(ShopProdUnit::getIsSystem, SystemConstants.OneZero.ONE);
});
});
queryWrapper.orderBy(ShopProdUnit::getId, false);
@@ -74,7 +74,7 @@ public class ShopProdUnitServiceImpl extends ServiceImpl<ShopProdUnitMapper, Sho
q.eq(ShopProdUnit::getShopId, shopId).or(q1 -> {
q1.eq(ShopProdUnit::getShopId, 1L);
}).or(q2 -> {
q2.eq(ShopProdUnit::getIsSystem, YesNoEnum.YES.value());
q2.eq(ShopProdUnit::getIsSystem, SystemConstants.OneZero.ONE);
});
}));
if (exists) {
@@ -84,7 +84,7 @@ public class ShopProdUnitServiceImpl extends ServiceImpl<ShopProdUnitMapper, Sho
// 单位类型 number-计数 weight-记重
entity.setUnitType(UnitTypeEnum.NUMBER.value());
// 单位来源 1-系统预设 0-商家创建
entity.setIsSystem(YesNoEnum.NO.value());
entity.setIsSystem(SystemConstants.OneZero.ZERO);
entity.setStatus(StatusEnum.ENABLED.value());
entity.setShopId(shopId);
super.save(entity);
@@ -102,7 +102,7 @@ public class ShopProdUnitServiceImpl extends ServiceImpl<ShopProdUnitMapper, Sho
q.eq(ShopProdUnit::getShopId, shopId).or(q1 -> {
q1.eq(ShopProdUnit::getShopId, 1L);
}).or(q2 -> {
q2.eq(ShopProdUnit::getIsSystem, YesNoEnum.YES.value());
q2.eq(ShopProdUnit::getIsSystem, SystemConstants.OneZero.ONE);
});
})
);
@@ -148,7 +148,7 @@ public class ShopProdUnitServiceImpl extends ServiceImpl<ShopProdUnitMapper, Sho
if (entity == null) {
throw new CzgException("单位信息不存在");
}
if (entity.getIsSystem() == YesNoEnum.YES.value()) {
if (SystemConstants.OneZero.ONE == entity.getIsSystem()) {
throw new CzgException("系统预设单位不可操作");
}
if (!shopId.equals(entity.getShopId())) {

24
cash-service/product-service/src/main/java/com/czg/service/product/service/impl/UProductServiceImpl.java
View File

@@ -7,9 +7,9 @@ import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.StrUtil;
import com.czg.constant.CacheConstant;
import com.czg.constants.SystemConstants;
import com.czg.enums.DeleteEnum;
import com.czg.enums.StatusEnum;
import com.czg.enums.YesNoEnum;
import com.czg.exception.CzgException;
import com.czg.product.dto.ProdGroupRelationDTO;
import com.czg.product.dto.ProdSkuDTO;
@@ -66,7 +66,7 @@ public class UProductServiceImpl extends ServiceImpl<ProductMapper, Product> imp
list.forEach(item -> {
List<ProdSkuDTO> skuList = prodSkuMapper.selectListByQueryAs(query()
.eq(ProdSku::getProductId, item.getId())
.eq(ProdSku::getIsGrounding, YesNoEnum.YES.value())
.eq(ProdSku::getIsGrounding, SystemConstants.OneZero.ONE)
.eq(ProdSku::getIsDel, DeleteEnum.NORMAL.value()), ProdSkuDTO.class);
item.setSkuList(skuList);
});
@@ -84,7 +84,7 @@ public class UProductServiceImpl extends ServiceImpl<ProductMapper, Product> imp
productAllList.forEach(item -> {
List<ProdSkuDTO> skuList = prodSkuMapper.selectListByQueryAs(query()
.eq(ProdSku::getProductId, item.getId())
.eq(ProdSku::getIsGrounding, YesNoEnum.YES.value())
.eq(ProdSku::getIsGrounding, SystemConstants.OneZero.ONE)
.eq(ProdSku::getIsDel, DeleteEnum.NORMAL.value()), ProdSkuDTO.class);
item.setSkuList(skuList);
});
@@ -147,7 +147,7 @@ public class UProductServiceImpl extends ServiceImpl<ProductMapper, Product> imp
query().eq(ProdSku::getProductId, param.getId())
.eq(ProdSku::getShopId, shopId)
.eq(ProdSku::getIsDel, DeleteEnum.NORMAL.value())
.eq(ProdSku::getIsGrounding, YesNoEnum.YES.value())
.eq(ProdSku::getIsGrounding, SystemConstants.OneZero.ONE)
.eq(ProdSku::getSpecInfo, specInfo)
, ShopProductSkuInfoVo.class);
// throw new CzgException("商品SKU不可售或不存在");
@@ -189,7 +189,7 @@ public class UProductServiceImpl extends ServiceImpl<ProductMapper, Product> imp
}
productList.parallelStream().forEach(record -> {
record.setStockNumber(productStock.getOrDefault(record.getId(), 0));
if (record.getIsStock() == YesNoEnum.YES.value()) {
if (record.getIsStock() == SystemConstants.OneZero.ONE) {
refreshRedisStock(record.getShopId(), record.getId(), record.getStockNumber());
} else {
redisService.del(StrUtil.format(CacheConstant.SHOP_PRODUCT_STOCK, record.getShopId(), record.getId()));
@@ -213,7 +213,7 @@ public class UProductServiceImpl extends ServiceImpl<ProductMapper, Product> imp
@Override
public Integer calcIsSaleTime(String days, LocalTime startTime, LocalTime endTime) {
if (StrUtil.isBlank(days) || ObjUtil.isNull(startTime) || ObjUtil.isNull(endTime)) {
return YesNoEnum.NO.value();
return SystemConstants.OneZero.ZERO;
}
String today = getWeekDayEnName();
List<String> dayList = StrUtil.split(days, ",");
@@ -230,9 +230,9 @@ public class UProductServiceImpl extends ServiceImpl<ProductMapper, Product> imp
}
}
if(isSaleTime && inDays){
return YesNoEnum.YES.value();
return SystemConstants.OneZero.ONE;
}
return YesNoEnum.NO.value();
return SystemConstants.OneZero.ZERO;
}
/**
@@ -249,19 +249,19 @@ public class UProductServiceImpl extends ServiceImpl<ProductMapper, Product> imp
return prodIsSaleTime;
}
if (ObjUtil.isNull(startTime) || ObjUtil.isNull(endTime)) {
return YesNoEnum.NO.value();
return SystemConstants.OneZero.ZERO;
}
LocalTime now = LocalTime.now().withNano(0);
if (startTime.isBefore(endTime)) {
if (now.isAfter(startTime) && now.isBefore(endTime)) {
return YesNoEnum.YES.value();
return SystemConstants.OneZero.ONE;
}
} else {
if (now.isAfter(startTime) || now.isBefore(endTime)) {
return YesNoEnum.YES.value();
return SystemConstants.OneZero.ONE;
}
}
return YesNoEnum.NO.value();
return SystemConstants.OneZero.ZERO;
}
/**