Procházet zdrojové kódy

chore: auto bump version and changelog [skip ci]

iwt před 1 měsícem
rodič
revize
89a0687b9f

+ 2 - 0
cfc-backend/src/main/java/com/etotem/cfc/entity/Product.java

@@ -50,6 +50,7 @@ public class Product implements Serializable {
     private Long distributionSystemId;     // 销售体系ID
 
     private Integer deliveryMethod;        // 配送方式: 1=快递 2=自提 3=两者皆可
+    private Integer minQuantity;           // 最小购买数量限制
 
     private Date createdAt;
     private Date updatedAt;
@@ -74,6 +75,7 @@ public class Product implements Serializable {
     public Integer getSalesCount() { return salesCount; }
     public String getRejectReason() { return rejectReason; }
     public Integer getDeliveryMethod() { return deliveryMethod; }
+    public Integer getMinQuantity() { return minQuantity; }
     public Date getCreatedAt() { return createdAt; }
     public Date getUpdatedAt() { return updatedAt; }
 }

+ 5 - 0
cfc-backend/src/main/java/com/etotem/cfc/service/ProductOrderService.java

@@ -116,6 +116,11 @@ public class ProductOrderService {
                 && product.getStock() < dto.getQuantity()) {
             return Result.error("库存不足");
         }
+        // 校验最小购买数量
+        if (product.getMinQuantity() != null && product.getMinQuantity() > 1
+                && dto.getQuantity() < product.getMinQuantity()) {
+            return Result.error("该商品最少需购买" + product.getMinQuantity() + "件");
+        }
 
         User buyer = userMapper.selectById(buyerId);
         ProductOrder order = new ProductOrder();

+ 1 - 1
cfc-web/.last_build_commit

@@ -1 +1 @@
-46fec0b23036a950e3bf27a9581bf16d0cb55bdf
+4e925e144d6cc412ba6b6f2de68496693ac155ff

+ 2 - 2
cfc-web/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "cfc-web",
-  "version": "1.0.527",
+  "version": "1.0.528",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "cfc-web",
-      "version": "1.0.527",
+      "version": "1.0.528",
       "dependencies": {
         "@wangeditor/editor": "^5.1.23",
         "@wangeditor/editor-for-vue": "^1.0.2",