ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/constants/NotificationTypeConstant.java
@@ -9,4 +9,8 @@ String SECKILL = "seckill"; String GROUP_PURCHASE = "group_purchase"; String AUCTION_GOODS = "auction_goods"; String AUCTION_SALESROOM = "auction_salesroom"; String AUCTION_SALESROOM_GOODS = "auction_salesroom_goods"; } ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/AuctionCollectionDTO.java
@@ -22,4 +22,7 @@ @ApiModelProperty(value = "商品名称") private String goodsSkuName; @ApiModelProperty(value = "1是普通商品,2 团购商品,3 秒杀商品") private Integer type; } ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/AuctionSalesroomDTO.java
File was renamed from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/AuctionSalesroomGoodsDTO.java @@ -6,8 +6,8 @@ import lombok.Data; @Data @ApiModel(value = "拍卖商品数据传输对象", description = "拍卖商品数据传输对象") public class AuctionSalesroomGoodsDTO extends BasePage { @ApiModel(value = "拍卖场数据对象", description = "拍卖场数据对象") public class AuctionSalesroomDTO extends BasePage { @ApiModelProperty(value = "拍卖场id") private Long auctionSalesroomId; ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/judgeSensitiveWordsDTO.java
New file @@ -0,0 +1,12 @@ package com.ruoyi.system.api.domain.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data @ApiModel(value = "敏感词判断", description = "敏感词判断") public class judgeSensitiveWordsDTO { @ApiModelProperty(value = "输入文本") private String text; } ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/ForepartAuctionSalesroomGoodsVO.java
@@ -1,6 +1,7 @@ package com.ruoyi.system.api.domain.vo; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.core.enums.AuctionGoodsStatusEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -32,7 +33,7 @@ private Integer SalesroomType; @ApiModelProperty(value = "状态 0=预展中 1=拍卖中 2=已结束") private Integer goodsSkustatus; private AuctionGoodsStatusEnum goodsSkustatus; @ApiModelProperty(value = "拍卖时间(分钟)") private Integer listingDuration; ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/HomeGoodsSkuListVO.java
@@ -2,10 +2,12 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.ruoyi.common.core.enums.StartStatusEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; import java.time.LocalDateTime; @Data public class HomeGoodsSkuListVO { @@ -32,6 +34,25 @@ @ApiModelProperty(value = "是收藏 1未收藏,2收藏") private Integer isCollection; @ApiModelProperty(value = "1是普通商品,2 团购商品,3 秒杀商品") private Integer type; @ApiModelProperty(value = "开始状态 0=未开始 1= 已开始 2=已结束") private StartStatusEnum startStatus; @ApiModelProperty(value = "开始时间") private LocalDateTime startTime; @ApiModelProperty(value = "结束时间") private LocalDateTime endTime; @ApiModelProperty(value = " 销售价格") private BigDecimal xiaosPrice; } ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/judgeSensitiveWordsVO.java
New file @@ -0,0 +1,10 @@ package com.ruoyi.system.api.domain.vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data public class judgeSensitiveWordsVO { @ApiModelProperty(value = "1是有包含敏感词,2 没有") private Integer type; } ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartLogisticsController.java
New file @@ -0,0 +1,39 @@ package com.ruoyi.order.controller.forepart; import com.ruoyi.common.core.domain.R; import com.ruoyi.order.dto.MemberInvoiceDTO; import com.ruoyi.order.service.ILogisticsService; import com.ruoyi.order.service.impl.LogisticsServiceImpl; import com.ruoyi.system.api.domain.Logistics; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; /** * <p> * 物流公司 前端控制器 * </p> * * @author mitao * @since 2024-06-07 */ @RestController @RequestMapping("/forepart/logistics") @Api(value = "用户端-获取快递信息", tags = "用户端-获取快递信息", description = "用户端-获取快递信息") public class ForepartLogisticsController { @Resource private ILogisticsService iLogisticsService; @PostMapping("/getLogistics") @ApiOperation(value = "用户端-获取快递公司") public R<Logistics> getLogistics() { iLogisticsService.list(); return R.ok(); } }