12 Commits

72 changed files with 3044 additions and 472 deletions
@@ -50,11 +50,41 @@ class PayCostCalculatorTest
PayOrderCostResult over = PayCostCalculator.calculate(product, new BigDecimal("7"),
null, null, null, null, "Mainland / Mad High Density", null, 1);
assertTrue(hasFee(over, "基础运费", "3.18"));
assertTrue(hasFee(over, "每公斤续重", "0.54"));
assertTrue(hasFee(over, "基础运费", "3.72"));
assertTrue(over.getFees().stream().noneMatch(fee -> "每公斤续重".equals(fee.getFeeName())));
assertEquals(new BigDecimal("3.72"), over.getPayTotal());
}
@Test
void continuationChargesAFullStepWhenTheExcessIsUnderOneKilogram()
{
PayProduct product = new PayProduct();
product.setProductName("CTT 48H");
product.setCurrency("EUR");
PayWeightBand first = band("0", "1", "2.40", "Medium");
first.setSectionName("派送费");
first.setChargeName("派送费");
first.setPriceUnit("EUR/ITEM");
product.setWeightBands(new ArrayList<>(List.of(first)));
PaySurcharge extra = fee(11L, "每公斤续重", "0.34", "EUR", "EXTRA_KG", "1");
extra.setSectionName("派送费");
extra.setZoneName("Medium");
extra.setPriceUnit("EUR/KG");
extra.setChargeText("每增加 1Kg 0.34 EUR/KG");
product.setSurcharges(List.of(extra));
PayOrderCostResult partial = PayCostCalculator.calculate(product, new BigDecimal("1.2"),
null, null, null, null, "Medium", null, 1);
assertTrue(hasFee(partial, "基础运费", "2.74"));
assertTrue(partial.getFees().stream().noneMatch(fee -> "每公斤续重".equals(fee.getFeeName())));
assertEquals(new BigDecimal("2.74"), partial.getPayTotal());
PayOrderCostResult twoSteps = PayCostCalculator.calculate(product, new BigDecimal("2.2"),
null, null, null, null, "Medium", null, 1);
assertTrue(hasFee(twoSteps, "基础运费", "3.08"));
assertTrue(twoSteps.getFees().stream().noneMatch(fee -> "每公斤续重".equals(fee.getFeeName())));
}
@Test
void boundSurchargesKeepTheCardContinuation()
{
@@ -81,8 +111,8 @@ class PayCostCalculatorTest
PayOrderCostResult over = PayCostCalculator.calculate(product, new BigDecimal("3"),
null, null, null, "KY4 0DN", "UK Mainland", null, 1);
assertTrue(hasFee(over, "基础运费", "10"));
assertTrue(hasFee(over, "每公斤续重", "4"));
assertTrue(hasFee(over, "基础运费", "14"));
assertTrue(over.getFees().stream().noneMatch(fee -> "每公斤续重".equals(fee.getFeeName())));
assertTrue(hasFee(over, "燃油", "1"));
assertFalse(over.getFees().stream().anyMatch(fee -> fee.getFeeName().contains("偏远")));
assertFalse(over.getFees().stream().anyMatch(fee -> "超重续收".equals(fee.getFeeName())));
@@ -139,6 +169,20 @@ class PayCostCalculatorTest
new BigDecimal("70"), new BigDecimal("50"), new BigDecimal("40"), "07008", "马德里", null, 9,
List.of(), true, true, "FR", "法国");
assertTrue(france.getFees().stream().noneMatch(row -> "偏远附加费".equals(row.getFeeName())));
PaySurcharge volume = fee(17L, "体积附加费", "6", "EUR", "SIZE", null);
volume.setSectionName("附加费配置");
volume.setSizeType("VOLUME");
volume.setVolumeM3(new BigDecimal("0.01"));
product.setSurcharges(List.of(fuel, volume));
PayOrderCostResult underVolume = PayCostCalculator.calculate(product, new BigDecimal("1"),
new BigDecimal("20"), new BigDecimal("20"), new BigDecimal("5"), "28001", "马德里", null, 1);
assertTrue(underVolume.getFees().stream().noneMatch(row -> "体积附加费".equals(row.getFeeName())));
PayOrderCostResult overVolume = PayCostCalculator.calculate(product, new BigDecimal("1"),
new BigDecimal("50"), new BigDecimal("40"), new BigDecimal("20"), "28001", "马德里", null, 1);
assertTrue(hasFee(overVolume, "体积附加费", "6"));
assertTrue(overVolume.getFees().stream().anyMatch(row -> "体积附加费".equals(row.getFeeName())
&& row.getRemark() != null && row.getRemark().contains("体积超过")));
}
@Test
@@ -166,9 +210,8 @@ class PayCostCalculatorTest
PayOrderCostResult over = PayCostCalculator.calculate(product, new BigDecimal("2"),
null, null, null, null, "Canary Islands / Minor Islands", null, 1);
assertTrue(hasFee(over, "基础运费", "13.12"));
assertTrue(hasFee(over, "每公斤续重", "1.86"));
assertEquals(1, over.getFees().stream().filter(fee -> "每公斤续重".equals(fee.getFeeName())).count());
assertTrue(hasFee(over, "基础运费", "14.98"));
assertTrue(over.getFees().stream().noneMatch(fee -> "每公斤续重".equals(fee.getFeeName())));
assertEquals(new BigDecimal("14.98"), over.getPayTotal());
}
@@ -182,13 +225,15 @@ class PayCostCalculatorTest
}
@Test
void oversizeUsesTheHigherPercentWhenBothTiersMatch()
void oversizeAddsEveryMatchingTierOfTheSameName()
{
PayOrderCostResult result = PayCostCalculator.calculate(spainOneZone(), new BigDecimal("1"),
new BigDecimal("130"), new BigDecimal("50"), new BigDecimal("40"), "28001", null, 1);
assertTrue(hasFee(result, "基础运费", "2.27"));
assertTrue(hasFee(result, "特大包裹收费", "0.79"));
assertTrue(hasFee(result, "特大包裹收费", "1.59"));
assertEquals(1, result.getFees().stream().filter(fee -> "特大包裹收费".equals(fee.getFeeName())).count());
assertEquals(2, result.getFees().stream().filter(fee -> "特大包裹收费".equals(fee.getFeeName())).count());
assertEquals(new BigDecimal("4.65"), result.getPayTotal());
}
@Test
@@ -233,6 +278,43 @@ class PayCostCalculatorTest
assertTrue(mainland.getFees().stream().noneMatch(fee -> "偏远附加费".equals(fee.getFeeName())));
}
@Test
void evriRemoteWeightBandAddsTheSameWeightRow()
{
PayProduct product = new PayProduct();
product.setProductName("Evri 48H");
product.setCurrency("GBP");
PayWeightBand mainlandLight = band("0", "1", "1.51", "UK Mainland\n英国大陆");
mainlandLight.setChargeName("派送费");
mainlandLight.setSectionName("派送费");
PayWeightBand mainlandNext = band("1", "2", "1.53", "UK Mainland\n英国大陆");
mainlandNext.setChargeName("派送费");
mainlandNext.setSectionName("派送费");
PayWeightBand highlandsLight = band("0", "1", "5.95", "Highlands& Islands\n高地和岛屿");
highlandsLight.setChargeName("偏远附加费");
highlandsLight.setSectionName("偏远附加费");
PayWeightBand highlandsNext = band("1", "2", "5.95", "Highlands& Islands\n高地和岛屿");
highlandsNext.setChargeName("偏远附加费");
highlandsNext.setSectionName("偏远附加费");
PayWeightBand heavyRemote = band("15", "20", "8.2", "Highlands& Islands\n高地和岛屿");
heavyRemote.setChargeName("偏远附加费");
heavyRemote.setSectionName("偏远附加费");
product.setWeightBands(new ArrayList<>(List.of(mainlandLight, mainlandNext, highlandsLight, highlandsNext, heavyRemote)));
PayOrderCostResult mainland = PayCostCalculator.calculate(product, new BigDecimal("0.5"),
null, null, null, "LL22 8PJ", "UK Mainland\n英国大陆", null, 1);
assertTrue(hasFee(mainland, "基础运费", "1.51"));
assertTrue(mainland.getFees().stream().noneMatch(fee -> "偏远附加费".equals(fee.getFeeName())));
assertEquals(new BigDecimal("1.51"), mainland.getPayTotal());
PayOrderCostResult remote = PayCostCalculator.calculate(product, new BigDecimal("0.5"),
null, null, null, "IV1 1AA", "Highlands& Islands\n高地和岛屿", null, 1);
assertTrue(hasFee(remote, "基础运费", "1.51"));
assertTrue(hasFee(remote, "偏远附加费", "5.95"));
assertEquals(1, remote.getFees().stream().filter(fee -> "偏远附加费".equals(fee.getFeeName())).count());
assertEquals(new BigDecimal("7.46"), remote.getPayTotal());
}
@Test
void spanishPrefixChargesFirstWeightThenExtraKg()
{
@@ -284,9 +366,11 @@ class PayCostCalculatorTest
PayWeightBand lineHaul = band("0", "1", "0.09", "Mad High Density 马德里高密度地区");
lineHaul.setSectionName("额外线路运输费");
lineHaul.setChargeName("额外线路运输费");
PayWeightBand remote = band("0", "1", "7.1", "Balearic Islands 07邮编开头");
PayWeightBand remote = band("0", "1", "7.1", "Balearic Islands");
remote.setSectionName("偏远附加费");
remote.setChargeName("偏远附加费");
remote.setCalcRule("POSTCODE");
remote.setCalcParam("07");
product.setWeightBands(new ArrayList<>(List.of(delivery, lineHaul, remote)));
PaySurcharge deliveryExtra = fee(11L, "每公斤续重", "0.29", "EUR", "EXTRA_KG", "1");
deliveryExtra.setSectionName("派送费");
@@ -296,21 +380,19 @@ class PayCostCalculatorTest
lineExtra.setZoneName("Mad High Density 马德里高密度地区");
PaySurcharge remoteExtra = fee(13L, "每公斤续重", "4", "EUR", "EXTRA_KG", "1");
remoteExtra.setSectionName("偏远附加费");
remoteExtra.setZoneName("Balearic Islands 07邮编开头");
remoteExtra.setZoneName("Balearic Islands");
product.setSurcharges(List.of(deliveryExtra, lineExtra, remoteExtra));
PayOrderCostResult island = PayCostCalculator.calculate(product, new BigDecimal("3"),
null, null, null, "07008", "Mad High Density 马德里高密度地区", null, 1);
assertTrue(hasFee(island, "基础运费", "2.05"));
assertTrue(hasFee(island, "每公斤续重", "0.58"));
assertTrue(hasFee(island, "额外线路运输费", "0.09"));
assertTrue(hasFee(island, "额外线路运输费", "0.10"));
assertTrue(hasFee(island, "偏远附加费", "7.1"));
assertTrue(hasFee(island, "偏远附加费", "8"));
null, null, null, "07008", "Mad High Density 马德里高密度地区", null, 1, List.of(), true, true, "ES", "西班牙");
assertTrue(hasFee(island, "基础运费", "15.1"));
assertTrue(island.getFees().stream().noneMatch(fee -> "每公斤续重".equals(fee.getFeeName())
|| fee.getAmount().compareTo(new BigDecimal("2.05")) == 0
|| fee.getFeeName().contains("额外线路") || "偏远附加费".equals(fee.getFeeName())));
PayOrderCostResult mainland = PayCostCalculator.calculate(product, new BigDecimal("3"),
null, null, null, "28001", "Mad High Density 马德里高密度地区", null, 1);
assertTrue(hasFee(mainland, "基础运费", "2.05"));
assertTrue(hasFee(mainland, "基础运费", "2.63"));
assertTrue(hasFee(mainland, "额外线路运输费", "0.09"));
assertTrue(mainland.getFees().stream().noneMatch(fee -> "偏远附加费".equals(fee.getFeeName())));
assertEquals("07", PaySurchargeRules.remotePrefixes("Balearic Islands 07邮编开头"));
@@ -319,6 +401,40 @@ class PayCostCalculatorTest
assertEquals("", PaySurchargeRules.remotePrefixes("岛屿邮编地区"));
}
@Test
void weightBandConditionSelectsSizeOrWeightTier()
{
PayProduct product = new PayProduct();
product.setProductName("尺寸重量");
product.setCurrency("EUR");
PayWeightBand normal = band("0", "30", "2.00", "普通");
normal.setSectionName("派送费");
normal.setChargeName("派送费");
PayWeightBand heavy = band("0", "30", "8.00", "超重");
heavy.setSectionName("派送费");
heavy.setChargeName("派送费");
heavy.setCalcRule("WEIGHT");
heavy.setCalcParam("5");
PayWeightBand bulky = band("0", "30", "12.00", "超尺寸");
bulky.setSectionName("派送费");
bulky.setChargeName("派送费");
bulky.setCalcRule("SIZE");
bulky.setCalcParam("side:100");
product.setWeightBands(new ArrayList<>(List.of(normal, heavy, bulky)));
PayOrderCostResult plain = PayCostCalculator.calculate(product, new BigDecimal("2"),
new BigDecimal("40"), new BigDecimal("30"), new BigDecimal("20"), "28001", "普通", null, 1);
assertTrue(hasFee(plain, "基础运费", "2"));
PayOrderCostResult overWeight = PayCostCalculator.calculate(product, new BigDecimal("6"),
new BigDecimal("40"), new BigDecimal("30"), new BigDecimal("20"), "28001", "普通", null, 1);
assertTrue(hasFee(overWeight, "基础运费", "8"));
PayOrderCostResult overSize = PayCostCalculator.calculate(product, new BigDecimal("6"),
new BigDecimal("120"), new BigDecimal("30"), new BigDecimal("20"), "28001", "普通", null, 1);
assertTrue(hasFee(overSize, "基础运费", "12"));
}
@Test
void productPostcodeBookChoosesTheMatchingRemoteFee()
{
@@ -410,6 +526,59 @@ class PayCostCalculatorTest
assertTrue(PayRemoteBook.hits(List.of(delivery), List.of(line(42L, "28001")), "28001", "ES", "西班牙") == null);
}
@Test
void evriFeePostcodeAddsTheMatchingSurcharge()
{
assertTrue(PaySurchargeRules.matchesFeePostcode("BS1 1BT", "BS1 1BT"));
assertTrue(PaySurchargeRules.matchesFeePostcode("BS1 1BT", "bs11bt"));
assertTrue(PaySurchargeRules.matchesFeePostcode("BS1", "BS1 1BT"));
assertTrue(PaySurchargeRules.matchesFeePostcode("BS1 1BT", "BS1"));
assertFalse(PaySurchargeRules.matchesFeePostcode("BS1 1BT", "SW1A 1AA"));
assertFalse(PaySurchargeRules.matchesFeePostcode("B", "BS1 1BT"));
PayProduct product = new PayProduct();
product.setProductName("Evri 48H");
product.setCurrency("GBP");
product.setWeightBands(new ArrayList<>(List.of(band("0", "1", "1.51", "UK Mainland"))));
PaySurcharge air = fee(9L, "空气减排附加费", "0.45", "GBP", "FEE_POSTCODE", null);
air.setSectionName("附加费配置");
air.setScId(9L);
product.setSurcharges(List.of(air));
List<PayRemoteBook.Hit> hits = List.of(new PayRemoteBook.Hit("空气减排附加费", null, "Bristol", "Bristol"));
PayOrderCostResult hit = PayCostCalculator.calculate(product, new BigDecimal("0.5"),
null, null, null, "BS1 1BT", "UK Mainland", null, 1, null, true, true, "GB", "英国", hits);
assertTrue(hasFee(hit, "基础运费", "1.51"));
assertTrue(hasFee(hit, "空气减排附加费", "0.45"));
assertEquals(new BigDecimal("1.96"), hit.getPayTotal());
PayOrderCostResult miss = PayCostCalculator.calculate(product, new BigDecimal("0.5"),
null, null, null, "SW1A 1AA", "UK Mainland", null, 1, null, true, true, "GB", "英国", List.of());
assertTrue(miss.getFees().stream().noneMatch(row -> "空气减排附加费".equals(row.getFeeName())));
List<PayRemoteBook.Hit> other = List.of(new PayRemoteBook.Hit("燃油附加费", null, "", ""));
PayOrderCostResult named = PayCostCalculator.calculate(product, new BigDecimal("0.5"),
null, null, null, "BS1 1BT", "UK Mainland", null, 1, null, true, true, "GB", "英国", other);
assertTrue(named.getFees().stream().noneMatch(row -> "空气减排附加费".equals(row.getFeeName())));
PayPostcodeLine stored = new PayPostcodeLine();
stored.setChannelName("Evri 48H");
stored.setFeeName("空气减排附加费");
stored.setPostcode("BS1 3LT");
List<PayRemoteBook.Hit> channelHits = PayRemoteBook.surchargeHits(List.of(stored), "BS1 3LT", "UBI英国EVRi普", "UBI_GBPEVRI", "Evri 48H");
assertEquals(1, channelHits.size());
assertEquals("空气减排附加费", channelHits.get(0).getFeeName());
PaySurcharge configured = fee(203L, "空气减排费_Evri_48H", "0.45", "EUR", "POSTCODE", null);
configured.setSectionName("附加费配置");
configured.setScId(203L);
configured.setPostcodeText("BS1");
product.setSurcharges(List.of(configured));
PayOrderCostResult order = PayCostCalculator.calculate(product, new BigDecimal("0.5"),
null, null, null, "BS1 3LT", "UK Mainland", null, 1, null, true, true, "GB", "英国", channelHits);
assertTrue(order.getFees().stream().anyMatch(row -> "空气减排费_Evri_48H".equals(row.getFeeName())
&& row.getAmount().compareTo(new BigDecimal("0.45")) == 0 && "EUR".equals(row.getCurrency())));
}
@Test
void severalZonesCannotBePricedFromTheOrder()
{
@@ -2,11 +2,13 @@ package com.bms.price.pay;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.ByteArrayOutputStream;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.List;
import java.util.Arrays;
import java.util.stream.Stream;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import com.bms.price.domain.PayPostcodeGroup;
@@ -32,7 +34,7 @@ class PayPostcodeImporterTest
assertEquals("Royal Mail", remote195.getChannelName());
assertEquals("Royal Mail", remote115.getChannelName());
assertEquals("EVRI", evri.getChannelName());
assertEquals("EVRI", air.getChannelName());
assertEquals("Evri 48H", air.getChannelName());
assertEquals(15, remote195.getLineCount());
assertTrue(remote195.getLines().stream().anyMatch(line -> "PA60-78".equals(line.getPostcode())));
assertTrue(remote195.getLines().stream().anyMatch(line -> "PA80".equals(line.getPostcode())));
@@ -47,7 +49,8 @@ class PayPostcodeImporterTest
assertEquals("REMOTE", remote195.getCoverage());
assertEquals("REMOTE", remote115.getCoverage());
assertEquals("REMOTE", evri.getCoverage());
assertEquals("", air.getCoverage());
assertEquals("SURCHARGE", air.getCoverage());
assertTrue(air.getLines().stream().anyMatch(line -> "BS1 1BT".equals(line.getPostcode()) && "Bristol".equals(line.getZoneName())));
assertTrue(groups.stream().noneMatch(item -> "Evri 48H".equals(item.getSheetName())));
PayPostcodeGroup italy = groups.stream().filter(item -> "iMile邮编分区".equals(item.getSheetName()) && "IT".equals(item.getCountryCode())).findFirst().orElseThrow();
@@ -80,7 +83,7 @@ class PayPostcodeImporterTest
assertEquals("REACH", PayPostcodeImporter.coverageOf("法国GOFO可达邮编", "", ""));
assertEquals("UNREACH", PayPostcodeImporter.coverageOf("德国DPD挂号(DEDPD)不可达邮编", "", ""));
assertEquals("REMOTE", PayPostcodeImporter.coverageOf("evri 偏远", "", ""));
assertEquals("", PayPostcodeImporter.coverageOf("英国附加费", "EVRI偏远&空气减排地区附加费", "空气减排附加费"));
assertEquals("SURCHARGE", PayPostcodeImporter.coverageOf("英国附加费", "EVRI偏远&空气减排地区附加费", "空气减排附加费"));
List<PayPostcodeImporter.PostcodeToken> kept = PayPostcodeImporter.expandPostcode("KA27-28");
assertEquals("KA27-28", kept.get(0).postcode);
assertEquals("", kept.get(0).end);
@@ -89,6 +92,75 @@ class PayPostcodeImporterTest
assertEquals("57039", range.get(0).end);
}
@Test
void evriAirReductionReadsAsSurchargeOnEvri48h() throws Exception
{
List<PayPostcodeGroup> groups = importer.parse(ukFeeBook(), "英国附加费.xlsx");
PayPostcodeGroup royal = one(groups.stream().filter(item -> "FEE".equals(item.getConfigKind())).toList(), "偏远附加费", "1.95GBP/票");
assertEquals("Royal Mail", royal.getChannelName());
assertEquals("REMOTE", royal.getCoverage());
assertTrue(royal.getLines().stream().anyMatch(line -> "IV".equals(line.getPostcode())));
assertTrue(royal.getLines().stream().anyMatch(line -> "HS".equals(line.getPostcode())));
PayPostcodeGroup evri = one(groups.stream().filter(item -> "FEE".equals(item.getConfigKind())).toList(), "偏远附加费", "5.95GBP/票");
assertEquals("EVRI", evri.getChannelName());
assertEquals("REMOTE", evri.getCoverage());
assertTrue(evri.getLines().stream().anyMatch(line -> "GY".equals(line.getPostcode()) && "GY*".equals(line.getPostcodeRaw())));
assertTrue(evri.getLines().stream().noneMatch(line -> "BS1 1BT".equals(line.getPostcode())));
PayPostcodeGroup air = one(groups.stream().filter(item -> "FEE".equals(item.getConfigKind())).toList(), "空气减排附加费", "0.45GBP/票");
assertEquals("Evri 48H", air.getChannelName());
assertEquals("SURCHARGE", air.getCoverage());
assertEquals("英国", air.getCountryName());
assertEquals(2, air.getLineCount());
assertTrue(air.getLines().stream().anyMatch(line -> "BS1 1BT".equals(line.getPostcode()) && "Bristol".equals(line.getZoneName()) && "Bristol".equals(line.getRegionName())));
assertTrue(air.getLines().stream().anyMatch(line -> "BS1 1BU".equals(line.getPostcode()) && "Bristol".equals(line.getZoneName())));
}
private static byte[] ukFeeBook() throws Exception
{
try (XSSFWorkbook book = new XSSFWorkbook(); ByteArrayOutputStream out = new ByteArrayOutputStream())
{
var sheet = book.createSheet("英国附加费");
var title = sheet.createRow(0);
title.createCell(0).setCellValue("Royal Mail偏远地区附加费");
title.createCell(4).setCellValue("EVRI偏远&空气减排地区附加费");
var head = sheet.createRow(1);
String[] headers = {
"偏远地区(英文)", "邮编开头", "偏远附加费", "",
"偏远地区(英文)", "偏远地区(中文)", "邮编开头", "偏远附加费",
"空气减排地区", "空气减排地区邮编", "空气减排附加费"
};
for (int i = 0; i < headers.length; i++)
{
if (!headers[i].isEmpty())
{
head.createCell(i).setCellValue(headers[i]);
}
}
var first = sheet.createRow(2);
first.createCell(0).setCellValue("The Highlands");
first.createCell(1).setCellValue("IV");
first.createCell(2).setCellValue("1.95GBP/票");
first.createCell(4).setCellValue("Channel Islands");
first.createCell(5).setCellValue("海峡群岛(含锡利岛)");
first.createCell(6).setCellValue("GY*");
first.createCell(7).setCellValue("5.95GBP/票");
first.createCell(8).setCellValue("Bristol");
first.createCell(9).setCellValue("BS1 1BT");
first.createCell(10).setCellValue("0.45GBP/票");
var second = sheet.createRow(3);
second.createCell(1).setCellValue("HS");
second.createCell(2).setCellValue("1.95GBP/票");
second.createCell(6).setCellValue("JE*");
second.createCell(7).setCellValue("5.95GBP/票");
second.createCell(9).setCellValue("BS1 1BU");
second.createCell(10).setCellValue("0.45GBP/票");
book.write(out);
return out.toByteArray();
}
}
@Test
@Disabled("依赖开发机 D:/应付供应商 下的价卡文件,未随项目提供")
void reachableUnreachableAndRemoteKeepTheirOwnCountry() throws Exception
@@ -37,8 +37,24 @@ class PayWorkbookParserTest
assertTrue(ctt.getWeightBands().stream().anyMatch(band -> band.getWeightLabel() != null && band.getWeightLabel().contains("首重") && decimal(band, "2.05")));
assertTrue(ctt.getWeightBands().stream().noneMatch(band -> band.getWeightLabel() != null && band.getWeightLabel().contains("每增加")));
assertTrue(ctt.getSurcharges().stream().anyMatch(fee -> "每公斤续重".equals(fee.getFeeName()) && fee.getAmount() != null && fee.getAmount().compareTo(new BigDecimal("0.29")) == 0));
assertTrue(ctt.getWeightBands().stream().anyMatch(band -> band.getChargeName() != null && band.getChargeName().contains("偏远") && decimal(band, "7.1")));
assertTrue(ctt.getWeightBands().stream().anyMatch(band -> band.getChargeName() != null && (band.getChargeName().contains("额外") || band.getChargeName().toLowerCase().contains("line-haul")) && decimal(band, "0.09")));
assertTrue(ctt.getWeightBands().stream().anyMatch(band -> "西班牙(ES)".equals(band.getCountryName()) && "ES".equals(band.getCountryCode())
&& band.getZoneName() != null && band.getZoneName().contains("马德里") && decimal(band, "2.05")));
assertTrue(ctt.getWeightBands().stream().anyMatch(band -> "葡萄牙(PT)".equals(band.getCountryName()) && "PT".equals(band.getCountryCode())
&& band.getZoneName() != null && band.getZoneName().contains("Mainland") && decimal(band, "2.63")));
assertTrue(ctt.getWeightBands().stream().noneMatch(band -> band.getCountryName() != null && band.getCountryName().contains("西班牙") && band.getCountryName().contains("葡萄牙")));
assertEquals(1, ctt.getWeightBands().stream().filter(band -> "葡萄牙(PT)".equals(band.getCountryName()) && "派送费".equals(band.getChargeName())).count());
assertTrue(ctt.getWeightBands().stream().anyMatch(band -> band.getChargeName() != null && band.getChargeName().contains("偏远")
&& "西班牙(ES)".equals(band.getCountryName()) && "Balearic Islands".equals(band.getZoneName())
&& "POSTCODE".equals(band.getCalcRule()) && "07".equals(band.getCalcParam()) && decimal(band, "7.1")));
assertTrue(ctt.getWeightBands().stream().anyMatch(band -> band.getChargeName() != null && band.getChargeName().contains("偏远")
&& "葡萄牙(PT)".equals(band.getCountryName()) && "Portuguese Island".equals(band.getZoneName())
&& "POSTCODE".equals(band.getCalcRule()) && "9".equals(band.getCalcParam())));
assertTrue(ctt.getWeightBands().stream().noneMatch(band -> band.getZoneName() != null && band.getZoneName().contains("邮编")));
assertTrue(ctt.getSurcharges().stream().anyMatch(fee -> "每公斤续重".equals(fee.getFeeName()) && fee.getSectionName() != null && fee.getSectionName().contains("偏远")
&& fee.getZoneName() != null && "Balearic Islands".equals(fee.getZoneName())
&& fee.getAmount() != null && fee.getAmount().compareTo(new BigDecimal("4")) == 0));
assertTrue(ctt.getWeightBands().stream().noneMatch(band -> band.getChargeName() != null && (band.getChargeName().contains("额外") || band.getChargeName().toLowerCase().contains("line-haul"))));
assertTrue(ctt.getSurcharges().stream().noneMatch(fee -> fee.getFeeName() != null && (fee.getFeeName().contains("额外线路") || fee.getFeeName().toLowerCase().contains("line-haul") || fee.getSectionName() != null && fee.getSectionName().toLowerCase().contains("line-haul"))));
}
@Test
@@ -225,14 +241,24 @@ class PayWorkbookParserTest
assertEquals("Evri 48H", evri.getDictValue());
assertEquals("Evri 48H", evri.getSheetName());
assertFalse(evri.getWeightBands().isEmpty());
assertTrue(evri.getWeightBands().stream().allMatch(band -> "派送费".equals(band.getChargeName())));
assertTrue(evri.getWeightBands().stream().noneMatch(band -> bandText(band).contains("偏远") || bandText(band).contains("Highlands")));
assertTrue(evri.getWeightBands().stream().anyMatch(band -> decimal(band, "1.51") && band.getZoneName().contains("Mainland")));
PaySurcharge highlands = evri.getSurcharges().stream()
.filter(fee -> "偏远附加费".equals(fee.getFeeName()) && fee.getZoneName().contains("Highlands") && decimalFee(fee, "5.95"))
assertTrue(evri.getWeightBands().stream().filter(band -> "派送费".equals(band.getChargeName()))
.allMatch(band -> band.getZoneName() != null && band.getZoneName().contains("Mainland")));
assertTrue(evri.getWeightBands().stream().anyMatch(band -> decimal(band, "1.51") && band.getZoneName().contains("Mainland")
&& "派送费".equals(band.getChargeName())));
PayWeightBand highlands = evri.getWeightBands().stream()
.filter(band -> "偏远附加费".equals(band.getChargeName()) && band.getZoneName().contains("Highlands") && decimal(band, "5.95"))
.findFirst().orElseThrow();
assertEquals("ZONE", highlands.getCalcRule());
assertTrue(highlands.getWeightMax() != null && highlands.getWeightMax().compareTo(java.math.BigDecimal.ONE) == 0);
assertTrue(highlands.getWeightMin() != null && highlands.getWeightMin().compareTo(java.math.BigDecimal.ZERO) == 0);
assertEquals(5, evri.getWeightBands().stream()
.filter(band -> "偏远附加费".equals(band.getChargeName()) && band.getWeightMax() != null
&& band.getWeightMax().compareTo(java.math.BigDecimal.ONE) == 0)
.count());
assertTrue(evri.getWeightBands().stream().anyMatch(band -> "偏远附加费".equals(band.getChargeName())
&& band.getZoneName().contains("Isle of Man") && decimal(band, "8.2")
&& band.getWeightMin() != null && band.getWeightMin().compareTo(new java.math.BigDecimal("15")) == 0));
assertTrue(evri.getSurcharges().stream().noneMatch(fee -> "偏远附加费".equals(fee.getFeeName()) && decimalFee(fee, "5.95")));
assertTrue(evri.getSurcharges().stream().anyMatch(fee -> "战争附加费".equals(fee.getFeeName())));
}
@Test
@@ -458,29 +484,18 @@ class PayWorkbookParserTest
PayPreview preview = parser.parseMatched(Files.readAllBytes(file), file.getFileName().toString(), "CTT 48H",
List.of("CTT 48H"));
PayProduct ctt = preview.getProducts().get(0);
assertTrue(ctt.getWeightBands().stream().allMatch(band -> "派送费".equals(band.getChargeName())),
ctt.getWeightBands().stream().map(band -> band.getChargeName() + "/" + band.getZoneName() + "/" + band.getPrice()).toList().toString());
assertTrue(ctt.getWeightBands().stream().anyMatch(band -> decimal(band, "2.05") && band.getZoneName().contains("马德里")));
assertTrue(ctt.getWeightBands().stream().noneMatch(band -> bandText(band).contains("偏远") || bandText(band).contains("额外")
|| bandText(band).toLowerCase().contains("line-haul")));
PaySurcharge balearic = ctt.getSurcharges().stream()
.filter(fee -> "偏远附加费".equals(fee.getFeeName()) && fee.getZoneName().contains("Balearic") && decimalFee(fee, "7.1"))
.findFirst().orElseThrow();
assertTrue(balearic.getFeeDesc().contains("首重"));
assertEquals("POSTCODE", balearic.getCalcRule());
assertTrue(balearic.getCalcParam() != null && balearic.getCalcParam().contains("07"));
assertTrue(balearic.getWeightMax() != null && balearic.getWeightMax().compareTo(new java.math.BigDecimal("1")) == 0);
PaySurcharge canary = ctt.getSurcharges().stream()
.filter(fee -> "偏远附加费".equals(fee.getFeeName()) && fee.getZoneName().contains("Canary") && decimalFee(fee, "4.5")
&& fee.getChargeText().contains("KG"))
.findFirst().orElseThrow();
assertEquals("EXTRA_KG", canary.getCalcRule());
assertEquals("1", canary.getCalcParam());
assertTrue(canary.getPostcodeParam() != null && canary.getPostcodeParam().contains("35") && canary.getPostcodeParam().contains("38"));
assertTrue(ctt.getSurcharges().stream().anyMatch(fee -> fee.getFeeName().contains("额外线路运输费") && "MANUAL".equals(fee.getCalcRule())));
assertTrue(ctt.getSurcharges().stream().anyMatch(fee -> fee.getFeeName().contains("额外线路运输费") && decimalFee(fee, "0.09")));
assertTrue(ctt.getSurcharges().stream().anyMatch(fee -> fee.getFeeName().contains("额外线路运输费")
&& fee.getFeeDesc().contains("800公里")));
assertTrue(ctt.getWeightBands().stream().anyMatch(band -> "派送费".equals(band.getChargeName()) && "西班牙(ES)".equals(band.getCountryName())
&& decimal(band, "2.05") && band.getZoneName().contains("马德里")));
assertTrue(ctt.getWeightBands().stream().anyMatch(band -> "派送费".equals(band.getChargeName()) && "葡萄牙(PT)".equals(band.getCountryName())
&& band.getZoneName() != null && band.getZoneName().contains("Mainland")));
assertTrue(ctt.getWeightBands().stream().anyMatch(band -> band.getChargeName() != null && band.getChargeName().contains("偏远")
&& "西班牙(ES)".equals(band.getCountryName()) && band.getZoneName() != null && band.getZoneName().contains("Balearic") && decimal(band, "7.1")));
assertTrue(ctt.getSurcharges().stream().anyMatch(fee -> "每公斤续重".equals(fee.getFeeName()) && fee.getSectionName() != null
&& fee.getSectionName().contains("偏远") && fee.getZoneName() != null && fee.getZoneName().contains("Canary") && decimalFee(fee, "4.5")));
assertTrue(ctt.getWeightBands().stream().noneMatch(band -> band.getChargeName() != null
&& (band.getChargeName().contains("额外") || band.getChargeName().toLowerCase().contains("line-haul"))));
assertTrue(ctt.getSurcharges().stream().noneMatch(fee -> (fee.getFeeName() != null && (fee.getFeeName().contains("额外线路") || fee.getFeeName().toLowerCase().contains("line-haul")))
|| (fee.getSectionName() != null && (fee.getSectionName().contains("额外线路") || fee.getSectionName().toLowerCase().contains("line-haul")))));
assertTrue(ctt.getSurcharges().stream().anyMatch(fee -> "超重附加费".equals(fee.getFeeName()) && decimalFee(fee, "5.98")));
}
@@ -588,13 +603,13 @@ class PayWorkbookParserTest
PayOrderCostResult twoKg = PayCostCalculator.calculate(ctt, new java.math.BigDecimal("2"), null, null, null, null,
"Balearic Islands Economy 48H / Majorca", null, 1);
assertEquals(new java.math.BigDecimal("4.24"), twoKg.getPayTotal());
assertEquals(1, twoKg.getFees().stream().filter(fee -> "每公斤续重".equals(fee.getFeeName())
&& fee.getAmount().compareTo(new java.math.BigDecimal("0.85")) == 0).count());
assertTrue(twoKg.getFees().stream().anyMatch(fee -> "基础运费".equals(fee.getFeeName())
&& fee.getAmount().compareTo(new java.math.BigDecimal("4.24")) == 0));
assertTrue(twoKg.getFees().stream().noneMatch(fee -> "每公斤续重".equals(fee.getFeeName())));
PayOrderCostResult island = PayCostCalculator.calculate(ctt, new java.math.BigDecimal("2"), null, null, null, null,
"Portuguese Island / Island", null, 1);
assertEquals(new java.math.BigDecimal("12.41"), island.getPayTotal());
assertEquals(1, island.getFees().stream().filter(fee -> "每公斤续重".equals(fee.getFeeName())
&& fee.getAmount().compareTo(new java.math.BigDecimal("3.34")) == 0).count());
assertTrue(island.getFees().stream().noneMatch(fee -> "每公斤续重".equals(fee.getFeeName())));
}
@Test
@@ -105,8 +105,8 @@ public class LblProduct extends BaseEntity
private List<LblExtraLine> extraLines;
/** 邮编→分区(保存时按产品同步到 prc_zone LABEL,不落产品子表) */
private Map<String, List<String>> zonePostcodes;
/** 邮编→分区(保存时按产品同步到 prc_zone LABEL;元素含 postcode+matchType) */
private Map<String, List<PrcZoneDetail>> zonePostcodes;
/** 编辑保存删除标记(不落库) */
private Boolean deleted;
@@ -28,7 +28,7 @@ public class PayPostcodeGroup extends BaseEntity
/** ZONE 邮编分区,FEE 附加费 */
private String configKind;
/** REACH 可达,UNREACH 不可达,REMOTE 偏远。普通分区为空 */
/** REACH 可达,UNREACH 不可达,REMOTE 偏远,SURCHARGE 附加费。普通分区为空 */
private String coverage;
/** 渠道名称,从表头识别,可在页面修改 */
@@ -22,6 +22,9 @@ public class PayPostcodeLine implements Serializable
/** 查询条件:只看这个渠道下的邮编 */
private String channelName;
/** 附加费邮编查询时带出这一组的费用名 */
private String feeName;
private String regionName;
private String regionNameCn;
@@ -75,6 +75,12 @@ public class PaySurcharge
/** 来自附加费配置的高,厘米。本表不保存 */
private BigDecimal heightCm;
/** 来自附加费配置的超尺寸类型:SIDE 任一边,VOLUME 体积。本表不保存 */
private String sizeType;
/** 来自附加费配置的体积阈值,立方米。本表不保存 */
private BigDecimal volumeM3;
/** 来自附加费配置的超重阈值,公斤。本表不保存 */
private BigDecimal overWeightKg;
@@ -29,6 +29,12 @@ public class PayWeightBand
/** 价格列名称,例如英国大陆、马德里高密度 */
private String zoneName;
/** 计费条件类型。POSTCODE 邮编,SIZE 尺寸,WEIGHT 重量。空表示这一档只按分区 */
private String calcRule;
/** 条件参数。邮编如 07 或 35,38;尺寸如 side:80;sum:180 或 box:60*40*30;重量如 30 表示超过 30kg */
private String calcParam;
/** 重量段原文 */
private String weightLabel;
@@ -27,6 +27,10 @@ public class PrcSurcharge extends BaseEntity
private BigDecimal widthCm;
/** 超尺寸高,厘米 */
private BigDecimal heightCm;
/** 超尺寸类型,字典 bms_size_type:SIDE 任一边,VOLUME 体积 */
private String sizeType;
/** 超尺寸体积阈值,立方米。类型为体积时,订单体积超过该值才收取 */
private BigDecimal volumeM3;
/** 超重阈值,公斤 */
private BigDecimal overWeightKg;
/** 超重续收起始重量,公斤 */
@@ -62,6 +62,12 @@ public class PrcSurchargeBind
private BigDecimal heightCm;
/** 超尺寸类型:SIDE 任一边,VOLUME 体积 */
private String sizeType;
/** 超尺寸体积阈值,立方米 */
private BigDecimal volumeM3;
private BigDecimal overWeightKg;
private BigDecimal extraWeightKg;
@@ -53,6 +53,12 @@ public class PrcSurchargeRel extends BaseEntity
private String scNote;
/** 命中邮编(来自 prc_surcharge.postcode_text) */
private String postcodeText;
/** 超尺寸类型:SIDE 任一边,VOLUME 体积 */
private String sizeType;
/** 超尺寸体积阈值,立方米 */
private BigDecimal volumeM3;
/** 超尺寸长/宽/高(厘米) */
private BigDecimal lengthCm;
private BigDecimal widthCm;
@@ -2,6 +2,7 @@ package com.bms.price.domain;
import java.io.Serializable;
import java.util.Date;
import java.util.Locale;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
@@ -11,11 +12,41 @@ public class PrcZoneDetail implements Serializable
{
private static final long serialVersionUID = 1L;
/** 全匹配邮编 */
public static final String MATCH_FULL = "FULL";
/** 匹配邮编开头 */
public static final String MATCH_PREFIX = "PREFIX";
private Long detailId;
private Long zoneId;
private String postcode;
/** FULL / PREFIX,默认 FULL */
private String matchType;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
public static String normalizeMatchType(String raw)
{
if (raw == null || raw.isBlank())
{
return MATCH_FULL;
}
String value = raw.trim().toUpperCase(Locale.ROOT);
if (MATCH_PREFIX.equals(value) || "START".equals(value) || "STARTS".equals(value))
{
return MATCH_PREFIX;
}
return MATCH_FULL;
}
public static PrcZoneDetail of(String postcode, String matchType)
{
PrcZoneDetail detail = new PrcZoneDetail();
detail.setPostcode(postcode);
detail.setMatchType(normalizeMatchType(matchType));
return detail;
}
}
@@ -35,6 +35,13 @@ public final class LblCostCalculator
public static PayOrderCostResult calculate(LblProduct product, BigDecimal weight, BigDecimal length, BigDecimal width,
BigDecimal height, String postcode, String zoneName, Date bizDate, Integer orderStatus)
{
return calculate(product, weight, length, width, height, postcode, zoneName, bizDate, orderStatus, null, null);
}
public static PayOrderCostResult calculate(LblProduct product, BigDecimal weight, BigDecimal length, BigDecimal width,
BigDecimal height, String postcode, String zoneName, Date bizDate, Integer orderStatus,
String countryCode, String countryName)
{
PayOrderCostResult result = new PayOrderCostResult();
result.setFees(new ArrayList<PayCostLine>());
@@ -52,7 +59,14 @@ public final class LblCostCalculator
return result;
}
List<LblWeightBand> all = product.getWeightBands() == null ? List.of() : product.getWeightBands();
List<LblWeightBand> raw = product.getWeightBands() == null ? List.of() : product.getWeightBands();
List<LblWeightBand> all = filterByCountry(raw, countryCode, countryName);
if (all.isEmpty() && !raw.isEmpty() && hasCountryCode(countryCode, countryName))
{
result.setMessage("产品「" + nz(product.getProductName()) + "」没有命中国家 "
+ nz(countryCode) + (nz(countryName).isEmpty() ? "" : "/" + nz(countryName)) + " 的价卡");
return result;
}
Set<String> zones = zoneNames(all);
if (zones.size() > 1 && (zoneName == null || zoneName.isBlank()))
{
@@ -101,12 +115,24 @@ public final class LblCostCalculator
}
}
if (!hasFreightLine)
{
// 价卡仅有处理费/偏远、无派送费段时(如 NL-DHL),允许按已算费用出账;附加费基数用处理费
if (!hasFreightTypeBands(all) && result.getFees() != null && !result.getFees().isEmpty())
{
freight = sumFeeAmounts(result, "REGISTRATION_FEE");
if (freight.compareTo(BigDecimal.ZERO) == 0)
{
freight = sumAllFeeAmounts(result);
}
}
else
{
result.setMessage(outOfRange(product, all, weight, zoneName));
result.getFees().clear();
return result;
}
}
}
result.setCurrency(currency);
PayProduct pay = LblProductPayAdapter.toPayProductForSurcharge(product);
@@ -287,11 +313,14 @@ public final class LblCostCalculator
return base;
}
BigDecimal over = weight.subtract(first);
if (over.compareTo(BigDecimal.ZERO) < 0)
if (over.compareTo(BigDecimal.ZERO) <= 0)
{
over = BigDecimal.ZERO;
return base;
}
return base.add(extra.multiply(over));
// 首重+续重:超出部分按「每增加 X Kg」向上取整档数(不按公斤比例)
BigDecimal step = extraStepKg(band, first);
BigDecimal steps = over.divide(step, 0, RoundingMode.CEILING);
return base.add(extra.multiply(steps));
}
if (band.getPrice() == null)
{
@@ -305,6 +334,23 @@ public final class LblCostCalculator
return band.getPrice();
}
/**
* 续重步长:优先解析重量段「每增加 X」;否则用首重;再否则 1kg。
*/
private static BigDecimal extraStepKg(LblWeightBand band, BigDecimal firstKg)
{
BigDecimal fromLabel = LblTexts.extraStepKg(band == null ? null : band.getWeightLabel());
if (fromLabel != null && fromLabel.compareTo(BigDecimal.ZERO) > 0)
{
return fromLabel;
}
if (firstKg != null && firstKg.compareTo(BigDecimal.ZERO) > 0)
{
return firstKg;
}
return BigDecimal.ONE;
}
private static BigDecimal firstKg(LblWeightBand band)
{
if (band.getCalcParam() != null && !band.getCalcParam().isBlank())
@@ -379,6 +425,132 @@ public final class LblCostCalculator
return "基础运费";
}
/** 按订单国家收窄重量段;有国别代码时不允许误用其他国。 */
private static List<LblWeightBand> filterByCountry(List<LblWeightBand> bands, String countryCode, String countryName)
{
if (bands == null || bands.isEmpty() || !hasCountryCode(countryCode, countryName))
{
return bands == null ? List.of() : bands;
}
List<LblWeightBand> matched = new ArrayList<LblWeightBand>();
List<LblWeightBand> blank = new ArrayList<LblWeightBand>();
for (LblWeightBand band : bands)
{
if (band == null)
{
continue;
}
if (bandCountryBlank(band))
{
blank.add(band);
continue;
}
if (bandMatchesCountry(band, countryCode, countryName))
{
matched.add(band);
}
}
return matched.isEmpty() ? blank : matched;
}
private static boolean hasCountryCode(String countryCode, String countryName)
{
return (countryCode != null && !countryCode.isBlank()) || (countryName != null && !countryName.isBlank());
}
private static boolean bandCountryBlank(LblWeightBand band)
{
return nz(band.getCountryCode()).isEmpty() && nz(band.getCountryName()).isEmpty();
}
private static boolean bandMatchesCountry(LblWeightBand band, String countryCode, String countryName)
{
String orderCc = nz(countryCode).toUpperCase(Locale.ROOT);
String bandCc = nz(band.getCountryCode()).toUpperCase(Locale.ROOT);
if (!orderCc.isEmpty() && !bandCc.isEmpty())
{
for (String part : bandCc.split("[,;/\\s]+"))
{
if (part != null && orderCc.equals(part.trim()))
{
return true;
}
}
String bandNameU = nz(band.getCountryName()).toUpperCase(Locale.ROOT).replace(" ", "");
if (bandNameU.contains("(" + orderCc + ")") || bandNameU.endsWith(orderCc))
{
return true;
}
}
String orderName = nz(countryName);
String bandName = nz(band.getCountryName());
if (!orderName.isEmpty() && !bandName.isEmpty())
{
String bare = bandName.replaceAll("\\([^)]*\\)", "").trim();
if (bandName.contains(orderName) || (!bare.isEmpty() && orderName.contains(bare)))
{
return true;
}
}
return false;
}
/** 当前国家收窄后是否存在派送费(FREIGHT)段;空 fee_type 视为 FREIGHT */
private static boolean hasFreightTypeBands(List<LblWeightBand> bands)
{
if (bands == null || bands.isEmpty())
{
return false;
}
for (LblWeightBand band : bands)
{
if (band == null)
{
continue;
}
String ft = nz(band.getFeeType());
if (ft.isEmpty() || LblFeeType.FREIGHT.equals(ft))
{
return true;
}
}
return false;
}
private static BigDecimal sumFeeAmounts(PayOrderCostResult result, String feeType)
{
BigDecimal sum = BigDecimal.ZERO;
if (result == null || result.getFees() == null || feeType == null)
{
return sum;
}
for (PayCostLine fee : result.getFees())
{
if (fee != null && feeType.equals(fee.getFeeType()) && fee.getAmount() != null)
{
sum = sum.add(fee.getAmount());
}
}
return sum;
}
private static BigDecimal sumAllFeeAmounts(PayOrderCostResult result)
{
BigDecimal sum = BigDecimal.ZERO;
if (result == null || result.getFees() == null)
{
return sum;
}
for (PayCostLine fee : result.getFees())
{
if (fee != null && fee.getAmount() != null)
{
sum = sum.add(fee.getAmount());
}
}
return sum;
}
private static Set<String> zoneNames(List<LblWeightBand> bands)
{
Set<String> zones = new LinkedHashSet<String>();
@@ -94,6 +94,23 @@ public final class LblTexts
return bounds;
}
/**
* 从「每增加 X Kg」取续重步长;解不出返 null。
*/
public static BigDecimal extraStepKg(String label)
{
if (label == null || label.isBlank())
{
return null;
}
Matcher step = STEP_WEIGHT.matcher(label);
if (step.find())
{
return decimal(step.group(1));
}
return null;
}
public static boolean looksLikeWeight(String text)
{
if (text == null)
@@ -1611,8 +1611,9 @@ public class LblWorkbookParser
}
else if (remoteHandle)
{
band.setFeeType(com.bms.price.domain.LblFeeType.REMOTE);
band.setChargeName(chargeTitle(parent[col]));
// CTT 等:「偏远附加费」实为派送费(FREIGHT),按邮编前缀命中,不落 REMOTE
band.setFeeType(com.bms.price.domain.LblFeeType.FREIGHT);
band.setChargeName("派送费");
band.setZoneName(zoneName);
applyRemotePostcode(band, rawZone);
band.setPrice(price);
@@ -4378,7 +4379,8 @@ public class LblWorkbookParser
}
/**
* 价表中与派送费并排的偏远列:落重量段 fee_type=REMOTE,不进附加费表。
* 价表中「偏远附加费」列/表头:CTT 等按派送费 FREIGHT+邮编前缀落库;
* Evri 等非首重/续重并排列仍可落 REMOTE。
*/
private static boolean isRemoteHandleHead(String head)
{
@@ -14,10 +14,12 @@ import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
import com.bms.price.domain.LblProduct;
import com.bms.price.domain.LblWeightBand;
import com.bms.price.domain.PrcZoneDetail;
/**
* 打单价卡「邮编分区」表抽取为 zone→postcodes,保存时同步到分区管理 prc_zone。
* 支持 Corres/双列、Colissimo Densite、CTT Density、PosteItaliane 三列、iMile IT/DE。
* 支持 Corres/双列、Colissimo Densite、CTT Density、PosteItaliane 三列、iMile IT/DE;
* 以及「英国附加费」中 EVRI 偏远邮编前缀(挂到 Evri 产品)。
*/
public final class LblZonePostcodeAttach
{
@@ -43,6 +45,11 @@ public final class LblZonePostcodeAttach
continue;
}
String sheetName = sheet.getSheetName() == null ? "" : sheet.getSheetName().trim();
if (isUkSurchargeSheet(sheetName))
{
attachUkEvri(sheet, sheetName, products);
continue;
}
if (!isZonePostcodeSheet(sheetName))
{
continue;
@@ -52,17 +59,32 @@ public final class LblZonePostcodeAttach
attachImile(sheet, sheetName, products);
continue;
}
Map<String, List<String>> zoneMap = parseSheet(sheet);
if (zoneMap.isEmpty())
{
continue;
}
LblProduct target = matchProduct(products, sheetName);
if (target == null)
{
continue;
}
mergeZonePostcodes(target, zoneMap);
Map<String, List<String>> poste = parsePosteItaliane(sheet);
if (!poste.isEmpty())
{
Map<String, List<String>> city = new LinkedHashMap<String, List<String>>();
Map<String, List<String>> rural = new LinkedHashMap<String, List<String>>();
if (poste.get("City") != null) city.put("City", poste.get("City"));
if (poste.get("Province") != null) city.put("Province", poste.get("Province"));
if (poste.get("Rural") != null) rural.put("Rural", poste.get("Rural"));
mergeZonePostcodes(target, city, PrcZoneDetail.MATCH_PREFIX);
mergeZonePostcodes(target, rural, PrcZoneDetail.MATCH_FULL);
linkSheet(target, sheetName);
continue;
}
Map<String, List<String>> zoneMap = parseSheet(sheet);
if (zoneMap.isEmpty())
{
continue;
}
// 表名含「邮编开头」或单元格带 * 时按前缀;否则全匹配
String matchType = sheetName.contains("邮编开头") ? PrcZoneDetail.MATCH_PREFIX : PrcZoneDetail.MATCH_FULL;
mergeZonePostcodes(target, zoneMap, matchType);
linkSheet(target, sheetName);
}
}
@@ -95,9 +117,18 @@ public final class LblZonePostcodeAttach
{
return m.group(1);
}
// IT-iMile / DE-iMile:从表名/产品名推导
String blob = compact(nz(product.getSheetName()) + nz(product.getProductName()) + nz(product.getDictValue()));
if (blob.contains("itimile") || blob.startsWith("itimile") || blob.contains("italyimile"))
{
return "IT";
}
if (blob.contains("deimile") || blob.contains("germanyimile"))
{
return "DE";
}
return "";
}
private static boolean isZonePostcodeSheet(String sheetName)
{
if (sheetName == null || sheetName.isBlank())
@@ -107,6 +138,257 @@ public final class LblZonePostcodeAttach
return sheetName.contains("邮编") && sheetName.contains("分区");
}
/** 英国附加费:Royal Mail / EVRI 偏远邮编前缀表。 */
private static boolean isUkSurchargeSheet(String sheetName)
{
if (sheetName == null || sheetName.isBlank())
{
return false;
}
return sheetName.contains("英国") && sheetName.contains("附加费");
}
/**
* 从「英国附加费」右侧 EVRI 列抽取偏远邮编,映射为 Evri 价表分区名后挂到 Evri 产品。
*/
private static void attachUkEvri(Sheet sheet, String sheetName, List<LblProduct> products)
{
Map<String, List<String>> zoneMap = parseUkEvriZonePostcodes(sheet);
if (zoneMap.isEmpty())
{
return;
}
LblProduct target = matchEvriProduct(products);
if (target == null)
{
return;
}
mergeZonePostcodes(target, zoneMap, PrcZoneDetail.MATCH_PREFIX);
linkSheet(target, sheetName);
}
private static Map<String, List<String>> parseUkEvriZonePostcodes(Sheet sheet)
{
Map<String, List<String>> map = new LinkedHashMap<String, List<String>>();
int lastRow = Math.min(sheet.getLastRowNum(), MAX_ROWS);
int headerRow = -1;
int enCol = 4;
int zhCol = 5;
int postcodeCol = 6;
for (int r = 0; r <= Math.min(lastRow, 8); r++)
{
Row row = sheet.getRow(r);
if (row == null)
{
continue;
}
boolean hasEvriTitle = false;
boolean hasPcHead = false;
for (int c = 0; c < row.getLastCellNum(); c++)
{
String val = cellText(row.getCell(c));
String up = val.toUpperCase(Locale.ROOT);
if (up.contains("EVRI"))
{
hasEvriTitle = true;
}
if (val.contains("邮编开头") && c >= 3)
{
hasPcHead = true;
}
}
if (hasEvriTitle && !hasPcHead)
{
Row next = sheet.getRow(r + 1);
if (next != null)
{
int foundEn = -1;
int foundZh = -1;
int foundPc = -1;
for (int c = 0; c < next.getLastCellNum(); c++)
{
String val = cellText(next.getCell(c));
if (c < 3)
{
continue;
}
if (val.contains("偏远地区") && val.contains("英文") && foundEn < 0)
{
foundEn = c;
}
else if (val.contains("偏远地区") && val.contains("中文") && foundZh < 0)
{
foundZh = c;
}
else if (val.contains("邮编开头") && foundPc < 0)
{
foundPc = c;
}
}
if (foundPc >= 0)
{
headerRow = r + 1;
if (foundEn >= 0)
{
enCol = foundEn;
}
if (foundZh >= 0)
{
zhCol = foundZh;
}
postcodeCol = foundPc;
break;
}
}
}
if (hasPcHead)
{
int foundEn = -1;
int foundZh = -1;
int foundPc = -1;
for (int c = 0; c < row.getLastCellNum(); c++)
{
String val = cellText(row.getCell(c));
if (c < 3)
{
continue;
}
if (val.contains("偏远地区") && val.contains("英文") && foundEn < 0)
{
foundEn = c;
}
else if (val.contains("偏远地区") && val.contains("中文") && foundZh < 0)
{
foundZh = c;
}
else if (val.contains("邮编开头") && foundPc < 0)
{
foundPc = c;
}
}
if (foundPc >= 0)
{
headerRow = r;
if (foundEn >= 0)
{
enCol = foundEn;
}
if (foundZh >= 0)
{
zhCol = foundZh;
}
postcodeCol = foundPc;
break;
}
}
}
if (headerRow < 0)
{
headerRow = 1;
enCol = 4;
zhCol = 5;
postcodeCol = 6;
}
String lastEn = "";
String lastZh = "";
for (int r = headerRow + 1; r <= lastRow; r++)
{
Row row = sheet.getRow(r);
if (row == null)
{
continue;
}
String en = normalizeZone(cellText(row.getCell(enCol)));
String zh = normalizeZone(cellText(row.getCell(zhCol)));
if (!en.isEmpty())
{
lastEn = en;
}
if (!zh.isEmpty())
{
lastZh = zh;
}
String postcode = stripTrailingStar(normalizePostcode(cellText(row.getCell(postcodeCol)), 0));
if (postcode.isEmpty() || (lastEn.isEmpty() && lastZh.isEmpty()))
{
continue;
}
String zone = mapEvriZoneName(lastEn, lastZh);
if (zone.isEmpty())
{
continue;
}
List<String> list = map.computeIfAbsent(zone, k -> new ArrayList<String>());
if (!list.contains(postcode))
{
list.add(postcode);
}
}
return map;
}
/** 映射为与 Evri 48H 价表分区列可对上的名称。 */
private static String mapEvriZoneName(String en, String zh)
{
String blob = ((en == null ? "" : en) + " " + (zh == null ? "" : zh)).toLowerCase(Locale.ROOT);
if (blob.contains("bfpo"))
{
return "BFPO";
}
if (blob.contains("isle of man") || blob.contains("马恩"))
{
return "Isle of Man";
}
if (blob.contains("northern ireland") || blob.contains("北爱尔兰"))
{
return "Northern Ireland";
}
if (blob.contains("channel") || blob.contains("scilly") || blob.contains("海峡") || blob.contains("锡利"))
{
return "Channel Islands / Isle of Scilly";
}
if (blob.contains("scottish") || blob.contains("shetland") || blob.contains("highland") || blob.contains("h&i")
|| blob.contains("高地"))
{
return "Highlands & Islands";
}
String fallback = normalizeZone(en);
if (!fallback.isEmpty())
{
return fallback;
}
return normalizeZone(zh);
}
private static LblProduct matchEvriProduct(List<LblProduct> products)
{
LblProduct hit = null;
int count = 0;
for (LblProduct product : products)
{
String blob = compact(nz(product.getProductName()) + nz(product.getSheetName()) + nz(product.getDictValue()));
if (blob.contains("evri"))
{
hit = product;
count++;
}
}
if (count == 1)
{
return hit;
}
return null;
}
private static String stripTrailingStar(String text)
{
if (text == null || text.isEmpty())
{
return "";
}
return text.replaceAll("\\*+\\s*$", "").trim();
}
private static Map<String, List<String>> parseSheet(Sheet sheet)
{
Map<String, List<String>> poste = parsePosteItaliane(sheet);
@@ -209,6 +491,16 @@ public final class LblZonePostcodeAttach
}
}
private static String detectMatchType(String raw, String fallback)
{
String text = raw == null ? "" : raw.trim();
if (text.endsWith("*") || text.contains("邮编开头"))
{
return PrcZoneDetail.MATCH_PREFIX;
}
return PrcZoneDetail.normalizeMatchType(fallback);
}
private static Map<String, List<String>> parseCtt(Sheet sheet)
{
Map<String, List<String>> map = new LinkedHashMap<String, List<String>>();
@@ -433,7 +725,8 @@ public final class LblZonePostcodeAttach
LblProduct germany = productOf(products, "DE-iMile");
int lastRow = Math.min(sheet.getLastRowNum(), MAX_ROWS);
int header = -1;
for (int r = 0; r <= Math.min(lastRow, 6); r++)
// 不能只认「邮编」:标题行「IT-iMile邮编分区」也含该字,须同时有列名(城市/分区/ZIP)
for (int r = 0; r <= Math.min(lastRow, 8); r++)
{
Row row = sheet.getRow(r);
if (row == null)
@@ -443,11 +736,20 @@ public final class LblZonePostcodeAttach
StringBuilder line = new StringBuilder();
for (int c = 0; c < row.getLastCellNum(); c++)
{
line.append(cellText(row.getCell(c)));
line.append(cellText(row.getCell(c))).append(' ');
}
String text = line.toString();
if (text.contains("邮编") || text.toLowerCase(Locale.ROOT).contains("zip"))
String low = text.toLowerCase(Locale.ROOT);
boolean hasItHead = text.contains("邮编") && (text.contains("分区") || text.contains("城市"));
boolean hasDeHead = low.contains("zip");
if (hasItHead || hasDeHead)
{
// 排除纯标题:仅有「xxx邮编分区」无列名
if (text.contains("邮编分区") && !text.contains("城市") && !low.contains("zip")
&& !text.contains("邮编(") && !text.contains("邮编("))
{
continue;
}
header = r;
break;
}
@@ -520,12 +822,12 @@ public final class LblZonePostcodeAttach
}
if (italy != null && !itMap.isEmpty())
{
mergeZonePostcodes(italy, itMap);
mergeZonePostcodes(italy, itMap, PrcZoneDetail.MATCH_FULL);
linkSheet(italy, sheetName);
}
if (germany != null && !deMap.isEmpty())
{
mergeZonePostcodes(germany, deMap);
mergeZonePostcodes(germany, deMap, PrcZoneDetail.MATCH_FULL);
linkSheet(germany, sheetName);
}
}
@@ -550,6 +852,10 @@ public final class LblZonePostcodeAttach
private static LblProduct productOf(List<LblProduct> products, String name)
{
if (products == null || name == null || name.isBlank())
{
return null;
}
for (LblProduct product : products)
{
if (name.equals(product.getSheetName()) || name.equals(product.getProductName())
@@ -558,6 +864,16 @@ public final class LblZonePostcodeAttach
return product;
}
}
// IT-iMile / DE-iMile:允许 sheet/dict 含同名 token
String key = compact(name);
for (LblProduct product : products)
{
String blob = compact(nz(product.getProductName()) + nz(product.getSheetName()) + nz(product.getDictValue()));
if (!key.isEmpty() && blob.contains(key))
{
return product;
}
}
return null;
}
@@ -615,22 +931,49 @@ public final class LblZonePostcodeAttach
return null;
}
private static void mergeZonePostcodes(LblProduct product, Map<String, List<String>> incoming)
private static void mergeZonePostcodes(LblProduct product, Map<String, List<String>> incoming, String matchType)
{
Map<String, List<String>> current = product.getZonePostcodes();
if (product == null || incoming == null || incoming.isEmpty())
{
return;
}
Map<String, List<PrcZoneDetail>> current = product.getZonePostcodes();
if (current == null)
{
current = new LinkedHashMap<String, List<String>>();
current = new LinkedHashMap<String, List<PrcZoneDetail>>();
product.setZonePostcodes(current);
}
String type = PrcZoneDetail.normalizeMatchType(matchType);
for (Map.Entry<String, List<String>> e : incoming.entrySet())
{
List<String> list = current.computeIfAbsent(e.getKey(), k -> new ArrayList<String>());
List<PrcZoneDetail> list = current.computeIfAbsent(e.getKey(), k -> new ArrayList<PrcZoneDetail>());
for (String pc : e.getValue())
{
if (!list.contains(pc))
if (pc == null || pc.isBlank())
{
list.add(pc);
continue;
}
String postcode = pc.trim();
String rowType = detectMatchType(postcode, type);
// 落库前去掉尾部 *
postcode = stripTrailingStar(postcode);
if (postcode.isEmpty())
{
continue;
}
boolean exists = false;
for (PrcZoneDetail item : list)
{
if (item != null && postcode.equalsIgnoreCase(item.getPostcode()))
{
item.setMatchType(rowType);
exists = true;
break;
}
}
if (!exists)
{
list.add(PrcZoneDetail.of(postcode, rowType));
}
}
}
@@ -2,13 +2,21 @@ package com.bms.price.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.bms.common.core.domain.entity.SysUser;
import com.bms.price.domain.PayOrderQuery;
import com.bms.price.domain.PayOrderRow;
/** 应付列表。 */
public interface PayOrderListMapper
{
List<PayOrderRow> selectList(PayOrderQuery query);
/** 当前页的计费订单 ID,顺序就是列表顺序。 */
List<Long> selectPageIds(PayOrderQuery query);
/** 按主键取出这一页的列表字段。 */
List<PayOrderRow> selectByBillIds(@Param("billIds") List<Long> billIds);
/** 这一页更新人对应的账号和昵称。 */
List<SysUser> selectUsers(@Param("userIds") List<Long> userIds, @Param("userNames") List<String> userNames);
PayOrderRow selectRow(@Param("billId") String billId);
@@ -67,6 +67,10 @@ public interface PayPostcodeMapper
List<PayPostcodeGroup> selectRemoteGroupsByCountry(@Param("countryCode") String countryCode,
@Param("countryName") String countryName);
/** 附加费邮编。compact 是去掉空格和符号后的订单邮编,用来按前几位缩小范围。 */
List<PayPostcodeLine> selectSurchargeLines(@Param("countryCode") String countryCode,
@Param("countryName") String countryName, @Param("compact") String compact);
List<PayPostcodeLine> selectRegionKeys(@Param("groupIds") List<Long> groupIds);
List<PayPostcodeLine> selectLinesByGroups(@Param("groupIds") List<Long> groupIds);
@@ -16,6 +16,9 @@ public interface PrcSurchargeRelMapper
*/
public List<PrcSurchargeRel> selectPrcSurchargeRelList(PrcSurchargeRel rel);
/** 按套餐版本查销售附加费关联(产品或明细) */
public List<PrcSurchargeRel> selectSalesRelsByPsvId(@Param("psvId") Long psvId);
public List<PrcSurchargeRel> selectByDetailIdsAndPriceType(
@Param("detailIds") List<Long> detailIds,
@Param("priceType") String priceType);
@@ -423,34 +423,7 @@ public final class LabelArCostCalculator
result.getSkipped().add(name + ":价卡没有可计算的条件,暂不计费");
}
}
result.getFees().addAll(keepHighestByName(sized));
}
/** 同一费用名的尺寸档同时命中时,只收较高的一档,例如 70% 覆盖 35%。 */
private static List<PayCostLine> keepHighestByName(List<PayCostLine> lines)
{
List<PayCostLine> kept = new ArrayList<>();
for (PayCostLine line : lines)
{
PayCostLine same = null;
for (PayCostLine exists : kept)
{
if (exists.getFeeName().equals(line.getFeeName()))
{
same = exists;
break;
}
}
if (same == null)
{
kept.add(line);
}
else if (line.getAmount().compareTo(same.getAmount()) > 0)
{
kept.set(kept.indexOf(same), line);
}
}
return kept;
result.getFees().addAll(sized);
}
private static void addExtraKg(List<PayCostLine> fees, PaySurcharge fee, BigDecimal weight, String currency)
@@ -473,13 +446,43 @@ public final class LabelArCostCalculator
{
return;
}
BigDecimal steps = PaySurchargeRules.extraSteps(fee, weight);
if (steps.compareTo(BigDecimal.ZERO) <= 0)
{
return;
}
BigDecimal over = weight.subtract(threshold);
BigDecimal amount = fee.getAmount().multiply(over).setScale(2, RoundingMode.HALF_UP);
BigDecimal amount = fee.getAmount().multiply(steps).setScale(2, RoundingMode.HALF_UP);
String billed = plain(steps.multiply(PaySurchargeRules.extraStepKg(fee)));
PayCostLine freightLine = freightLine(fees);
if (freightLine != null && "每公斤续重".equals(blank(fee.getFeeName())))
{
freightLine.setAmount(freightLine.getAmount().add(amount).setScale(2, RoundingMode.HALF_UP));
String remark = blank(freightLine.getRemark());
freightLine.setRemark((remark.isEmpty() ? "" : remark + ";") + "续重 " + billed + "kg × " + plain(fee.getAmount()));
return;
}
long scId = fee.getSurchargeId() == null ? 0L : fee.getSurchargeId();
String remark = "超出 " + plain(over) + "kg × " + plain(fee.getAmount()) + " " + blank(fee.getPriceUnit());
String remark = "超出 " + plain(over) + "kg,按 " + billed + "kg × " + plain(fee.getAmount()) + " " + blank(fee.getPriceUnit());
fees.add(line("SURCHARGE", blank(fee.getFeeName()), scId, amount, currency, remark));
}
private static PayCostLine freightLine(List<PayCostLine> fees)
{
if (fees == null)
{
return null;
}
for (PayCostLine row : fees)
{
if (row != null && "BASIC_FREIGHT".equals(row.getFeeType()))
{
return row;
}
}
return null;
}
/** 同一地区有多张服务表时,续重只跟本次首重所在的那一张表。 */
private static boolean sameSection(String feeSection, String freightSection)
{
@@ -103,7 +103,7 @@ public final class PayCostCalculator
boolean postcodeOn, boolean zoneOn)
{
return calculate(product, weight, length, width, height, postcode, zoneName, bizDate, orderStatus, remoteHits,
postcodeOn, zoneOn, null, null);
postcodeOn, zoneOn, null, null, null);
}
/**
@@ -112,6 +112,17 @@ public final class PayCostCalculator
public static PayOrderCostResult calculate(PayProduct product, BigDecimal weight, BigDecimal length, BigDecimal width,
BigDecimal height, String postcode, String zoneName, Date bizDate, Integer orderStatus, List<PayRemoteBook.Hit> remoteHits,
boolean postcodeOn, boolean zoneOn, String countryCode, String countryName)
{
return calculate(product, weight, length, width, height, postcode, zoneName, bizDate, orderStatus, remoteHits,
postcodeOn, zoneOn, countryCode, countryName, null);
}
/**
* surchargeHits 是应付邮编配置里属性为附加费、并且前几位对上订单邮编的结果。
*/
public static PayOrderCostResult calculate(PayProduct product, BigDecimal weight, BigDecimal length, BigDecimal width,
BigDecimal height, String postcode, String zoneName, Date bizDate, Integer orderStatus, List<PayRemoteBook.Hit> remoteHits,
boolean postcodeOn, boolean zoneOn, String countryCode, String countryName, List<PayRemoteBook.Hit> surchargeHits)
{
PayOrderCostResult result = new PayOrderCostResult();
result.setFees(new ArrayList<>());
@@ -128,9 +139,23 @@ public final class PayCostCalculator
result.setMessage(PaymentMesEnum.BMS_PAY_NO_WEIGHT.getCnMes());
return result;
}
PayWeightBand remoteHit = conditionBand(product, postcode, countryCode, weight, length, width, height);
PayWeightBand band;
String pricedZone = zoneName;
if (remoteHit != null)
{
band = remoteHit;
if (!blank(remoteHit.getZoneName()).isEmpty())
{
pricedZone = remoteHit.getZoneName();
}
}
else
{
List<PayWeightBand> usable = usableBands(product.getWeightBands());
List<PayWeightBand> bands = forZone(usable, zoneName);
if (zoneName != null && !zoneName.isBlank() && bands.isEmpty() && hasZoneFee(product, zoneName))
if (zoneName != null && !zoneName.isBlank() && bands.isEmpty()
&& (hasZoneFee(product, zoneName) || hasRemoteWeightBand(product, zoneName)))
{
bands = deliveryBands(usable, product);
}
@@ -146,7 +171,7 @@ public final class PayCostCalculator
+ "),邮编没有对上其中的地区,无法确定运费");
return result;
}
PayWeightBand band = matchBand(bands, weight);
band = matchBand(bands, weight);
if (band == null)
{
PayWeightBand top = highestBand(bands);
@@ -158,19 +183,20 @@ public final class PayCostCalculator
}
band = top;
}
}
String currency = currencyOf(product, band);
BigDecimal freight = bandAmount(band, weight);
String freightRemark = band.getWeightLabel() + " " + plain(band.getPrice()) + " " + blank(band.getPriceUnit());
if (zoneName != null && !zoneName.isBlank())
if (pricedZone != null && !pricedZone.isBlank())
{
freightRemark = freightRemark + ",地区 " + zoneName.replace('\n', ' ');
freightRemark = freightRemark + ",地区 " + pricedZone.replace('\n', ' ');
}
PayCostLine freightLine = line("BASIC_FREIGHT", "基础运费", 0L, freight, currency, freightRemark);
result.getFees().add(freightLine);
result.setCurrency(currency);
addZoneFeeBands(result, product, band, weight, postcode, currency);
addSurcharges(product, weight, length, width, height, postcode, zoneName, bizDate, orderStatus, freight, currency,
band.getSectionName(), remoteHits, postcodeOn, zoneOn, countryCode, countryName, result);
addZoneFeeBands(result, product, band, weight, postcode, currency, zoneName);
addSurcharges(product, weight, length, width, height, postcode, pricedZone, bizDate, orderStatus, freight, currency,
band.getSectionName(), remoteHits, surchargeHits, postcodeOn, zoneOn, countryCode, countryName, result);
BigDecimal total = BigDecimal.ZERO;
for (PayCostLine fee : result.getFees())
{
@@ -181,6 +207,24 @@ public final class PayCostCalculator
return result;
}
/** 偏远费写在重量段里,和派送费按同一重量行对齐。分区对上时,运费仍用派送档。 */
private static boolean hasRemoteWeightBand(PayProduct product, String zoneName)
{
if (product.getWeightBands() == null || zoneName == null || zoneName.isBlank())
{
return false;
}
for (PayWeightBand band : product.getWeightBands())
{
if (band != null && zoneFeeBand(band) && blank(band.getCalcRule()).isEmpty()
&& PayZoneMatcher.sameZone(band.getZoneName(), zoneName))
{
return true;
}
}
return false;
}
/** 邮编落到偏远分区,而价卡重量段只有大陆派送费时,运费用大陆档。 */
private static boolean hasZoneFee(PayProduct product, String zoneName)
{
@@ -290,7 +334,7 @@ public final class PayCostCalculator
*/
private static void addSurcharges(PayProduct product, BigDecimal weight, BigDecimal length, BigDecimal width,
BigDecimal height, String postcode, String zoneName, Date bizDate, Integer orderStatus, BigDecimal freight, String currency,
String freightSection, List<PayRemoteBook.Hit> remoteHits, boolean postcodeOn, boolean zoneOn,
String freightSection, List<PayRemoteBook.Hit> remoteHits, List<PayRemoteBook.Hit> surchargeHits, boolean postcodeOn, boolean zoneOn,
String countryCode, String countryName, PayOrderCostResult result)
{
if (product.getSurcharges() == null)
@@ -311,6 +355,19 @@ public final class PayCostCalculator
{
continue;
}
if (PaySurchargeRules.FEE_POSTCODE.equals(rule))
{
String feePostName = blank(fee.getFeeName());
if (postcode == null || postcode.isBlank())
{
result.getSkipped().add(feePostName + ":订单没有邮编");
}
else if (surchargeBookApplies(surchargeHits, fee))
{
addFlat(result.getFees(), fee, currency, "邮编 " + postcode.trim());
}
continue;
}
if (!countryAllows(fee, countryCode))
{
continue;
@@ -367,7 +424,11 @@ public final class PayCostCalculator
String name = blank(fee.getFeeName());
if (PaySurchargeRules.POSTCODE.equals(rule))
{
if (!postcodeRules.isEmpty())
if (configFee && surchargeBookApplies(surchargeHits, fee))
{
addFlat(result.getFees(), fee, currency, "邮编 " + (postcode == null ? "" : postcode.trim()));
}
else if (!postcodeRules.isEmpty())
{
addConfiguredZoneFee(result, fee, weight, currency, postcode, countryCode, countryName, postcodeRules, "邮编 ");
}
@@ -482,37 +543,10 @@ public final class PayCostCalculator
result.getSkipped().add(name + ":价卡没有可计算的条件,暂不计费");
}
}
result.getFees().addAll(keepHighestByName(sized));
result.getFees().addAll(sized);
result.getFees().addAll(stepped);
}
/** 同一费用名的按票尺寸档同时命中时,只收较高的一档,例如 70% 覆盖 35%。按超出单位计的不并进这一档。 */
private static List<PayCostLine> keepHighestByName(List<PayCostLine> lines)
{
List<PayCostLine> kept = new ArrayList<>();
for (PayCostLine line : lines)
{
PayCostLine same = null;
for (PayCostLine exists : kept)
{
if (exists.getFeeName().equals(line.getFeeName()))
{
same = exists;
break;
}
}
if (same == null)
{
kept.add(line);
}
else if (line.getAmount().compareTo(same.getAmount()) > 0)
{
kept.set(kept.indexOf(same), line);
}
}
return kept;
}
private static void addExtraKg(List<PayCostLine> fees, PaySurcharge fee, BigDecimal weight, String currency)
{
if (fee.getAmount() == null || weight == null)
@@ -533,13 +567,43 @@ public final class PayCostCalculator
{
return;
}
BigDecimal steps = PaySurchargeRules.extraSteps(fee, weight);
if (steps.compareTo(BigDecimal.ZERO) <= 0)
{
return;
}
BigDecimal over = weight.subtract(threshold);
BigDecimal amount = fee.getAmount().multiply(over).setScale(2, RoundingMode.HALF_UP);
BigDecimal amount = fee.getAmount().multiply(steps).setScale(2, RoundingMode.HALF_UP);
String billed = plain(steps.multiply(PaySurchargeRules.extraStepKg(fee)));
PayCostLine freightLine = freightLine(fees);
if (freightLine != null && "每公斤续重".equals(blank(fee.getFeeName())))
{
freightLine.setAmount(freightLine.getAmount().add(amount).setScale(2, RoundingMode.HALF_UP));
String remark = blank(freightLine.getRemark());
freightLine.setRemark((remark.isEmpty() ? "" : remark + ";") + "续重 " + billed + "kg × " + plain(fee.getAmount()));
return;
}
long scId = feeRef(fee);
String remark = "超出 " + plain(over) + "kg × " + plain(fee.getAmount()) + " " + blank(fee.getPriceUnit());
String remark = "超出 " + plain(over) + "kg,按 " + billed + "kg × " + plain(fee.getAmount()) + " " + blank(fee.getPriceUnit());
fees.add(line("SURCHARGE", blank(fee.getFeeName()), scId, amount, currency, remark));
}
private static PayCostLine freightLine(List<PayCostLine> fees)
{
if (fees == null)
{
return null;
}
for (PayCostLine row : fees)
{
if (row != null && "BASIC_FREIGHT".equals(row.getFeeType()))
{
return row;
}
}
return null;
}
/** 同一地区有多张服务表时,续重只跟本次首重所在的那一张表。 */
private static boolean sameSection(String feeSection, String freightSection)
{
@@ -599,6 +663,11 @@ public final class PayCostCalculator
private static boolean sizeHit(PayProduct product, PaySurcharge fee, BigDecimal length, BigDecimal width, BigDecimal height,
BigDecimal weight)
{
if (fee != null && (("VOLUME".equalsIgnoreCase(fee.getSizeType()) && fee.getVolumeM3() != null)
|| (fee.getLengthCm() != null && fee.getWidthCm() != null && fee.getHeightCm() != null)))
{
return PaySurchargeRules.matchesFeeSize(fee, length, width, height);
}
List<Map<String, Object>> details = ruleDetails(product, PaySurchargeRules.SIZE);
if (details.isEmpty())
{
@@ -691,6 +760,29 @@ public final class PayCostCalculator
return name.contains("偏远") || name.contains("岛屿") || name.contains("remote") || name.contains("island");
}
/** 附加费配置的费用名和邮编组上的费用名对得上,才收这一笔。邮编组没写费用名时,这一条附加费邮编都收。 */
private static boolean surchargeBookApplies(List<PayRemoteBook.Hit> hits, PaySurcharge fee)
{
if (hits == null || hits.isEmpty() || fee == null)
{
return false;
}
String name = blank(fee.getFeeName());
for (PayRemoteBook.Hit hit : hits)
{
if (hit == null)
{
continue;
}
String book = blank(hit.getFeeName());
if (book.isEmpty() || name.isEmpty() || sameFeeName(book, name) || sameFeeCore(book, name))
{
return true;
}
}
return false;
}
/** 邮编配置命中后,金额相同的那一档才收。命中写了地区时要对上分区;没写地区时用价卡上的邮编前缀选档。 */
private static boolean bookApplies(List<PayRemoteBook.Hit> hits, PaySurcharge fee, String rule, String postcode)
{
@@ -752,6 +844,22 @@ public final class PayCostCalculator
return fee.contains(book) || book.contains(fee);
}
/** 去掉渠道和「附加费」这几个字后再比,空气减排费_Evri_48H 和空气减排附加费算同一笔。 */
private static boolean sameFeeCore(String bookName, String feeName)
{
String book = feeCore(bookName);
String fee = feeCore(feeName);
return !book.isEmpty() && !fee.isEmpty() && (book.contains(fee) || fee.contains(book));
}
private static String feeCore(String name)
{
String text = blank(name).toLowerCase(Locale.ROOT);
text = text.replace("附加费", "").replace("附加", "").replace("费", "");
text = text.replace("evri48h", "").replace("evri", "").replace("48h", "");
return text.replaceAll("[^a-z0-9\\u4e00-\\u9fa5]", "");
}
private static String feeKey(String name)
{
return blank(name).toLowerCase(Locale.ROOT).replace("地区", "").replace(" ", "");
@@ -812,7 +920,20 @@ public final class PayCostCalculator
return stepped;
}
}
return matchedFee(fee, freight, currency, "尺寸命中");
return matchedFee(fee, freight, currency, sizeRemark(fee));
}
private static String sizeRemark(PaySurcharge fee)
{
if (fee != null && "VOLUME".equalsIgnoreCase(blank(fee.getSizeType())) && fee.getVolumeM3() != null)
{
return "体积超过 " + plain(fee.getVolumeM3()) + "m³";
}
if (fee == null || fee.getLengthCm() == null || fee.getWidthCm() == null || fee.getHeightCm() == null)
{
return "尺寸命中";
}
return "任一边超过 " + plain(fee.getLengthCm()) + "×" + plain(fee.getWidthCm()) + "×" + plain(fee.getHeightCm()) + "cm";
}
/** 价卡写成每增加、每超出时,金额是一个步长的单价。 */
@@ -913,17 +1034,18 @@ public final class PayCostCalculator
}
amount = freight.multiply(fee.getAmount()).divide(new BigDecimal("100"), 2, RoundingMode.HALF_UP);
}
else
String lineCurrency = currency;
if (!percent(fee))
{
amount = amount.setScale(2, RoundingMode.HALF_UP);
String feeCurrency = normalize(fee.getCurrency());
if (!feeCurrency.isEmpty() && !feeCurrency.equals(currency))
if (!feeCurrency.isEmpty())
{
return null;
lineCurrency = feeCurrency;
}
}
long scId = feeRef(fee);
return line("SURCHARGE", blank(fee.getFeeName()), scId, amount, currency, remark);
return line("SURCHARGE", blank(fee.getFeeName()), scId, amount, lineCurrency, remark);
}
private static boolean percent(PaySurcharge fee)
@@ -957,9 +1079,137 @@ public final class PayCostCalculator
return name.contains("偏远") || name.contains("额外") || name.contains("line-haul") || name.contains("linehaul") || name.contains("运输费");
}
/** 和首重同一地区的线路费直接加;带邮编前缀的偏远费按邮编加。超出首重再加该费用自己的续重价。 */
/**
* 重量段写了计费条件时,按条件选用这一档的金额和续重。没写条件的价卡仍按分区计费。
* 邮编取更长前缀,重量取更高门槛,尺寸取排序靠后的一条。不同类型同时命中时,邮编优先于尺寸,尺寸优先于重量。
*/
private static PayWeightBand conditionBand(PayProduct product, String postcode, String countryCode, BigDecimal weight,
BigDecimal length, BigDecimal width, BigDecimal height)
{
if (product.getWeightBands() == null)
{
return null;
}
PayWeightBand best = null;
int bestRank = 0;
int bestPrefix = 0;
BigDecimal bestWeight = null;
int bestIndex = -1;
int index = 0;
for (PayWeightBand band : product.getWeightBands())
{
int rank = conditionRank(band, postcode, countryCode, weight, length, width, height);
if (rank > bestRank)
{
best = band;
bestRank = rank;
bestPrefix = prefixScore(band, postcode);
bestWeight = weightGate(band);
bestIndex = index;
}
else if (rank > 0 && rank == bestRank)
{
if (rank == 3 && prefixScore(band, postcode) > bestPrefix)
{
best = band;
bestPrefix = prefixScore(band, postcode);
bestIndex = index;
}
else if (rank == 1)
{
BigDecimal gate = weightGate(band);
if (gate != null && (bestWeight == null || gate.compareTo(bestWeight) > 0))
{
best = band;
bestWeight = gate;
bestIndex = index;
}
}
else if (rank == 2 && index > bestIndex)
{
best = band;
bestIndex = index;
}
}
index++;
}
return best;
}
/** 邮编 3,尺寸 2,重量 1。没有命中返回 0。 */
private static int conditionRank(PayWeightBand band, String postcode, String countryCode, BigDecimal weight,
BigDecimal length, BigDecimal width, BigDecimal height)
{
if (band == null || band.getPrice() == null || !countryFits(band.getCountryCode(), countryCode))
{
return 0;
}
String rule = blank(band.getCalcRule()).toUpperCase(Locale.ROOT);
String param = blank(band.getCalcParam());
if (rule.isEmpty() || param.isEmpty())
{
return 0;
}
if (PaySurchargeRules.POSTCODE.equals(rule) && PaySurchargeRules.matchesPostcode(param, postcode))
{
return 3;
}
if (PaySurchargeRules.SIZE.equals(rule) && PaySurchargeRules.matchesSize(param, length, width, height))
{
return 2;
}
if (PaySurchargeRules.WEIGHT.equals(rule) && PaySurchargeRules.matchesWeight(param, weight))
{
return 1;
}
return 0;
}
private static int prefixScore(PayWeightBand band, String postcode)
{
int length = prefixLength(blank(band.getCalcParam()), postcode);
return length == 0 ? 1 : length;
}
private static BigDecimal weightGate(PayWeightBand band)
{
try
{
return new BigDecimal(blank(band.getCalcParam()).trim());
}
catch (NumberFormatException ex)
{
return null;
}
}
private static boolean countryFits(String bandCountry, String orderCountry)
{
if (bandCountry == null || bandCountry.isBlank() || orderCountry == null || orderCountry.isBlank())
{
return true;
}
return bandCountry.trim().equalsIgnoreCase(orderCountry.trim());
}
private static int prefixLength(String prefixes, String postcode)
{
String digits = postcode.replaceAll("\\D", "");
int best = 0;
for (String token : prefixes.split(","))
{
String value = token.trim();
if (value.matches("\\d{1,5}") && !digits.isEmpty() && digits.startsWith(value) && value.length() > best)
{
best = value.length();
}
}
return best;
}
/** 没有邮编条件的分区费用仍按地区加在已选运费上。写了邮编条件的档已经当作运费本身。 */
private static void addZoneFeeBands(PayOrderCostResult result, PayProduct product, PayWeightBand freight, BigDecimal weight,
String postcode, String currency)
String postcode, String currency, String orderZone)
{
if (product.getWeightBands() == null || freight == null)
{
@@ -967,7 +1217,8 @@ public final class PayCostCalculator
}
for (PayWeightBand band : product.getWeightBands())
{
if (band == null || band.getPrice() == null || !zoneFeeBand(band) || !zoneFeeHits(band, freight, postcode))
if (band == null || band.getPrice() == null || !zoneFeeBand(band) || !blank(band.getCalcRule()).isEmpty()
|| !sameWeightRow(band, freight) || !zoneFeeHits(band, freight, postcode, orderZone))
{
continue;
}
@@ -979,13 +1230,29 @@ public final class PayCostCalculator
}
}
private static boolean zoneFeeHits(PayWeightBand band, PayWeightBand freight, String postcode)
/** 偏远行和本次派送费是同一重量段,才按这一行加价。 */
private static boolean sameWeightRow(PayWeightBand band, PayWeightBand freight)
{
if (band.getWeightMin() == null || band.getWeightMax() == null || freight.getWeightMin() == null || freight.getWeightMax() == null)
{
return true;
}
return band.getWeightMin().compareTo(freight.getWeightMin()) == 0
&& band.getWeightMax().compareTo(freight.getWeightMax()) == 0;
}
private static boolean zoneFeeHits(PayWeightBand band, PayWeightBand freight, String postcode, String orderZone)
{
String prefixes = PaySurchargeRules.remotePrefixes(band.getZoneName());
if (!prefixes.isEmpty())
{
return PaySurchargeRules.matchesPostcode(prefixes, postcode);
}
String label = blank(band.getChargeName()) + " " + blank(band.getSectionName());
if (label.contains("偏远"))
{
return orderZone != null && !orderZone.isBlank() && PayZoneMatcher.sameZone(band.getZoneName(), orderZone);
}
return PayZoneMatcher.sameZone(band.getZoneName(), freight.getZoneName());
}
@@ -1010,11 +1277,17 @@ public final class PayCostCalculator
{
continue;
}
BigDecimal steps = PaySurchargeRules.extraSteps(fee, weight);
if (steps.compareTo(BigDecimal.ZERO) <= 0)
{
return;
}
BigDecimal over = weight.subtract(band.getWeightMax());
BigDecimal amount = fee.getAmount().multiply(over).setScale(2, RoundingMode.HALF_UP);
BigDecimal amount = fee.getAmount().multiply(steps).setScale(2, RoundingMode.HALF_UP);
long scId = feeRef(fee);
result.getFees().add(line("SURCHARGE", name, scId, amount, currency,
"超出 " + plain(over) + "kg × " + plain(fee.getAmount()) + " " + blank(fee.getPriceUnit())));
"超出 " + plain(over) + "kg,按 " + plain(steps.multiply(PaySurchargeRules.extraStepKg(fee))) + "kg × "
+ plain(fee.getAmount()) + " " + blank(fee.getPriceUnit())));
return;
}
}
@@ -1028,7 +1301,8 @@ public final class PayCostCalculator
}
for (PayWeightBand band : bands)
{
if (band != null && band.getPrice() != null && band.getWeightMin() != null && band.getWeightMax() != null && !zoneFeeBand(band))
if (band != null && band.getPrice() != null && band.getWeightMin() != null && band.getWeightMax() != null
&& !zoneFeeBand(band) && blank(band.getCalcRule()).isEmpty())
{
usable.add(band);
}
@@ -6,6 +6,7 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Locale;
import java.util.Set;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -69,9 +70,10 @@ public class PayOrderFeeCalculator
String zoneName = resolveZone(channel, product, bill.getDestPostcode(), bill.getCountryCode(), bill.getCountryName(), linked);
applyCurrentSurcharge(channel.getId(), product);
List<PayRemoteBook.Hit> remoteHits = remoteHits(linked, bill.getDestPostcode(), bill.getCountryCode(), bill.getCountryName(), channel);
List<PayRemoteBook.Hit> surchargeHits = surchargeHits(bill.getDestPostcode(), bill.getCountryCode(), bill.getCountryName(), channel, product);
PayOrderCostResult result = PayCostCalculator.calculate(product, weight, bill.getPkgLength(), bill.getPkgWidth(),
bill.getPkgHeight(), bill.getDestPostcode(), zoneName, priceDate, orderStatus, remoteHits, true, true,
bill.getCountryCode(), bill.getCountryName());
bill.getCountryCode(), bill.getCountryName(), surchargeHits);
result.setBillId(bill.getBillId());
result.setChannelId(channel.getId());
result.setChannelName(channel.getChannelName());
@@ -285,6 +287,32 @@ public class PayOrderFeeCalculator
return hits == null || hits.isEmpty() ? null : hits;
}
/** EVRI 渠道按应付邮编配置里的附加费邮编判断。前几位对上时,返回对应的费用名。 */
private List<PayRemoteBook.Hit> surchargeHits(String postcode, String countryCode, String countryName, ServiceChannel channel,
PayProduct product)
{
String productName = product == null ? "" : product.getProductName();
if (channel == null || postcode == null || postcode.isBlank() || !evriChannel(channel, productName))
{
return new ArrayList<>();
}
String compact = postcode.toUpperCase(Locale.ROOT).replaceAll("[^A-Z0-9]", "");
if (compact.length() < 2)
{
return new ArrayList<>();
}
List<PayPostcodeLine> lines = payPostcodeMapper.selectSurchargeLines(countryCode, countryName, compact);
return PayRemoteBook.surchargeHits(lines, postcode, channel.getChannelName(), channel.getChannelCode(), productName);
}
private static boolean evriChannel(ServiceChannel channel, String productName)
{
String blob = ((channel.getChannelName() == null ? "" : channel.getChannelName()) + " "
+ (channel.getChannelCode() == null ? "" : channel.getChannelCode()) + " "
+ (productName == null ? "" : productName)).toLowerCase(Locale.ROOT);
return blob.contains("evri");
}
/**
* 在给定邮编组里做偏远匹配。没有偏远组时返回 null,有组但邮编没命中时返回空列表。
*
@@ -468,7 +496,8 @@ public class PayOrderFeeCalculator
{
continue;
}
if ("UNREACH".equalsIgnoreCase(group.getCoverage() == null ? "" : group.getCoverage().trim()))
String coverage = group.getCoverage() == null ? "" : group.getCoverage().trim();
if ("UNREACH".equalsIgnoreCase(coverage) || "SURCHARGE".equalsIgnoreCase(coverage))
{
continue;
}
@@ -415,6 +415,12 @@ public class PayPostcodeImporter
series.startCol = bound(owner, i, start, end, true);
series.endBound = bound(owner, i, start, end, false);
series.channel = channelOf(channelSources(grid, header, owner, i, start, end, title, sheetName));
if (airReduction(grid, header, series))
{
series.air = true;
series.channel = "Evri 48H";
series.coverage = "SURCHARGE";
}
list.add(series);
}
return list;
@@ -620,6 +626,10 @@ public class PayPostcodeImporter
String feeName = series.fee ? cut(series.feeName, 200) : "";
String feeValue = series.fee ? cut(feeText, 200) : "";
String channel = cut(series.channel, 100);
if (series.air && (zone == null || zone.isBlank()))
{
zone = region;
}
String key = kind + "|" + sheetName + "|" + country.code + "|" + channel + "|" + feeName + "|" + feeValue + "|" + (series.fee ? "" : series.startCol);
PayPostcodeGroup group = groups.get(key);
if (group == null)
@@ -630,7 +640,7 @@ public class PayPostcodeImporter
group.setSheetName(sheetName);
group.setBlockTitle(cut(series.title.isEmpty() ? sheetName : series.title, 200));
group.setConfigKind(kind);
group.setCoverage(coverageOf(sheetName, series.title, feeName));
group.setCoverage(series.coverage.isEmpty() ? coverageOf(sheetName, series.title, feeName) : series.coverage);
group.setChannelName(channel);
group.setCountryName(country.name);
group.setCountryCode(country.code);
@@ -694,6 +704,10 @@ public class PayPostcodeImporter
{
return "REACH";
}
if (source.contains("空气减排"))
{
return "SURCHARGE";
}
if (source.contains("偏远") || source.contains("岛屿"))
{
return "REMOTE";
@@ -701,6 +715,15 @@ public class PayPostcodeImporter
return "";
}
/** 空气减排地区、空气减排地区邮编这一组,属性记为附加费,渠道记为 Evri 48H。 */
private static boolean airReduction(ExcelGrid grid, int header, Series series)
{
String feeHead = series.feeCol >= 0 ? flat(grid.text(header, series.feeCol)) : "";
String postHead = flat(grid.text(header, series.postcodeCol));
String regionHead = series.regionCol >= 0 ? flat(grid.text(header, series.regionCol)) : "";
return feeHead.contains("空气减排") || postHead.contains("空气减排") || regionHead.contains("空气减排");
}
/**
* 一个格子里用逗号写了多条邮编时拆开。两端都是完整邮编的区间写成起止,KA27-28 这种短区间保持原文。
*/
@@ -1182,6 +1205,8 @@ public class PayPostcodeImporter
private String title = "";
private String feeName = "";
private String channel = "";
private String coverage = "";
private boolean air;
private String zoneAbove = "";
private String countryHint = "";
}
@@ -6,6 +6,7 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import com.bms.price.domain.PayPostcodeGroup;
@@ -133,6 +134,63 @@ public final class PayRemoteBook
return hits;
}
/**
* 渠道对得上、邮编前几位命中的附加费邮编。同一费用名只留一条。
*/
public static List<Hit> surchargeHits(List<PayPostcodeLine> lines, String postcode, String channelName, String channelCode,
String productName)
{
List<Hit> hits = new ArrayList<>();
if (lines == null || lines.isEmpty() || postcode == null || postcode.isBlank())
{
return hits;
}
Set<String> seen = new java.util.LinkedHashSet<>();
for (PayPostcodeLine line : lines)
{
if (line == null || !channelOwns(line.getChannelName(), channelName, channelCode, productName)
|| !PaySurchargeRules.matchesFeePostcode(line.getPostcode(), postcode))
{
continue;
}
String feeName = line.getFeeName() == null ? "" : line.getFeeName().trim();
if (!seen.add(feeName))
{
continue;
}
String region = first(line.getRegionName(), line.getRegionNameCn());
hits.add(new Hit(feeName, null, line.getZoneName(), region));
}
return hits;
}
/** 服务渠道或价卡产品名对上邮编组上的渠道即可。Evri 48H 价卡挂在「UBI英国EVRi普」这类渠道上时仍能用。 */
private static boolean channelOwns(String bookChannel, String channelName, String channelCode, String productName)
{
if (owns(bookChannel, channelName, channelCode))
{
return true;
}
return owns(bookChannel, productName, "");
}
private static boolean owns(String bookChannel, String channelName, String channelCode)
{
PayPostcodeGroup probe = new PayPostcodeGroup();
probe.setChannelName(bookChannel);
List<PayPostcodeGroup> kept = PayPostcodeBooks.ownChannel(List.of(probe), channelName, channelCode);
String book = bookChannel == null ? "" : bookChannel.trim();
for (PayPostcodeGroup group : kept)
{
String name = group.getChannelName() == null ? "" : group.getChannelName().trim();
if (book.equals(name))
{
return true;
}
}
return false;
}
public static BigDecimal amountOf(String feeText)
{
if (feeText == null || feeText.isBlank())
@@ -32,6 +32,9 @@ public final class PaySurchargeRules
/** 邮编已经落到这个分区,再按重量区间收取,例如英国高地 */
public static final String ZONE = "ZONE";
/** 邮编落在应付邮编配置的附加费邮编里才收取,前几位按正则前缀匹配。 */
public static final String FEE_POSTCODE = "FEE_POSTCODE";
private static final Pattern REMOTE_PREFIX = Pattern.compile("(\\d{1,5}(?:\\s*[、,,]\\s*\\d{1,5})*)\\s*邮编");
private static final Pattern RANGE = Pattern.compile("([A-Z]{1,2})(\\d{1,2})\\s*-\\s*(\\d{1,2})");
@@ -54,6 +57,8 @@ public final class PaySurchargeRules
private static final Pattern KG = Pattern.compile("(?i)(\\d+(?:\\.\\d+)?)\\s*(?:kg|公斤|千克)");
private static final Pattern EXTRA_STEP = Pattern.compile("(?i)(?:每增加|每超过|每超出)\\s*(\\d+(?:\\.\\d+)?)\\s*(?:kg|公斤|千克)");
private PaySurchargeRules()
{
}
@@ -149,6 +154,39 @@ public final class PaySurchargeRules
return false;
}
/**
* 应付邮编配置里的附加费邮编。去掉空格后,配置邮编是订单邮编的前几位,或订单前几位对上配置邮编,都算命中。
*/
public static boolean matchesFeePostcode(String configured, String postcode)
{
String book = compactPostcode(configured);
String order = compactPostcode(postcode);
if (book.length() < 2 || order.isEmpty())
{
return false;
}
if (leading(book, order))
{
return true;
}
return order.length() >= 3 && leading(order, book);
}
/** 前缀正则。quote 掉邮编里的符号,只认开头连续的几位。 */
private static boolean leading(String prefix, String text)
{
return Pattern.compile("^" + Pattern.quote(prefix)).matcher(text).find();
}
private static String compactPostcode(String value)
{
if (value == null)
{
return "";
}
return value.toUpperCase(Locale.ROOT).replaceAll("[^A-Z0-9]", "");
}
/**
* 应收订单附加费邮编命中:去掉全部空白后按连续串计费。
* 如 PA2 8HA → PA28HA,并尝试 PA2/PA28 等外向码前缀,便于命中 PA20-49。
@@ -557,6 +595,14 @@ public final class PaySurchargeRules
/** 配置了长宽高时按三边箱规判断,否则仍认导入价卡里的尺寸表达式。 */
public static boolean matchesFeeSize(PaySurcharge fee, BigDecimal length, BigDecimal width, BigDecimal height)
{
if (fee != null && "VOLUME".equalsIgnoreCase(fee.getSizeType()) && fee.getVolumeM3() != null)
{
if (length == null || width == null || height == null)
{
return false;
}
return cubicMetres(length, width, height).compareTo(fee.getVolumeM3()) > 0;
}
if (fee != null && fee.getLengthCm() != null && fee.getWidthCm() != null && fee.getHeightCm() != null)
{
if (length == null || width == null || height == null)
@@ -660,6 +706,45 @@ public final class PaySurchargeRules
}
}
/** 续重计费步长。价卡写了每增加若干公斤时用该步长,否则按 1kg。 */
public static BigDecimal extraStepKg(PaySurcharge fee)
{
if (fee != null)
{
String blob = (fee.getChargeText() == null ? "" : fee.getChargeText()) + " "
+ (fee.getFeeDesc() == null ? "" : fee.getFeeDesc());
Matcher matcher = EXTRA_STEP.matcher(blob);
if (matcher.find())
{
try
{
BigDecimal step = new BigDecimal(matcher.group(1));
if (step.compareTo(BigDecimal.ZERO) > 0)
{
return step;
}
}
catch (NumberFormatException ex)
{
return BigDecimal.ONE;
}
}
}
return BigDecimal.ONE;
}
/** 超出起重后的续重档数。不足一个计重单位也按一整档收取。 */
public static BigDecimal extraSteps(PaySurcharge fee, BigDecimal weight)
{
BigDecimal threshold = extraStartKg(fee);
if (threshold == null || weight == null || weight.compareTo(threshold) <= 0)
{
return BigDecimal.ZERO;
}
BigDecimal step = extraStepKg(fee);
return weight.subtract(threshold).divide(step, 0, RoundingMode.CEILING);
}
/** 命中邮编。独立字段优先,其次是原来的邮编列和导入文本。 */
public static String feePostcodes(PaySurcharge fee)
{
@@ -913,6 +998,11 @@ public final class PaySurchargeRules
return null;
}
private static BigDecimal cubicMetres(BigDecimal length, BigDecimal width, BigDecimal height)
{
return length.multiply(width).multiply(height).divide(new BigDecimal("1000000"), 6, RoundingMode.HALF_UP);
}
private static boolean exceedsBox(BigDecimal[] parcel, BigDecimal a, BigDecimal b, BigDecimal c)
{
BigDecimal[] limit = desc(a, b, c);
@@ -428,6 +428,8 @@ public class PayWorkbookParser
copy.setCountryName(band.getCountryName());
copy.setCountryCode(band.getCountryCode());
copy.setZoneName(band.getZoneName());
copy.setCalcRule(band.getCalcRule());
copy.setCalcParam(band.getCalcParam());
copy.setWeightLabel(band.getWeightLabel());
copy.setWeightMin(band.getWeightMin());
copy.setWeightMax(band.getWeightMax());
@@ -1151,7 +1153,7 @@ public class PayWorkbookParser
}
if (isFeeRateHeader(grid, row))
{
row = readFeeRateTable(grid, row, product);
row = isLineHaulHeader(grid, row) ? skipRateTable(grid, row) : readFeeRateTable(grid, row, product);
pending = "";
continue;
}
@@ -1239,7 +1241,7 @@ public class PayWorkbookParser
private int readFeeRateTable(ExcelGrid grid, int header, PayProduct product)
{
int data = header + 1;
int subHeader = -1;
List<Integer> labelRows = new ArrayList<>();
while (data < grid.rows() && !grid.blankRow(data) && !isHardHeader(grid, data))
{
if (countNumbers(grid, data) > 0 || rowHasWeight(grid, data))
@@ -1248,17 +1250,20 @@ public class PayWorkbookParser
}
if (countText(grid, data) >= 2)
{
subHeader = data;
labelRows.add(data);
}
data++;
}
int[] heads = countryAndZoneRows(grid, labelRows);
int countryRow = heads[0];
int zoneRow = heads[1];
int[] kind = new int[grid.cols()];
String[] parent = new String[grid.cols()];
String[] sub = new String[grid.cols()];
String carry = "";
for (int col = 0; col < grid.cols(); col++)
{
if (strayColumn(grid, header, col, subHeader))
if (strayColumn(grid, header, col, zoneRow))
{
parent[col] = "";
sub[col] = "";
@@ -1275,7 +1280,7 @@ public class PayWorkbookParser
head = carry;
}
parent[col] = head;
sub[col] = subHeader < 0 ? "" : grid.text(subHeader, col);
sub[col] = zoneRow < 0 ? "" : spanned(grid, zoneRow, col);
kind[col] = columnKind(head, numericBelow(grid, col, data));
}
int added = product.getSurcharges().size();
@@ -1324,13 +1329,16 @@ public class PayWorkbookParser
String zone = zoneOf(sub[col], parent[col]).replace('\n', ' ').replaceAll("\\s+", " ").trim();
if (zoneFeeName(feeName))
{
String grouped = countryRow < 0 ? "" : countryAt(grid, countryRow, col);
String prefixes = PaySurchargeRules.remotePrefixes(zone);
String place = prefixes.isEmpty() ? zone : zoneWithoutPostcode(zone);
if (stepWeight(weight))
{
addExtraKg(product, feeName, zone, weight, price, firstLimit(product, feeName, zone));
addExtraKg(product, feeName, place, weight, price, firstLimit(product, feeName, place));
}
else
{
addZoneFeeBand(product, feeName, zone, weight, price, parent[col]);
addZoneFeeBand(product, feeName, place, weight, price, parent[col], countryLabel(grouped), countryCodeOf(grouped), prefixes);
}
continue;
}
@@ -1378,8 +1386,8 @@ public class PayWorkbookParser
private int readPriceTable(ExcelGrid grid, int header, String pending, PayProduct product, StringBuilder note)
{
int data = header + 1;
int subHeader = -1;
String section = cleanTitle(pending);
List<Integer> labelRows = new ArrayList<>();
while (data < grid.rows() && !grid.blankRow(data) && !isHardHeader(grid, data))
{
if (countNumbers(grid, data) > 0 || rowHasWeight(grid, data))
@@ -1388,7 +1396,7 @@ public class PayWorkbookParser
}
if (countText(grid, data) >= 2)
{
subHeader = data;
labelRows.add(data);
}
else if (section.isEmpty())
{
@@ -1396,13 +1404,16 @@ public class PayWorkbookParser
}
data++;
}
int[] heads = countryAndZoneRows(grid, labelRows);
int countryRow = heads[0];
int zoneRow = heads[1];
int[] kind = new int[grid.cols()];
String[] parent = new String[grid.cols()];
String[] sub = new String[grid.cols()];
String carry = "";
for (int col = 0; col < grid.cols(); col++)
{
if (strayColumn(grid, header, col, subHeader))
if (strayColumn(grid, header, col, zoneRow))
{
parent[col] = "";
sub[col] = "";
@@ -1419,7 +1430,7 @@ public class PayWorkbookParser
head = carry;
}
parent[col] = head;
sub[col] = subHeader < 0 ? "" : grid.text(subHeader, col);
sub[col] = zoneRow < 0 ? "" : spanned(grid, zoneRow, col);
kind[col] = columnKind(head, numericBelow(grid, col, data));
}
if (section.isEmpty())
@@ -1506,8 +1517,28 @@ public class PayWorkbookParser
}
priced = true;
if (isSurchargePriceHead(parent[col]))
{
String feeName = chargeTitle(parent[col]);
if (zoneFeeName(feeName))
{
String remoteCountry = country;
String remoteCode = countryCode;
if (countryRow >= 0)
{
String grouped = countryAt(grid, countryRow, col);
if (!grouped.isBlank())
{
remoteCountry = countryLabel(grouped);
remoteCode = countryCodeOf(grouped);
}
}
addZoneFeeBand(product, feeName, zoneOf(sub[col], parent[col]), weight, price, parent[col],
remoteCountry, remoteCode, "");
}
else
{
addPricedSurcharge(product, blankTo(section, "价格"), parent[col], zoneOf(sub[col], parent[col]), weight, price);
}
continue;
}
boolean feeHead = isPriceHead(parent[col]);
@@ -1518,10 +1549,21 @@ public class PayWorkbookParser
addExtraKg(product, sectionName, zone, weight, price, firstLimit(product, sectionName, zone));
continue;
}
String bandCountry = country;
String bandCode = countryCode;
if (countryRow >= 0)
{
String grouped = countryAt(grid, countryRow, col);
if (!grouped.isBlank())
{
bandCountry = countryLabel(grouped);
bandCode = countryCodeOf(grouped);
}
}
PayWeightBand band = new PayWeightBand();
band.setSectionName(blankTo(section, "价格"));
band.setCountryName(country);
band.setCountryCode(countryCode);
band.setCountryName(bandCountry);
band.setCountryCode(bandCode);
band.setWeightLabel(weight);
BigDecimal[] bounds = PayTexts.weightBounds(weight);
band.setWeightMin(bounds[0]);
@@ -2159,12 +2201,32 @@ public class PayWorkbookParser
product.getSurcharges().add(fee);
}
/** 偏远附加费、额外线路运输费的首重,作为重量段里的费用项。 */
private static void addZoneFeeBand(PayProduct product, String feeName, String zone, String weight, BigDecimal price, String head)
/** 分区里的“07邮编开头”“35、38邮编开头”拆出去,地区名单独留下。 */
private static String zoneWithoutPostcode(String zone)
{
if (zone == null || zone.isBlank())
{
return zone;
}
String cleaned = zone.replaceAll("\\d+(?:[、,,\\s]+\\d+)*\\s*邮编开头", "");
cleaned = cleaned.replaceAll("\\s+", " ").trim();
return cleaned.isEmpty() ? zone : cleaned;
}
/** 偏远附加费的首重记进重量段。邮编写成计费条件,分区只留地区名。 */
private static void addZoneFeeBand(PayProduct product, String feeName, String zone, String weight, BigDecimal price, String head,
String country, String countryCode, String postcodeParam)
{
PayWeightBand band = new PayWeightBand();
band.setSectionName(feeName);
band.setCountryName(country == null || country.isBlank() ? null : country);
band.setCountryCode(countryCode == null || countryCode.isBlank() ? null : countryCode);
band.setZoneName(zone);
if (postcodeParam != null && !postcodeParam.isBlank())
{
band.setCalcRule(PaySurchargeRules.POSTCODE);
band.setCalcParam(postcodeParam);
}
band.setWeightLabel(weight);
BigDecimal[] bounds = PayTexts.weightBounds(weight);
band.setWeightMin(bounds[0]);
@@ -2204,15 +2266,184 @@ public class PayWorkbookParser
return compact.contains("每增加") || compact.contains("additionalkg") || compact.contains("kg.ad");
}
/** 偏远、额外线路这类和首重同表的费用,要进重量段。超重、超尺寸仍走附加费。 */
/** 偏远附加费进重量段。额外线路运输费先不解析。超重、超尺寸仍走附加费。 */
private static boolean zoneFeeName(String name)
{
if (name == null)
return name != null && name.contains("偏远");
}
/** 表头下先是国家、再是分区时两行都认。只有一行时当作分区。 */
private static int[] countryAndZoneRows(ExcelGrid grid, List<Integer> labelRows)
{
int country = -1;
int zone = labelRows == null || labelRows.isEmpty() ? -1 : labelRows.get(labelRows.size() - 1);
if (labelRows != null && labelRows.size() >= 2 && countryGroupRow(grid, labelRows.get(0)))
{
country = labelRows.get(0);
}
return new int[] { country, zone };
}
private static boolean countryGroupRow(ExcelGrid grid, int row)
{
int countries = 0;
for (int col = 0; col < grid.cols(); col++)
{
String text = spanned(grid, row, col);
if (text.isBlank())
{
continue;
}
if (zoneMarker(text))
{
return false;
}
String text = name.toLowerCase(Locale.ROOT);
return text.contains("偏远") || text.contains("额外") || text.contains("line-haul") || text.contains("linehaul") || text.contains("运输费");
if (countryWord(text))
{
countries++;
}
}
return countries >= 1;
}
private static boolean countryWord(String text)
{
String lower = text.toLowerCase(Locale.ROOT);
return text.contains("西班牙") || text.contains("葡萄牙") || text.contains("英国") || text.contains("法国")
|| text.contains("德国") || text.contains("意大利") || text.contains("荷兰")
|| lower.contains("spain") || lower.contains("portugal");
}
private static boolean zoneMarker(String text)
{
String lower = text.toLowerCase(Locale.ROOT);
return text.contains("地区") || text.contains("邮编") || text.contains("密度")
|| lower.contains("density") || lower.contains("island") || lower.contains("mainland");
}
private static String countryLabel(String country)
{
if (country == null || country.isBlank())
{
return country;
}
String code = countryCodeOf(country);
if (code.isEmpty() || country.contains("("))
{
return country;
}
return country + "(" + code + ")";
}
private static String countryCodeOf(String country)
{
if (country == null || country.isBlank())
{
return "";
}
if (country.contains("西班牙") || country.toLowerCase(Locale.ROOT).contains("spain"))
{
return "ES";
}
if (country.contains("葡萄牙") || country.toLowerCase(Locale.ROOT).contains("portugal"))
{
return "PT";
}
if (country.contains("英国"))
{
return "GB";
}
if (country.contains("法国"))
{
return "FR";
}
if (country.contains("德国"))
{
return "DE";
}
if (country.contains("意大利"))
{
return "IT";
}
if (country.contains("荷兰"))
{
return "NL";
}
return "";
}
/** 国家表头按列向左找到这一列所属国家。合并格和只写在左上角的国家都能认到。 */
private static String countryAt(ExcelGrid grid, int row, int col)
{
if (row < 0)
{
return "";
}
String own = spanned(grid, row, col);
if (!own.isBlank())
{
return own;
}
for (int left = col - 1; left >= 0; left--)
{
String text = spanned(grid, row, left);
if (text.isBlank())
{
continue;
}
return countryWord(text) ? text : "";
}
return "";
}
/** 合并单元格只在左上角有字,右侧列沿用这一格。 */
private static String spanned(ExcelGrid grid, int row, int col)
{
String text = grid.text(row, col).replace('\n', ' ').replaceAll("\\s+", " ").trim();
if (!text.isBlank())
{
return text;
}
for (int left = col - 1; left >= 0; left--)
{
if (grid.colSpan(row, left) > 1 && left + grid.colSpan(row, left) - 1 >= col)
{
return grid.text(row, left).replace('\n', ' ').replaceAll("\\s+", " ").trim();
}
}
return "";
}
private static boolean isLineHaulHeader(ExcelGrid grid, int row)
{
for (int col = 0; col < grid.cols(); col++)
{
String text = grid.text(row, col).toLowerCase(Locale.ROOT);
if (text.contains("line-haul") || text.contains("linehaul") || text.contains("额外线路") || text.contains("额外路线"))
{
return true;
}
}
return false;
}
/** 额外线路运输费整表跳过,留到下一块表头。 */
private int skipRateTable(ExcelGrid grid, int header)
{
int data = header + 1;
while (data < grid.rows() && !grid.blankRow(data) && !isHardHeader(grid, data))
{
if (countNumbers(grid, data) > 0 || rowHasWeight(grid, data))
{
break;
}
data++;
}
while (data < grid.rows() && !grid.blankRow(data) && !isHardHeader(grid, data))
{
data++;
}
return data;
}
private static boolean sameSectionText(String left, String right)
@@ -4384,7 +4615,7 @@ public class PayWorkbookParser
}
}
/** 价格表里和派送费并排的偏远列,按分区和重量区间记附加费,不进重量段。 */
/** 价格表里和派送费并排、又不是偏远的费用列,按分区和重量区间记附加费。偏远列记进重量段。 */
private void addPricedSurcharge(PayProduct product, String section, String head, String zone, String weight, BigDecimal price)
{
String feeName = shortCharge(head);
@@ -84,8 +84,8 @@ public interface IPrcPriceSetService
public List<PrcPriceSetDetail> selectDetailListByVersion(Long psvId);
/**
* 版本明细搜索下拉选项:按版本去重后的 产品/国家/分区 列表。
* 返回 { products: [{code,name}], countries: [{code,name}], zones: [{code,name}] }
* 版本明细搜索下拉选项:按版本去重后的 产品/国家/分区。
* products 项含 surcharges(轻量,供查看详情产品列表)。
*/
public Map<String, Object> selectDetailOptions(Long psvId);
@@ -55,5 +55,5 @@ public interface IPrcZoneService
/**
* 按打单产品同步 LABEL 邮编分区:仅覆盖本次出现的 zone,不碰其他产品/常规分区。
*/
public String syncLabelProductZones(Long productId, String countryCode2, Map<String, List<String>> zonePostcodes);
public String syncLabelProductZones(Long productId, String countryCode2, Map<String, List<PrcZoneDetail>> zonePostcodes);
}
@@ -138,9 +138,10 @@ public class PayOrderCostServiceImpl implements IPayOrderCostService
String zoneName = resolveZone(channel, product, bill.getDestPostcode(), bill.getCountryCode(), bill.getCountryName(), linked);
applyCurrentSurcharge(channel.getId(), product);
List<PayRemoteBook.Hit> remoteHits = remoteHits(linked, bill.getDestPostcode(), bill.getCountryCode(), bill.getCountryName(), channel);
List<PayRemoteBook.Hit> surchargeHits = surchargeHits(bill.getDestPostcode(), bill.getCountryCode(), bill.getCountryName(), channel, product);
PayOrderCostResult result = PayCostCalculator.calculate(product, weight, bill.getPkgLength(), bill.getPkgWidth(),
bill.getPkgHeight(), bill.getDestPostcode(), zoneName, bizDate, orderStatus, remoteHits, true, true,
bill.getCountryCode(), bill.getCountryName());
bill.getCountryCode(), bill.getCountryName(), surchargeHits);
result.setBillId(bill.getBillId());
result.setChannelId(channel.getId());
result.setChannelName(channel.getChannelName());
@@ -312,6 +313,34 @@ public class PayOrderCostServiceImpl implements IPayOrderCostService
return hits == null || hits.isEmpty() ? null : hits;
}
/**
* EVRI 渠道按应付邮编配置里的附加费邮编判断。前几位对上时,返回对应的费用名。
*/
private List<PayRemoteBook.Hit> surchargeHits(String postcode, String countryCode, String countryName, ServiceChannel channel,
PayProduct product)
{
String productName = product == null ? "" : product.getProductName();
if (channel == null || postcode == null || postcode.isBlank() || !evriChannel(channel, productName))
{
return new ArrayList<>();
}
String compact = postcode.toUpperCase(Locale.ROOT).replaceAll("[^A-Z0-9]", "");
if (compact.length() < 2)
{
return new ArrayList<>();
}
List<PayPostcodeLine> lines = payPostcodeMapper.selectSurchargeLines(countryCode, countryName, compact);
return PayRemoteBook.surchargeHits(lines, postcode, channel.getChannelName(), channel.getChannelCode(), productName);
}
private static boolean evriChannel(ServiceChannel channel, String productName)
{
String blob = ((channel.getChannelName() == null ? "" : channel.getChannelName()) + " "
+ (channel.getChannelCode() == null ? "" : channel.getChannelCode()) + " "
+ (productName == null ? "" : productName)).toLowerCase(Locale.ROOT);
return blob.contains("evri");
}
/** 在给定邮编组里做偏远匹配。没有偏远组时返回 null,有组但邮编没命中时返回空列表。 */
private List<PayRemoteBook.Hit> hitsOf(List<PayPostcodeGroup> groups, String postcode, String countryCode, String countryName)
{
@@ -487,7 +516,8 @@ public class PayOrderCostServiceImpl implements IPayOrderCostService
{
continue;
}
if ("UNREACH".equalsIgnoreCase(group.getCoverage() == null ? "" : group.getCoverage().trim()))
String coverage = group.getCoverage() == null ? "" : group.getCoverage().trim();
if ("UNREACH".equalsIgnoreCase(coverage) || "SURCHARGE".equalsIgnoreCase(coverage))
{
continue;
}
@@ -3,9 +3,11 @@ package com.bms.price.service.impl;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.UUID;
import org.springframework.beans.factory.annotation.Autowired;
@@ -13,10 +15,13 @@ import org.springframework.context.annotation.Lazy;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.bms.common.core.domain.entity.SysUser;
import com.bms.common.enums.PaymentMesEnum;
import com.bms.common.exception.ServiceException;
import com.bms.common.utils.SecurityUtils;
import com.bms.common.utils.uuid.IdUtils;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
import com.bms.price.domain.PayOrderCostResult;
import com.bms.price.domain.PayOrderFeeBoard;
import com.bms.price.domain.PrcPayBill;
@@ -97,7 +102,133 @@ public class PayOrderListServiceImpl implements IPayOrderListService
safe.setOrderNos(null);
safe.setOrderNo(orderNos.isEmpty() ? null : orderNos.get(0));
}
return payOrderListMapper.selectList(safe);
List<Long> billIds = payOrderListMapper.selectPageIds(safe);
PageHelper.clearPage();
Page<PayOrderRow> page = new Page<>();
if (billIds instanceof Page<?> source)
{
page.setTotal(source.getTotal());
page.setPageNum(source.getPageNum());
page.setPageSize(source.getPageSize());
}
if (billIds == null || billIds.isEmpty())
{
return page;
}
Map<String, PayOrderRow> byId = new HashMap<>();
for (PayOrderRow row : payOrderListMapper.selectByBillIds(billIds))
{
if (row != null && row.getBillId() != null)
{
byId.put(row.getBillId().trim(), row);
}
}
for (Long billId : billIds)
{
PayOrderRow row = byId.get(String.valueOf(billId));
if (row != null)
{
page.add(row);
}
}
fillOperators(page);
return page;
}
/** 只给当前页解析更新人。system 显示系统自动,数字主键取昵称,其余按账号取昵称。 */
private void fillOperators(List<PayOrderRow> rows)
{
List<Long> userIds = new ArrayList<>();
List<String> userNames = new ArrayList<>();
for (PayOrderRow row : rows)
{
String raw = row.getUpdateBy();
if (raw == null || raw.isBlank())
{
continue;
}
if ("system".equalsIgnoreCase(raw.trim()))
{
row.setUpdateBy("系统自动");
continue;
}
if (raw.matches("^[0-9]+$"))
{
try
{
userIds.add(Long.parseLong(raw));
}
catch (NumberFormatException ex)
{
continue;
}
}
else
{
userNames.add(raw);
}
}
if (userIds.isEmpty() && userNames.isEmpty())
{
return;
}
Map<Long, String> byUserId = new HashMap<>();
Map<String, String> byUserName = new HashMap<>();
for (SysUser user : payOrderListMapper.selectUsers(userIds, userNames))
{
if (user == null)
{
continue;
}
String label = operatorLabel(user);
if (user.getUserId() != null && !byUserId.containsKey(user.getUserId()))
{
byUserId.put(user.getUserId(), label);
}
if (user.getUserName() != null && !user.getUserName().isBlank())
{
byUserName.putIfAbsent(user.getUserName().toLowerCase(Locale.ROOT), label);
}
}
for (PayOrderRow row : rows)
{
String raw = row.getUpdateBy();
if (raw == null || raw.isBlank() || "系统自动".equals(raw))
{
continue;
}
String label = null;
if (raw.matches("^[0-9]+$"))
{
try
{
label = byUserId.get(Long.parseLong(raw));
}
catch (NumberFormatException ex)
{
label = null;
}
}
else
{
label = byUserName.get(raw.toLowerCase(Locale.ROOT));
}
if (label != null && !label.isBlank())
{
row.setUpdateBy(label);
}
}
}
/** 有昵称用昵称,没有就用账号。和原来列表里的更新人显示一致。 */
private static String operatorLabel(SysUser user)
{
String nick = user.getNickName() == null ? "" : user.getNickName().trim();
if (!nick.isEmpty())
{
return user.getNickName();
}
return user.getUserName();
}
/**
@@ -399,7 +399,7 @@ public class PayPostcodeServiceImpl implements IPayPostcodeService
private static String normalizeCoverage(String value)
{
String coverage = trimToEmpty(value).toUpperCase(java.util.Locale.ROOT);
if (coverage.isEmpty() || "REACH".equals(coverage) || "UNREACH".equals(coverage) || "REMOTE".equals(coverage))
if (coverage.isEmpty() || "REACH".equals(coverage) || "UNREACH".equals(coverage) || "REMOTE".equals(coverage) || "SURCHARGE".equals(coverage))
{
return coverage;
}
@@ -51,6 +51,7 @@ import com.bms.price.mapper.PrcPriceSetMapper;
import com.bms.price.mapper.PrcSurchargeBindMapper;
import com.bms.price.mapper.PrcSurchargeMapper;
import com.bms.price.pay.PayParseProgressListener;
import com.bms.price.pay.PaySurchargeRules;
import com.bms.price.pay.PayChargeMode;
import com.bms.price.pay.PayTemplateWorkbook;
import com.bms.price.pay.PayWorkbookParser;
@@ -1132,11 +1133,19 @@ public class PayProductServiceImpl implements IPayProductService
String rule = fee.getCalcRule();
String currency = isBlank(fee.getCurrency()) ? DEFAULT_CURRENCY : fee.getCurrency();
if ("SIZE".equals(rule))
{
if ("VOLUME".equalsIgnoreCase(config.getSizeType()))
{
BigDecimal volume = positive(config.getVolumeM3(), fee.getFeeName() + "的体积");
fee.setChargeText("体积超过 " + plain(volume) + "m³");
}
else
{
BigDecimal length = positive(config.getLengthCm(), fee.getFeeName() + "的长");
BigDecimal width = positive(config.getWidthCm(), fee.getFeeName() + "的宽");
BigDecimal height = positive(config.getHeightCm(), fee.getFeeName() + "的高");
fee.setChargeText("超过 " + plain(length) + "×" + plain(width) + "×" + plain(height) + "cm");
fee.setChargeText("任一边超过 " + plain(length) + "×" + plain(width) + "×" + plain(height) + "cm");
}
fee.setPriceUnit(currency + "/ITEM");
return;
}
@@ -1165,6 +1174,12 @@ public class PayProductServiceImpl implements IPayProductService
fee.setPriceUnit(currency + "/ITEM");
return;
}
if (PaySurchargeRules.FEE_POSTCODE.equals(rule))
{
fee.setChargeText("邮编命中应付邮编配置中的附加费");
fee.setPriceUnit(currency + "/ITEM");
return;
}
fee.setPriceUnit(currency + "/ITEM");
fee.setChargeText(isBlank(fee.getFeeDesc()) ? "" : cut(fee.getFeeDesc(), 500));
}
@@ -1209,6 +1224,8 @@ public class PayProductServiceImpl implements IPayProductService
fee.setLengthCm(bind.getLengthCm());
fee.setWidthCm(bind.getWidthCm());
fee.setHeightCm(bind.getHeightCm());
fee.setSizeType(bind.getSizeType());
fee.setVolumeM3(bind.getVolumeM3());
fee.setOverWeightKg(bind.getOverWeightKg());
fee.setExtraWeightKg(bind.getExtraWeightKg());
fee.setPostcodeText(bind.getPostcodeText());
@@ -1218,6 +1235,8 @@ public class PayProductServiceImpl implements IPayProductService
config.setLengthCm(bind.getLengthCm());
config.setWidthCm(bind.getWidthCm());
config.setHeightCm(bind.getHeightCm());
config.setSizeType(bind.getSizeType());
config.setVolumeM3(bind.getVolumeM3());
config.setOverWeightKg(bind.getOverWeightKg());
config.setExtraWeightKg(bind.getExtraWeightKg());
config.setPostcodeText(bind.getPostcodeText());
@@ -1265,7 +1284,8 @@ public class PayProductServiceImpl implements IPayProductService
return "MANUAL";
}
if ("ALWAYS".equals(code) || "POSTCODE".equals(code) || "ZONE".equals(code) || "EXTRA_KG".equals(code)
|| "WEIGHT".equals(code) || "SIZE".equals(code) || "RETURN".equals(code) || "MANUAL".equals(code))
|| "WEIGHT".equals(code) || "SIZE".equals(code) || "RETURN".equals(code) || "MANUAL".equals(code)
|| PaySurchargeRules.FEE_POSTCODE.equals(code))
{
return code;
}
@@ -2188,6 +2208,8 @@ public class PayProductServiceImpl implements IPayProductService
band.setCountryName(cut(band.getCountryName(), 200));
band.setCountryCode(cut(band.getCountryCode(), 32));
band.setZoneName(cut(band.getZoneName(), 200));
band.setCalcRule(cut(band.getCalcRule(), 32));
band.setCalcParam(cut(band.getCalcParam(), 1000));
band.setWeightLabel(cut(band.getWeightLabel(), 100));
band.setVolumeText(cut(band.getVolumeText(), 40));
band.setChargeName(cut(band.getChargeName(), 200));
@@ -490,8 +490,14 @@ public class PrcOrderBillServiceImpl implements IPrcOrderBillService
{
throw new ServiceException(MessageUtils.message("price.bill.notFound"));
}
return toResult(bill, incomeBillFeeMapper.selectByBillId(bill.getBillId()),
TmsPriceQuoteResult result = toResult(bill, incomeBillFeeMapper.selectByBillId(bill.getBillId()),
payBillFeeMapper.selectByBillId(bill.getBillId()));
PrcPayBill payBill = payBillMapper.selectByBillId(bill.getBillId());
if (payBill != null && payBill.getPayTotal() != null)
{
result.setPayTotal(payBill.getPayTotal());
}
return result;
}
@@ -2075,10 +2081,18 @@ public class PrcOrderBillServiceImpl implements IPrcOrderBillService
{
applyProductCodeMapping(bill, request);
}
// 已有真实销售产品名时不覆盖;仅缺失或与编码相同时才用报价结果补全
if (result != null && StringUtils.isNotEmpty(result.getProductName()))
{
String existing = StringUtils.trim(bill.getProductName());
String code = StringUtils.trim(bill.getProductCode());
boolean missingOrCodeOnly = StringUtils.isEmpty(existing)
|| (StringUtils.isNotEmpty(code) && existing.equalsIgnoreCase(code));
if (missingOrCodeOnly)
{
bill.setProductName(result.getProductName());
}
}
if (StringUtils.isEmpty(bill.getCountryCode()) && result != null)
{
bill.setCountryCode(result.getCountryCode());
@@ -994,13 +994,87 @@ public class PrcPriceSetServiceImpl implements IPrcPriceSetService
zones.putIfAbsent(zoneCode != null ? zoneCode : zoneName, item);
}
}
// 补全套餐产品表(无明细时也能展示)
PrcPriceSetProduct pq = new PrcPriceSetProduct();
pq.setPsvId(psvId);
List<PrcPriceSetProduct> setProducts = setProductMapper.selectPrcPriceSetProductList(pq);
if (setProducts != null)
{
for (PrcPriceSetProduct sp : setProducts)
{
if (sp == null || StringUtils.isBlank(sp.getProductCode()))
{
continue;
}
Map<String, String> item = new LinkedHashMap<String, String>();
item.put("code", sp.getProductCode());
item.put("name", StringUtils.isNotBlank(sp.getProductName()) ? sp.getProductName() : sp.getProductCode());
products.putIfAbsent(sp.getProductCode(), item);
}
}
// 产品列表轻量挂附加费,避免查看详情拉整版明细
Map<String, List<PrcSurchargeRel>> scByProduct = loadSalesSurchargesByProduct(psvId);
List<Map<String, Object>> productRows = new ArrayList<Map<String, Object>>();
for (Map<String, String> p : products.values())
{
Map<String, Object> row = new LinkedHashMap<String, Object>();
row.put("code", p.get("code"));
row.put("name", p.get("name"));
String code = p.get("code");
List<PrcSurchargeRel> sc = code == null ? null : scByProduct.get(code);
row.put("surcharges", sc != null ? sc : new ArrayList<PrcSurchargeRel>());
productRows.add(row);
}
Map<String, Object> result = new HashMap<String, Object>();
result.put("products", new ArrayList<Map<String, String>>(products.values()));
result.put("products", productRows);
result.put("countries", new ArrayList<Map<String, String>>(countries.values()));
result.put("zones", new ArrayList<Map<String, String>>(zones.values()));
return result;
}
/** 按产品代码汇总版本销售附加费(scId 去重) */
private Map<String, List<PrcSurchargeRel>> loadSalesSurchargesByProduct(Long psvId)
{
Map<String, List<PrcSurchargeRel>> out = new LinkedHashMap<String, List<PrcSurchargeRel>>();
if (psvId == null)
{
return out;
}
List<PrcSurchargeRel> rels = surchargeRelMapper.selectSalesRelsByPsvId(psvId);
if (rels == null || rels.isEmpty())
{
return out;
}
Map<String, Map<Long, PrcSurchargeRel>> dedupe = new LinkedHashMap<String, Map<Long, PrcSurchargeRel>>();
for (PrcSurchargeRel rel : rels)
{
if (rel == null || rel.getScId() == null)
{
continue;
}
String code = StringUtils.trim(rel.getProductCode());
if (StringUtils.isEmpty(code))
{
continue;
}
Map<Long, PrcSurchargeRel> bySc = dedupe.get(code);
if (bySc == null)
{
bySc = new LinkedHashMap<Long, PrcSurchargeRel>();
dedupe.put(code, bySc);
}
if (!bySc.containsKey(rel.getScId()))
{
bySc.put(rel.getScId(), rel);
}
}
for (Map.Entry<String, Map<Long, PrcSurchargeRel>> e : dedupe.entrySet())
{
out.put(e.getKey(), new ArrayList<PrcSurchargeRel>(e.getValue().values()));
}
return out;
}
/** 为一页明细挂载 SALES 附加费关联(detail_id=psd_id)。 */
private void fillDetailSurcharges(List<PrcPriceSetDetail> details)
{
@@ -3670,6 +3744,7 @@ public class PrcPriceSetServiceImpl implements IPrcPriceSetService
version.setProducts(products == null ? new ArrayList<PrcPriceSetProduct>() : products);
// 明细 + SALES 附加费关联按需加载(编辑价格/明细抽屉)
version.setDetails(new ArrayList<PrcPriceSetDetail>());
version.setDetailCount(Integer.valueOf(detailMapper.countByPsvId(version.getPsvId())));
}
private PrcPriceSetVersion pickCurrentVersion(List<PrcPriceSetVersion> versions)
@@ -10,6 +10,7 @@ import com.bms.common.exception.ServiceException;
import com.bms.common.utils.MessageUtils;
import com.bms.common.utils.StringUtils;
import com.bms.price.domain.PrcSurcharge;
import com.bms.price.pay.PaySurchargeRules;
import com.bms.price.mapper.PrcSurchargeBindMapper;
import com.bms.price.mapper.PrcSurchargeMapper;
import com.bms.price.mapper.PrcSurchargeRelMapper;
@@ -96,6 +97,8 @@ public class PrcSurchargeServiceImpl implements IPrcSurchargeService
fresh.setLengthCm(surcharge.getLengthCm());
fresh.setWidthCm(surcharge.getWidthCm());
fresh.setHeightCm(surcharge.getHeightCm());
fresh.setSizeType(surcharge.getSizeType());
fresh.setVolumeM3(surcharge.getVolumeM3());
fresh.setOverWeightKg(surcharge.getOverWeightKg());
fresh.setExtraWeightKg(surcharge.getExtraWeightKg());
fresh.setPostcodeText(surcharge.getPostcodeText());
@@ -125,6 +128,8 @@ public class PrcSurchargeServiceImpl implements IPrcSurchargeService
&& eqDecimal(old.getLengthCm(), updated.getLengthCm())
&& eqDecimal(old.getWidthCm(), updated.getWidthCm())
&& eqDecimal(old.getHeightCm(), updated.getHeightCm())
&& eq(old.getSizeType(), updated.getSizeType())
&& eqDecimal(old.getVolumeM3(), updated.getVolumeM3())
&& eqDecimal(old.getOverWeightKg(), updated.getOverWeightKg())
&& eqDecimal(old.getExtraWeightKg(), updated.getExtraWeightKg())
&& eq(old.getPostcodeText(), updated.getPostcodeText())
@@ -226,11 +231,21 @@ public class PrcSurchargeServiceImpl implements IPrcSurchargeService
BigDecimal overWeight = null;
BigDecimal extraWeight = null;
String postcodes = null;
String sizeType = null;
BigDecimal volume = null;
if ("SIZE".equals(type))
{
sizeType = requiredSizeType(row.getSizeType());
if ("VOLUME".equals(sizeType))
{
volume = requiredSize(row.getVolumeM3(), "体积");
}
else
{
length = requiredSize(row.getLengthCm(), "长");
width = requiredSize(row.getWidthCm(), "宽");
height = requiredSize(row.getHeightCm(), "高");
}
row.setBlockTitle(null);
}
else if ("WEIGHT".equals(type))
@@ -259,11 +274,32 @@ public class PrcSurchargeServiceImpl implements IPrcSurchargeService
row.setLengthCm(length);
row.setWidthCm(width);
row.setHeightCm(height);
row.setSizeType(sizeType);
row.setVolumeM3(volume);
row.setOverWeightKg(overWeight);
row.setExtraWeightKg(extraWeight);
row.setPostcodeText(postcodes);
}
private static String requiredSizeType(String raw)
{
String code = raw == null ? "" : raw.trim().toUpperCase();
if (!"SIDE".equals(code) && !"VOLUME".equals(code))
{
throw new ServiceException("请选择超尺寸类型");
}
return code;
}
private static String sizeChargeText(String sizeType, BigDecimal length, BigDecimal width, BigDecimal height, BigDecimal volume)
{
if ("VOLUME".equals(sizeType))
{
return "体积超过 " + plain(volume) + "m³";
}
return "任一边超过 " + plain(length) + "×" + plain(width) + "×" + plain(height) + "cm";
}
private static BigDecimal requiredSize(BigDecimal value, String label)
{
if (value == null || value.compareTo(BigDecimal.ZERO) <= 0)
@@ -321,7 +357,7 @@ public class PrcSurchargeServiceImpl implements IPrcSurchargeService
String text;
if ("SIZE".equals(rule))
{
text = "超过 " + plain(row.getLengthCm()) + "×" + plain(row.getWidthCm()) + "×" + plain(row.getHeightCm()) + "cm";
text = sizeChargeText(row.getSizeType(), row.getLengthCm(), row.getWidthCm(), row.getHeightCm(), row.getVolumeM3());
}
else if ("WEIGHT".equals(rule))
{
@@ -335,6 +371,10 @@ public class PrcSurchargeServiceImpl implements IPrcSurchargeService
{
text = "邮编 " + (row.getPostcodeText() == null ? "" : row.getPostcodeText());
}
else if (PaySurchargeRules.FEE_POSTCODE.equals(rule))
{
text = "邮编命中应付邮编配置中的附加费";
}
else
{
text = row.getScNote() == null ? "" : row.getScNote();
@@ -219,12 +219,20 @@ public class PrcZoneServiceImpl implements IPrcZoneService
@Override
public int insertPrcZoneDetail(PrcZoneDetail detail)
{
if (detail != null)
{
detail.setMatchType(PrcZoneDetail.normalizeMatchType(detail.getMatchType()));
}
return detailMapper.insertPrcZoneDetail(detail);
}
@Override
public int updatePrcZoneDetail(PrcZoneDetail detail)
{
if (detail != null && detail.getMatchType() != null)
{
detail.setMatchType(PrcZoneDetail.normalizeMatchType(detail.getMatchType()));
}
return detailMapper.updatePrcZoneDetail(detail);
}
@@ -281,7 +289,7 @@ public class PrcZoneServiceImpl implements IPrcZoneService
unmatched.add(item.countryHint + "(" + item.sheetName + ")");
continue;
}
int[] counts = replaceRegionZones(region, zonePostcodes);
int[] counts = replaceRegionZones(region, zonePostcodes, item.matchType);
countryCount += 1;
zoneCount += counts[0];
detailCount += counts[1];
@@ -398,6 +406,10 @@ public class PrcZoneServiceImpl implements IPrcZoneService
PrcZoneDetail detail = new PrcZoneDetail();
detail.setZoneId(zone.getZoneId());
detail.setPostcode(postcode.trim());
if (detail.getMatchType() == null || detail.getMatchType().isBlank())
{
detail.setMatchType(PrcZoneDetail.MATCH_FULL);
}
batch.add(detail);
if (batch.size() >= BATCH_SIZE)
{
@@ -418,7 +430,7 @@ public class PrcZoneServiceImpl implements IPrcZoneService
@Override
@Transactional(rollbackFor = Exception.class)
public String syncLabelProductZones(Long productId, String countryCode2, Map<String, List<String>> zonePostcodes)
public String syncLabelProductZones(Long productId, String countryCode2, Map<String, List<PrcZoneDetail>> zonePostcodes)
{
if (productId == null)
{
@@ -456,9 +468,9 @@ public class PrcZoneServiceImpl implements IPrcZoneService
}
int zoneUpsert = 0;
int detailInserted = 0;
List<Map.Entry<String, List<String>>> entries = new ArrayList<>(zonePostcodes.entrySet());
List<Map.Entry<String, List<PrcZoneDetail>>> entries = new ArrayList<>(zonePostcodes.entrySet());
entries.sort(Comparator.comparingInt(e -> extractZoneSort(e.getKey())));
for (Map.Entry<String, List<String>> entry : entries)
for (Map.Entry<String, List<PrcZoneDetail>> entry : entries)
{
String label = StringUtils.trim(entry.getKey());
if (StringUtils.isEmpty(label))
@@ -501,21 +513,26 @@ public class PrcZoneServiceImpl implements IPrcZoneService
detailMapper.deletePrcZoneDetailByZoneId(zone.getZoneId());
}
zoneUpsert++;
Set<String> uniquePostcodes = new LinkedHashSet<String>();
Map<String, PrcZoneDetail> unique = new LinkedHashMap<String, PrcZoneDetail>();
if (entry.getValue() != null)
{
uniquePostcodes.addAll(entry.getValue());
}
List<PrcZoneDetail> batch = new ArrayList<>(BATCH_SIZE);
for (String postcode : uniquePostcodes)
for (PrcZoneDetail item : entry.getValue())
{
if (StringUtils.isEmpty(postcode))
if (item == null || StringUtils.isEmpty(item.getPostcode()))
{
continue;
}
String pc = item.getPostcode().trim();
PrcZoneDetail detail = new PrcZoneDetail();
detail.setZoneId(zone.getZoneId());
detail.setPostcode(postcode.trim());
detail.setPostcode(pc);
detail.setMatchType(PrcZoneDetail.normalizeMatchType(item.getMatchType()));
unique.put(pc.toUpperCase(Locale.ROOT), detail);
}
}
List<PrcZoneDetail> batch = new ArrayList<>(BATCH_SIZE);
for (PrcZoneDetail detail : unique.values())
{
batch.add(detail);
if (batch.size() >= BATCH_SIZE)
{
@@ -534,11 +551,17 @@ public class PrcZoneServiceImpl implements IPrcZoneService
}
private int[] replaceRegionZones(BmsRegion region, Map<String, List<String>> zonePostcodes)
{
return replaceRegionZones(region, zonePostcodes, PrcZoneDetail.MATCH_FULL);
}
private int[] replaceRegionZones(BmsRegion region, Map<String, List<String>> zonePostcodes, String matchType)
{
if (StringUtils.isEmpty(region.getCountryCode2()))
{
throw new ServiceException(MessageUtils.message("price.zone.countryCode.empty"));
}
matchType = PrcZoneDetail.normalizeMatchType(matchType);
Long regionId = region.getRegionId();
detailMapper.deletePrcZoneDetailByRegionId(regionId);
zoneMapper.deletePrcZoneByRegionId(regionId);
@@ -570,6 +593,7 @@ public class PrcZoneServiceImpl implements IPrcZoneService
PrcZoneDetail detail = new PrcZoneDetail();
detail.setZoneId(zone.getZoneId());
detail.setPostcode(postcode);
detail.setMatchType(matchType);
batch.add(detail);
if (batch.size() >= BATCH_SIZE)
{
@@ -592,12 +616,19 @@ public class PrcZoneServiceImpl implements IPrcZoneService
private final String sheetName;
private final String countryHint;
private final Map<String, List<String>> zonePostcodes;
private final String matchType;
private SheetImport(String sheetName, String countryHint, Map<String, List<String>> zonePostcodes)
{
this(sheetName, countryHint, zonePostcodes, PrcZoneDetail.MATCH_FULL);
}
private SheetImport(String sheetName, String countryHint, Map<String, List<String>> zonePostcodes, String matchType)
{
this.sheetName = sheetName;
this.countryHint = countryHint;
this.zonePostcodes = zonePostcodes;
this.matchType = PrcZoneDetail.normalizeMatchType(matchType);
}
}
@@ -646,7 +677,11 @@ public class PrcZoneServiceImpl implements IPrcZoneService
{
countryHint = sheetName;
}
list.add(new SheetImport(sheetName, countryHint, parsed));
// 英国/偏远/邮编开头类表才落 PREFIX;其余默认 FULL
String matchType = (sheetName.contains("英国") || sheetName.contains("邮编开头")
|| sheetName.contains("偏远") || sheetName.contains("加拿大"))
? PrcZoneDetail.MATCH_PREFIX : PrcZoneDetail.MATCH_FULL;
list.add(new SheetImport(sheetName, countryHint, parsed, matchType));
}
return list;
}
@@ -73,6 +73,7 @@ import com.bms.price.search.IBillSearchStore;
import com.bms.price.service.ILblProductService;
import com.bms.price.service.IPayProductService;
import com.bms.price.label.LblCostCalculator;
import com.bms.price.label.LblSurchargeRules;
import com.bms.price.label.LblProductPayAdapter;
import com.bms.price.domain.LblFeeType;
import com.bms.price.domain.LblProduct;
@@ -739,7 +740,7 @@ public class TmsPriceQuoteServiceImpl implements ITmsPriceQuoteService
throw ex;
}
PayOrderCostResult cost = LblCostCalculator.calculate(lblProduct, weight, length, width, height,
request.getDestPostcode(), freightZone, bizDate, orderStatus);
request.getDestPostcode(), freightZone, bizDate, orderStatus, countryCode, countryName);
if (cost == null || cost.getFees() == null || cost.getFees().isEmpty())
{
if (request instanceof TmsPriceBillRequest)
@@ -779,6 +780,12 @@ public class TmsPriceQuoteServiceImpl implements ITmsPriceQuoteService
return countryFreight.get(0);
}
List<String> candidates = countryFreight.isEmpty() ? zoneNames : countryFreight;
// 优先:派送费重量段上的邮编前缀(如 CTT 加那利 35/38)
String byParam = labelFreightZoneByPostcodeParam(product, cc, destPostcode, candidates);
if (byParam != null)
{
return byParam;
}
if (product == null || product.getProductId() == null)
{
throw new ServiceException("邮编未匹配到产品分区");
@@ -787,6 +794,13 @@ public class TmsPriceQuoteServiceImpl implements ITmsPriceQuoteService
product.getProductId(), normalizePostcode(destPostcode));
if (resolved == null)
{
// 未命中偏远前缀时,若价卡有大陆列则走大陆(Evri UK Mainland)
PayZoneMatcher.Decision mainland = PayZoneMatcher.resolve(candidates, java.util.Collections.emptyList(),
destPostcode);
if (mainland != null && mainland.getZoneName() != null)
{
return mainland.getZoneName();
}
throw new ServiceException("邮编未匹配到产品分区");
}
String mapped = PayZoneMatcher.mapRegion(candidates, resolved.getZoneCode());
@@ -803,6 +817,69 @@ public class TmsPriceQuoteServiceImpl implements ITmsPriceQuoteService
return mapped;
}
/**
* 按派送费重量段 postcodeParam(如 35,38)命中分区名。
*/
private static String labelFreightZoneByPostcodeParam(LblProduct product, String countryCode, String postcode,
List<String> candidates)
{
if (product == null || product.getWeightBands() == null || StringUtils.isEmpty(postcode))
{
return null;
}
String best = null;
int bestScore = -1;
for (LblWeightBand band : product.getWeightBands())
{
if (band == null)
{
continue;
}
String ft = band.getFeeType();
if (ft != null && !ft.isEmpty() && !LblFeeType.FREIGHT.equals(ft))
{
continue;
}
if (StringUtils.isNotEmpty(countryCode) && !bandCountryMatches(band.getCountryCode(), countryCode))
{
continue;
}
String param = band.getPostcodeParam();
if (StringUtils.isEmpty(param))
{
continue;
}
if (!LblSurchargeRules.matchesPostcode(param, postcode) && !PaySurchargeRules.matchesPostcode(param, postcode))
{
continue;
}
String zone = band.getZoneName();
if (zone == null || zone.isBlank())
{
continue;
}
zone = zone.trim();
if (candidates != null && !candidates.isEmpty())
{
for (String c : candidates)
{
if (zone.equals(c) || PayZoneMatcher.sameZone(c, zone))
{
zone = c;
break;
}
}
}
int score = param.replace(",", "").length();
if (score > bestScore)
{
bestScore = score;
best = zone;
}
}
return best;
}
private static List<String> labelBandZoneNames(LblProduct product)
{
LinkedHashSet<String> names = new LinkedHashSet<String>();
@@ -825,7 +902,7 @@ public class TmsPriceQuoteServiceImpl implements ITmsPriceQuoteService
return new ArrayList<String>(names);
}
/** 该国家下运费(FREIGHT)分区列名;偏远行不算入。 */
/** 该国家下运费(FREIGHT)分区列名(含带邮编前缀的岛屿派送费)。 */
private static List<String> labelFreightZonesForCountry(LblProduct product, String countryCode)
{
LinkedHashSet<String> names = new LinkedHashSet<String>();
@@ -980,8 +1057,8 @@ public class TmsPriceQuoteServiceImpl implements ITmsPriceQuoteService
{
incomeTotal = freightAmount.add(registrationFee).add(surchargeAmount).setScale(2, rm);
}
String labelProductName = StringUtils.isNotEmpty(product.getProductName())
? product.getProductName() : productName;
// 保留订单/上游销售产品名,不用打单价卡产品名覆盖(含义不同)
String keepProductName = StringUtils.isNotEmpty(productName) ? productName : product.getProductName();
TmsPriceQuoteResult r = new TmsPriceQuoteResult();
r.setMatchSource(SRC_LABEL);
r.setMatchMessage("hit label package pay card V"
@@ -990,7 +1067,7 @@ public class TmsPriceQuoteServiceImpl implements ITmsPriceQuoteService
r.setVersionNo(product.getVersionNo() == null ? null : ("V" + product.getVersionNo()));
r.setCustomerId(bind.getCustomerId());
r.setProductCode(productCode);
r.setProductName(labelProductName);
r.setProductName(keepProductName);
r.setCountryCode(countryCode);
r.setCountryName(countryName);
r.setWeight(weight);
@@ -17,22 +17,7 @@
ifnull(nullif(trim(b.currency), ''), 'CNY') as currency,
b.pay_calc_status as payCalcStatus,
b.pay_calc_msg as payCalcMsg,
case
when lower(trim(b.update_by)) = 'system' then '系统自动'
else ifnull((
select case
when nullif(trim(u.nick_name), '') is not null then u.nick_name
else u.user_name
end
from sys_user u
where u.del_flag = '0'
and (
(b.update_by regexp '^[0-9]+$' and u.user_id = cast(b.update_by as unsigned))
or (ifnull(b.update_by, '') not regexp '^[0-9]+$' and u.user_name = b.update_by COLLATE utf8mb4_general_ci)
)
limit 1
), b.update_by)
end as updateBy,
b.update_by as updateBy,
b.update_time as updateTime,
p.biz_date as bizDate
from prc_order_bill p
@@ -40,9 +25,7 @@
left join prc_pay_bill b on b.bill_id = p.bill_id
</sql>
<select id="selectList" resultType="com.bms.price.domain.PayOrderRow">
<include refid="orderColumns"/>
<where>
<sql id="pageFilters">
<if test="orderNos != null and orderNos.size() &gt; 0">
and p.order_no in
<foreach collection="orderNos" item="no" open="(" separator="," close=")">#{no}</foreach>
@@ -50,15 +33,61 @@
<if test="(orderNos == null or orderNos.size() == 0) and orderNo != null and orderNo != ''">
and p.order_no like concat('%', #{orderNo}, '%')
</if>
<if test="ladingNo != null and ladingNo != ''">
and trim(e.air_no_old) like concat('%', #{ladingNo}, '%')
</if>
<if test="customerName != null and customerName != ''">
and (p.customer_name like concat('%', #{customerName}, '%')
or p.customer_code like concat('%', #{customerName}, '%'))
</if>
</sql>
<!-- 先只取这一页的订单主键。计数和排序都不带应付表,也不逐行查用户。 -->
<select id="selectPageIds" resultType="java.lang.Long">
<choose>
<when test="ladingNo != null and ladingNo != ''">
select p.bill_id
from prc_order_bill p
inner join (
select e.bill_id
from prc_order_bill_ext e
where e.air_no_old like concat('%', #{ladingNo}, '%')
) hit on hit.bill_id = p.bill_id
<where>
<include refid="pageFilters"/>
</where>
order by p.create_time desc, p.bill_id desc
</when>
<otherwise>
select p.bill_id
from prc_order_bill p
<where>
<include refid="pageFilters"/>
</where>
order by p.create_time desc, p.bill_id desc
</otherwise>
</choose>
</select>
<select id="selectByBillIds" resultType="com.bms.price.domain.PayOrderRow">
<include refid="orderColumns"/>
where p.bill_id in
<foreach collection="billIds" item="id" open="(" separator="," close=")">#{id}</foreach>
</select>
<select id="selectUsers" resultType="com.bms.common.core.domain.entity.SysUser">
select u.user_id as userId, u.user_name as userName, u.nick_name as nickName
from sys_user u
where u.del_flag = '0'
and (
<trim prefixOverrides="or">
<if test="userIds != null and userIds.size() &gt; 0">
u.user_id in
<foreach collection="userIds" item="id" open="(" separator="," close=")">#{id}</foreach>
</if>
<if test="userNames != null and userNames.size() &gt; 0">
or u.user_name in
<foreach collection="userNames" item="name" open="(" separator="," close=")">#{name} collate utf8mb4_general_ci</foreach>
</if>
</trim>
)
</select>
<select id="selectRow" resultType="com.bms.price.domain.PayOrderRow">
@@ -80,9 +109,9 @@
select p.bill_id as billId,
p.order_no as orderNo,
nullif(trim(e.air_no_old), '') as ladingNo
from prc_order_bill p
left join prc_order_bill_ext e on e.bill_id = p.bill_id
where trim(e.air_no_old) in
from prc_order_bill_ext e
inner join prc_order_bill p on p.bill_id = e.bill_id
where e.air_no_old in
<foreach collection="ladingNos" item="no" open="(" separator="," close=")">#{no}</foreach>
</select>
</mapper>
@@ -476,6 +476,29 @@
</choose>
</select>
<select id="selectSurchargeLines" resultType="com.bms.price.domain.PayPostcodeLine">
select l.line_id as lineId, l.group_id as groupId, g.channel_name as channelName, g.fee_name as feeName,
g.country_name as countryName, g.country_code as countryCode,
l.region_name as regionName, l.zone_name as zoneName, l.postcode
from pay_postcode_group g
inner join pay_postcode_line l on l.group_id = g.group_id
where upper(trim(ifnull(g.coverage, ''))) = 'SURCHARGE'
<if test="countryCode != null and countryCode != ''">
and upper(trim(g.country_code)) = upper(trim(#{countryCode}))
</if>
<if test="(countryCode == null or countryCode == '') and countryName != null and countryName != ''">
and trim(g.country_name) = trim(#{countryName})
</if>
and (
replace(replace(replace(upper(ifnull(l.postcode, '')), ' ', ''), '-', ''), '*', '') = #{compact}
or #{compact} like concat(replace(replace(replace(upper(ifnull(l.postcode, '')), ' ', ''), '-', ''), '*', ''), '%')
or (
char_length(#{compact}) &gt;= 3
and replace(replace(replace(upper(ifnull(l.postcode, '')), ' ', ''), '-', ''), '*', '') like concat(#{compact}, '%')
)
)
</select>
<select id="selectGroupsByTokens" resultType="com.bms.price.domain.PayPostcodeGroup">
select group_id as groupId, block_title as blockTitle, channel_name as channelName,
product_name as productName, quote_sheet as quoteSheet, sheet_name as sheetName,
@@ -109,6 +109,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and (b.weight_label like concat('%', #{weightKeyword}, '%')
or b.charge_name like concat('%', #{weightKeyword}, '%')
or b.zone_name like concat('%', #{weightKeyword}, '%')
or b.calc_param like concat('%', #{weightKeyword}, '%')
or b.country_name like concat('%', #{weightKeyword}, '%')
or b.section_name like concat('%', #{weightKeyword}, '%')
or b.volume_text like concat('%', #{weightKeyword}, '%'))
@@ -320,12 +321,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<insert id="insertWeightBands">
insert into pay_weight_band (
product_id, term_id, version_no, section_name, country_name, country_code, zone_name, weight_label, weight_min, weight_max,
product_id, term_id, version_no, section_name, country_name, country_code, zone_name, calc_rule, calc_param, weight_label, weight_min, weight_max,
volume_text, charge_name, price, price_unit, sort_no
) values
<foreach collection="list" item="row" separator=",">
(#{row.productId}, #{row.termId}, ifnull(#{row.versionNo}, 1), #{row.sectionName}, #{row.countryName}, #{row.countryCode}, #{row.zoneName},
#{row.weightLabel}, #{row.weightMin}, #{row.weightMax}, #{row.volumeText}, #{row.chargeName}, #{row.price},
#{row.calcRule}, #{row.calcParam}, #{row.weightLabel}, #{row.weightMin}, #{row.weightMax}, #{row.volumeText}, #{row.chargeName}, #{row.price},
#{row.priceUnit}, #{row.sortNo})
</foreach>
</insert>
@@ -352,7 +353,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectWeightBands" resultType="com.bms.price.domain.PayWeightBand">
select band_id as bandId, product_id as productId, term_id as termId, version_no as versionNo, section_name as sectionName, country_name as countryName,
country_code as countryCode, zone_name as zoneName, weight_label as weightLabel, weight_min as weightMin,
country_code as countryCode, zone_name as zoneName, calc_rule as calcRule, calc_param as calcParam, weight_label as weightLabel, weight_min as weightMin,
weight_max as weightMax, volume_text as volumeText, charge_name as chargeName, price, price_unit as priceUnit, sort_no as sortNo
from pay_weight_band
where product_id in
@@ -362,7 +363,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectWeightBandsByTerm" resultType="com.bms.price.domain.PayWeightBand">
select band_id as bandId, product_id as productId, term_id as termId, version_no as versionNo, section_name as sectionName, country_name as countryName,
country_code as countryCode, zone_name as zoneName, weight_label as weightLabel, weight_min as weightMin,
country_code as countryCode, zone_name as zoneName, calc_rule as calcRule, calc_param as calcParam, weight_label as weightLabel, weight_min as weightMin,
weight_max as weightMax, volume_text as volumeText, charge_name as chargeName, price, price_unit as priceUnit, sort_no as sortNo
from pay_weight_band
where term_id in
@@ -39,14 +39,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</insert>
<select id="selectByBillId" resultMap="PrcPayBillFeeLogResult">
select log_id, fee_id, bill_id, fee_name, amount, currency,
before_fee_name, before_amount, before_currency,
after_fee_name, after_amount, after_currency,
operation_type, remark,
case when lower(trim(create_by)) = 'system' then '系统自动' else create_by end as create_by,
create_time
from prc_pay_bill_fee_log
where bill_id = #{billId}
order by log_id desc
select l.log_id, l.fee_id, l.bill_id, l.fee_name, l.amount, l.currency,
l.before_fee_name, l.before_amount, l.before_currency,
l.after_fee_name, l.after_amount, l.after_currency,
l.operation_type, l.remark,
case
when lower(trim(l.create_by)) = 'system' then '系统自动'
else ifnull((
select case
when nullif(trim(u.nick_name), '') is not null then u.nick_name
else u.user_name
end
from sys_user u
where u.del_flag = '0'
and (
(l.create_by regexp '^[0-9]+$' and u.user_id = cast(l.create_by as unsigned))
or (ifnull(l.create_by, '') not regexp '^[0-9]+$' and u.user_name = l.create_by COLLATE utf8mb4_general_ci)
)
limit 1
), l.create_by)
end as create_by,
l.create_time
from prc_pay_bill_fee_log l
where l.bill_id = #{billId}
order by l.log_id desc
</select>
</mapper>
@@ -71,19 +71,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
bp.fv_registration_fee as base_registration_fee,
d.discount_value, d.round_mode, d.pr_id, d.effective_date, d.expire_date, d.is_del, d.create_time, d.update_time
from prc_price_set_detail d
left join prc_price_set_detail bp
on bp.price_type = 'PRODUCT'
and bp.product_code = d.product_code
and ifnull(bp.country_code,'') = ifnull(d.country_code,'')
and ifnull(bp.zone_code,'') = ifnull(d.zone_code,'')
and ifnull(bp.weight_min,-1) = ifnull(d.weight_min,-1)
and ifnull(bp.weight_max,-1) = ifnull(d.weight_max,-1)
and ifnull(bp.is_del, '0') = '0'
and bp.psv_id = (
left join (
select bp0.psd_id, bp0.product_code, bp0.country_code, bp0.zone_code,
bp0.weight_min, bp0.weight_max, bp0.fv_value, bp0.fv_registration_fee
from prc_price_set_detail bp0
where bp0.price_type = 'PRODUCT'
and ifnull(bp0.is_del, '0') = '0'
and bp0.psv_id = (
select v.psv_id from prc_price_set_version v
where v.price_type = 'PRODUCT' and v.price_set_id is null and v.status = '1'
order by v.version_seq desc limit 1
)
) bp
on bp.product_code = d.product_code
and bp.country_code &lt;=&gt; d.country_code
and bp.zone_code &lt;=&gt; d.zone_code
and bp.weight_min &lt;=&gt; d.weight_min
and bp.weight_max &lt;=&gt; d.weight_max
<where>
and ifnull(d.is_del, '0') = '0'
@@ -9,7 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
b.created_by as createdBy, b.create_time as createTime, b.updated_by as updatedBy, b.update_time as updateTime,
c.sc_name as scName, c.charge_type as chargeType, c.charge_value as chargeValue, c.currency, c.ss_code as ssCode,
c.block_title as blockTitle, c.sc_note as scNote, c.country_code as countryCode, c.fee_type as feeType,
c.length_cm as lengthCm, c.width_cm as widthCm, c.height_cm as heightCm,
c.length_cm as lengthCm, c.width_cm as widthCm, c.height_cm as heightCm, c.size_type as sizeType, c.volume_m3 as volumeM3,
c.over_weight_kg as overWeightKg, c.extra_weight_kg as extraWeightKg, c.postcode_text as postcodeText
</sql>
@@ -14,6 +14,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="lengthCm" column="length_cm" />
<result property="widthCm" column="width_cm" />
<result property="heightCm" column="height_cm" />
<result property="sizeType" column="size_type" />
<result property="volumeM3" column="volume_m3" />
<result property="overWeightKg" column="over_weight_kg" />
<result property="extraWeightKg" column="extra_weight_kg" />
<result property="postcodeText" column="postcode_text" />
@@ -33,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<sql id="selectPrcSurchargeVo">
select sc_id, sc_name, fee_type, charge_type, dict_value, charge_value,
length_cm, width_cm, height_cm, over_weight_kg, extra_weight_kg, postcode_text, currency, round_mode,
length_cm, width_cm, height_cm, size_type, volume_m3, over_weight_kg, extra_weight_kg, postcode_text, currency, round_mode,
ss_code, is_del, country_code, block_title, sc_note, tms_id, created_by, create_time, updated_by, update_time
from prc_surcharge
</sql>
@@ -102,6 +104,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="lengthCm != null">length_cm,</if>
<if test="widthCm != null">width_cm,</if>
<if test="heightCm != null">height_cm,</if>
<if test="sizeType != null and sizeType != ''">size_type,</if>
<if test="volumeM3 != null">volume_m3,</if>
<if test="overWeightKg != null">over_weight_kg,</if>
<if test="extraWeightKg != null">extra_weight_kg,</if>
<if test="postcodeText != null">postcode_text,</if>
@@ -124,6 +128,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="lengthCm != null">#{lengthCm},</if>
<if test="widthCm != null">#{widthCm},</if>
<if test="heightCm != null">#{heightCm},</if>
<if test="sizeType != null and sizeType != ''">#{sizeType},</if>
<if test="volumeM3 != null">#{volumeM3},</if>
<if test="overWeightKg != null">#{overWeightKg},</if>
<if test="extraWeightKg != null">#{extraWeightKg},</if>
<if test="postcodeText != null">#{postcodeText},</if>
@@ -25,6 +25,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="lengthCm" column="length_cm" />
<result property="widthCm" column="width_cm" />
<result property="heightCm" column="height_cm" />
<result property="sizeType" column="size_type" />
<result property="volumeM3" column="volume_m3" />
<result property="overWeightKg" column="over_weight_kg" />
<result property="extraWeightKg" column="extra_weight_kg" />
<result property="blockTitle" column="block_title" />
@@ -43,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
r.created_by, r.create_time, r.updated_by, r.update_time,
s.sc_name, s.fee_type, s.charge_type, s.charge_value, s.currency,
s.round_mode, s.ss_code, s.sc_note,
s.postcode_text, s.length_cm, s.width_cm, s.height_cm,
s.postcode_text, s.length_cm, s.width_cm, s.height_cm, s.size_type, s.volume_m3,
s.over_weight_kg, s.extra_weight_kg, s.block_title,
ifnull(c.country_name, rc.country_name) as country_name, ifnull(c.weight_min, rc.weight_min) as weight_min, ifnull(c.weight_max, rc.weight_max) as weight_max
from prc_surcharge_rel r
@@ -78,6 +80,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
order by r.detail_id is not null, r.rel_id asc
</select>
<!-- 按套餐版本轻量查销售附加费(产品/明细关联),供查看详情产品列表 -->
<select id="selectSalesRelsByPsvId" resultMap="PrcSurchargeRelResult">
select r.rel_id, r.sc_id, r.product_id,
coalesce(nullif(trim(r.product_code), ''), p.product_code, d.product_code) as product_code,
r.detail_id, r.price_type, r.country_code, r.is_del,
r.created_by, r.create_time, r.updated_by, r.update_time,
s.sc_name, s.fee_type, s.charge_type, s.charge_value, s.currency,
s.round_mode, s.ss_code, s.sc_note,
s.postcode_text, s.length_cm, s.width_cm, s.height_cm, s.size_type, s.volume_m3,
s.over_weight_kg, s.extra_weight_kg, s.block_title,
null as country_name, null as weight_min, null as weight_max
from prc_surcharge_rel r
join prc_surcharge s on s.sc_id = r.sc_id and ifnull(s.is_del, '0') = '0'
left join prc_price_set_product p on p.psp_id = r.product_id and p.psv_id = #{psvId}
left join prc_price_set_detail d on d.psd_id = r.detail_id and d.psv_id = #{psvId} and ifnull(d.is_del, '0') = '0'
where ifnull(r.is_del, '0') = '0'
and r.price_type = 'SALES'
and (p.psp_id is not null or d.psd_id is not null)
order by r.rel_id asc
</select>
<select id="selectByDetailIdsAndPriceType" resultMap="PrcSurchargeRelResult">
<include refid="selectPrcSurchargeRelVo"/>
where ifnull(r.is_del, '0') = '0'
@@ -8,12 +8,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<id property="detailId" column="detail_id" />
<result property="zoneId" column="zone_id" />
<result property="postcode" column="postcode" />
<result property="matchType" column="match_type" />
<result property="createTime" column="create_time" />
<result property="updateTime" column="update_time" />
</resultMap>
<sql id="selectPrcZoneDetailVo">
select detail_id, zone_id, postcode, create_time, update_time
select detail_id, zone_id, postcode, match_type, create_time, update_time
from prc_zone_detail
</sql>
@@ -51,18 +52,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
insert into prc_zone_detail (
<if test="zoneId != null">zone_id,</if>
<if test="postcode != null and postcode != ''">postcode,</if>
match_type,
create_time
) values (
<if test="zoneId != null">#{zoneId},</if>
<if test="postcode != null and postcode != ''">#{postcode},</if>
#{matchType},
sysdate()
)
</insert>
<insert id="insertPrcZoneDetailBatch">
insert into prc_zone_detail (zone_id, postcode, create_time) values
insert into prc_zone_detail (zone_id, postcode, match_type, create_time) values
<foreach collection="list" item="item" separator=",">
(#{item.zoneId}, #{item.postcode}, sysdate())
(#{item.zoneId}, #{item.postcode}, #{item.matchType}, sysdate())
</foreach>
</insert>
@@ -71,6 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<set>
<if test="zoneId != null">zone_id = #{zoneId},</if>
<if test="postcode != null and postcode != ''">postcode = #{postcode},</if>
<if test="matchType != null and matchType != ''">match_type = #{matchType},</if>
update_time = sysdate()
</set>
where detail_id = #{detailId}
@@ -120,8 +124,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and z.product_id is null
and upper(ifnull(z.country_code,'')) = upper(#{countryCode})
and (
replace(upper(ifnull(d.postcode,'')), ' ', '') = replace(upper(#{postcode}), ' ', '')
or replace(upper(#{postcode}), ' ', '') like concat(replace(upper(ifnull(d.postcode,'')), ' ', ''), '%')
(
upper(ifnull(d.match_type, 'FULL')) = 'FULL'
and replace(upper(ifnull(d.postcode,'')), ' ', '') = replace(upper(#{postcode}), ' ', '')
)
or
(
upper(ifnull(d.match_type, 'FULL')) = 'PREFIX'
and replace(upper(#{postcode}), ' ', '') like concat(replace(upper(ifnull(d.postcode,'')), ' ', ''), '%')
)
)
order by
case when replace(upper(ifnull(d.postcode,'')), ' ', '') = replace(upper(#{postcode}), ' ', '') then 0 else 1 end,
@@ -147,8 +158,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where z.zone_type = 'LABEL'
and z.product_id = #{productId}
and (
replace(upper(ifnull(d.postcode,'')), ' ', '') = replace(upper(#{postcode}), ' ', '')
or replace(upper(#{postcode}), ' ', '') like concat(replace(upper(ifnull(d.postcode,'')), ' ', ''), '%')
(
upper(ifnull(d.match_type, 'FULL')) = 'FULL'
and replace(upper(ifnull(d.postcode,'')), ' ', '') = replace(upper(#{postcode}), ' ', '')
)
or
(
upper(ifnull(d.match_type, 'FULL')) = 'PREFIX'
and replace(upper(#{postcode}), ' ', '') like concat(replace(upper(ifnull(d.postcode,'')), ' ', ''), '%')
)
)
order by
case when replace(upper(ifnull(d.postcode,'')), ' ', '') = replace(upper(#{postcode}), ' ', '') then 0 else 1 end,
@@ -0,0 +1,78 @@
-- 众升 2026-11-19 渠道变更:prc_order_bill 同步修改产品名称+产品代码(66 单)
-- 守卫带旧产品代码,防误改;执行后核对查询应看到 6 组新值、无旧值残留
-- 备份(回滚用,可不执行)
-- CREATE TABLE bak_prc_order_bill_20261119 AS
-- SELECT * FROM prc_order_bill WHERE order_no IN (
-- 'MS20261102015630106', 'MS20261101223958075', 'MS20261102075714101', 'MS20261102021718025', 'MS20261101112835035', 'MS20261101212721049', 'MS20261101000937086', 'MS20261101190713149',
-- 'MS20261101190906090', 'MS20261102073516088', 'MS20261101184605072', 'MS20261101084234113', 'MS20261102062854044', 'MS20261102070753089', 'MS20261102022047060', 'MS20261101201529093',
-- 'MS20261101062807057', 'MS20261103032420038', 'MS20261101083746056', 'MS20261104070523067', 'MS20261101183120126', 'MS20261103234634123', 'MS20261103184219061', 'MS20261103051434104',
-- 'MS20261102190537107', 'MS20261104223025045', 'MS20261104063437075', 'MS20261104021501015', 'MS20261104163029097', 'MS20261104014232104', 'MS20261102154710079', 'MS20261103063337074',
-- 'MS20261101223348059', 'MS20261103083612118', 'MS20261103204057080', 'MS20261103154351089', 'MS20261102210531170', 'MS20261106090329054', 'MS20261104161112109', 'MS20261105052635095',
-- 'MS20261104024953018', 'MS20261105062540026', 'MS20261104164434132', 'MS20261105201758004', 'MS20261106042152030', 'MS20261105234213114', 'MS20261104020640145', 'MS20261105174957139',
-- 'MS20261103235057005', 'JH20261107111V', 'YDM11071749901S', 'MMP43', 'I020261104550165010176YYYYYY', 'OA23201B', '1327110118498773', 'T210---1',
-- 'AA23336', 'YDM11071749901A', 'T210---1A', 'S967110911499386', '1327110912499482', 'YWLT11091749882', 'OA23332', 'YWLT11111549923',
-- 'XM2GRX3010155', 'MS20261105040758061'
-- );
-- 1. 标快服装-包税(限定)(WSP117) -> 标快普货-包税(限定)(WSP118),49 单
UPDATE prc_order_bill
SET product_name = '标快普货-包税(限定)', product_code = 'WSP118'
WHERE product_code = 'WSP117' AND order_no IN (
'MS20261102015630106', 'MS20261101223958075', 'MS20261102075714101', 'MS20261102021718025', 'MS20261101112835035', 'MS20261101212721049', 'MS20261101000937086', 'MS20261101190713149',
'MS20261101190906090', 'MS20261102073516088', 'MS20261101184605072', 'MS20261101084234113', 'MS20261102062854044', 'MS20261102070753089', 'MS20261102022047060', 'MS20261101201529093',
'MS20261101062807057', 'MS20261103032420038', 'MS20261101083746056', 'MS20261104070523067', 'MS20261101183120126', 'MS20261103234634123', 'MS20261103184219061', 'MS20261103051434104',
'MS20261102190537107', 'MS20261104223025045', 'MS20261104063437075', 'MS20261104021501015', 'MS20261104163029097', 'MS20261104014232104', 'MS20261102154710079', 'MS20261103063337074',
'MS20261101223348059', 'MS20261103083612118', 'MS20261103204057080', 'MS20261103154351089', 'MS20261102210531170', 'MS20261106090329054', 'MS20261104161112109', 'MS20261105052635095',
'MS20261104024953018', 'MS20261105062540026', 'MS20261104164434132', 'MS20261105201758004', 'MS20261106042152030', 'MS20261105234213114', 'MS20261104020640145', 'MS20261105174957139',
'MS20261103235057005'
);
-- 2. 标快球衣-包税(WSP037) -> 球衣服装-包税(WSP099),2 单
UPDATE prc_order_bill
SET product_name = '球衣服装-包税', product_code = 'WSP099'
WHERE product_code = 'WSP037' AND order_no IN (
'JH20261107111V', 'YDM11071749901S'
);
-- 3. 全球标快-球衣(WSP020) -> 标快服装-球衣(WSP098),2 单
UPDATE prc_order_bill
SET product_name = '标快服装-球衣', product_code = 'WSP098'
WHERE product_code = 'WSP020' AND order_no IN (
'MMP43', 'I020261104550165010176YYYYYY'
);
-- 4. 标快鞋盒-硬包(WSP067) -> 全球标快-球衣(WSP020),4 单
UPDATE prc_order_bill
SET product_name = '全球标快-球衣', product_code = 'WSP020'
WHERE product_code = 'WSP067' AND order_no IN (
'OA23201B', 'YWLT11091749882', 'YWLT11111549923', 'XM2GRX3010155'
);
-- 5. 标快鞋盒-包税(WSP066) -> 标快球衣-包税(WSP037),8 单
UPDATE prc_order_bill
SET product_name = '标快球衣-包税', product_code = 'WSP037'
WHERE product_code = 'WSP066' AND order_no IN (
'1327110118498773', 'T210---1', 'AA23336', 'YDM11071749901A', 'T210---1A', 'S967110911499386', '1327110912499482', 'OA23332'
);
-- 6. 标快服装-包税(限定)(WSP117) -> 标快鞋盒-包税(WSP066),1 单
UPDATE prc_order_bill
SET product_name = '标快鞋盒-包税', product_code = 'WSP066'
WHERE product_code = 'WSP117' AND order_no IN (
'MS20261105040758061'
);
-- 核对:应只剩 6 组新值,总 66 单
SELECT product_name, product_code, COUNT(*) AS 单数
FROM prc_order_bill WHERE order_no IN (
'MS20261102015630106', 'MS20261101223958075', 'MS20261102075714101', 'MS20261102021718025', 'MS20261101112835035', 'MS20261101212721049', 'MS20261101000937086', 'MS20261101190713149',
'MS20261101190906090', 'MS20261102073516088', 'MS20261101184605072', 'MS20261101084234113', 'MS20261102062854044', 'MS20261102070753089', 'MS20261102022047060', 'MS20261101201529093',
'MS20261101062807057', 'MS20261103032420038', 'MS20261101083746056', 'MS20261104070523067', 'MS20261101183120126', 'MS20261103234634123', 'MS20261103184219061', 'MS20261103051434104',
'MS20261102190537107', 'MS20261104223025045', 'MS20261104063437075', 'MS20261104021501015', 'MS20261104163029097', 'MS20261104014232104', 'MS20261102154710079', 'MS20261103063337074',
'MS20261101223348059', 'MS20261103083612118', 'MS20261103204057080', 'MS20261103154351089', 'MS20261102210531170', 'MS20261106090329054', 'MS20261104161112109', 'MS20261105052635095',
'MS20261104024953018', 'MS20261105062540026', 'MS20261104164434132', 'MS20261105201758004', 'MS20261106042152030', 'MS20261105234213114', 'MS20261104020640145', 'MS20261105174957139',
'MS20261103235057005', 'JH20261107111V', 'YDM11071749901S', 'MMP43', 'I020261104550165010176YYYYYY', 'OA23201B', '1327110118498773', 'T210---1',
'AA23336', 'YDM11071749901A', 'T210---1A', 'S967110911499386', '1327110912499482', 'YWLT11091749882', 'OA23332', 'YWLT11111549923',
'XM2GRX3010155', 'MS20261105040758061'
) GROUP BY product_name, product_code ORDER BY 单数 DESC;
+1
View File
@@ -1596,6 +1596,7 @@ CREATE TABLE `prc_zone_detail` (
`detail_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'detail id',
`zone_id` bigint(20) NOT NULL COMMENT 'zone id',
`postcode` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'postcode',
`match_type` varchar(16) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'FULL' COMMENT 'FULL exact / PREFIX starts with',
`create_time` datetime DEFAULT NULL COMMENT 'created at',
`update_time` datetime DEFAULT NULL COMMENT 'updated at',
PRIMARY KEY (`detail_id`),
@@ -0,0 +1,5 @@
-- `prc_order_bill` 增加创建时间和主键索引,应付列表按创建时间倒序翻页
ALTER TABLE `bms`.`prc_order_bill` ADD INDEX `idx_order_bill_create_bill` (`create_time`, `bill_id`);
-- `prc_order_bill_ext` 增加提单号索引,按空运单号筛选和重算时不再扫整张扩展表
ALTER TABLE `bms`.`prc_order_bill_ext` ADD INDEX `idx_ext_air_no` (`air_no_old`, `bill_id`);
@@ -0,0 +1,8 @@
-- `pay_weight_band` 表中添加`calc_rule` 属性
ALTER TABLE `bms`.`pay_weight_band` ADD COLUMN `calc_rule` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '计费条件类型:POSTCODE邮编、SIZE尺寸、WEIGHT重量。空表示按分区计费' AFTER `zone_name`;
-- `pay_weight_band` 表中添加`calc_param` 属性
ALTER TABLE `bms`.`pay_weight_band` ADD COLUMN `calc_param` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '计费条件参数。邮编如07或35,38;尺寸如side:80;sum:180或box:60*40*30;重量如30表示超过30kg' AFTER `calc_rule`;
-- 原邮编条件改为通用计费条件
UPDATE `bms`.`pay_weight_band` SET `calc_rule` = 'POSTCODE', `calc_param` = `postcode_param` WHERE `postcode_param` IS NOT NULL AND TRIM(`postcode_param`) <> '';
-- `pay_weight_band` 去掉只表示邮编的字段
ALTER TABLE `bms`.`pay_weight_band` DROP COLUMN `postcode_param`;
@@ -0,0 +1,18 @@
-- `pay_weight_band` 表中添加`postcode_param` 属性
ALTER TABLE `bms`.`pay_weight_band` ADD COLUMN `postcode_param` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '邮编条件,如07或35,38。有值时按邮编选用这一档金额和续重' AFTER `zone_name`;
-- 巴利阿里偏远档的邮编条件从分区拆出
UPDATE `bms`.`pay_weight_band` SET `postcode_param` = '07', `zone_name` = TRIM(REPLACE(`zone_name`, '07邮编开头', '')) WHERE `zone_name` LIKE '%07邮编开头%';
-- 加那利偏远档的邮编条件从分区拆出
UPDATE `bms`.`pay_weight_band` SET `postcode_param` = '35,38', `zone_name` = TRIM(REPLACE(`zone_name`, '35、38邮编开头', '')) WHERE `zone_name` LIKE '%35、38邮编开头%';
-- 休达和梅利利亚偏远档的邮编条件从分区拆出
UPDATE `bms`.`pay_weight_band` SET `postcode_param` = '51,52', `zone_name` = TRIM(REPLACE(`zone_name`, '51、52邮编开头', '')) WHERE `zone_name` LIKE '%51、52邮编开头%';
-- 葡萄牙岛屿偏远档的邮编条件从分区拆出
UPDATE `bms`.`pay_weight_band` SET `postcode_param` = '9', `zone_name` = TRIM(REPLACE(`zone_name`, '9邮编开头', '')) WHERE `zone_name` LIKE '%9邮编开头%';
-- 巴利阿里续重分区去掉邮编字样
UPDATE `bms`.`pay_surcharge` SET `zone_name` = TRIM(REPLACE(`zone_name`, '07邮编开头', '')) WHERE `zone_name` LIKE '%07邮编开头%';
-- 加那利续重分区去掉邮编字样
UPDATE `bms`.`pay_surcharge` SET `zone_name` = TRIM(REPLACE(`zone_name`, '35、38邮编开头', '')) WHERE `zone_name` LIKE '%35、38邮编开头%';
-- 休达和梅利利亚续重分区去掉邮编字样
UPDATE `bms`.`pay_surcharge` SET `zone_name` = TRIM(REPLACE(`zone_name`, '51、52邮编开头', '')) WHERE `zone_name` LIKE '%51、52邮编开头%';
-- 葡萄牙岛屿续重分区去掉邮编字样
UPDATE `bms`.`pay_surcharge` SET `zone_name` = TRIM(REPLACE(`zone_name`, '9邮编开头', '')) WHERE `zone_name` LIKE '%9邮编开头%';
@@ -0,0 +1,20 @@
-- `prc_surcharge` 表中添加`size_type` 属性
ALTER TABLE `bms`.`prc_surcharge` ADD COLUMN `size_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '超尺寸类型,字典 bms_size_type:SIDE任一边、VOLUME体积' AFTER `height_cm`;
-- 增加超尺寸类型字典
INSERT INTO `bms`.`sys_dict_type` (`dict_name`, `dict_type`, `status`, `create_by`, `create_time`, `remark`)
SELECT '超尺寸类型', 'bms_size_type', '0', 'admin', sysdate(), '附加费超尺寸的比对方式'
FROM DUAL
WHERE NOT EXISTS (SELECT 1 FROM `bms`.`sys_dict_type` WHERE `dict_type` = 'bms_size_type');
-- 超尺寸类型增加任一边
INSERT INTO `bms`.`sys_dict_data` (`dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `remark`)
SELECT 1, '任一边', 'SIDE', 'bms_size_type', '', 'default', 'N', '0', 'admin', sysdate(), '长宽高按从大到小比对,任一边超过即命中'
FROM DUAL
WHERE NOT EXISTS (SELECT 1 FROM `bms`.`sys_dict_data` WHERE `dict_type` = 'bms_size_type' AND `dict_value` = 'SIDE');
-- 超尺寸类型增加体积
INSERT INTO `bms`.`sys_dict_data` (`dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `remark`)
SELECT 2, '体积(m³)', 'VOLUME', 'bms_size_type', '', 'default', 'N', '0', 'admin', sysdate(), '长宽高相乘换算立方米后比较'
FROM DUAL
WHERE NOT EXISTS (SELECT 1 FROM `bms`.`sys_dict_data` WHERE `dict_type` = 'bms_size_type' AND `dict_value` = 'VOLUME');
@@ -0,0 +1,2 @@
-- `prc_surcharge` 表中添加`volume_m3` 属性
ALTER TABLE `bms`.`prc_surcharge` ADD COLUMN `volume_m3` decimal(12,6) NULL COMMENT '超尺寸体积阈值,立方米。类型为体积时,订单体积超过该值才收取' AFTER `size_type`;
@@ -0,0 +1,13 @@
-- prc_zone_detail.match_type: FULL exact / PREFIX starts-with
-- Idempotent. Column default is FULL. No bulk rewrite of existing rows.
SET @db := DATABASE();
SELECT COUNT(*) INTO @col_match_type
FROM information_schema.COLUMNS
WHERE TABLE_SCHEMA = @db AND TABLE_NAME = 'prc_zone_detail' AND COLUMN_NAME = 'match_type';
SET @sql := IF(@col_match_type = 0,
'ALTER TABLE prc_zone_detail ADD COLUMN match_type varchar(16) NOT NULL DEFAULT ''FULL'' COMMENT ''FULL exact match / PREFIX starts with'' AFTER postcode',
'SELECT 1');
PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
@@ -0,0 +1,7 @@
-- One-shot: undo earlier mistaken "all rows = PREFIX" migration.
-- Default display/billing type becomes FULL.
-- After running, re-import Evri / UK / Canada remote sheets if those need PREFIX.
UPDATE prc_zone_detail
SET match_type = 'FULL'
WHERE match_type IS NULL OR match_type = '' OR UPPER(match_type) = 'PREFIX';
@@ -67,7 +67,8 @@ const lineRef = ref()
const coverageOptions = [
{ label: '可达', value: 'REACH' },
{ label: '不可达', value: 'UNREACH' },
{ label: '偏远', value: 'REMOTE' }
{ label: '偏远', value: 'REMOTE' },
{ label: '附加费', value: 'SURCHARGE' }
]
function firstPart(value) {
@@ -81,6 +82,7 @@ function coverageLabel(value) {
function coverageType(value) {
if (value === 'UNREACH') return 'danger'
if (value === 'REMOTE') return 'warning'
if (value === 'SURCHARGE') return 'primary'
return 'success'
}
@@ -43,7 +43,8 @@ const rules = {
const coverageOptions = [
{ label: '可达', value: 'REACH' },
{ label: '不可达', value: 'UNREACH' },
{ label: '偏远', value: 'REMOTE' }
{ label: '偏远', value: 'REMOTE' },
{ label: '附加费', value: 'SURCHARGE' }
]
function open(row) {
@@ -35,7 +35,7 @@
</basic-table>
<el-dialog v-model="open" title="导入应付邮编" width="480px" append-to-body destroy-on-close>
<p class="import-tip">导入后按国家归成一行。表头里带邮编或附加费的工作表会被导入。可达、可派记为可达,不可达记为不可达,偏远和岛屿记为偏远。</p>
<!-- <p class="import-tip">导入后按国家归成一行。表头里带邮编或附加费的工作表会被导入。可达、可派记为可达,不可达记为不可达,偏远和岛屿记为偏远。英国附加费里的空气减排地区和空气减排地区邮编记为附加费,渠道为 Evri 48H。</p>-->
<el-upload :auto-upload="false" :limit="1" accept=".xlsx" :on-change="onFile" :on-remove="() => file = null">
<el-button type="primary" plain>选择 xlsx</el-button>
</el-upload>
@@ -87,7 +87,8 @@ const form = ref({})
const coverageOptions = [
{ label: '可达', value: 'REACH' },
{ label: '不可达', value: 'UNREACH' },
{ label: '偏远', value: 'REMOTE' }
{ label: '偏远', value: 'REMOTE' },
{ label: '附加费', value: 'SURCHARGE' }
]
function coverageParts(value) {
@@ -101,6 +102,7 @@ function coverageLabel(value) {
function coverageType(value) {
if (value === 'UNREACH') return 'danger'
if (value === 'REMOTE') return 'warning'
if (value === 'SURCHARGE') return 'primary'
return 'success'
}
@@ -171,13 +171,20 @@ function scheduleAutoCollapse() {
}
function open(filterQuery, autoStart) {
// Already running / finished: just reopen progress view (same as order-list rebill).
if (loading.value || finished.value) {
// Still running: only reopen progress (do not start another task).
if (loading.value) {
visible.value = true
return
}
// Finished + reopen only (float click): show last result.
if (finished.value && !autoStart && filterQuery == null) {
visible.value = true
return
}
// New sync: clear previous result first.
query.value = { ...(filterQuery || {}) }
asyncTaskIdRef.value = ''
pollGeneration.value += 1
progress.value = {
percent: 0,
message: '',
@@ -357,7 +364,11 @@ onBeforeUnmount(() => {
pollGeneration.value += 1
})
defineExpose({ open })
function reopen() {
visible.value = true
}
defineExpose({ open, reopen })
</script>
<style scoped>
@@ -2,7 +2,7 @@
<div class="app-container order-source-page">
<div v-if="syncFloatVisible" class="retry-status-float">
<el-tooltip :content="syncFloatTooltip" placement="bottom">
<el-button class="retry-status-button" type="primary" plain size="small" @click="openFilterSync()">
<el-button class="retry-status-button" type="primary" plain size="small" @click="reopenSyncProgress()">
<span class="retry-progress-ring" :style="{ '--retry-progress': syncProgressDegree + 'deg' }" aria-hidden="true">
<span class="retry-progress-value">{{ syncProgressText }}</span>
</span>
@@ -458,12 +458,28 @@ function onCompareFillSearch(payload) {
tableRef.value?.handleQuery?.()
}
function reopenSyncProgress() {
const dlg = syncDialogRef.value
if (dlg && typeof dlg.reopen === 'function') {
dlg.reopen()
} else {
dlg?.open(null, false)
}
}
function openFilterSync() {
// Running / just finished: reopen progress dialog (same as order-list float click).
if (syncFloat.value && (syncFloat.value.loading || syncFloat.value.finished)) {
syncDialogRef.value?.open(null, false)
// Running: reopen progress; finished result must not block a new sync.
if (syncFloat.value?.loading) {
reopenSyncProgress()
return
}
if (syncFloat.value?.finished) {
if (syncFloatHideTimer) {
clearTimeout(syncFloatHideTimer)
syncFloatHideTimer = null
}
syncFloat.value = null
}
const q = buildFilterQuery()
const identifierCount = (q.orderIdentifiers || []).length
const hasIdentifier = identifierCount > 0
@@ -7,7 +7,7 @@
<el-option v-for="item in available" :key="item.scId" :label="optionLabel(item)" :value="item.scId" />
</el-select>
<el-button type="primary" plain class="add" @click="addPicked">添加</el-button>
<p class="hint">从附加费配置里选择。长宽高、重量和邮编在配置里维护,这里只选用。</p>
<p class="hint">从附加费配置里选择。长宽高、体积、重量和邮编在配置里维护,这里只选用。</p>
</section>
<section class="chosen">
<div class="pane-title">已选附加费</div>
@@ -84,6 +84,19 @@ function valueText(row) {
return `${row.amount} ${row.currency || ''}`.trim()
}
function configMeasure(item) {
return {
lengthCm: item.lengthCm,
widthCm: item.widthCm,
heightCm: item.heightCm,
sizeType: item.sizeType,
volumeM3: item.volumeM3,
overWeightKg: item.overWeightKg,
extraWeightKg: item.extraWeightKg,
postcodeText: item.postcodeText || ''
}
}
function rowFromConfig(item) {
return {
scId: item.scId,
@@ -92,12 +105,7 @@ function rowFromConfig(item) {
amount: item.chargeValue,
currency: item.currency,
zoneName: item.blockTitle || '',
lengthCm: item.lengthCm,
widthCm: item.widthCm,
heightCm: item.heightCm,
overWeightKg: item.overWeightKg,
extraWeightKg: item.extraWeightKg,
postcodeText: item.postcodeText || ''
...configMeasure(item)
}
}
@@ -117,6 +125,12 @@ function removeRow(row) {
function conditionText(row) {
if (row.calcRule === 'SIZE') {
if (String(row.sizeType || '').trim().toUpperCase() === 'VOLUME') {
if (Number(row.volumeM3) > 0) {
return `体积超过 ${row.volumeM3} m³`
}
return '体积还没在附加费配置里填写'
}
if (Number(row.lengthCm) > 0 && Number(row.widthCm) > 0 && Number(row.heightCm) > 0) {
return `长 ${row.lengthCm} cm,宽 ${row.widthCm} cm,高 ${row.heightCm} cm`
}
@@ -164,12 +178,7 @@ async function open(row) {
amount: item.amount,
currency: item.currency,
zoneName: item.zoneName || '',
lengthCm: item.lengthCm,
widthCm: item.widthCm,
heightCm: item.heightCm,
overWeightKg: item.overWeightKg,
extraWeightKg: item.extraWeightKg,
postcodeText: item.postcodeText || ''
...configMeasure(item)
}))
} finally {
loading.value = false
@@ -36,6 +36,19 @@
<el-table-column prop="zoneName" label="分区" min-width="140" show-overflow-tooltip>
<template #default="{ row }"><cell-text v-model="row.zoneName" :edit="isRowEditing(row)" /></template>
</el-table-column>
<el-table-column prop="calcRule" label="计费条件" width="110" align="center">
<template #default="{ row }">
<el-select v-if="isRowEditing(row)" v-model="row.calcRule" clearable size="small" placeholder="不限">
<el-option label="邮编" value="POSTCODE" />
<el-option label="尺寸" value="SIZE" />
<el-option label="重量" value="WEIGHT" />
</el-select>
<span v-else>{{ bandRuleLabel(row.calcRule) }}</span>
</template>
</el-table-column>
<el-table-column prop="calcParam" label="条件参数" min-width="150" show-overflow-tooltip>
<template #default="{ row }"><cell-text v-model="row.calcParam" :edit="isRowEditing(row)" /></template>
</el-table-column>
<el-table-column prop="weightLabel" label="重量段" min-width="120" show-overflow-tooltip>
<template #default="{ row }"><cell-text v-model="row.weightLabel" :edit="isRowEditing(row)" /></template>
</el-table-column>
@@ -539,7 +552,7 @@ watch(source, (list) => {
}, { immediate: true })
function filteredBands(pane) {
return filterRows(pane.item.weightBands || [], pane.bandKeyword, ['sectionName', 'countryName', 'countryCode', 'zoneName', 'weightLabel', 'chargeName', 'priceUnit'])
return filterRows(pane.item.weightBands || [], pane.bandKeyword, ['sectionName', 'countryName', 'countryCode', 'zoneName', 'calcRule', 'calcParam', 'weightLabel', 'chargeName', 'priceUnit'])
}
function filteredFees(pane) {
@@ -718,6 +731,14 @@ function filterRows(rows, keyword, fields) {
return rows.filter(row => fields.some(field => String(row?.[field] ?? '').toLowerCase().includes(text)))
}
function bandRuleLabel(rule) {
const value = String(rule || '').toUpperCase()
if (value === 'POSTCODE') return '邮编'
if (value === 'SIZE') return '尺寸'
if (value === 'WEIGHT') return '重量'
return ''
}
function pageOf(rows, pageNo) {
const start = (pageNo - 1) * pageSize
return rows.slice(start, start + pageSize)
@@ -66,6 +66,18 @@
<el-table-column label="分区" min-width="120">
<template #default="{ row }"><el-input v-model="row.zoneName" size="small" placeholder="不分区可空" /></template>
</el-table-column>
<el-table-column label="计费条件" width="110">
<template #default="{ row }">
<el-select v-model="row.calcRule" clearable size="small" placeholder="不限">
<el-option label="邮编" value="POSTCODE" />
<el-option label="尺寸" value="SIZE" />
<el-option label="重量" value="WEIGHT" />
</el-select>
</template>
</el-table-column>
<el-table-column label="条件参数" min-width="160">
<template #default="{ row }"><el-input v-model="row.calcParam" size="small" placeholder="07 / side:80 / 30" /></template>
</el-table-column>
<el-table-column v-if="form.chargeType !== 'EXTRA'" label="重量下限KG" width="120">
<template #default="{ row }"><el-input v-model="row.weightMin" size="small" /></template>
</el-table-column>
@@ -186,7 +198,7 @@ function onMode() {
}
function blankRow() {
return { countryName: '', countryCode: '', zoneName: '', weightMin: '0', weightMax: '', price: '', extraPrice: '' }
return { countryName: '', countryCode: '', zoneName: '', calcRule: '', calcParam: '', weightMin: '0', weightMax: '', price: '', extraPrice: '' }
}
function addRow() {
@@ -235,6 +247,8 @@ async function submit() {
countryName: row.countryName,
countryCode: row.countryCode,
zoneName: row.zoneName,
calcRule: row.calcRule,
calcParam: row.calcParam,
weightMin: 0,
weightMax: firstKg,
price
@@ -253,6 +267,8 @@ async function submit() {
countryName: row.countryName,
countryCode: row.countryCode,
zoneName: row.zoneName,
calcRule: row.calcRule,
calcParam: row.calcParam,
weightMin: min,
weightMax: max,
price
@@ -29,6 +29,7 @@ const calcModeOptions = [
{ value: 'MANUAL', label: '暂不计费' },
{ value: 'ALWAYS', label: '每票都收' },
{ value: 'POSTCODE', label: '命中邮编' },
{ value: 'FEE_POSTCODE', label: '附加费邮编' },
{ value: 'ZONE', label: '命中分区' },
{ value: 'EXTRA_KG', label: '超重续收' },
{ value: 'WEIGHT', label: '超重' },
@@ -50,6 +51,8 @@ const blockSelectOptions = computed(() =>
const chargeType = computed(() => String(form.value.chargeType || '').toUpperCase())
const sizeKind = computed(() => String(form.value.sizeType || '').toUpperCase())
const schemas = computed(() => [
{
label: '附加费名称',
@@ -81,15 +84,26 @@ const schemas = computed(() => [
width: '100%',
rules: [{ required: true, message: '请选择计费方式', trigger: 'change' }]
},
{
label: '超尺寸类型',
prop: 'sizeType',
component: 'select',
placeholder: '请选择',
dict: 'bms_size_type',
span: 12,
width: '100%',
show: chargeType.value === 'SIZE',
rules: chargeType.value === 'SIZE' ? [{ required: true, message: '请选择超尺寸类型', trigger: 'change' }] : undefined
},
{
label: '长(cm)',
prop: 'lengthCm',
component: 'inputNumber',
span: 12,
width: '100%',
show: chargeType.value === 'SIZE',
show: chargeType.value === 'SIZE' && sizeKind.value === 'SIDE',
props: { min: 0, precision: 2, controls: false, align: 'left' },
rules: chargeType.value === 'SIZE' ? [{ required: true, message: '请填写长', trigger: 'blur' }] : undefined
rules: chargeType.value === 'SIZE' && sizeKind.value === 'SIDE' ? [{ required: true, message: '请填写长', trigger: 'blur' }] : undefined
},
{
label: '宽(cm)',
@@ -97,9 +111,9 @@ const schemas = computed(() => [
component: 'inputNumber',
span: 12,
width: '100%',
show: chargeType.value === 'SIZE',
show: chargeType.value === 'SIZE' && sizeKind.value === 'SIDE',
props: { min: 0, precision: 2, controls: false, align: 'left' },
rules: chargeType.value === 'SIZE' ? [{ required: true, message: '请填写宽', trigger: 'blur' }] : undefined
rules: chargeType.value === 'SIZE' && sizeKind.value === 'SIDE' ? [{ required: true, message: '请填写宽', trigger: 'blur' }] : undefined
},
{
label: '高(cm)',
@@ -107,9 +121,20 @@ const schemas = computed(() => [
component: 'inputNumber',
span: 12,
width: '100%',
show: chargeType.value === 'SIZE',
show: chargeType.value === 'SIZE' && sizeKind.value === 'SIDE',
props: { min: 0, precision: 2, controls: false, align: 'left' },
rules: chargeType.value === 'SIZE' ? [{ required: true, message: '请填写高', trigger: 'blur' }] : undefined
rules: chargeType.value === 'SIZE' && sizeKind.value === 'SIDE' ? [{ required: true, message: '请填写高', trigger: 'blur' }] : undefined
},
{
label: '体积值/m³',
prop: 'volumeM3',
component: 'inputNumber',
placeholder: '超过这个体积才收取',
span: 12,
width: '100%',
show: chargeType.value === 'SIZE' && sizeKind.value === 'VOLUME',
props: { min: 0, precision: 6, controls: false, align: 'left' },
rules: chargeType.value === 'SIZE' && sizeKind.value === 'VOLUME' ? [{ required: true, message: '请填写体积', trigger: 'blur' }] : undefined
},
{
label: '超过重量(kg)',
@@ -217,6 +242,8 @@ function emptyForm() {
countryCode: undefined,
blockTitle: undefined,
scNote: undefined,
sizeType: undefined,
volumeM3: undefined,
lengthCm: undefined,
widthCm: undefined,
heightCm: undefined,
@@ -327,6 +354,8 @@ watch(() => form.value.countryCode, (code, prev) => {
watch(() => form.value.chargeType, (type, prev) => {
if (suppressCountryWatch.value || !prev || type === prev) return
form.value.sizeType = undefined
form.value.volumeM3 = undefined
form.value.lengthCm = undefined
form.value.widthCm = undefined
form.value.heightCm = undefined
@@ -337,6 +366,19 @@ watch(() => form.value.chargeType, (type, prev) => {
nextTick(() => formRef.value?.clearValidate())
})
watch(() => form.value.sizeType, (type, prev) => {
if (suppressCountryWatch.value || !prev || type === prev) return
const code = String(type || '').toUpperCase()
if (code === 'VOLUME') {
form.value.lengthCm = undefined
form.value.widthCm = undefined
form.value.heightCm = undefined
} else if (code === 'SIDE') {
form.value.volumeM3 = undefined
}
nextTick(() => formRef.value?.clearValidate())
})
defineExpose({ open })
</script>
@@ -109,6 +109,7 @@ const chargeTypeLabelMap = {
MANUAL: '暂不计费',
ALWAYS: '每票都收',
POSTCODE: '命中邮编',
FEE_POSTCODE: '附加费邮编',
ZONE: '命中分区',
EXTRA_KG: '超重续收',
WEIGHT: '超重',
@@ -87,6 +87,7 @@ const calcModeLabelMap = {
MANUAL: '暂不计费',
ALWAYS: '每票都收',
POSTCODE: '命中邮编',
FEE_POSTCODE: '附加费邮编',
ZONE: '命中分区',
EXTRA_KG: '超重续收',
WEIGHT: '超重',
@@ -98,6 +99,8 @@ const columns = [
{ label: '附加费名称', prop: 'scName', align: 'center', minWidth: 140, showOverflowTooltip: true },
{ label: '费用类型', prop: 'feeType', align: 'center', width: 110, dict: 'bms_fee_type' },
{ label: '计费方式', prop: 'chargeType', align: 'center', width: 110 },
{ label: '超尺寸类型', prop: 'sizeType', align: 'center', width: 120, dict: 'bms_size_type' },
{ label: '体积(m³)', prop: 'volumeM3', align: 'center', width: 110 },
{ label: '计费数值', prop: 'chargeValue', align: 'center', width: 140 },
{ label: '取值方式', prop: 'roundMode', align: 'center', width: 110, dict: 'bms_round_mode' },
{ label: '适用国家', prop: 'countryCode', align: 'center', minWidth: 120, showOverflowTooltip: true },
@@ -25,6 +25,11 @@
<el-table v-loading="loading" :data="list" border row-key="detailId" empty-text="暂无邮编">
<el-table-column label="ID" prop="detailId" align="center" width="90" />
<el-table-column label="邮编" prop="postcode" align="center" min-width="140" />
<el-table-column label="匹配类型" prop="matchType" align="center" min-width="140">
<template #default="{ row }">
{{ matchTypeText(row.matchType) }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="160">
<template #default="{ row }">
<el-button link type="primary" icon="Edit" @click="handleUpdate(row)" v-hasPermi="['price:zone:edit']">编辑</el-button>
@@ -96,6 +101,11 @@ function loadList() {
})
}
function matchTypeText(type) {
if (String(type || '').toUpperCase() === 'PREFIX') return '匹配邮编开头'
return '全匹配'
}
function handleAdd() {
postcodeFormRef.value.open(selectedZone.value)
}
@@ -1,9 +1,15 @@
<template>
<el-dialog :title="title" v-model="visible" width="420px" append-to-body>
<el-form ref="postcodeFormRef" :model="form" :rules="rules" label-width="80px">
<el-dialog :title="title" v-model="visible" width="480px" append-to-body>
<el-form ref="postcodeFormRef" :model="form" :rules="rules" label-width="100px">
<el-form-item label="邮编" prop="postcode">
<el-input v-model="form.postcode" placeholder="请输入邮编" maxlength="32" />
</el-form-item>
<el-form-item label="匹配类型" prop="matchType">
<el-radio-group v-model="form.matchType">
<el-radio label="FULL">全匹配</el-radio>
<el-radio label="PREFIX">匹配邮编开头</el-radio>
</el-radio-group>
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
@@ -26,17 +32,19 @@ const title = ref('')
const postcodeFormRef = ref()
const form = ref({})
const rules = {
postcode: [{ required: true, message: '邮编不能为空', trigger: 'blur' }]
postcode: [{ required: true, message: '邮编不能为空', trigger: 'blur' }],
matchType: [{ required: true, message: '请选择匹配类型', trigger: 'change' }]
}
/** zone 为所属分区;row 传空为新增,传邮编行为编辑 */
function open(zone, row) {
form.value = row
? { ...row }
? { ...row, matchType: row.matchType || 'FULL' }
: {
detailId: undefined,
zoneId: zone?.zoneId,
postcode: undefined
postcode: undefined,
matchType: 'FULL'
}
title.value = row ? '编辑邮编' : '新增邮编'
visible.value = true
@@ -48,7 +56,8 @@ function submitForm() {
if (!valid) return
const payload = {
...form.value,
postcode: String(form.value.postcode || '').trim()
postcode: String(form.value.postcode || '').trim(),
matchType: form.value.matchType || 'FULL'
}
const req = payload.detailId != null ? updateDetail(payload) : addDetail(payload)
req.then(() => {
@@ -0,0 +1,189 @@
<template>
<el-dialog
v-model="visible"
title="选择渠道"
width="920px"
append-to-body
destroy-on-close
@opened="onOpened"
>
<div class="picker-bar">
<el-input
v-model="keyword"
clearable
placeholder="搜索渠道编码、渠道名称"
class="picker-search"
/>
<span class="picker-meta">共 {{ filteredRows.length }} 项,已选 {{ picked.length }} 项</span>
</div>
<el-table
ref="tableRef"
v-loading="loading"
:data="filteredRows"
row-key="id"
border
size="small"
max-height="420"
empty-text="暂无可选渠道"
@selection-change="onSelectionChange"
>
<el-table-column type="selection" width="46" :selectable="canSelect" />
<el-table-column prop="channelCode" label="渠道编码" min-width="140" show-overflow-tooltip />
<el-table-column prop="channelName" label="渠道名称" min-width="200" show-overflow-tooltip />
<el-table-column label="状态" width="90" align="center">
<template #default="{ row }">
<el-tag v-if="String(row.blOpen) === '1'" size="small" type="success">启用</el-tag>
<el-tag v-else size="small" type="info">停用</el-tag>
</template>
</el-table-column>
</el-table>
<div class="picker-hint">
绑定为收款(AR),落库 srv_channel_product_map;一个渠道同一收付类型仅保留一条产品映射。已绑定渠道不可重复勾选。
</div>
<template #footer>
<el-button @click="visible = false">取 消</el-button>
<el-button type="primary" :disabled="!picked.length" @click="submit">确 定</el-button>
</template>
</el-dialog>
</template>
<script setup name="LabelChannelPickerDialog">
import { listChannelOptions } from '@/api/masterdata/serviceChannel'
const props = defineProps({
modelValue: { type: Boolean, default: false },
/** 已绑定的渠道 id,用于禁用重复勾选 */
excludeChannelIds: { type: Array, default: () => [] }
})
const emit = defineEmits(['update:modelValue', 'confirm'])
const { proxy } = getCurrentInstance()
const tableRef = ref()
const loading = ref(false)
const keyword = ref('')
const rows = ref([])
const pickedIds = ref(new Set())
const syncing = ref(false)
const visible = computed({
get: () => props.modelValue,
set: v => emit('update:modelValue', v)
})
const excludeSet = computed(() => new Set((props.excludeChannelIds || []).map(id => String(id))))
function canSelect(row) {
if (row?.id == null) return false
return !excludeSet.value.has(String(row.id))
}
const filteredRows = computed(() => {
const text = String(keyword.value || '').trim().toLowerCase()
const list = rows.value || []
if (!text) return list
return list.filter(row => {
const bag = [row.channelCode, row.channelName, row.id]
.map(v => String(v ?? '').toLowerCase())
return bag.some(item => item.includes(text))
})
})
const picked = computed(() => {
const ids = pickedIds.value
return (rows.value || []).filter(row => row?.id != null && ids.has(String(row.id)) && canSelect(row))
})
function onSelectionChange(selection) {
if (syncing.value) return
const visibleIds = new Set((filteredRows.value || []).map(row => String(row.id)))
const next = new Set(pickedIds.value)
for (const id of visibleIds) {
next.delete(id)
}
for (const row of selection || []) {
if (row?.id != null && canSelect(row)) next.add(String(row.id))
}
pickedIds.value = next
}
function restoreSelection() {
const table = tableRef.value
if (!table) return
syncing.value = true
table.clearSelection()
for (const row of filteredRows.value || []) {
if (row?.id != null && pickedIds.value.has(String(row.id))) {
table.toggleRowSelection(row, true)
}
}
nextTick(() => {
syncing.value = false
})
}
async function loadRows() {
loading.value = true
try {
const res = await listChannelOptions({ blOpen: '1' })
rows.value = res.data || []
} catch (e) {
rows.value = []
} finally {
loading.value = false
nextTick(() => restoreSelection())
}
}
function onOpened() {
keyword.value = ''
pickedIds.value = new Set()
nextTick(() => {
tableRef.value?.clearSelection?.()
})
loadRows()
}
function submit() {
const list = picked.value
if (!list.length) {
proxy.$modal.msgWarning('请先勾选要添加的渠道')
return
}
emit('confirm', list)
visible.value = false
}
watch(keyword, () => {
nextTick(() => restoreSelection())
})
watch(() => props.modelValue, v => {
if (v && !rows.value.length) loadRows()
})
</script>
<style scoped>
.picker-bar {
display: flex;
align-items: center;
flex-wrap: wrap;
gap: 12px;
margin-bottom: 10px;
}
.picker-search {
width: 320px;
}
.picker-meta {
color: var(--el-text-color-secondary);
font-size: 12px;
}
.picker-hint {
margin-top: 10px;
color: var(--el-text-color-secondary);
font-size: 12px;
line-height: 1.5;
}
</style>
@@ -73,46 +73,11 @@
</template>
</el-drawer>
<el-dialog
<label-channel-picker-dialog
v-model="addVisible"
:title="addTitle"
width="560px"
append-to-body
destroy-on-close
@closed="onAddClosed"
>
<div v-loading="addLoading">
<el-form label-width="88px">
<el-form-item :label="lblProduct">
<span>{{ bindProductName }}</span>
</el-form-item>
<el-form-item :label="lblChannels">
<el-select
v-model="addChannelIds"
multiple
filterable
clearable
collapse-tags
collapse-tags-tooltip
:placeholder="phChannels"
style="width: 100%"
>
<el-option
v-for="item in addableChannelOptions"
:key="item.id"
:label="channelOptionLabel(item)"
:value="String(item.id)"
:exclude-channel-ids="currentBoundIds()"
@confirm="onPickerConfirm"
/>
</el-select>
</el-form-item>
<div class="bind-hint">{{ bindHint }}</div>
</el-form>
</div>
<template #footer>
<el-button @click="addVisible = false">取消</el-button>
<el-button type="primary" :loading="addSaving" @click="submitAddChannels">保存</el-button>
</template>
</el-dialog>
<el-drawer
v-model="detailVisible"
@@ -140,8 +105,8 @@ import {
replaceLabelProductChannels,
getLabelProduct
} from '@/api/price/label'
import { listChannelOptions } from '@/api/masterdata/serviceChannel'
import LabelConfigDetail from './LabelConfigDetail.vue'
import LabelChannelPickerDialog from './LabelChannelPickerDialog.vue'
const props = defineProps({
visible: { type: Boolean, default: false },
@@ -159,12 +124,9 @@ const bindListLoading = ref(false)
const bindProductId = ref(null)
const bindProductName = ref('')
const boundChannels = ref([])
const channelOptions = ref([])
const addVisible = ref(false)
const addLoading = ref(false)
const addSaving = ref(false)
const addChannelIds = ref([])
const detailVisible = ref(false)
const detailLoading = ref(false)
const detailProduct = ref(null)
@@ -186,12 +148,7 @@ const colBoundChannels = '绑定渠道'
const colAction = '操作'
const colChannelCode = '渠道编码'
const colChannelName = '渠道名称'
const lblProduct = '产品'
const lblChannels = '添加渠道'
const phChannels = '请选择要添加的渠道(可多选)'
const bindHint = '绑定为收款(AR),落库 srv_channel_product_map;一个渠道同一收付类型仅保留一条产品映射。'
const emptyBound = '暂无绑定渠道'
const addTitle = '添加渠道'
const title = computed(() => {
const v = props.version || {}
@@ -212,11 +169,6 @@ const filteredRows = computed(() => {
})
})
const addableChannelOptions = computed(() => {
const bound = new Set((boundChannels.value || []).map(item => String(item.channelId)))
return (channelOptions.value || []).filter(item => item && item.id != null && !bound.has(String(item.id)))
})
function formatHour(val) {
if (!val) return ''
const text = String(val).replace('T', ' ')
@@ -269,12 +221,6 @@ async function load() {
}
}
async function ensureChannelOptions() {
if (channelOptions.value.length) return
const res = await listChannelOptions({ blOpen: '1' })
channelOptions.value = res.data || []
}
async function loadBoundChannels() {
if (!bindProductId.value) {
boundChannels.value = []
@@ -323,33 +269,21 @@ function onBindListClosed() {
bindProductName.value = ''
boundChannels.value = []
addVisible.value = false
addChannelIds.value = []
}
async function openAddChannels() {
addChannelIds.value = []
addVisible.value = true
addLoading.value = true
try {
await ensureChannelOptions()
} finally {
addLoading.value = false
}
}
function onAddClosed() {
addChannelIds.value = []
}
function currentBoundIds() {
return (boundChannels.value || []).map(item => String(item.channelId)).filter(Boolean)
}
function submitAddChannels() {
function onPickerConfirm(list) {
if (!bindProductId.value) return
const selected = (addChannelIds.value || []).map(String).filter(Boolean)
const selected = (list || []).map(item => String(item.id)).filter(Boolean)
if (!selected.length) {
proxy.$modal.msgWarning('请先选择要添加的渠道')
proxy.$modal.msgWarning('请先勾选要添加的渠道')
return
}
const merged = Array.from(new Set(currentBoundIds().concat(selected)))
@@ -398,10 +332,4 @@ watch(() => [props.visible, props.priceSetId, props.version?.versionNo], ([vis])
justify-content: flex-end;
margin-bottom: 12px;
}
.bind-hint {
margin: -4px 0 0 88px;
color: #909399;
font-size: 12px;
line-height: 1.5;
}
</style>
+50 -4
View File
@@ -166,7 +166,7 @@ const pageBanner = computed(() => {
return `新建版本:${name}(${code})`
})
const headerTip = computed(() => {
if (editVersionMode.value) return '可重新导入或修改明细;完成后按ID更新/新增/删除,不新增版本号'
if (editVersionMode.value) return '可重新导入或修改明细;再导入按产品合并(同名覆盖、其余保留),完成后按ID更新/新增/删除,不新增版本号'
if (newVersionMode.value) return '导入后生成待生效新版本;生效时间请回详情页设置'
return '打单价卡与应付独立;解析后回填到此表,可删除不需要的产品,编辑明细后点完成保存'
})
@@ -246,6 +246,23 @@ function productKey(row) {
return row?.rowKey || `${row?.sheetName || ''}-${row?.productName || ''}`
}
/** 用于编辑再导入时判断同一产品(dict/名称/表名任一相等即命中) */
function productTokens(row) {
return [row?.dictValue, row?.productName, row?.sheetName]
.map(s => String(s || '').toLowerCase().replace(/[^a-z0-9\u4e00-\u9fa5]/g, ''))
.filter(Boolean)
}
function productIdentity(row) {
return productTokens(row)[0] || ''
}
function sameProduct(left, right) {
const a = new Set(productTokens(left))
const b = productTokens(right)
return b.some(token => a.has(token))
}
function aliveDetailRows(list) {
return (list || []).filter(row => row && row.deleted !== true)
}
@@ -319,14 +336,43 @@ async function removeSelectedProducts() {
}
function onImportConfirm(payload) {
const incoming = (payload?.products || []).filter(Boolean)
if (editVersionMode.value) {
for (const row of productRows.value || []) {
if (row?.versionId || row?.productId) markProductRemoved(row)
// 编辑再导入:按产品合并,不清空其它产品;同名则用新价卡覆盖
const matched = new Set()
const replaced = []
for (const neu of incoming) {
const key = productIdentity(neu)
if (!key) {
replaced.push(neu)
continue
}
const old = (productRows.value || []).find(row => sameProduct(row, neu))
if (old) {
for (const token of productTokens(old)) matched.add(token)
for (const token of productTokens(neu)) matched.add(token)
if (old.versionId || old.productId) {
markProductRemoved(old)
}
replaced.push({
...neu,
productId: old.productId ?? neu.productId,
versionId: null,
termId: null,
rowKey: `${neu.sheetName || ''}-${neu.productName || ''}-${old.productId || old.versionId || ''}`,
duplicated: true
})
} else {
for (const token of productTokens(neu)) matched.add(token)
replaced.push(neu)
}
}
const kept = (productRows.value || []).filter(row => !productTokens(row).some(token => matched.has(token)))
productRows.value = [...kept, ...replaced]
} else {
removedProducts.value = []
productRows.value = incoming
}
productRows.value = payload?.products || []
selectedProducts.value = []
importMeta.sourceFile = payload?.sourceFile || ''
importMeta.supplierName = payload?.supplierName || ''
@@ -295,26 +295,19 @@ function normalizeProducts(list) {
productCode: p.productCode || p.code,
productName: p.productName || p.name || p.productCode || p.code,
taxMode: p.taxMode,
surcharges: []
surcharges: Array.isArray(p.surcharges) ? p.surcharges : []
}))
}
/** 按产品汇总版本明细上的附加费(scId 去重) */
function attachProductSurcharges(productList, detailRows) {
function mergeProductSurcharges(productList, optionProducts) {
const byCode = new Map()
for (const d of detailRows || []) {
if (!d?.productCode) continue
if (!byCode.has(d.productCode)) byCode.set(d.productCode, new Map())
const map = byCode.get(d.productCode)
for (const s of d.surcharges || []) {
if (!s || s.scId == null) continue
const key = String(s.scId)
if (!map.has(key)) map.set(key, s)
}
for (const p of optionProducts || []) {
if (!p?.productCode) continue
byCode.set(p.productCode, p.surcharges || [])
}
return (productList || []).map(p => ({
...p,
surcharges: [...(byCode.get(p.productCode)?.values() || [])]
surcharges: byCode.get(p.productCode) || p.surcharges || []
}))
}
@@ -327,14 +320,15 @@ async function loadProducts() {
}
loading.value = true
try {
// 轻量:options 带产品+附加费,不再拉整版 byVersion 明细
const res = await api.listSetDetailOptions(psvId)
const optList = normalizeProducts((res.data || {}).products || [])
let list = normalizeProducts(v.products)
if (!list.length) {
const res = await api.listSetDetailOptions(psvId)
const data = res.data || {}
list = normalizeProducts(data.products || [])
products.value = optList
} else {
products.value = mergeProductSurcharges(list, optList)
}
const detailRes = await api.listSetDetailByVersion(psvId)
products.value = attachProductSurcharges(list, detailRes.data || [])
} catch (e) {
products.value = normalizeProducts(v.products)
} finally {