mall + promotion：优化限购、库存的返回结果

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/AppCombinationActivityController.java

@@ -94,34 +94,31 @@ public class AppCombinationActivityController {
         obj.setName("晚九点限时秒杀");
         obj.setStatus(1);
         obj.setStartTime(LocalDateTime.of(2023, 6, 15, 0, 0, 0));
-        obj.setEndTime(LocalDateTime.of(2023, 6, 15, 23, 59, 0));
+        obj.setEndTime(LocalDateTime.of(2023, 6, 20, 23, 59, 0));
         obj.setUserSize(2);
         obj.setSuccessCount(100);
         obj.setSpuId(633L);
+        obj.setSingleLimitCount(2);
+        obj.setTotalLimitCount(3);
+
         // 创建一个Product对象的列表
         List<AppCombinationActivityDetailRespVO.Product> productList = new ArrayList<>();
         // 创建三个新的Product对象并设置其属性的值
         AppCombinationActivityDetailRespVO.Product product1 = new AppCombinationActivityDetailRespVO.Product();
         product1.setSkuId(1L);
         product1.setCombinationPrice(100);
-        product1.setQuota(50);
-        product1.setLimitCount(3);
         // 将第一个Product对象添加到列表中
         productList.add(product1);
         // 创建第二个Product对象并设置其属性的值
         AppCombinationActivityDetailRespVO.Product product2 = new AppCombinationActivityDetailRespVO.Product();
         product2.setSkuId(2L);
         product2.setCombinationPrice(200);
-        product2.setQuota(100);
-        product2.setLimitCount(4);
         // 将第二个Product对象添加到列表中
         productList.add(product2);
         // 创建第三个Product对象并设置其属性的值
         AppCombinationActivityDetailRespVO.Product product3 = new AppCombinationActivityDetailRespVO.Product();
         product3.setSkuId(3L);
         product3.setCombinationPrice(300);
-        product3.setQuota(150);
-        product3.setLimitCount(5);
         // 将第三个Product对象添加到列表中
         productList.add(product3);
         // 将Product列表设置为对象的属性值

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/vo/activity/AppCombinationActivityDetailRespVO.java

@@ -34,6 +34,12 @@ public class AppCombinationActivityDetailRespVO {
     @Schema(description = "商品 SPU 编号", required = true, example = "2048")
     private Long spuId;
 
+    @Schema(description = "总共限购数量", example = "10")
+    private Integer totalLimitCount;
+
+    @Schema(description = "单次限购数量", example = "5")
+    private Integer singleLimitCount;
+
     @Schema(description = "商品信息数组", required = true)
     private List<Product> products;
 
@@ -47,12 +53,6 @@ public class AppCombinationActivityDetailRespVO {
         @Schema(description = "拼团金额，单位：分", required = true, example = "100")
         private Integer combinationPrice;
 
-        @Schema(description = "拼团限量库存", required = true, example = "50")
-        private Integer quota;
-
-        @Schema(description = "每人限购数量", required = true, example = "10")
-        private Integer limitCount;
-
     }
 
 }

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/seckill/AppSeckillActivityController.java

@@ -90,33 +90,35 @@ public class AppSeckillActivityController {
         obj.setId(id);
         obj.setName("晚九点限时秒杀");
         obj.setStatus(1);
-        obj.setStartTime(LocalDateTime.of(2023, 6, 11, 0, 0, 0));
+        obj.setStartTime(LocalDateTime.of(2023, 6, 16, 0, 0, 0));
-        obj.setEndTime(LocalDateTime.of(2023, 6, 11, 23, 59, 0));
+        obj.setEndTime(LocalDateTime.of(2023, 6, 20, 23, 59, 0));
         obj.setSpuId(633L);
+        obj.setSingleLimitCount(2);
+        obj.setTotalLimitCount(3);
+        obj.setStock(100);
+        obj.setTotalStock(200);
+
         // 创建一个Product对象的列表
         List<AppSeckillActivityDetailRespVO.Product> productList = new ArrayList<>();
         // 创建三个新的Product对象并设置其属性的值
         AppSeckillActivityDetailRespVO.Product product1 = new AppSeckillActivityDetailRespVO.Product();
         product1.setSkuId(1L);
         product1.setSeckillPrice(100);
-        product1.setQuota(50);
+        product1.setStock(50);
-        product1.setLimitCount(3);
         // 将第一个Product对象添加到列表中
         productList.add(product1);
         // 创建第二个Product对象并设置其属性的值
         AppSeckillActivityDetailRespVO.Product product2 = new AppSeckillActivityDetailRespVO.Product();
         product2.setSkuId(2L);
         product2.setSeckillPrice(200);
-        product2.setQuota(100);
+        product2.setStock(100);
-        product2.setLimitCount(4);
         // 将第二个Product对象添加到列表中
         productList.add(product2);
         // 创建第三个Product对象并设置其属性的值
         AppSeckillActivityDetailRespVO.Product product3 = new AppSeckillActivityDetailRespVO.Product();
         product3.setSkuId(3L);
         product3.setSeckillPrice(300);
-        product3.setQuota(150);
+        product3.setStock(150);
-        product3.setLimitCount(5);
         // 将第三个Product对象添加到列表中
         productList.add(product3);
         // 将Product列表设置为对象的属性值

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/seckill/vo/activity/AppSeckillActivityDetailRespVO.java

@@ -30,6 +30,18 @@ public class AppSeckillActivityDetailRespVO {
     @Schema(description = "商品 SPU 编号", required = true, example = "2048")
     private Long spuId;
 
+    @Schema(description = "总共限购数量", example = "10")
+    private Integer totalLimitCount;
+
+    @Schema(description = "单次限购数量", example = "5")
+    private Integer singleLimitCount;
+
+    @Schema(description = "秒杀库存（剩余）", required = true, example = "50")
+    private Integer stock;
+
+    @Schema(description = "秒杀库存（总计）", required = true, example = "100")
+    private Integer totalStock;
+
     @Schema(description = "商品信息数组", required = true)
     private List<Product> products;
 
@@ -44,10 +56,7 @@ public class AppSeckillActivityDetailRespVO {
         private Integer seckillPrice;
 
         @Schema(description = "秒杀限量库存", required = true, example = "50")
-        private Integer quota;
+        private Integer stock;
-
-        @Schema(description = "每人限购数量", required = true, example = "10")
-        private Integer limitCount;
 
     }