From 7188f28998d47c286e34cbd525986603cfc19ba9 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 31 七月 2026 17:58:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business' into dev_business
---
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/business/CrmBusinessSaveReqVO.java | 34 +++++++++++++++++++++++++---------
1 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/business/CrmBusinessSaveReqVO.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/business/CrmBusinessSaveReqVO.java
index 102fcba..53059be 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/business/CrmBusinessSaveReqVO.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/business/CrmBusinessSaveReqVO.java
@@ -58,6 +58,12 @@
@NotNull(message = "鏁村崟鎶樻墸涓嶈兘涓虹┖")
private BigDecimal discountPercent;
+ @Schema(description = "浜у搧鎬讳环", example = "12000.00")
+ private BigDecimal totalProductPrice;
+
+ @Schema(description = "鍟嗘満鎬讳环锛堟姌鍚庯級", example = "11280.00")
+ private BigDecimal totalPrice;
+
@Schema(description = "澶囨敞", example = "闅忎究")
@DiffLogField(name = "澶囨敞")
private String remark;
@@ -74,21 +80,31 @@
@AllArgsConstructor
public static class BusinessProduct {
- @Schema(description = "浜у搧缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "20529")
- @NotNull(message = "浜у搧缂栧彿涓嶈兘涓虹┖")
- private Long productId;
+ @Schema(description = "浜у搧鍏宠仈缂栧彿", example = "5")
+ private Long id;
- @Schema(description = "浜у搧鍗曚环", requiredMode = Schema.RequiredMode.REQUIRED, example = "123.00")
- @NotNull(message = "浜у搧鍗曚环涓嶈兘涓虹┖")
- private BigDecimal productPrice;
+ @Schema(description = "MDM 鐗╂枡缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "20529")
+ @NotNull(message = "鐗╂枡缂栧彿涓嶈兘涓虹┖")
+ private Long itemId;
+
+ @Schema(description = "璁￠噺鍗曚綅缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+ @NotNull(message = "璁￠噺鍗曚綅涓嶈兘涓虹┖")
+ private Long itemUnitId;
+
+ @Schema(description = "鐗╂枡鍘熶环", requiredMode = Schema.RequiredMode.REQUIRED, example = "123.00")
+ @NotNull(message = "鐗╂枡鍘熶环涓嶈兘涓虹┖")
+ private BigDecimal itemPrice;
@Schema(description = "鍟嗘満浠锋牸", requiredMode = Schema.RequiredMode.REQUIRED, example = "123.00")
@NotNull(message = "鍟嗘満浠锋牸涓嶈兘涓虹┖")
private BigDecimal businessPrice;
- @Schema(description = "浜у搧鏁伴噺", requiredMode = Schema.RequiredMode.REQUIRED, example = "8911")
- @NotNull(message = "浜у搧鏁伴噺涓嶈兘涓虹┖")
- private Integer count;
+ @Schema(description = "鏁伴噺", requiredMode = Schema.RequiredMode.REQUIRED, example = "8911")
+ @NotNull(message = "鏁伴噺涓嶈兘涓虹┖")
+ private BigDecimal count;
+
+ @Schema(description = "鎬昏浠锋牸锛坆usinessPrice * count锛�", example = "12000.00")
+ private BigDecimal totalPrice;
}
--
Gitblit v1.9.3