mirror of
https://gitee.com/huangge1199_admin/vue-pro.git
synced 2024-12-02 12:11:54 +08:00
Merge branch 'feature/mall_product' into mall_product_aftersalelog
# Conflicts: # yudao-framework/yudao-spring-boot-starter-biz-trade/pom.xml # yudao-module-mall/yudao-module-trade-biz/pom.xml # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/aftersale/TradeAfterSaleServiceImpl.java # yudao-server/pom.xml
This commit is contained in:
commit
b7c0fef63f
@ -96,6 +96,11 @@
|
|||||||
<artifactId>yudao-spring-boot-starter-biz-operatelog</artifactId>
|
<artifactId>yudao-spring-boot-starter-biz-operatelog</artifactId>
|
||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>cn.iocoder.boot</groupId>
|
||||||
|
<artifactId>yudao-spring-boot-starter-biz-trade</artifactId>
|
||||||
|
<version>${revision}</version>
|
||||||
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.iocoder.boot</groupId>
|
<groupId>cn.iocoder.boot</groupId>
|
||||||
<artifactId>yudao-spring-boot-starter-biz-dict</artifactId>
|
<artifactId>yudao-spring-boot-starter-biz-dict</artifactId>
|
||||||
|
@ -8,7 +8,7 @@ import lombok.ToString;
|
|||||||
|
|
||||||
import javax.validation.constraints.NotNull;
|
import javax.validation.constraints.NotNull;
|
||||||
|
|
||||||
@Schema(description = "用户APP - 商品评价分页 Request VO")
|
@Schema(description = "用户 App - 商品评价分页 Request VO")
|
||||||
@Data
|
@Data
|
||||||
@EqualsAndHashCode(callSuper = true)
|
@EqualsAndHashCode(callSuper = true)
|
||||||
@ToString(callSuper = true)
|
@ToString(callSuper = true)
|
||||||
|
@ -8,7 +8,7 @@ import javax.validation.constraints.NotNull;
|
|||||||
import javax.validation.constraints.Size;
|
import javax.validation.constraints.Size;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@Schema(description = "用户APP - 商品评价创建 Request VO")
|
@Schema(description = "用户 App - 商品评价创建 Request VO")
|
||||||
@Data
|
@Data
|
||||||
@ToString(callSuper = true)
|
@ToString(callSuper = true)
|
||||||
public class AppProductCommentCreateReqVO {
|
public class AppProductCommentCreateReqVO {
|
||||||
|
@ -14,11 +14,11 @@ import java.util.List;
|
|||||||
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
|
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 用户APP - 商品评价详情 Response VO
|
* 用户 App - 商品评价详情 Response VO
|
||||||
*
|
*
|
||||||
* @author HUIHUI
|
* @author HUIHUI
|
||||||
*/
|
*/
|
||||||
@Schema(description = "用户APP - 商品评价详情 Response VO")
|
@Schema(description = "用户 App - 商品评价详情 Response VO")
|
||||||
@Data
|
@Data
|
||||||
@ToString(callSuper = true)
|
@ToString(callSuper = true)
|
||||||
public class AppProductCommentRespVO {
|
public class AppProductCommentRespVO {
|
||||||
|
@ -4,7 +4,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageParam;
|
|||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
@Schema(description = "用户APP - 商品收藏分页查询 Request VO")
|
@Schema(description = "用户 App - 商品收藏分页查询 Request VO")
|
||||||
@Data
|
@Data
|
||||||
public class AppFavoritePageReqVO extends PageParam {
|
public class AppFavoritePageReqVO extends PageParam {
|
||||||
}
|
}
|
||||||
|
@ -4,7 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
|
|||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED;
|
import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED;
|
||||||
|
|
||||||
@Schema(description = "用户APP - 商品收藏 Response VO")
|
@Schema(description = "用户 App - 商品收藏 Response VO")
|
||||||
@Data
|
@Data
|
||||||
public class AppFavoriteRespVO {
|
public class AppFavoriteRespVO {
|
||||||
|
|
||||||
|
@ -38,7 +38,7 @@ public class AppCombinationActivityController {
|
|||||||
activity1.setName("618 大拼团");
|
activity1.setName("618 大拼团");
|
||||||
activity1.setUserSize(3);
|
activity1.setUserSize(3);
|
||||||
activity1.setSpuId(2048L);
|
activity1.setSpuId(2048L);
|
||||||
activity1.setPicUrl("商品图片地址");
|
activity1.setPicUrl("https://demo26.crmeb.net/uploads/attach/2021/11/15/a79f5d2ea6bf0c3c11b2127332dfe2df.jpg");
|
||||||
activity1.setMarketPrice(50);
|
activity1.setMarketPrice(50);
|
||||||
activity1.setCombinationPrice(100);
|
activity1.setCombinationPrice(100);
|
||||||
activityList.add(activity1);
|
activityList.add(activity1);
|
||||||
@ -48,7 +48,7 @@ public class AppCombinationActivityController {
|
|||||||
activity2.setName("双十一拼团");
|
activity2.setName("双十一拼团");
|
||||||
activity2.setUserSize(5);
|
activity2.setUserSize(5);
|
||||||
activity2.setSpuId(4096L);
|
activity2.setSpuId(4096L);
|
||||||
activity2.setPicUrl("商品图片地址");
|
activity2.setPicUrl("https://thirdwx.qlogo.cn/mmopen/vi_32/Q0j4TwGTfTKXMYJOomfp7cebz3cIeb8sHk3GGSIJtWEgREe3j7J1WoAbTvIOicpcNdFkWAziatBSMod8b5RyS4CQ/132");
|
||||||
activity2.setMarketPrice(100);
|
activity2.setMarketPrice(100);
|
||||||
activity2.setCombinationPrice(200);
|
activity2.setCombinationPrice(200);
|
||||||
activityList.add(activity2);
|
activityList.add(activity2);
|
||||||
@ -94,34 +94,31 @@ public class AppCombinationActivityController {
|
|||||||
obj.setName("晚九点限时秒杀");
|
obj.setName("晚九点限时秒杀");
|
||||||
obj.setStatus(1);
|
obj.setStatus(1);
|
||||||
obj.setStartTime(LocalDateTime.of(2023, 6, 15, 0, 0, 0));
|
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.setUserSize(2);
|
||||||
obj.setSuccessCount(100);
|
obj.setSuccessCount(100);
|
||||||
obj.setSpuId(633L);
|
obj.setSpuId(633L);
|
||||||
|
obj.setSingleLimitCount(2);
|
||||||
|
obj.setTotalLimitCount(3);
|
||||||
|
|
||||||
// 创建一个Product对象的列表
|
// 创建一个Product对象的列表
|
||||||
List<AppCombinationActivityDetailRespVO.Product> productList = new ArrayList<>();
|
List<AppCombinationActivityDetailRespVO.Product> productList = new ArrayList<>();
|
||||||
// 创建三个新的Product对象并设置其属性的值
|
// 创建三个新的Product对象并设置其属性的值
|
||||||
AppCombinationActivityDetailRespVO.Product product1 = new AppCombinationActivityDetailRespVO.Product();
|
AppCombinationActivityDetailRespVO.Product product1 = new AppCombinationActivityDetailRespVO.Product();
|
||||||
product1.setSkuId(1L);
|
product1.setSkuId(1L);
|
||||||
product1.setCombinationPrice(100);
|
product1.setCombinationPrice(100);
|
||||||
product1.setQuota(50);
|
|
||||||
product1.setLimitCount(3);
|
|
||||||
// 将第一个Product对象添加到列表中
|
// 将第一个Product对象添加到列表中
|
||||||
productList.add(product1);
|
productList.add(product1);
|
||||||
// 创建第二个Product对象并设置其属性的值
|
// 创建第二个Product对象并设置其属性的值
|
||||||
AppCombinationActivityDetailRespVO.Product product2 = new AppCombinationActivityDetailRespVO.Product();
|
AppCombinationActivityDetailRespVO.Product product2 = new AppCombinationActivityDetailRespVO.Product();
|
||||||
product2.setSkuId(2L);
|
product2.setSkuId(2L);
|
||||||
product2.setCombinationPrice(200);
|
product2.setCombinationPrice(200);
|
||||||
product2.setQuota(100);
|
|
||||||
product2.setLimitCount(4);
|
|
||||||
// 将第二个Product对象添加到列表中
|
// 将第二个Product对象添加到列表中
|
||||||
productList.add(product2);
|
productList.add(product2);
|
||||||
// 创建第三个Product对象并设置其属性的值
|
// 创建第三个Product对象并设置其属性的值
|
||||||
AppCombinationActivityDetailRespVO.Product product3 = new AppCombinationActivityDetailRespVO.Product();
|
AppCombinationActivityDetailRespVO.Product product3 = new AppCombinationActivityDetailRespVO.Product();
|
||||||
product3.setSkuId(3L);
|
product3.setSkuId(3L);
|
||||||
product3.setCombinationPrice(300);
|
product3.setCombinationPrice(300);
|
||||||
product3.setQuota(150);
|
|
||||||
product3.setLimitCount(5);
|
|
||||||
// 将第三个Product对象添加到列表中
|
// 将第三个Product对象添加到列表中
|
||||||
productList.add(product3);
|
productList.add(product3);
|
||||||
// 将Product列表设置为对象的属性值
|
// 将Product列表设置为对象的属性值
|
||||||
|
@ -34,6 +34,12 @@ public class AppCombinationActivityDetailRespVO {
|
|||||||
@Schema(description = "商品 SPU 编号", required = true, example = "2048")
|
@Schema(description = "商品 SPU 编号", required = true, example = "2048")
|
||||||
private Long spuId;
|
private Long spuId;
|
||||||
|
|
||||||
|
@Schema(description = "总共限购数量", example = "10")
|
||||||
|
private Integer totalLimitCount;
|
||||||
|
|
||||||
|
@Schema(description = "单次限购数量", example = "5")
|
||||||
|
private Integer singleLimitCount;
|
||||||
|
|
||||||
@Schema(description = "商品信息数组", required = true)
|
@Schema(description = "商品信息数组", required = true)
|
||||||
private List<Product> products;
|
private List<Product> products;
|
||||||
|
|
||||||
@ -47,12 +53,6 @@ public class AppCombinationActivityDetailRespVO {
|
|||||||
@Schema(description = "拼团金额,单位:分", required = true, example = "100")
|
@Schema(description = "拼团金额,单位:分", required = true, example = "100")
|
||||||
private Integer combinationPrice;
|
private Integer combinationPrice;
|
||||||
|
|
||||||
@Schema(description = "拼团限量库存", required = true, example = "50")
|
|
||||||
private Integer quota;
|
|
||||||
|
|
||||||
@Schema(description = "每人限购数量", required = true, example = "10")
|
|
||||||
private Integer limitCount;
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -1,7 +1,12 @@
|
|||||||
package cn.iocoder.yudao.module.promotion.controller.app.seckill;
|
package cn.iocoder.yudao.module.promotion.controller.app.seckill;
|
||||||
|
|
||||||
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
|
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
|
||||||
import cn.iocoder.yudao.module.promotion.controller.app.seckill.vo.AppSeckillActivitiDetailRespVO;
|
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
||||||
|
import cn.iocoder.yudao.module.promotion.controller.app.seckill.vo.activity.AppSeckillActivityDetailRespVO;
|
||||||
|
import cn.iocoder.yudao.module.promotion.controller.app.seckill.vo.activity.AppSeckillActivityNowRespVO;
|
||||||
|
import cn.iocoder.yudao.module.promotion.controller.app.seckill.vo.activity.AppSeckillActivityPageReqVO;
|
||||||
|
import cn.iocoder.yudao.module.promotion.controller.app.seckill.vo.activity.AppSeckillActivityRespVO;
|
||||||
|
import cn.iocoder.yudao.module.promotion.controller.app.seckill.vo.config.AppSeckillConfigRespVO;
|
||||||
import io.swagger.v3.oas.annotations.Operation;
|
import io.swagger.v3.oas.annotations.Operation;
|
||||||
import io.swagger.v3.oas.annotations.Parameter;
|
import io.swagger.v3.oas.annotations.Parameter;
|
||||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||||
@ -23,43 +28,104 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
|
|||||||
@Validated
|
@Validated
|
||||||
public class AppSeckillActivityController {
|
public class AppSeckillActivityController {
|
||||||
|
|
||||||
|
@GetMapping("/get-now")
|
||||||
|
@Operation(summary = "获得当前秒杀活动") // 提供给首页使用
|
||||||
|
// TODO 芋艿:需要增加 spring cache
|
||||||
|
public CommonResult<AppSeckillActivityNowRespVO> getNowSeckillActivity() {
|
||||||
|
AppSeckillActivityNowRespVO respVO = new AppSeckillActivityNowRespVO();
|
||||||
|
respVO.setConfig(new AppSeckillConfigRespVO().setId(10L).setStartTime("01:00").setEndTime("09:59"));
|
||||||
|
List<AppSeckillActivityRespVO> activityList = new ArrayList<>();
|
||||||
|
AppSeckillActivityRespVO activity1 = new AppSeckillActivityRespVO();
|
||||||
|
activity1.setId(1L);
|
||||||
|
activity1.setName("618 大秒杀");
|
||||||
|
activity1.setSpuId(2048L);
|
||||||
|
activity1.setPicUrl("https://demo26.crmeb.net/uploads/attach/2021/11/15/a79f5d2ea6bf0c3c11b2127332dfe2df.jpg");
|
||||||
|
activity1.setMarketPrice(50);
|
||||||
|
activity1.setSeckillPrice(100);
|
||||||
|
activityList.add(activity1);
|
||||||
|
|
||||||
|
AppSeckillActivityRespVO activity2 = new AppSeckillActivityRespVO();
|
||||||
|
activity2.setId(2L);
|
||||||
|
activity2.setName("双十一大秒杀");
|
||||||
|
activity2.setSpuId(4096L);
|
||||||
|
activity2.setPicUrl("https://thirdwx.qlogo.cn/mmopen/vi_32/Q0j4TwGTfTKXMYJOomfp7cebz3cIeb8sHk3GGSIJtWEgREe3j7J1WoAbTvIOicpcNdFkWAziatBSMod8b5RyS4CQ/132");
|
||||||
|
activity2.setMarketPrice(100);
|
||||||
|
activity2.setSeckillPrice(200);
|
||||||
|
activityList.add(activity2);
|
||||||
|
respVO.setActivities(activityList);
|
||||||
|
return success(respVO);
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/page")
|
||||||
|
@Operation(summary = "获得秒杀活动分页")
|
||||||
|
// TODO @芋艿:分页参数
|
||||||
|
public CommonResult<PageResult<AppSeckillActivityRespVO>> getSeckillActivityPage(AppSeckillActivityPageReqVO pageReqVO) {
|
||||||
|
List<AppSeckillActivityRespVO> activityList = new ArrayList<>();
|
||||||
|
AppSeckillActivityRespVO activity1 = new AppSeckillActivityRespVO();
|
||||||
|
activity1.setId(1L);
|
||||||
|
activity1.setName("618 大秒杀");
|
||||||
|
activity1.setSpuId(2048L);
|
||||||
|
activity1.setPicUrl("https://demo26.crmeb.net/uploads/attach/2021/11/15/a79f5d2ea6bf0c3c11b2127332dfe2df.jpg");
|
||||||
|
activity1.setMarketPrice(50);
|
||||||
|
activity1.setSeckillPrice(100);
|
||||||
|
activity1.setUnitName("个");
|
||||||
|
activity1.setStock(1);
|
||||||
|
activity1.setTotalStock(2);
|
||||||
|
activityList.add(activity1);
|
||||||
|
|
||||||
|
AppSeckillActivityRespVO activity2 = new AppSeckillActivityRespVO();
|
||||||
|
activity2.setId(2L);
|
||||||
|
activity2.setName("双十一大秒杀");
|
||||||
|
activity2.setSpuId(4096L);
|
||||||
|
activity2.setPicUrl("https://thirdwx.qlogo.cn/mmopen/vi_32/Q0j4TwGTfTKXMYJOomfp7cebz3cIeb8sHk3GGSIJtWEgREe3j7J1WoAbTvIOicpcNdFkWAziatBSMod8b5RyS4CQ/132");
|
||||||
|
activity2.setMarketPrice(100);
|
||||||
|
activity2.setSeckillPrice(200);
|
||||||
|
activity2.setUnitName("套");
|
||||||
|
activity2.setStock(2);
|
||||||
|
activity2.setTotalStock(3);
|
||||||
|
activityList.add(activity2);
|
||||||
|
return success(new PageResult<>(activityList, 100L));
|
||||||
|
}
|
||||||
|
|
||||||
@GetMapping("/get-detail")
|
@GetMapping("/get-detail")
|
||||||
@Operation(summary = "获得秒杀活动明细")
|
@Operation(summary = "获得秒杀活动明细")
|
||||||
@Parameter(name = "id", description = "活动编号", required = true, example = "1024")
|
@Parameter(name = "id", description = "活动编号", required = true, example = "1024")
|
||||||
public CommonResult<AppSeckillActivitiDetailRespVO> getSeckillActivity(@RequestParam("id") Long id) {
|
public CommonResult<AppSeckillActivityDetailRespVO> getSeckillActivity(@RequestParam("id") Long id) {
|
||||||
// TODO 芋艿:如果禁用的时候,需要抛出异常;
|
// TODO 芋艿:如果禁用的时候,需要抛出异常;
|
||||||
AppSeckillActivitiDetailRespVO obj = new AppSeckillActivitiDetailRespVO();
|
AppSeckillActivityDetailRespVO obj = new AppSeckillActivityDetailRespVO();
|
||||||
// 设置其属性的值
|
// 设置其属性的值
|
||||||
obj.setId(id);
|
obj.setId(id);
|
||||||
obj.setName("晚九点限时秒杀");
|
obj.setName("晚九点限时秒杀");
|
||||||
obj.setStatus(1);
|
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.setSpuId(633L);
|
||||||
|
obj.setSingleLimitCount(2);
|
||||||
|
obj.setTotalLimitCount(3);
|
||||||
|
obj.setStock(100);
|
||||||
|
obj.setTotalStock(200);
|
||||||
|
|
||||||
// 创建一个Product对象的列表
|
// 创建一个Product对象的列表
|
||||||
List<AppSeckillActivitiDetailRespVO.Product> productList = new ArrayList<>();
|
List<AppSeckillActivityDetailRespVO.Product> productList = new ArrayList<>();
|
||||||
// 创建三个新的Product对象并设置其属性的值
|
// 创建三个新的Product对象并设置其属性的值
|
||||||
AppSeckillActivitiDetailRespVO.Product product1 = new AppSeckillActivitiDetailRespVO.Product();
|
AppSeckillActivityDetailRespVO.Product product1 = new AppSeckillActivityDetailRespVO.Product();
|
||||||
product1.setSkuId(1L);
|
product1.setSkuId(1L);
|
||||||
product1.setSeckillPrice(100);
|
product1.setSeckillPrice(100);
|
||||||
product1.setQuota(50);
|
product1.setStock(50);
|
||||||
product1.setLimitCount(3);
|
|
||||||
// 将第一个Product对象添加到列表中
|
// 将第一个Product对象添加到列表中
|
||||||
productList.add(product1);
|
productList.add(product1);
|
||||||
// 创建第二个Product对象并设置其属性的值
|
// 创建第二个Product对象并设置其属性的值
|
||||||
AppSeckillActivitiDetailRespVO.Product product2 = new AppSeckillActivitiDetailRespVO.Product();
|
AppSeckillActivityDetailRespVO.Product product2 = new AppSeckillActivityDetailRespVO.Product();
|
||||||
product2.setSkuId(2L);
|
product2.setSkuId(2L);
|
||||||
product2.setSeckillPrice(200);
|
product2.setSeckillPrice(200);
|
||||||
product2.setQuota(100);
|
product2.setStock(100);
|
||||||
product2.setLimitCount(4);
|
|
||||||
// 将第二个Product对象添加到列表中
|
// 将第二个Product对象添加到列表中
|
||||||
productList.add(product2);
|
productList.add(product2);
|
||||||
// 创建第三个Product对象并设置其属性的值
|
// 创建第三个Product对象并设置其属性的值
|
||||||
AppSeckillActivitiDetailRespVO.Product product3 = new AppSeckillActivitiDetailRespVO.Product();
|
AppSeckillActivityDetailRespVO.Product product3 = new AppSeckillActivityDetailRespVO.Product();
|
||||||
product3.setSkuId(3L);
|
product3.setSkuId(3L);
|
||||||
product3.setSeckillPrice(300);
|
product3.setSeckillPrice(300);
|
||||||
product3.setQuota(150);
|
product3.setStock(150);
|
||||||
product3.setLimitCount(5);
|
|
||||||
// 将第三个Product对象添加到列表中
|
// 将第三个Product对象添加到列表中
|
||||||
productList.add(product3);
|
productList.add(product3);
|
||||||
// 将Product列表设置为对象的属性值
|
// 将Product列表设置为对象的属性值
|
||||||
|
@ -0,0 +1,36 @@
|
|||||||
|
package cn.iocoder.yudao.module.promotion.controller.app.seckill;
|
||||||
|
|
||||||
|
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
|
||||||
|
import cn.iocoder.yudao.module.promotion.controller.app.seckill.vo.config.AppSeckillConfigRespVO;
|
||||||
|
import io.swagger.v3.oas.annotations.Operation;
|
||||||
|
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||||
|
import org.springframework.validation.annotation.Validated;
|
||||||
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
|
import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
|
|
||||||
|
import java.util.Arrays;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
|
||||||
|
|
||||||
|
@Tag(name = "用户 App - 秒杀时间段")
|
||||||
|
@RestController
|
||||||
|
@RequestMapping("/promotion/seckill-config")
|
||||||
|
@Validated
|
||||||
|
public class AppSeckillConfigController {
|
||||||
|
|
||||||
|
@GetMapping("/list")
|
||||||
|
@Operation(summary = "获得秒杀时间段列表")
|
||||||
|
public CommonResult<List<AppSeckillConfigRespVO>> getSeckillConfigList() {
|
||||||
|
return success(Arrays.asList(
|
||||||
|
new AppSeckillConfigRespVO().setId(1L).setStartTime("00:00").setEndTime("09:59")
|
||||||
|
.setSliderPicUrls(Arrays.asList("https://demo26.crmeb.net/uploads/attach/2021/11/15/a79f5d2ea6bf0c3c11b2127332dfe2df.jpg",
|
||||||
|
"https://thirdwx.qlogo.cn/mmopen/vi_32/Q0j4TwGTfTKXMYJOomfp7cebz3cIeb8sHk3GGSIJtWEgREe3j7J1WoAbTvIOicpcNdFkWAziatBSMod8b5RyS4CQ/132")),
|
||||||
|
new AppSeckillConfigRespVO().setId(2L).setStartTime("10:00").setEndTime("12:59"),
|
||||||
|
new AppSeckillConfigRespVO().setId(2L).setStartTime("13:00").setEndTime("22:59"),
|
||||||
|
new AppSeckillConfigRespVO().setId(2L).setStartTime("23:00").setEndTime("23:59")
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -1,4 +1,4 @@
|
|||||||
package cn.iocoder.yudao.module.promotion.controller.app.seckill.vo;
|
package cn.iocoder.yudao.module.promotion.controller.app.seckill.vo.activity;
|
||||||
|
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
@ -6,9 +6,9 @@ import lombok.Data;
|
|||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@Schema(description = "用户 App - 秒杀活动 Response VO")
|
@Schema(description = "用户 App - 秒杀活动的详细 Response VO")
|
||||||
@Data
|
@Data
|
||||||
public class AppSeckillActivitiDetailRespVO {
|
public class AppSeckillActivityDetailRespVO {
|
||||||
|
|
||||||
@Schema(description = "秒杀活动编号", required = true, example = "1024")
|
@Schema(description = "秒杀活动编号", required = true, example = "1024")
|
||||||
private Long id;
|
private Long id;
|
||||||
@ -30,6 +30,18 @@ public class AppSeckillActivitiDetailRespVO {
|
|||||||
@Schema(description = "商品 SPU 编号", required = true, example = "2048")
|
@Schema(description = "商品 SPU 编号", required = true, example = "2048")
|
||||||
private Long spuId;
|
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)
|
@Schema(description = "商品信息数组", required = true)
|
||||||
private List<Product> products;
|
private List<Product> products;
|
||||||
|
|
||||||
@ -44,10 +56,7 @@ public class AppSeckillActivitiDetailRespVO {
|
|||||||
private Integer seckillPrice;
|
private Integer seckillPrice;
|
||||||
|
|
||||||
@Schema(description = "秒杀限量库存", required = true, example = "50")
|
@Schema(description = "秒杀限量库存", required = true, example = "50")
|
||||||
private Integer quota;
|
private Integer stock;
|
||||||
|
|
||||||
@Schema(description = "每人限购数量", required = true, example = "10")
|
|
||||||
private Integer limitCount;
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
@ -0,0 +1,19 @@
|
|||||||
|
package cn.iocoder.yudao.module.promotion.controller.app.seckill.vo.activity;
|
||||||
|
|
||||||
|
import cn.iocoder.yudao.module.promotion.controller.app.seckill.vo.config.AppSeckillConfigRespVO;
|
||||||
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Schema(description = "用户 App - 当前秒杀活动 Response VO")
|
||||||
|
@Data
|
||||||
|
public class AppSeckillActivityNowRespVO {
|
||||||
|
|
||||||
|
@Schema(description = "秒杀时间段", required = true)
|
||||||
|
private AppSeckillConfigRespVO config;
|
||||||
|
|
||||||
|
@Schema(description = "秒杀活动数组", required = true)
|
||||||
|
private List<AppSeckillActivityRespVO> activities;
|
||||||
|
|
||||||
|
}
|
@ -0,0 +1,18 @@
|
|||||||
|
package cn.iocoder.yudao.module.promotion.controller.app.seckill.vo.activity;
|
||||||
|
|
||||||
|
import cn.iocoder.yudao.framework.common.pojo.PageParam;
|
||||||
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.EqualsAndHashCode;
|
||||||
|
import lombok.ToString;
|
||||||
|
|
||||||
|
@Schema(description = "用户 App - 商品评价分页 Request VO")
|
||||||
|
@Data
|
||||||
|
@EqualsAndHashCode(callSuper = true)
|
||||||
|
@ToString(callSuper = true)
|
||||||
|
public class AppSeckillActivityPageReqVO extends PageParam {
|
||||||
|
|
||||||
|
@Schema(description = "秒杀配置编号", example = "1024")
|
||||||
|
private Long configId;
|
||||||
|
|
||||||
|
}
|
@ -0,0 +1,34 @@
|
|||||||
|
package cn.iocoder.yudao.module.promotion.controller.app.seckill.vo.activity;
|
||||||
|
|
||||||
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
@Schema(description = "用户 App - 秒杀活动 Response VO")
|
||||||
|
@Data
|
||||||
|
public class AppSeckillActivityRespVO {
|
||||||
|
|
||||||
|
@Schema(description = "秒杀活动编号", required = true, example = "1024")
|
||||||
|
private Long id;
|
||||||
|
|
||||||
|
@Schema(description = "秒杀活动名称", required = true, example = "晚九点限时秒杀")
|
||||||
|
private String name;
|
||||||
|
|
||||||
|
@Schema(description = "商品 SPU 编号", required = true, example = "2048")
|
||||||
|
private Long spuId;
|
||||||
|
|
||||||
|
@Schema(description = "商品图片", required = true, example = "4096") // 从 SPU 的 picUrl 读取
|
||||||
|
private String picUrl;
|
||||||
|
@Schema(description = "单位名", requiredMode = Schema.RequiredMode.REQUIRED, example = "个")
|
||||||
|
private String unitName;
|
||||||
|
@Schema(description = "商品市场价,单位:分", required = true, example = "50") // 从 SPU 的 marketPrice 读取
|
||||||
|
private Integer marketPrice;
|
||||||
|
|
||||||
|
@Schema(description = "秒杀库存(剩余)", required = true, example = "100")
|
||||||
|
private Integer stock;
|
||||||
|
@Schema(description = "秒杀库存(总共)", required = true, example = "200")
|
||||||
|
private Integer totalStock;
|
||||||
|
|
||||||
|
@Schema(description = "秒杀金额,单位:分", required = true, example = "100") // 从秒杀商品里取最低价
|
||||||
|
private Integer seckillPrice;
|
||||||
|
|
||||||
|
}
|
@ -0,0 +1,23 @@
|
|||||||
|
package cn.iocoder.yudao.module.promotion.controller.app.seckill.vo.config;
|
||||||
|
|
||||||
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Schema(description = "用户 App - 秒杀时间段 Response VO")
|
||||||
|
@Data
|
||||||
|
public class AppSeckillConfigRespVO {
|
||||||
|
|
||||||
|
@Schema(description = "秒杀时间段编号", required = true, example = "1024")
|
||||||
|
private Long id;
|
||||||
|
|
||||||
|
@Schema(description = "开始时间点", required = true, example = "09:00")
|
||||||
|
private String startTime;
|
||||||
|
@Schema(description = "结束时间点", required = true, example = "09:59")
|
||||||
|
private String endTime;
|
||||||
|
|
||||||
|
@Schema(description = "轮播图", required = true)
|
||||||
|
private List<String> sliderPicUrls;
|
||||||
|
|
||||||
|
}
|
@ -7,7 +7,7 @@ import javax.validation.constraints.NotNull;
|
|||||||
import javax.validation.constraints.Size;
|
import javax.validation.constraints.Size;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@Schema(description = "用户APP - 商品评价创建 Request VO")
|
@Schema(description = "用户 App - 商品评价创建 Request VO")
|
||||||
@Data
|
@Data
|
||||||
public class AppTradeOrderItemCommentCreateReqVO {
|
public class AppTradeOrderItemCommentCreateReqVO {
|
||||||
|
|
||||||
|
@ -54,11 +54,11 @@
|
|||||||
<!-- <version>${revision}</version>-->
|
<!-- <version>${revision}</version>-->
|
||||||
<!-- </dependency>-->
|
<!-- </dependency>-->
|
||||||
<!-- 支付服务 -->
|
<!-- 支付服务 -->
|
||||||
<!-- <dependency>-->
|
<dependency>
|
||||||
<!-- <groupId>cn.iocoder.boot</groupId>-->
|
<groupId>cn.iocoder.boot</groupId>
|
||||||
<!-- <artifactId>yudao-module-pay-biz</artifactId>-->
|
<artifactId>yudao-module-pay-biz</artifactId>
|
||||||
<!-- <version>${revision}</version>-->
|
<version>${revision}</version>
|
||||||
<!-- </dependency>-->
|
</dependency>
|
||||||
|
|
||||||
<!-- 微信公众号模块。默认注释,保证编译速度 -->
|
<!-- 微信公众号模块。默认注释,保证编译速度 -->
|
||||||
<!-- <dependency>-->
|
<!-- <dependency>-->
|
||||||
@ -68,27 +68,21 @@
|
|||||||
<!-- </dependency>-->
|
<!-- </dependency>-->
|
||||||
|
|
||||||
<!-- 商城相关模块。默认注释,保证编译速度 -->
|
<!-- 商城相关模块。默认注释,保证编译速度 -->
|
||||||
<!-- <dependency>-->
|
<dependency>
|
||||||
<!-- <groupId>cn.iocoder.boot</groupId>-->
|
<groupId>cn.iocoder.boot</groupId>
|
||||||
<!-- <artifactId>yudao-module-promotion-biz</artifactId>-->
|
<artifactId>yudao-module-promotion-biz</artifactId>
|
||||||
<!-- <version>${revision}</version>-->
|
<version>${revision}</version>
|
||||||
<!-- </dependency>-->
|
</dependency>
|
||||||
<!-- <dependency>-->
|
<dependency>
|
||||||
<!-- <groupId>cn.iocoder.boot</groupId>-->
|
<groupId>cn.iocoder.boot</groupId>
|
||||||
<!-- <artifactId>yudao-module-product-biz</artifactId>-->
|
<artifactId>yudao-module-product-biz</artifactId>
|
||||||
<!-- <version>${revision}</version>-->
|
<version>${revision}</version>
|
||||||
<!-- </dependency>-->
|
</dependency>
|
||||||
<!-- <dependency>-->
|
<dependency>
|
||||||
<!-- <groupId>cn.iocoder.boot</groupId>-->
|
<groupId>cn.iocoder.boot</groupId>
|
||||||
<!-- <artifactId>yudao-module-trade-biz</artifactId>-->
|
<artifactId>yudao-module-trade-biz</artifactId>
|
||||||
<!-- <version>${revision}</version>-->
|
<version>${revision}</version>
|
||||||
<!-- </dependency>-->
|
</dependency>
|
||||||
|
|
||||||
<!-- <dependency>-->
|
|
||||||
<!-- <groupId>cn.iocoder.boot</groupId>-->
|
|
||||||
<!-- <artifactId>yudao-module-point-biz</artifactId>-->
|
|
||||||
<!-- <version>${revision}</version>-->
|
|
||||||
<!-- </dependency>-->
|
|
||||||
|
|
||||||
<!-- spring boot 配置所需依赖 -->
|
<!-- spring boot 配置所需依赖 -->
|
||||||
<dependency>
|
<dependency>
|
||||||
|
Loading…
Reference in New Issue
Block a user