ruoyi-modules/ruoyi-article/pom.xml
@@ -12,8 +12,8 @@ <artifactId>ruoyi-modules-article</artifactId> <properties> <maven.compiler.source>11</maven.compiler.source> <maven.compiler.target>11</maven.compiler.target> <maven.compiler.source>8</maven.compiler.source> <maven.compiler.target>8</maven.compiler.target> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> <description> ruoyi-modules/ruoyi-auction/pom.xml
@@ -12,8 +12,8 @@ <artifactId>ruoyi-modules-auction</artifactId> <properties> <maven.compiler.source>11</maven.compiler.source> <maven.compiler.target>11</maven.compiler.target> <maven.compiler.source>8</maven.compiler.source> <maven.compiler.target>8</maven.compiler.target> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> <description> ruoyi-modules/ruoyi-goods/pom.xml
@@ -12,8 +12,8 @@ <artifactId>ruoyi-modules-goods</artifactId> <properties> <maven.compiler.source>11</maven.compiler.source> <maven.compiler.target>11</maven.compiler.target> <maven.compiler.source>8</maven.compiler.source> <maven.compiler.target>8</maven.compiler.target> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> <description> ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/MgtGoodsGroupPurchaseController.java
@@ -58,7 +58,7 @@ */ @ApiOperation(value = "添加/编辑 团购商品", notes = "添加/编辑 团购商品") @PostMapping("/save") public R<Void> saveGoodsGroupPurchase(GoodsGroupPurchaseDTO dto) { public R<Void> saveGoodsGroupPurchase(@Validated @RequestBody GoodsGroupPurchaseDTO dto) { goodsGroupPurchaseService.saveGoodsGroupPurchase(dto); return R.ok(); } ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/dto/GoodsSkuInfoDTO.java
@@ -19,15 +19,15 @@ @ApiModelProperty(value = "商品id") @NotNull(message = "商品id不能为空") private Long goods_sku_id; private Long goodsSkuId; @ApiModelProperty(value = "秒杀价格") @NotNull(message = "秒杀价格不能为空") private BigDecimal skillPrice; private BigDecimal seckillPrice; @ApiModelProperty(value = "秒杀库存") @NotNull(message = "秒杀库存不能为空") private Integer skillStock; private Integer seckillStock; @ApiModelProperty(value = "限购数量") private Integer limitNumber; ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/vo/GoodsSeckillVO.java
@@ -1,5 +1,6 @@ package com.ruoyi.goods.controller.management.vo; import com.ruoyi.common.core.enums.ListingStatusEnum; import com.ruoyi.common.core.enums.StartStatusEnum; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -63,6 +64,9 @@ @ApiModelProperty(value = "开始状态 0=未开始 1= 已开始 2=已结束") private StartStatusEnum startStatus; @ApiModelProperty(value = "上架状态 0=已上架 1=已下架") private ListingStatusEnum listingStatus; @ApiModelProperty(value = "已购会员数") private Integer numberOfPurchasedMembers; } ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/vo/GoodsSkuVO.java
@@ -49,7 +49,7 @@ private Integer stock; @ApiModelProperty(value = "已售数量") private Integer soldQuantity; private Integer soldQuantity = 0; @ApiModelProperty(value = "单位") private String unit; ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSeckillServiceImpl.java
@@ -26,11 +26,14 @@ import com.ruoyi.goods.service.async.AsyncMethodService; import com.ruoyi.system.api.constants.DelayTaskEnum; import com.ruoyi.system.api.constants.NotificationTypeConstant; import com.ruoyi.system.api.domain.*; import com.ruoyi.system.api.domain.dto.AuctionGoodsListPageDTO; import com.ruoyi.system.api.domain.GoodsBrand; import com.ruoyi.system.api.domain.GoodsCategory; import com.ruoyi.system.api.domain.GoodsFlavorType; import com.ruoyi.system.api.domain.GoodsSeckill; import com.ruoyi.system.api.domain.GoodsSeries; import com.ruoyi.system.api.domain.GoodsSku; import com.ruoyi.system.api.domain.dto.HomeGoodsSkuDTO; import com.ruoyi.system.api.domain.dto.ListStatusDTO; import com.ruoyi.system.api.domain.vo.AuctionGoodsListVO; import com.ruoyi.system.api.domain.vo.HomeGoodsSeckillInfoVO; import com.ruoyi.system.api.domain.vo.HomeGoodsSeckillVO; import com.ruoyi.system.api.feignClient.GoodsSkuClient; @@ -39,10 +42,13 @@ import com.ruoyi.system.api.util.WebSocketUsers; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.*; import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Optional; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSkuServiceImpl.java
@@ -212,18 +212,23 @@ LambdaQueryWrapper<GoodsSeckill> queryWrapper =new LambdaQueryWrapper<>(); queryWrapper.eq(GoodsSeckill::getListingStatus, ListingStatusEnum.ON_SHELVES) .eq(GoodsSeckill::getGoodsSkuId, dto.getId()); GoodsSeckill goodsSeckill = goodsSeckillMapper.selectOne(queryWrapper); goodsSeckill.setListingStatus(ListingStatusEnum.REMOVED_FROM_THE_SHELF); goodsSeckillMapper.updateById(goodsSeckill); List<GoodsSeckill> goodsSeckillList = goodsSeckillMapper.selectList(queryWrapper); if (StringUtils.isNotNull(goodsSeckillList)) { for (GoodsSeckill goodsSeckill : goodsSeckillList) { goodsSeckill.setListingStatus(ListingStatusEnum.REMOVED_FROM_THE_SHELF); goodsSeckillMapper.updateById(goodsSeckill); } } LambdaQueryWrapper<GoodsGroupPurchase> queryWrapper1 =new LambdaQueryWrapper<>(); queryWrapper1.eq(GoodsGroupPurchase::getListingStatus, ListingStatusEnum.ON_SHELVES) .eq(GoodsGroupPurchase::getGoodsSkuId, dto.getId()); GoodsGroupPurchase goodsGroupPurchase = goodsGroupPurchaseMapper.selectOne(queryWrapper1); goodsGroupPurchase.setListingStatus(ListingStatusEnum.REMOVED_FROM_THE_SHELF); goodsGroupPurchaseMapper.updateById(goodsGroupPurchase); if (StringUtils.isNotNull(goodsGroupPurchase)) { goodsGroupPurchase.setListingStatus(ListingStatusEnum.REMOVED_FROM_THE_SHELF); goodsGroupPurchaseMapper.updateById(goodsGroupPurchase); } } /** ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/GoodsGroupPurchaseMapper.xml
@@ -6,13 +6,13 @@ resultType="com.ruoyi.goods.controller.management.vo.GoodsGroupPurchaseVO"> SELECT tgp.*, tgs.goods_sku_name tgs.sku_name AS goodsSkuName FROM t_goods_group_purchase tgp LEFT JOIN t_goods_sku tgs ON tgp.goods_sku_id = tgs.id <where> <if test="goodsSkuName != null and goodsSkuName != ''"> AND tgs.goods_sku_name LIKE CONCAT('%',#{goodsSkuName},'%') AND tgs.sku_name LIKE CONCAT('%',#{goodsSkuName},'%') </if> </where> </select> ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/GoodsSeckillMapper.xml
@@ -5,7 +5,7 @@ resultType="com.ruoyi.goods.controller.management.vo.GoodsSeckillVO"> SELECT gs.id, gsku.goods_sku_name, gsku.sku_name AS goodsSkuName, gs.seckill_price, gs.sold_quantity, gs.seckill_stock, @@ -15,13 +15,14 @@ gs.share_pic, gs.start_time, gs.end_time, gs.start_status gs.start_status, gs.listing_status FROM t_goods_seckill gs LEFT JOIN t_goods_sku gsku ON gs.goods_sku_id = gsku.id <where> <if test="goodsSkuName != null and goodsSkuName != ''"> AND gsku.goods_sku_name LIKE CONCAT('%',#{goodsSkuName},'%') AND gsku.sku_name LIKE CONCAT('%',#{goodsSkuName},'%') </if> </where> ORDER BY gs.create_time DESC ruoyi-modules/ruoyi-order/pom.xml
@@ -12,8 +12,8 @@ <artifactId>ruoyi-modules-order</artifactId> <properties> <maven.compiler.source>11</maven.compiler.source> <maven.compiler.target>11</maven.compiler.target> <maven.compiler.source>8</maven.compiler.source> <maven.compiler.target>8</maven.compiler.target> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> <description> ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java
@@ -3,10 +3,6 @@ import static com.ruoyi.order.util.tencent.WXPay.requestRefundService; import static com.ruoyi.order.util.tencent.WXPay.requestUnifiedorderService; import com.alipay.api.AlipayClient; import com.alipay.api.DefaultAlipayClient; import com.alipay.api.request.AlipayTradeRefundRequest; import com.alipay.api.response.AlipayTradeRefundResponse; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -24,7 +20,6 @@ import com.ruoyi.order.util.tencent.common.XMLParser; import com.ruoyi.order.util.tencent.protocol.AppPayReqData; import com.ruoyi.order.util.tencent.protocol.UnifiedorderReqData; import com.ruoyi.system.api.domain.dto.BondDTO; import com.ruoyi.system.api.domain.dto.RefundDTO; import com.ruoyi.system.api.feignClient.OrderClient; @@ -46,7 +41,6 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.springframework.stereotype.Service; /** ruoyi-modules/ruoyi-promotion/pom.xml
@@ -12,8 +12,8 @@ <artifactId>ruoyi-modules-promotion</artifactId> <properties> <maven.compiler.source>11</maven.compiler.source> <maven.compiler.target>11</maven.compiler.target> <maven.compiler.source>8</maven.compiler.source> <maven.compiler.target>8</maven.compiler.target> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> <description>
