修改价格限制

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
@@ -75,7 +75,6 @@ price.set.detail.registration.empty=固定价明细必须填写挂号费
price.set.detail.zone.empty=固定价明细必须选择分区 price.set.detail.zone.empty=固定价明细必须选择分区
price.set.detail.roundMode.invalid=取值方式仅支持 UP / DOWN / HALF_UP price.set.detail.roundMode.invalid=取值方式仅支持 UP / DOWN / HALF_UP
price.set.detail.freight.belowBase=套餐运费不能低于导入基准价 {0} price.set.detail.freight.belowBase=套餐运费不能低于导入基准价 {0}
price.set.detail.registration.belowBase=套餐挂号费不能低于导入基准价 {0}
price.set.customer.notExists=客户绑定不存在 price.set.customer.notExists=客户绑定不存在
price.set.customer.unbindAudit=审核中的套餐不允许解绑客户 price.set.customer.unbindAudit=审核中的套餐不允许解绑客户
price.set.customer.customerId.empty=客户ID不能为空 price.set.customer.customerId.empty=客户ID不能为空
@@ -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) private void assertNotBelowImportedPrice(PrcPriceSetDetail detail)
{ {
BmsProductCountry base = findImportedPrice(detail); // Temporarily allow package freight below imported base price.
if (base == null) // BmsProductCountry base = findImportedPrice(detail);
{ // if (base == null)
return; // {
} // return;
if (detail.getFvValue() != null && base.getFreightPrice() != null // }
&& detail.getFvValue().compareTo(base.getFreightPrice()) < 0) // 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()))); // 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())));
}
} }
private BmsProductCountry findImportedPrice(PrcPriceSetDetail detail) private BmsProductCountry findImportedPrice(PrcPriceSetDetail detail)
@@ -111,7 +111,7 @@ const title = computed(() => {
const name = props.productName || '' const name = props.productName || ''
return code + ' · ' + name + ' · 国家服务价格' return code + ' · ' + name + ' · 国家服务价格'
}) })
const hint = '黄色行=已改价;点编辑图标后修改,失焦即刻写入数据库。单位:运费 RMB/KG,挂号费 RMB/票。不能低于导入基准价。' const hint = '黄色行=已改价;点编辑图标后修改,失焦即刻写入数据库。单位:运费 RMB/KG,挂号费 RMB/票。'
const phSearch = '搜索国家/分区' const phSearch = '搜索国家/分区'
const colCountry = '国家' const colCountry = '国家'
const colZone = '分区' const colZone = '分区'
@@ -168,14 +168,16 @@ async function commitEdit(row, field) {
editingKey.value = '' editingKey.value = ''
try { try {
if (!row) return if (!row) return
const floor = field === 'fv' ? row._floorFreight : row._floorReg // Temporarily allow freight / registration below imported base price.
const value = field === 'fv' ? row.fvValue : row.fvRegistrationFee // if (field === 'fv') {
if (isBelowFloor(value, floor)) { // const floor = row._floorFreight
if (field === 'fv') row.fvValue = row._editPrevFv // const value = row.fvValue
else row.fvRegistrationFee = row._editPrevReg // if (isBelowFloor(value, floor)) {
proxy.$modal.msgError(belowFloorMessage(field, floor)) // row.fvValue = row._editPrevFv
return // proxy.$modal.msgError(belowFloorMessage(field, floor))
} // return
// }
// }
if (!row.psdId) return if (!row.psdId) return
emit('row-change', row) emit('row-change', row)
} finally { } finally {