统一将 bms_region 替换为 region,更新相关注释和文档以反映这一变化。

This commit is contained in:
wuweihua
2026-09-29 08:57:41 +08:00
parent 0ad90f6183
commit b8e1f8cd40
23 changed files with 68 additions and 54 deletions
@@ -5,7 +5,7 @@ import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
/** Zone under bms_region: prc_zone */
/** Zone under region: prc_zone */
@Data
public class PrcZone implements Serializable
{
@@ -25,6 +25,6 @@ public class PrcZone implements Serializable
private Date updateTime;
/** list display, not a table column */
private Integer detailCount;
/** list display from bms_region */
/** list display from region */
private String countryNameCn;
}
@@ -4,7 +4,7 @@ import java.io.Serializable;
import lombok.Data;
/**
* Zone country list row: bms_region + zone aggregates (not a table)
* Zone country list row: region + zone aggregates (not a table)
*/
@Data
public class PrcZoneRegion implements Serializable
@@ -49,7 +49,7 @@ public interface IBmsProductService
* The destination country is chosen by the user, not read from the sheet.
*
* @param file uploaded xlsx/xls
* @param countryCode ISO country code (bms_region.country_code_2)
* @param countryCode ISO country code (region.country_code_2)
* @param operName operator
* @return HTML result message
*/
@@ -18,7 +18,7 @@ public interface IPrcBillingTaskService
List<PrcBillingTask> selectList(PrcBillingTask query);
/**
* Manual resync: reset to WAITING then process again.
* Manual resync: reset to WAITING then process again (including SUCCESS for correction).
* @return task after retry
*/
PrcBillingTask retryTask(Long taskId);
@@ -12,7 +12,7 @@ public interface IPrcZoneService
public List<PrcZoneRegion> selectZoneRegionList(PrcZoneRegion query);
/** Delete all zones (and details) for the given bms_region ids */
/** Delete all zones (and details) for the given region ids */
public int deleteZonesByRegionIds(Long[] regionIds);
public PrcZone selectPrcZoneById(Long zoneId);
@@ -1179,7 +1179,7 @@ public class BmsProductServiceImpl implements IBmsProductService
}
/**
* Load bms_region map: country_name_cn -> region (for country_code_2).
* Load region map: country_name_cn -> region (for country_code_2).
*/
private Map<String, BmsRegion> loadRegionByNameCn()
{
@@ -342,12 +342,8 @@ public class PrcBillingTaskServiceImpl implements IPrcBillingTaskService
{
throw new ServiceException("billing task not found");
}
String st = task.getSuccessStatus();
if (BillTaskSuccessStatus.SUCCESS.getCode().equals(st))
{
throw new ServiceException("SUCCESS task cannot retry");
}
// Reset to WAITING so UI reflects re-queue; then sync process (admin expects immediate result).
// Allow SUCCESS retry: billing result may be wrong and needs re-run.
// Reset to WAITING so processTask does not short-circuit on SUCCESS; then sync process.
PrcBillingTask reset = new PrcBillingTask();
reset.setTaskId(taskId);
reset.setSuccessStatus(BillTaskSuccessStatus.WAITING.getCode());
@@ -36,7 +36,7 @@ import com.bms.system.domain.BmsRegion;
import com.bms.system.mapper.BmsRegionMapper;
/**
* Zone management: bms_region -> prc_zone -> postcode detail
* Zone management: region -> prc_zone -> postcode detail
*/
@Service
public class PrcZoneServiceImpl implements IPrcZoneService