wuweihua/BMS
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改价格限制

Browse Source
This commit is contained in:
wuweihua
2026-09-28 16:38:19 +08:00
parent 623df69d4b
commit c278ed76f7
3 changed files with 24 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bms-back/bms-admin/src/main/resources/i18n/messages.properties
-1
View File
@@ -75,7 +75,6 @@ price.set.detail.registration.empty=固定价明细必须填写挂号费
price.set.detail.zone.empty=固定价明细必须选择分区
price.set.detail.roundMode.invalid=取值方式仅支持 UP / DOWN / HALF_UP
price.set.detail.freight.belowBase=套餐运费不能低于导入基准价 {0}
price.set.detail.registration.belowBase=套餐挂号费不能低于导入基准价 {0}
price.set.customer.notExists=客户绑定不存在
price.set.customer.unbindAudit=审核中的套餐不允许解绑客户
price.set.customer.customerId.empty=客户ID不能为空
bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcPriceSetServiceImpl.java
+13 -18
View File
@@ -1093,26 +1093,21 @@ public class PrcPriceSetServiceImpl implements IPrcPriceSetService
}
}
/** Package freight / registration must not go below the imported product country price. */
/** Package freight floor vs imported base — temporarily disabled. */
private void assertNotBelowImportedPrice(PrcPriceSetDetail detail)
{
BmsProductCountry base = findImportedPrice(detail);
if (base == null)
{
return;
}
if (detail.getFvValue() != null && base.getFreightPrice() != null
&& detail.getFvValue().compareTo(base.getFreightPrice()) < 0)
{
throw new ServiceException(MessageUtils.message("price.set.detail.freight.belowBase",
stripTrailingZeros(base.getFreightPrice())));
}
if (detail.getFvRegistrationFee() != null && base.getRegistrationFee() != null
&& detail.getFvRegistrationFee().compareTo(base.getRegistrationFee()) < 0)
{
throw new ServiceException(MessageUtils.message("price.set.detail.registration.belowBase",
stripTrailingZeros(base.getRegistrationFee())));
}
// Temporarily allow package freight below imported base price.
// BmsProductCountry base = findImportedPrice(detail);
// if (base == null)
// {
// return;
// }
// if (detail.getFvValue() != null && base.getFreightPrice() != null
// && detail.getFvValue().compareTo(base.getFreightPrice()) < 0)
// {
// throw new ServiceException(MessageUtils.message("price.set.detail.freight.belowBase",
// stripTrailingZeros(base.getFreightPrice())));
// }
}
private BmsProductCountry findImportedPrice(PrcPriceSetDetail detail)