java-project/baiyue-firstleg
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(firstleg): make scanned shipment id optional

Browse Source
This commit is contained in:
ouyangxq
2026-08-11 09:57:45 +08:00
parent dfc1db6e8c
commit bceaff496e
5 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
firstleg/src/main/java/com/baiyue/firstleg/dto/MojiaMeasurementDtos.java
+1 -1
View File
@@ -19,7 +19,7 @@ public final class MojiaMeasurementDtos {
public record UploadRequest(
@NotBlank @Size(max = 128) String boxCode,
@JsonProperty("shipment_id") @JsonAlias("shipmentId")
@NotBlank @Size(max = 64) String shipmentId,
@Size(max = 64) String shipmentId,
@NotNull @DecimalMin("0.001") @DecimalMax("999999999.999") BigDecimal length,
@NotNull @DecimalMin("0.001") @DecimalMax("999999999.999") BigDecimal width,
@NotNull @DecimalMin("0.001") @DecimalMax("999999999.999") BigDecimal height,
firstleg/src/main/java/com/baiyue/firstleg/service/MojiaMeasurementOpenApiService.java
+6 -2
View File
@@ -79,7 +79,7 @@ public class MojiaMeasurementOpenApiService {
app.tenantId(), app.subjectId(), new CartonMeasurementCommand(
request.boxCode(), request.length(), request.width(), request.height(), request.weight(),
request.machineNo(), request.measuredAt() == null ? LocalDateTime.now() : request.measuredAt(),
image, request.shipmentId().trim()));
image, optionalTrim(request.shipmentId())));
} catch (BizException exception) {
if (exception.getResultCode() == ResultCode.NOT_FOUND) {
return saveUnmatched(app, request, image, exception);
@@ -117,7 +117,7 @@ public class MojiaMeasurementOpenApiService {
receipt.setTenantId(app.tenantId());
receipt.setSubjectId(app.subjectId());
receipt.setBoxCode(request.boxCode().trim());
receipt.setScannedShipmentId(request.shipmentId().trim());
receipt.setScannedShipmentId(optionalTrim(request.shipmentId()));
receipt.setLengthCm(request.length());
receipt.setWidthCm(request.width());
receipt.setHeightCm(request.height());
@@ -218,6 +218,10 @@ public class MojiaMeasurementOpenApiService {
return normalized.length() <= 160 ? normalized : normalized.substring(0, 160);
}
private String optionalTrim(String value) {
return value == null || value.isBlank() ? null : value.trim();
}
private record InMemoryMultipartFile(byte[] content) implements MultipartFile {
@Override public String getName() { return "image"; }
@Override public String getOriginalFilename() { return "mojia-measurement.jpg"; }