优化

firstleg/src/main/java/com/baiyue/firstleg/controller/InternalCustomerDimensionConfigController.java

@@ -0,0 +1,61 @@
+package com.baiyue.firstleg.controller;
+
+import com.baiyue.common.core.api.ApiResponse;
+import com.baiyue.common.core.api.ResultCode;
+import com.baiyue.common.core.exception.BizException;
+import com.baiyue.firstleg.dto.CustomerDimensionConfigDtos.InitializeRequest;
+import com.baiyue.firstleg.dto.CustomerDimensionConfigDtos.InitializeResponse;
+import com.baiyue.firstleg.service.CustomerDimensionConfigService;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.nio.charset.StandardCharsets;
+import java.security.MessageDigest;
+
+@RestController
+@RequestMapping("/internal/firstleg/v1/customer-dimension-configs")
+public class InternalCustomerDimensionConfigController {
+    @Resource
+    private CustomerDimensionConfigService service;
+    @Value("${baiyue.security.internal-service-token}")
+    private String internalToken;
+    private byte[] expectedToken;
+
+    @PostConstruct
+    void initializeToken() {
+        expectedToken = internalToken.getBytes(StandardCharsets.UTF_8);
+    }
+
+    @PostMapping("/defaults")
+    public ApiResponse<InitializeResponse> initializeDefault(
+        @RequestHeader(value = "X-Internal-Service-Token", required = false) String token,
+        @Valid @RequestBody InitializeRequest request) {
+        requireToken(token);
+        return ApiResponse.success(service.initializeDefault(
+            request.tenantId(), request.operatorId(), request.initializationKey()));
+    }
+
+    @DeleteMapping("/defaults")
+    public ApiResponse<Void> compensateDefault(
+        @RequestHeader(value = "X-Internal-Service-Token", required = false) String token,
+        @RequestParam long tenantId, @RequestParam String initializationKey) {
+        requireToken(token);
+        service.compensateDefault(tenantId, initializationKey);
+        return ApiResponse.success(null);
+    }
+
+    private void requireToken(String token) {
+        if (token == null || !MessageDigest.isEqual(expectedToken, token.getBytes(StandardCharsets.UTF_8))) {
+            throw new BizException(ResultCode.FORBIDDEN, "内部服务凭证无效");
+        }
+    }
+}

firstleg/src/main/java/com/baiyue/firstleg/controller/PlatformCustomerDimensionConfigController.java

@@ -0,0 +1,50 @@
+package com.baiyue.firstleg.controller;
+
+import com.baiyue.common.audit.BusinessAudit;
+import com.baiyue.common.core.api.ApiResponse;
+import com.baiyue.common.security.AuthenticatedUser;
+import com.baiyue.firstleg.dto.CustomerDimensionConfigDtos.Response;
+import com.baiyue.firstleg.dto.CustomerDimensionConfigDtos.UpdateRequest;
+import com.baiyue.firstleg.service.CustomerDimensionConfigService;
+import com.baiyue.firstleg.service.FirstlegScopeGuard;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@Tag(name = "客户尺寸计算配置")
+@RestController
+@RequestMapping("/api/platform/v1/first-leg/customer-dimension-config")
+public class PlatformCustomerDimensionConfigController {
+    @Resource
+    private CustomerDimensionConfigService service;
+
+    @GetMapping
+    @PreAuthorize("hasAuthority('firstleg:dimension-config:view')")
+    @Operation(summary = "查询客户尺寸计算配置")
+    public ApiResponse<Response> get(@AuthenticationPrincipal AuthenticatedUser user,
+                                     @RequestParam long tenantId) {
+        return ApiResponse.success(service.get(FirstlegScopeGuard.platform(user, tenantId)));
+    }
+
+    @PutMapping
+    @PreAuthorize("hasAuthority('firstleg:dimension-config:edit')")
+    @BusinessAudit(event = "CUSTOMER_DIMENSION_CONFIG_UPDATE",
+        resourceType = "DIMENSION_CONFIG", resourceId = "#tenantId",
+        description = "平台编辑客户尺寸计算配置")
+    @Operation(summary = "编辑客户尺寸计算配置")
+    public ApiResponse<Response> update(@AuthenticationPrincipal AuthenticatedUser user,
+                                        @RequestParam long tenantId,
+                                        @Valid @RequestBody UpdateRequest request) {
+        long scope = FirstlegScopeGuard.platform(user, tenantId);
+        return ApiResponse.success(service.update(scope, user.userId(), request));
+    }
+}

firstleg/src/main/java/com/baiyue/firstleg/dto/CustomerDimensionConfigDtos.java

@@ -0,0 +1,41 @@
+package com.baiyue.firstleg.dto;
+
+import jakarta.validation.constraints.DecimalMax;
+import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.Digits;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+public final class CustomerDimensionConfigDtos {
+    private CustomerDimensionConfigDtos() { }
+
+    public record UpdateRequest(
+        @NotNull @DecimalMin("0.001") @DecimalMax("100.000") @Digits(integer = 3, fraction = 3)
+        BigDecimal edgeAdditionCm,
+        @Size(max = 500) String remark,
+        @NotNull @Min(0) Integer version
+    ) { }
+
+    public record Response(
+        Long id,
+        Long tenantId,
+        BigDecimal edgeAdditionCm,
+        String remark,
+        Integer version,
+        LocalDateTime createdAt,
+        LocalDateTime updatedAt
+    ) { }
+
+    public record InitializeRequest(
+        @NotNull @Min(1) Long tenantId,
+        @NotNull @Min(0) Long operatorId,
+        @NotBlank @Size(max = 128) String initializationKey
+    ) { }
+
+    public record InitializeResponse(Long configId, boolean createdByThisInitialization) { }
+}

firstleg/src/main/java/com/baiyue/firstleg/entity/CustomerDimensionConfigEntity.java

@@ -0,0 +1,23 @@
+package com.baiyue.firstleg.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baiyue.common.core.model.BaseEntity;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+
+/** 客户填写真实尺寸后使用的每侧加宽配置。 */
+@Getter
+@Setter
+@TableName("fl_customer_dimension_config")
+public class CustomerDimensionConfigEntity extends BaseEntity {
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+    private Long tenantId;
+    private BigDecimal edgeAdditionCm;
+    private String remark;
+    private String initializationKey;
+}

firstleg/src/main/java/com/baiyue/firstleg/mapper/CustomerDimensionConfigMapper.java

@@ -0,0 +1,37 @@
+package com.baiyue.firstleg.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baiyue.firstleg.entity.CustomerDimensionConfigEntity;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.Param;
+
+import java.math.BigDecimal;
+
+public interface CustomerDimensionConfigMapper extends BaseMapper<CustomerDimensionConfigEntity> {
+    @Insert("""
+        INSERT IGNORE INTO fl_customer_dimension_config
+          (id, tenant_id, edge_addition_cm, remark, initialization_key, created_by, created_at,
+           updated_by, updated_at, deleted, version)
+        VALUES
+          (#{id}, #{tenantId}, #{edgeAdditionCm}, #{remark}, #{initializationKey}, #{operatorId}, CURRENT_TIMESTAMP(3),
+           #{operatorId}, CURRENT_TIMESTAMP(3), 0, 0)
+        """)
+    int insertDefault(@Param("id") long id, @Param("tenantId") long tenantId,
+                      @Param("edgeAdditionCm") BigDecimal edgeAdditionCm,
+                      @Param("remark") String remark, @Param("initializationKey") String initializationKey,
+                      @Param("operatorId") long operatorId);
+
+    @Delete("""
+        DELETE FROM fl_customer_dimension_config
+         WHERE id = #{id}
+           AND tenant_id = #{tenantId}
+           AND initialization_key = #{initializationKey}
+           AND edge_addition_cm = #{edgeAdditionCm}
+           AND version = 0
+           AND deleted = 0
+        """)
+    int deleteUnchangedDefault(@Param("tenantId") long tenantId, @Param("id") long id,
+                               @Param("initializationKey") String initializationKey,
+                               @Param("edgeAdditionCm") BigDecimal edgeAdditionCm);
+}

firstleg/src/main/java/com/baiyue/firstleg/repository/CustomerDimensionConfigRepository.java

@@ -0,0 +1,34 @@
+package com.baiyue.firstleg.repository;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baiyue.firstleg.entity.CustomerDimensionConfigEntity;
+import com.baiyue.firstleg.mapper.CustomerDimensionConfigMapper;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Repository;
+
+import java.math.BigDecimal;
+
+@Repository
+public class CustomerDimensionConfigRepository {
+    @Resource
+    private CustomerDimensionConfigMapper mapper;
+
+    public CustomerDimensionConfigEntity find(long tenantId) {
+        return mapper.selectOne(new LambdaQueryWrapper<CustomerDimensionConfigEntity>()
+            .eq(CustomerDimensionConfigEntity::getTenantId, tenantId));
+    }
+
+    public boolean insertDefault(long id, long tenantId, BigDecimal edgeAdditionCm,
+                                 String remark, String initializationKey, long operatorId) {
+        return mapper.insertDefault(id, tenantId, edgeAdditionCm, remark, initializationKey, operatorId) == 1;
+    }
+
+    public int update(CustomerDimensionConfigEntity value) {
+        return mapper.updateById(value);
+    }
+
+    public int deleteUnchangedDefault(long tenantId, long id, String initializationKey,
+                                      BigDecimal edgeAdditionCm) {
+        return mapper.deleteUnchangedDefault(tenantId, id, initializationKey, edgeAdditionCm);
+    }
+}

firstleg/src/main/java/com/baiyue/firstleg/service/CustomerDimensionConfigService.java

@@ -0,0 +1,102 @@
+package com.baiyue.firstleg.service;
+
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.baiyue.common.core.api.ResultCode;
+import com.baiyue.common.core.exception.BizException;
+import com.baiyue.firstleg.dto.CustomerDimensionConfigDtos.InitializeResponse;
+import com.baiyue.firstleg.dto.CustomerDimensionConfigDtos.Response;
+import com.baiyue.firstleg.dto.CustomerDimensionConfigDtos.UpdateRequest;
+import com.baiyue.firstleg.entity.CustomerDimensionConfigEntity;
+import com.baiyue.firstleg.repository.CustomerDimensionConfigRepository;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.math.BigDecimal;
+
+/** 管理每个客户唯一的尺寸加边配置，不参与当前订单或计费计算。 */
+@Service
+public class CustomerDimensionConfigService {
+    public static final BigDecimal DEFAULT_EDGE_ADDITION_CM = new BigDecimal("2.000");
+    private static final String DEFAULT_REMARK = "默认每侧加宽 2cm";
+
+    @Resource
+    private CustomerDimensionConfigRepository repository;
+
+    public Response get(long tenantId) {
+        CustomerDimensionConfigEntity value = repository.find(tenantId);
+        if (value == null) {
+            throw new BizException(ResultCode.NOT_FOUND, "客户尺寸计算配置不存在");
+        }
+        return response(value);
+    }
+
+    @Transactional
+    public Response update(long tenantId, long operatorId, UpdateRequest request) {
+        CustomerDimensionConfigEntity value = repository.find(tenantId);
+        if (value == null) {
+            throw new BizException(ResultCode.NOT_FOUND, "客户尺寸计算配置不存在");
+        }
+        if (!value.getVersion().equals(request.version())) {
+            throw new BizException(ResultCode.CONFLICT, "尺寸计算配置已被修改，请刷新后重试");
+        }
+        value.setEdgeAdditionCm(request.edgeAdditionCm());
+        value.setRemark(normalizeRemark(request.remark()));
+        value.setUpdatedBy(operatorId);
+        if (repository.update(value) != 1) {
+            throw new BizException(ResultCode.CONFLICT, "尺寸计算配置已被修改，请刷新后重试");
+        }
+        return response(value);
+    }
+
+    @Transactional
+    public InitializeResponse initializeDefault(long tenantId, long operatorId, String initializationKey) {
+        requireTenant(tenantId);
+        String normalizedKey = requireInitializationKey(initializationKey);
+        CustomerDimensionConfigEntity existing = repository.find(tenantId);
+        if (existing != null) {
+            return new InitializeResponse(existing.getId(),
+                normalizedKey.equals(existing.getInitializationKey()));
+        }
+
+        long id = IdWorker.getId();
+        boolean created = repository.insertDefault(id, tenantId, DEFAULT_EDGE_ADDITION_CM,
+            DEFAULT_REMARK, normalizedKey, operatorId);
+        CustomerDimensionConfigEntity persisted = repository.find(tenantId);
+        if (persisted == null) {
+            throw new BizException(ResultCode.INTERNAL_ERROR, "客户尺寸计算配置初始化失败");
+        }
+        boolean ownedByKey = normalizedKey.equals(persisted.getInitializationKey());
+        return new InitializeResponse(persisted.getId(), created || ownedByKey);
+    }
+
+    @Transactional
+    public void compensateDefault(long tenantId, String initializationKey) {
+        requireTenant(tenantId);
+        String normalizedKey = requireInitializationKey(initializationKey);
+        CustomerDimensionConfigEntity existing = repository.find(tenantId);
+        if (existing == null || !normalizedKey.equals(existing.getInitializationKey())) return;
+        repository.deleteUnchangedDefault(tenantId, existing.getId(), normalizedKey, DEFAULT_EDGE_ADDITION_CM);
+    }
+
+    private static Response response(CustomerDimensionConfigEntity value) {
+        return new Response(value.getId(), value.getTenantId(), value.getEdgeAdditionCm(), value.getRemark(),
+            value.getVersion(), value.getCreatedAt(), value.getUpdatedAt());
+    }
+
+    private static String normalizeRemark(String value) {
+        if (value == null || value.isBlank()) return null;
+        return value.trim();
+    }
+
+    private static void requireTenant(long tenantId) {
+        if (tenantId <= 0) throw new BizException(ResultCode.BAD_REQUEST, "客户ID无效");
+    }
+
+    private static String requireInitializationKey(String value) {
+        if (value == null || value.isBlank() || value.trim().length() > 128) {
+            throw new BizException(ResultCode.BAD_REQUEST, "初始化幂等键无效");
+        }
+        return value.trim();
+    }
+}

firstleg/src/main/java/com/baiyue/firstleg/service/InboundMeasurementService.java

@@ -199,6 +199,9 @@ public class InboundMeasurementService {
         requireVersion(request.version(), weight.getVersion());
         int currentVersion = request.version();
         if (request.hasAdjustment()) {
+            requireCompleteAdjustment(request.adjustedWeightValue(), request.adjustedWeightUnit(),
+                request.adjustmentReason());
+            requireConfirmableKg(request.adjustedWeightValue(), request.adjustedWeightUnit());
             currentVersion = applyWeightCorrection(weight, currentVersion,
                 request.adjustedWeightValue(), request.adjustedWeightUnit(),
                 request.adjustmentReason(), operatorId, operatorName);
@@ -211,7 +214,7 @@ public class InboundMeasurementService {
             throw new BizException(ResultCode.VALIDATION_FAILED, "OCR 重量无法确认，请先人工修正数值和单位");
         }
         String unit = normalizeUnit(rawUnit);
-        BigDecimal finalKg = toKg(value, unit);
+        BigDecimal finalKg = requireConfirmableKg(value, unit);
         weight.setFinalWeightKg(finalKg);
         weight.setRecognitionStatus(WEIGHT_CONFIRMED);
         weight.setConfirmedBy(operatorId);
@@ -418,6 +421,15 @@ public class InboundMeasurementService {
         return kg.setScale(3, RoundingMode.HALF_UP);
     }
 
+    private BigDecimal requireConfirmableKg(BigDecimal value, String unit) {
+        BigDecimal finalKg = toKg(value, normalizeUnit(unit));
+        if (!isPositive(finalKg)) {
+            throw new BizException(ResultCode.VALIDATION_FAILED,
+                "换算后重量不能小于 0.001 KG");
+        }
+        return finalKg;
+    }
+
     private BigDecimal effectiveValue(InboundWeightResultEntity weight) {
         return weight.getAdjustedWeightValue() == null
             ? weight.getOcrWeightValue() : weight.getAdjustedWeightValue();