BJ_ZTEITS-Developers / parking-cloud-yudao

Commit b44ad3a0f766d3b9e2339913a9b60139c339dc09

Authored by puhui999
2 parents 666925da 772a982b

Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product

Inline Side-by-side
Showing 7 changed files with 364 additions and 2 deletions
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/AppBargainActivityController.java 0 → 100644
  View file @b44ad3a
  1 +package cn.iocoder.yudao.module.promotion.controller.app.bargain;
  2 +
  3 +import cn.iocoder.yudao.framework.common.pojo.CommonResult;
  4 +import cn.iocoder.yudao.framework.common.pojo.PageParam;
  5 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  6 +import cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils;
  7 +import cn.iocoder.yudao.module.promotion.controller.app.bargain.vo.activity.AppBargainActivityDetailRespVO;
  8 +import cn.iocoder.yudao.module.promotion.controller.app.bargain.vo.activity.AppBargainActivityRespVO;
  9 +import io.swagger.v3.oas.annotations.Operation;
  10 +import io.swagger.v3.oas.annotations.tags.Tag;
  11 +import org.springframework.validation.annotation.Validated;
  12 +import org.springframework.web.bind.annotation.GetMapping;
  13 +import org.springframework.web.bind.annotation.RequestMapping;
  14 +import org.springframework.web.bind.annotation.RequestParam;
  15 +import org.springframework.web.bind.annotation.RestController;
  16 +
  17 +import java.time.Duration;
  18 +import java.util.ArrayList;
  19 +import java.util.List;
  20 +
  21 +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
  22 +
  23 +@Tag(name = "用户 App - 砍价活动")
  24 +@RestController
  25 +@RequestMapping("/promotion/bargain-activity")
  26 +@Validated
  27 +public class AppBargainActivityController {
  28 +
  29 + @GetMapping("/page")
  30 + @Operation(summary = "获得砍价活动活动") // TODO 芋艿：只查询进行中，且在时间范围内的
  31 + // TODO 芋艿：缺少 swagger 注解
  32 + public CommonResult<PageResult<AppBargainActivityRespVO>> getBargainActivityPage(PageParam pageReqVO) {
  33 + List<AppBargainActivityRespVO> activityList = new ArrayList<>();
  34 + AppBargainActivityRespVO activity1 = new AppBargainActivityRespVO();
  35 + activity1.setId(1L);
  36 + activity1.setName("618 大砍价");
  37 + activity1.setSpuId(2048L);
  38 + activity1.setPicUrl("https://demo26.crmeb.net/uploads/attach/2021/11/15/a79f5d2ea6bf0c3c11b2127332dfe2df.jpg");
  39 + activity1.setMarketPrice(50);
  40 + activity1.setBargainPrice(100);
  41 + activity1.setStartTime(LocalDateTimeUtils.addTime(Duration.ofDays(-2)));
  42 + activity1.setEndTime(LocalDateTimeUtils.addTime(Duration.ofDays(1)));
  43 + activity1.setStock(10);
  44 + activityList.add(activity1);
  45 +
  46 + AppBargainActivityRespVO activity2 = new AppBargainActivityRespVO();
  47 + activity2.setId(2L);
  48 + activity2.setName("双十一砍价");
  49 + activity2.setSpuId(4096L);
  50 + activity2.setPicUrl("https://thirdwx.qlogo.cn/mmopen/vi_32/Q0j4TwGTfTKXMYJOomfp7cebz3cIeb8sHk3GGSIJtWEgREe3j7J1WoAbTvIOicpcNdFkWAziatBSMod8b5RyS4CQ/132");
  51 + activity2.setMarketPrice(100);
  52 + activity2.setBargainPrice(200);
  53 + activity2.setStartTime(LocalDateTimeUtils.addTime(Duration.ofDays(-2)));
  54 + activity2.setEndTime(LocalDateTimeUtils.addTime(Duration.ofDays(1)));
  55 + activity2.setStock(0);
  56 + activityList.add(activity2);
  57 +
  58 + return success(new PageResult<>(activityList, 10L));
  59 + }
  60 +
  61 + @GetMapping("/list")
  62 + @Operation(summary = "获得砍价活动列表", description = "用于小程序首页")
  63 + // TODO 芋艿：增加 Spring Cache
  64 + // TODO 芋艿：缺少 swagger 注解
  65 + public CommonResult<List<AppBargainActivityRespVO>> getBargainActivityList(
  66 + @RequestParam(name = "count", defaultValue = "6") Integer count) {
  67 + List<AppBargainActivityRespVO> activityList = new ArrayList<>();
  68 + AppBargainActivityRespVO activity1 = new AppBargainActivityRespVO();
  69 + activity1.setId(1L);
  70 + activity1.setName("618 大砍价");
  71 + activity1.setSpuId(2048L);
  72 + activity1.setPicUrl("https://demo26.crmeb.net/uploads/attach/2021/11/15/a79f5d2ea6bf0c3c11b2127332dfe2df.jpg");
  73 + activity1.setMarketPrice(50);
  74 + activity1.setBargainPrice(100);
  75 + activityList.add(activity1);
  76 +
  77 + AppBargainActivityRespVO activity2 = new AppBargainActivityRespVO();
  78 + activity2.setId(2L);
  79 + activity2.setName("双十一砍价");
  80 + activity2.setSpuId(4096L);
  81 + activity2.setPicUrl("https://thirdwx.qlogo.cn/mmopen/vi_32/Q0j4TwGTfTKXMYJOomfp7cebz3cIeb8sHk3GGSIJtWEgREe3j7J1WoAbTvIOicpcNdFkWAziatBSMod8b5RyS4CQ/132");
  82 + activity2.setMarketPrice(100);
  83 + activity2.setBargainPrice(200);
  84 + activityList.add(activity2);
  85 +
  86 + return success(activityList);
  87 + }
  88 +
  89 + @GetMapping("/get-detail")
  90 + @Operation(summary = "获得砍价活动详情")
  91 + // TODO 芋艿：缺少 swagger 注解
  92 + public CommonResult<AppBargainActivityDetailRespVO> getBargainActivityDetail(@RequestParam("id") Long id) {
  93 + AppBargainActivityDetailRespVO activity = new AppBargainActivityDetailRespVO();
  94 + activity.setId(2L);
  95 + activity.setName("618 大砍价");
  96 + activity.setSpuId(2048L);
  97 + activity.setPicUrl("https://demo26.crmeb.net/uploads/attach/2021/11/15/a79f5d2ea6bf0c3c11b2127332dfe2df.jpg");
  98 + activity.setMarketPrice(50);
  99 + activity.setBargainPrice(100);
  100 + activity.setStock(10);
  101 + activity.setUnitName("件");
  102 + activity.setPrice(40);
  103 + activity.setStartTime(LocalDateTimeUtils.addTime(Duration.ofDays(-2)));
  104 + activity.setEndTime(LocalDateTimeUtils.addTime(Duration.ofDays(-10)));
  105 + activity.setDescription("我吃西红柿");
  106 + activity.setSuccessCount(10);
  107 + return success(activity);
  108 + }
  109 +
  110 +}
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/AppBargainRecordController.java 0 → 100644
  View file @b44ad3a
  1 +package cn.iocoder.yudao.module.promotion.controller.app.bargain;
  2 +
  3 +import cn.iocoder.yudao.framework.common.pojo.CommonResult;
  4 +import cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils;
  5 +import cn.iocoder.yudao.module.promotion.controller.app.bargain.vo.record.AppBargainRecordDetailRespVO;
  6 +import cn.iocoder.yudao.module.promotion.controller.app.bargain.vo.record.AppBargainRecordSummaryRespVO;
  7 +import io.swagger.v3.oas.annotations.Operation;
  8 +import io.swagger.v3.oas.annotations.tags.Tag;
  9 +import org.springframework.validation.annotation.Validated;
  10 +import org.springframework.web.bind.annotation.GetMapping;
  11 +import org.springframework.web.bind.annotation.RequestMapping;
  12 +import org.springframework.web.bind.annotation.RequestParam;
  13 +import org.springframework.web.bind.annotation.RestController;
  14 +
  15 +import java.time.Duration;
  16 +import java.util.ArrayList;
  17 +
  18 +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
  19 +
  20 +@Tag(name = "用户 App - 砍价记录")
  21 +@RestController
  22 +@RequestMapping("/promotion/bargain-record")
  23 +@Validated
  24 +public class AppBargainRecordController {
  25 +
  26 + @GetMapping("/get-summary")
  27 + @Operation(summary = "获得砍价记录的概要信息", description = "用于小程序首页")
  28 + // TODO 芋艿：增加 @Cache 缓存，1 分钟过期
  29 + public CommonResult<AppBargainRecordSummaryRespVO> getBargainRecordSummary() {
  30 + AppBargainRecordSummaryRespVO summary = new AppBargainRecordSummaryRespVO();
  31 + summary.setUserCount(1024);
  32 + summary.setSuccessRecords(new ArrayList<>());
  33 + AppBargainRecordSummaryRespVO.Record record1 = new AppBargainRecordSummaryRespVO.Record();
  34 + record1.setNickname("王**");
  35 + record1.setAvatar("https://www.iocoder.cn/xxx.jpg");
  36 + record1.setActivityName("天蚕土豆");
  37 + AppBargainRecordSummaryRespVO.Record record2 = new AppBargainRecordSummaryRespVO.Record();
  38 + record2.setNickname("张**");
  39 + record2.setAvatar("https://www.iocoder.cn/yyy.jpg");
  40 + record2.setActivityName("斗罗大陆");
  41 + summary.getSuccessRecords().add(record1);
  42 + summary.getSuccessRecords().add(record2);
  43 + return success(summary);
  44 + }
  45 +
  46 + @GetMapping("/get-detail")
  47 + @Operation(summary = "获得砍价记录的明细")
  48 + // TODO 芋艿：swagger；id 和 activityId 二选一
  49 + public CommonResult<AppBargainRecordDetailRespVO> getBargainRecordDetail(
  50 + @RequestParam(value = "id", required = false) Long id,
  51 + @RequestParam(value = "activityId", required = false) Long activityId) {
  52 + AppBargainRecordDetailRespVO detail = new AppBargainRecordDetailRespVO();
  53 + detail.setId(1L);
  54 + detail.setUserId(1L);
  55 + detail.setSpuId(1L);
  56 + detail.setSkuId(1L);
  57 + detail.setPrice(500);
  58 + detail.setActivityId(1L);
  59 + detail.setBargainPrice(150);
  60 + detail.setPrice(200);
  61 + detail.setPayPrice(180);
  62 + detail.setStatus(1);
  63 + detail.setAction(AppBargainRecordDetailRespVO.ACTION_SUCCESS);
  64 + detail.setExpireTime(LocalDateTimeUtils.addTime(Duration.ofDays(2)));
  65 + return success(detail);
  66 + }
  67 +
  68 +}
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/vo/activity/AppBargainActivityDetailRespVO.java 0 → 100644
  View file @b44ad3a
  1 +package cn.iocoder.yudao.module.promotion.controller.app.bargain.vo.activity;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +
  6 +import java.time.LocalDateTime;
  7 +
  8 +@Schema(description = "用户 App - 砍价活动的明细 Response VO")
  9 +@Data
  10 +public class AppBargainActivityDetailRespVO {
  11 +
  12 + @Schema(description = "砍价活动编号", required = true, example = "1024")
  13 + private Long id;
  14 +
  15 + @Schema(description = "砍价活动名称", required = true, example = "618 大砍价")
  16 + private String name;
  17 +
  18 + @Schema(description = "活动开始时间", required = true)
  19 + private LocalDateTime startTime;
  20 +
  21 + @Schema(description = "活动结束时间", required = true)
  22 + private LocalDateTime endTime;
  23 +
  24 + @Schema(description = "商品 SPU 编号", required = true, example = "2048")
  25 + private Long spuId;
  26 +
  27 + @Schema(description = "商品 SKU 编号", required = true, example = "1024")
  28 + private Long skuId;
  29 +
  30 + @Schema(description = "商品价格，单位：分", required = true, example = "100")
  31 + private Integer price;
  32 +
  33 + @Schema(description = "商品描述", required = true, example = "我要吃西红柿")
  34 + private String description;
  35 +
  36 + @Schema(description = "砍价库存", required = true, example = "512")
  37 + private Integer stock;
  38 +
  39 + @Schema(description = "商品图片", required = true, example = "4096") // 从 SPU 的 picUrl 读取
  40 + private String picUrl;
  41 +
  42 + @Schema(description = "商品市场价，单位：分", required = true, example = "50") // 从 SPU 的 marketPrice 读取
  43 + private Integer marketPrice;
  44 +
  45 + @Schema(description = "商品单位", required = true, example = "个") // 从 SPU 的 unit 读取，然后转换
  46 + private String unitName;
  47 +
  48 + @Schema(description = "砍价最低金额，单位：分", required = true, example = "100") // 从砍价商品里取最低价
  49 + private Integer bargainPrice;
  50 +
  51 + @Schema(description = "砍价成功数量", required = true, example = "100")
  52 + private Integer successCount;
  53 +
  54 +}
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/vo/activity/AppBargainActivityRespVO.java 0 → 100644
  View file @b44ad3a
  1 +package cn.iocoder.yudao.module.promotion.controller.app.bargain.vo.activity;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +
  6 +import java.time.LocalDateTime;
  7 +
  8 +@Schema(description = "用户 App - 砍价活动 Response VO")
  9 +@Data
  10 +public class AppBargainActivityRespVO {
  11 +
  12 + @Schema(description = "砍价活动编号", required = true, example = "1024")
  13 + private Long id;
  14 +
  15 + @Schema(description = "砍价活动名称", required = true, example = "618 大砍价")
  16 + private String name;
  17 +
  18 + @Schema(description = "活动开始时间", required = true)
  19 + private LocalDateTime startTime;
  20 +
  21 + @Schema(description = "活动结束时间", required = true)
  22 + private LocalDateTime endTime;
  23 +
  24 + @Schema(description = "商品 SPU 编号", required = true, example = "2048")
  25 + private Long spuId;
  26 +
  27 + @Schema(description = "商品 SKU 编号", required = true, example = "1024")
  28 + private Long skuId;
  29 +
  30 + @Schema(description = "砍价库存", required = true, example = "512")
  31 + private Integer stock;
  32 +
  33 + @Schema(description = "商品图片", required = true, example = "4096") // 从 SPU 的 picUrl 读取
  34 + private String picUrl;
  35 +
  36 + @Schema(description = "商品市场价，单位：分", required = true, example = "50") // 从 SPU 的 marketPrice 读取
  37 + private Integer marketPrice;
  38 +
  39 + @Schema(description = "砍价最低金额，单位：分", required = true, example = "100") // 从砍价商品里取最低价
  40 + private Integer bargainPrice;
  41 +
  42 +}
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/vo/record/AppBargainRecordDetailRespVO.java 0 → 100644
  View file @b44ad3a
  1 +package cn.iocoder.yudao.module.promotion.controller.app.bargain.vo.record;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +
  6 +import java.time.LocalDateTime;
  7 +
  8 +@Schema(description = "用户 App - 砍价记录的明细 Response VO")
  9 +@Data
  10 +public class AppBargainRecordDetailRespVO {
  11 +
  12 + public static final int ACTION_NONE = 1; // 参与动作 - 未参与，可参与
  13 + public static final int ACTION_WAITING = 2; // 参与动作 - 参与中，等待砍价
  14 + public static final int ACTION_SUCCESS = 3; // 参与动作 - 砍价成功，待下单
  15 + public static final int ACTION_ORDER_CREATE = 4; // 参与动作 - 已下单，未付款
  16 + public static final int ACTION_ORDER_PAY = 5; // 参与动作 - 已下单，已付款
  17 +
  18 + public static final int HELP_ACTION_NONE = 1; // 帮砍动作 - 未帮砍，可以帮砍
  19 + public static final int HELP_ACTION_FULL = 2; // 帮砍动作 - 未帮砍，无法帮砍（可帮砍次数已满)
  20 + public static final int HELP_ACTION_SUCCESS = 3; // 帮砍动作 - 已帮砍
  21 +
  22 + private Long id;
  23 + private Long userId;
  24 + private Long spuId;
  25 + private Long skuId;
  26 + private Long activityId;
  27 + private Integer bargainPrice;
  28 + private Integer price;
  29 + private Integer payPrice;
  30 + private Integer status;
  31 +
  32 + private LocalDateTime expireTime;
  33 +
  34 + private Long orderId; // 有且仅在自己的订单才返回
  35 +
  36 + private Integer action;
  37 + private Integer helpAction;
  38 +
  39 + // 【未参与】1-可以参与砍价：storeBargainUser 为空；
  40 + // 【未参与】2-参与次数已满：storeBargainUser 为空，但是砍价次数已满；storeBargainUser 非空已支付，但是砍价次数已满 TODO 芋艿：这个就不做了
  41 + // 【参与中】3-砍价中：storeBargainUser 非空，人数未满
  42 + // 【参与中】4-已完成：storeBargainUser 非空，未创建订单
  43 +
  44 + // 支付的情况；
  45 + // 8-已生成订单未支付：storeBargainUser 不为空（status = 3），但是订单未支付；
  46 + // 9-已支付：storeBargainUser 不为空（status = 3），且订单已支付；
  47 + // 10-取消支付：storeBargainUser 不为空（status = 3），取消支付；【可忽略】
  48 +
  49 + // help 的情况；
  50 + // 5-可以帮砍：和 3 对应；
  51 + // 6-已帮砍：其他人的，有帮砍过；
  52 + // 7-帮砍次数已满：其他人的，帮砍次数已满
  53 +
  54 +
  55 +}
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/vo/record/AppBargainRecordSummaryRespVO.java 0 → 100644
  View file @b44ad3a
  1 +package cn.iocoder.yudao.module.promotion.controller.app.bargain.vo.record;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +
  6 +import java.util.List;
  7 +
  8 +@Schema(description = "用户 App - 砍价记录的简要概括 Response VO")
  9 +@Data
  10 +public class AppBargainRecordSummaryRespVO {
  11 +
  12 + @Schema(description = "砍价用户数量", required = true, example = "1024")
  13 + private Integer userCount;
  14 +
  15 + @Schema(description = "成功砍价的记录", required = true) // 只返回最近的 7 个
  16 + private List<Record> successRecords;
  17 +
  18 + @Schema(description = "成功砍价记录")
  19 + @Data
  20 + public static class Record {
  21 +
  22 + @Schema(description = "用户昵称", required = true, example = "王**")
  23 + private String nickname;
  24 +
  25 + @Schema(description = "用户头像", required = true, example = "https://www.iocoder.cn/xxx.jpg")
  26 + private String avatar;
  27 +
  28 + @Schema(description = "活动名称", required = true, example = "天蚕土豆")
  29 + private String activityName;
  30 +
  31 + }
  32 +
  33 +}
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/AppCombinationRecordController.java
  View file @b44ad3a
@@ -29,9 +29,9 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; @@ -29,9 +29,9 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
29 public class AppCombinationRecordController { 29 public class AppCombinationRecordController {
30 30
31 @GetMapping("/get-summary") 31 @GetMapping("/get-summary")
32 - @Operation(summary = "获得拼团活动的概要信息", description = "用于小程序首页") 32 + @Operation(summary = "获得拼团记录的概要信息", description = "用于小程序首页")
33 // TODO 芋艿：增加 @Cache 缓存，1 分钟过期 33 // TODO 芋艿：增加 @Cache 缓存，1 分钟过期
34 - public CommonResult<AppCombinationRecordSummaryRespVO> getCombinationSummary() { 34 + public CommonResult<AppCombinationRecordSummaryRespVO> getCombinationRecordSummary() {
35 AppCombinationRecordSummaryRespVO summary = new AppCombinationRecordSummaryRespVO(); 35 AppCombinationRecordSummaryRespVO summary = new AppCombinationRecordSummaryRespVO();
36 summary.setUserCount(1024); 36 summary.setUserCount(1024);
37 summary.setAvatars(new ArrayList<>()); 37 summary.setAvatars(new ArrayList<>());