q792602257/FrameTour-BE
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加景区、删除子类型

Browse Source
This commit is contained in:
Jerry Yan
2025-08-15 13:33:51 +08:00
parent 9c932b6ba8
commit af5c59dc67
15 changed files with 391 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/ycwl/basic/pricing/service/IPriceBundleService.java
View File

@@ -33,4 +33,13 @@ public interface IPriceBundleService {
* @return 一口价配置列表
*/
List<PriceBundleConfig> getActiveBundles();
// ==================== 管理端接口（包含禁用的配置） ====================
/**
* 获取所有一口价配置（包含禁用的）- 管理端使用
*
* @return 一口价配置列表
*/
List<PriceBundleConfig> getAllBundlesForAdmin();
}

34
src/main/java/com/ycwl/basic/pricing/service/IPricingManagementService.java
View File

@@ -56,4 +56,38 @@ public interface IPricingManagementService {
* 更新一口价配置
*/
boolean updateBundleConfig(PriceBundleConfig config);
// ==================== 状态管理 ====================
/**
* 更新商品配置状态
*/
boolean updateProductConfigStatus(Long id, Boolean isActive);
/**
* 更新阶梯配置状态
*/
boolean updateTierConfigStatus(Long id, Boolean isActive);
/**
* 更新一口价配置状态
*/
boolean updateBundleConfigStatus(Long id, Boolean isActive);
// ==================== 删除操作 ====================
/**
* 删除商品配置
*/
boolean deleteProductConfig(Long id);
/**
* 删除阶梯配置
*/
boolean deleteTierConfig(Long id);
/**
* 删除一口价配置
*/
boolean deleteBundleConfig(Long id);
}

54
src/main/java/com/ycwl/basic/pricing/service/IProductConfigService.java
View File

@@ -32,22 +32,10 @@ public interface IProductConfigService {
*
* @param productType 商品类型
* @param productId 具体商品ID
* @param productSubType 商品子类型
* @param quantity 数量
* @return 阶梯价格配置
*/
PriceTierConfig getTierConfig(String productType, String productId, String productSubType, Integer quantity);
/**
* 根据商品类型和数量获取阶梯价格配置（兼容旧接口）
*
* @param productType 商品类型
* @param productSubType 商品子类型
* @param quantity 数量
* @return 阶梯价格配置
*/
@Deprecated
PriceTierConfig getTierConfig(String productType, String productSubType, Integer quantity);
PriceTierConfig getTierConfig(String productType, String productId, Integer quantity);
/**
* 获取所有启用的商品配置
@@ -72,4 +60,44 @@ public interface IProductConfigService {
* @return 阶梯配置列表
*/
List<PriceTierConfig> getTierConfigs(String productType, String productId);
/**
* 获取所有启用的阶梯配置
*
* @return 阶梯配置列表
*/
List<PriceTierConfig> getAllTierConfigs();
// ==================== 管理端接口（包含禁用的配置） ====================
/**
* 获取所有商品配置（包含禁用的）- 管理端使用
*
* @return 商品配置列表
*/
List<PriceProductConfig> getAllProductConfigsForAdmin();
/**
* 获取所有阶梯配置（包含禁用的）- 管理端使用
*
* @return 阶梯配置列表
*/
List<PriceTierConfig> getAllTierConfigsForAdmin();
/**
* 根据商品类型获取所有阶梯配置（包含禁用的）- 管理端使用
*
* @param productType 商品类型
* @return 阶梯配置列表
*/
List<PriceTierConfig> getTierConfigsForAdmin(String productType);
/**
* 根据商品类型和商品ID获取所有阶梯配置（包含禁用的）- 管理端使用
*
* @param productType 商品类型
* @param productId 具体商品ID
* @return 阶梯配置列表
*/
List<PriceTierConfig> getTierConfigsForAdmin(String productType, String productId);
}

11
src/main/java/com/ycwl/basic/pricing/service/impl/PriceBundleServiceImpl.java
View File

@@ -9,7 +9,7 @@ import com.ycwl.basic.pricing.mapper.PriceBundleConfigMapper;
import com.ycwl.basic.pricing.service.IPriceBundleService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.cache.annotation.Cacheable;
//import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
@@ -71,11 +71,18 @@ public class PriceBundleServiceImpl implements IPriceBundleService {
}
@Override
@Cacheable(value = "active-bundles")
// @Cacheable(value = "active-bundles")
public List<PriceBundleConfig> getActiveBundles() {
return bundleConfigMapper.selectActiveBundles();
}
// ==================== 管理端接口（包含禁用的配置） ====================
@Override
public List<PriceBundleConfig> getAllBundlesForAdmin() {
return bundleConfigMapper.selectAllBundlesForAdmin();
}
private boolean isProductsMatchBundle(Set<String> productTypes, PriceBundleConfig bundle) {
try {
List<String> includedProducts = objectMapper.readValue(

4
src/main/java/com/ycwl/basic/pricing/service/impl/PriceCalculationServiceImpl.java
View File

@@ -140,7 +140,7 @@ public class PriceCalculationServiceImpl implements IPriceCalculationService {
// 优先使用基于product_id的阶梯定价
PriceTierConfig tierConfig = productConfigService.getTierConfig(
productType.getCode(), productId, product.getProductSubType(), product.getQuantity());
productType.getCode(), productId, product.getQuantity());
if (tierConfig != null) {
log.debug("使用阶梯定价: productType={}, productId={}, quantity={}, price={}",
@@ -186,7 +186,7 @@ public class PriceCalculationServiceImpl implements IPriceCalculationService {
// 优先使用基于product_id的阶梯定价
PriceTierConfig tierConfig = productConfigService.getTierConfig(
productType.getCode(), productId, product.getProductSubType(), product.getQuantity());
productType.getCode(), productId, product.getQuantity());
if (tierConfig != null) {
actualPrice = tierConfig.getPrice();

46
src/main/java/com/ycwl/basic/pricing/service/impl/PricingManagementServiceImpl.java
View File

@@ -104,4 +104,50 @@ public class PricingManagementServiceImpl implements IPricingManagementService {
config.setUpdatedTime(LocalDateTime.now());
return bundleConfigMapper.updateBundleConfig(config) > 0;
}
// ==================== 状态管理 ====================
@Override
@Transactional
public boolean updateProductConfigStatus(Long id, Boolean isActive) {
log.info("更新商品配置状态: id={}, isActive={}", id, isActive);
return productConfigMapper.updateProductConfigStatus(id, isActive) > 0;
}
@Override
@Transactional
public boolean updateTierConfigStatus(Long id, Boolean isActive) {
log.info("更新阶梯配置状态: id={}, isActive={}", id, isActive);
return tierConfigMapper.updateTierConfigStatus(id, isActive) > 0;
}
@Override
@Transactional
public boolean updateBundleConfigStatus(Long id, Boolean isActive) {
log.info("更新一口价配置状态: id={}, isActive={}", id, isActive);
return bundleConfigMapper.updateBundleConfigStatus(id, isActive) > 0;
}
// ==================== 删除操作 ====================
@Override
@Transactional
public boolean deleteProductConfig(Long id) {
log.info("删除商品配置: id={}", id);
return productConfigMapper.deleteById(id) > 0;
}
@Override
@Transactional
public boolean deleteTierConfig(Long id) {
log.info("删除阶梯配置: id={}", id);
return tierConfigMapper.deleteById(id) > 0;
}
@Override
@Transactional
public boolean deleteBundleConfig(Long id) {
log.info("删除一口价配置: id={}", id);
return bundleConfigMapper.deleteById(id) > 0;
}
}

57
src/main/java/com/ycwl/basic/pricing/service/impl/ProductConfigServiceImpl.java
View File

@@ -8,7 +8,7 @@ import com.ycwl.basic.pricing.mapper.PriceTierConfigMapper;
import com.ycwl.basic.pricing.service.IProductConfigService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.cache.annotation.Cacheable;
//import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -25,13 +25,13 @@ public class ProductConfigServiceImpl implements IProductConfigService {
private final PriceTierConfigMapper tierConfigMapper;
@Override
@Cacheable(value = "product-config", key = "#productType")
// @Cacheable(value = "product-config", key = "#productType")
public List<PriceProductConfig> getProductConfig(String productType) {
return productConfigMapper.selectByProductType(productType);
}
@Override
@Cacheable(value = "product-config", key = "#productType + '_' + #productId")
// @Cacheable(value = "product-config", key = "#productType + '_' + #productId")
public PriceProductConfig getProductConfig(String productType, String productId) {
PriceProductConfig config = productConfigMapper.selectByProductTypeAndId(productType, productId);
if (config == null) {
@@ -41,38 +41,59 @@ public class ProductConfigServiceImpl implements IProductConfigService {
}
@Override
@Cacheable(value = "tier-config", key = "#productType + '_' + #productId + '_' + (#productSubType ?: 'default') + '_' + #quantity")
public PriceTierConfig getTierConfig(String productType, String productId, String productSubType, Integer quantity) {
PriceTierConfig config = tierConfigMapper.selectByProductTypeAndQuantity(productType, productId, productSubType, quantity);
// @Cacheable(value = "tier-config", key = "#productType + '_' + #productId + '_' + #quantity")
public PriceTierConfig getTierConfig(String productType, String productId, Integer quantity) {
PriceTierConfig config = tierConfigMapper.selectByProductTypeAndQuantity(productType, productId, quantity);
if (config == null) {
log.warn("阶梯定价配置未找到: productType={}, productId={}, productSubType={}, quantity={}",
productType, productId, productSubType, quantity);
log.warn("阶梯定价配置未找到: productType={}, productId={}, quantity={}",
productType, productId, quantity);
}
return config;
}
@Override
@Deprecated
public PriceTierConfig getTierConfig(String productType, String productSubType, Integer quantity) {
// 兼容旧接口，使用默认productId
return getTierConfig(productType, "default", productSubType, quantity);
}
@Override
@Cacheable(value = "active-product-configs")
// @Cacheable(value = "active-product-configs")
public List<PriceProductConfig> getActiveProductConfigs() {
return productConfigMapper.selectActiveConfigs();
}
@Override
@Cacheable(value = "tier-configs", key = "#productType")
// @Cacheable(value = "tier-configs", key = "#productType")
public List<PriceTierConfig> getTierConfigs(String productType) {
return tierConfigMapper.selectByProductType(productType);
}
@Override
@Cacheable(value = "tier-configs", key = "#productType + '_' + #productId")
// @Cacheable(value = "tier-configs", key = "#productType + '_' + #productId")
public List<PriceTierConfig> getTierConfigs(String productType, String productId) {
return tierConfigMapper.selectByProductTypeAndId(productType, productId);
}
@Override
// @Cacheable(value = "all-tier-configs")
public List<PriceTierConfig> getAllTierConfigs() {
return tierConfigMapper.selectAllActiveConfigs();
}
// ==================== 管理端接口（包含禁用的配置） ====================
@Override
public List<PriceProductConfig> getAllProductConfigsForAdmin() {
return productConfigMapper.selectAllConfigsForAdmin();
}
@Override
public List<PriceTierConfig> getAllTierConfigsForAdmin() {
return tierConfigMapper.selectAllConfigsForAdmin();
}
@Override
public List<PriceTierConfig> getTierConfigsForAdmin(String productType) {
return tierConfigMapper.selectByProductTypeForAdmin(productType);
}
@Override
public List<PriceTierConfig> getTierConfigsForAdmin(String productType, String productId) {
return tierConfigMapper.selectByProductTypeAndIdForAdmin(productType, productId);
}
}