From a6f319519036d9ba311cca516ad0b36b381eaa5d Mon Sep 17 00:00:00 2001 From: shenyifei Date: Fri, 9 Jan 2026 11:54:35 +0800 Subject: [PATCH] =?UTF-8?q?refactor(api):=20=E4=BC=98=E5=8C=96=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E4=BC=A0=E8=BE=93=E5=AF=B9=E8=B1=A1=E5=92=8C=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 移除PaymentTaskCreateCmd中的paymentTaskSn字段 - 为OrderRebate类的字段添加必填验证注解 - 在VehicleExtractionVO中新增草帘相关字段 - 为BoxProduct查询添加排序逻辑按sort升序和创建时间降序 --- .../gateway/BoxBrandGatewayImpl.java | 3 +++ .../api/biz/dto/cmd/PaymentTaskCreateCmd.java | 6 ------ .../erp/turbo/api/biz/dto/common/OrderRebate.java | 14 +++++++------- .../api/facade/dto/vo/VehicleExtractionVO.java | 6 ++++++ 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/BoxBrandGatewayImpl.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/BoxBrandGatewayImpl.java index b5621b2..9d9d117 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/BoxBrandGatewayImpl.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/BoxBrandGatewayImpl.java @@ -68,6 +68,8 @@ public class BoxBrandGatewayImpl implements BoxBrandGateway { if (CollUtil.isNotEmpty(brandIdList)) { LambdaQueryWrapper queryWrapper1 = Wrappers.lambdaQuery(BoxProductDO.class); queryWrapper1.in(BoxProductDO::getBrandId, brandIdList); + queryWrapper1.orderByAsc(BoxProductDO::getSort); + queryWrapper1.orderByDesc(BoxProductDO::getCreatedAt); List boxProductDOList = boxProductMapper.selectList(queryWrapper1); page.getRecords().forEach(boxBrandDO -> { @@ -97,6 +99,7 @@ public class BoxBrandGatewayImpl implements BoxBrandGateway { if (CollUtil.isNotEmpty(brandIdList)) { LambdaQueryWrapper queryWrapper1 = Wrappers.lambdaQuery(BoxProductDO.class); queryWrapper1.in(BoxProductDO::getBrandId, brandIdList); + queryWrapper1.orderByAsc(BoxProductDO::getSort); queryWrapper1.orderByDesc(BoxProductDO::getCreatedAt); List boxProductDOList = boxProductMapper.selectList(queryWrapper1); boxBrandDOList.forEach(boxBrandDO -> { diff --git a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/cmd/PaymentTaskCreateCmd.java b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/cmd/PaymentTaskCreateCmd.java index 186265b..7987b06 100644 --- a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/cmd/PaymentTaskCreateCmd.java +++ b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/cmd/PaymentTaskCreateCmd.java @@ -37,12 +37,6 @@ public class PaymentTaskCreateCmd extends Command { @Schema(title = "任务类型：1-瓜农付款任务", requiredMode = Schema.RequiredMode.REQUIRED) private PaymentTaskTypeEnum taskType; - /** - * 付款编码 - */ - @Schema(title = "付款编码", requiredMode = Schema.RequiredMode.REQUIRED) - private String paymentTaskSn; - /** * 付款任务对象ID */ diff --git a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/common/OrderRebate.java b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/common/OrderRebate.java index 1298f87..8801660 100644 --- a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/common/OrderRebate.java +++ b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/common/OrderRebate.java @@ -15,37 +15,37 @@ public class OrderRebate extends DTO { /** * 记录ID */ - @Schema(title = "记录ID", type = "string") + @Schema(title = "记录ID", type = "string", requiredMode = Schema.RequiredMode.REQUIRED) private Long orderRebateId; /** * 订单ID */ - @Schema(title = "订单ID", type = "string") + @Schema(title = "订单ID", type = "string", requiredMode = Schema.RequiredMode.REQUIRED) private Long orderId; /** * 客户ID */ - @Schema(title = "客户ID", type = "string") + @Schema(title = "客户ID", type = "string", requiredMode = Schema.RequiredMode.REQUIRED) private Long customerId; /** * 经销商ID */ - @Schema(title = "经销商ID", type = "string") + @Schema(title = "经销商ID", type = "string", requiredMode = Schema.RequiredMode.REQUIRED) private Long dealerId; /** * 客户名称 */ - @Schema(title = "客户名称") + @Schema(title = "客户名称", requiredMode = Schema.RequiredMode.REQUIRED) private String name; /** * 返点计算方式：1_按净重计算；2_固定金额； */ - @Schema(title = "返点计算方式：1_按净重计算；2_固定金额；") + @Schema(title = "返点计算方式：1_按净重计算；2_固定金额；", requiredMode = Schema.RequiredMode.REQUIRED) private OrderRebateCalcMethodEnum calcMethod; /** @@ -63,7 +63,7 @@ public class OrderRebate extends DTO { /** * 返点金额 */ - @Schema(title = "返点金额") + @Schema(title = "返点金额", requiredMode = Schema.RequiredMode.REQUIRED) private BigDecimal amount; /** diff --git a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/facade/dto/vo/VehicleExtractionVO.java b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/facade/dto/vo/VehicleExtractionVO.java index d8e8479..1e12988 100644 --- a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/facade/dto/vo/VehicleExtractionVO.java +++ b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/facade/dto/vo/VehicleExtractionVO.java @@ -35,4 +35,10 @@ public class VehicleExtractionVO { @Schema(title = "经销商信息") private DealerVO dealerVO; + + @Schema(title = "是否开启草帘") + private Boolean openStrawCurtain; + + @Schema(title = "草帘价格") + private BigDecimal strawCurtainPrice; }