!685 完善遗留的问题

Merge pull request !685 from puhui999/feature/mall_product

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/coupon/CouponTemplateApiImpl.java

@@ -0,0 +1,33 @@
+package cn.iocoder.yudao.module.promotion.api.coupon;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.iocoder.yudao.module.promotion.api.coupon.dto.CouponTemplateRespDTO;
+import cn.iocoder.yudao.module.promotion.convert.coupon.CouponTemplateConvert;
+import cn.iocoder.yudao.module.promotion.service.coupon.CouponTemplateService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * 优惠劵模版 API 接口实现类
+ *
+ * @author HUIHUI
+ */
+@Service
+public class CouponTemplateApiImpl implements CouponTemplateApi {
+
+    @Resource
+    private CouponTemplateService couponTemplateService;
+
+    @Override
+    public List<CouponTemplateRespDTO> getCouponTemplateListByIds(Collection<Long> ids) {
+        if (CollUtil.isEmpty(ids)) { // 防御一下
+            return Collections.emptyList();
+        }
+        return CouponTemplateConvert.INSTANCE.convertList(couponTemplateService.getCouponTemplateListByIds(ids));
+    }
+
+}

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/banner/vo/BannerBaseVO.java

@@ -27,6 +27,10 @@ public class BannerBaseVO {
     @NotNull(message = "图片地址不能为空")
     private String picUrl;
 
+    @Schema(description = "position", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "position 不能为空")
+    private Integer position;
+
     @Schema(description = "排序", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "排序不能为空")
     private Integer sort;

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/banner/vo/BannerPageReqVO.java

@@ -25,7 +25,6 @@ public class BannerPageReqVO extends PageParam {
     @Schema(description = "标题")
     private String title;
 
-
     @Schema(description = "状态")
     @InEnum(CommonStatusEnum.class)
     private Integer status;

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/article/AppArticleController.java

@@ -56,13 +56,11 @@ public class AppArticleController {
         return success(ArticleConvert.INSTANCE.convert01(articleService.getArticle(id)));
     }
 
-    // TODO @puhui999：add-browse-count 噢；前端 uniapp 也要接下；就是打开文章的时候，调用下这个接口；
-    @PutMapping("/add-browseCount")
+    @PutMapping("/add-browse-count")
     @Operation(summary = "增加文章浏览量")
     @Parameter(name = "id", description = "文章编号", example = "1024")
     public CommonResult<Boolean> addBrowseCount(@RequestParam("id") Long id) {
-        // TODO @puhui999：addArticleBrowseCount
-        articleService.addBrowseCount(id);
+        articleService.addArticleBrowseCount(id);
         return success(true);
     }
 

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/banner/AppBannerController.java

@@ -2,18 +2,23 @@ package cn.iocoder.yudao.module.promotion.controller.app.banner;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.module.promotion.controller.app.banner.vo.AppBannerRespVO;
+import cn.iocoder.yudao.module.promotion.convert.banner.BannerConvert;
+import cn.iocoder.yudao.module.promotion.dal.dataobject.banner.BannerDO;
+import cn.iocoder.yudao.module.promotion.service.banner.BannerService;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
 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.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
-import java.util.ArrayList;
+import javax.annotation.Resource;
+import java.time.Duration;
 import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.common.util.cache.CacheUtils.buildAsyncReloadingCache;
 
 @RestController
 @RequestMapping("/promotion/banner")
@@ -21,22 +26,39 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 @Validated
 public class AppBannerController {
 
+    @Resource
+    private BannerService bannerService;
+    /**
+     * {@link AppBannerRespVO} 缓存，通过它异步刷新 {@link #getBannerList0(Integer)} 所要的首页数据
+     */
+    private final LoadingCache<Integer, List<AppBannerRespVO>> bannerListCache = buildAsyncReloadingCache(Duration.ofSeconds(10L),
+            new CacheLoader<Integer, List<AppBannerRespVO>>() {
+
+                @Override
+                public List<AppBannerRespVO> load(Integer position) {
+                    return getBannerList0(position);
+                }
+
+            });
+
     @GetMapping("/list")
     @Operation(summary = "获得 banner 列表")
-    // todo @芋艿：swagger 注解，待补全
-    // TODO @芋艿：可以增加缓存，提升性能
-    // TODO @芋艿：position = 1 时，首页；position = 10 时，拼团活动页
+    @Parameter(name = "position", description = "Banner position", example = "1")
     public CommonResult<List<AppBannerRespVO>> getBannerList(@RequestParam("position") Integer position) {
-        List<AppBannerRespVO> bannerList = new ArrayList<>();
-        AppBannerRespVO banner1 = new AppBannerRespVO();
-        banner1.setUrl("https://www.example.com/link1");
-        banner1.setPicUrl("https://api.java.crmeb.net/crmebimage/public/content/2022/08/04/0f78716213f64bfa83f191d51a832cbf73f6axavoy.jpg");
-        bannerList.add(banner1);
-        AppBannerRespVO banner2 = new AppBannerRespVO();
-        banner2.setUrl("https://www.example.com/link2");
-        banner2.setPicUrl("https://api.java.crmeb.net/crmebimage/public/content/2023/01/11/be09e755268b43ee90b0db3a3e1b7132r7a6t2wvsm.jpg");
-        bannerList.add(banner2);
-        return success(bannerList);
+        return success(bannerListCache.getUnchecked(position));
+    }
+
+    private List<AppBannerRespVO> getBannerList0(Integer position) {
+        List<BannerDO> bannerList = bannerService.getBannerListByPosition(position);
+        return BannerConvert.INSTANCE.convertList01(bannerList);
+    }
+
+    @PutMapping("/add-browse-count")
+    @Operation(summary = "增加 Banner 点击量")
+    @Parameter(name = "id", description = "Banner 编号", example = "1024")
+    public CommonResult<Boolean> addBrowseCount(@RequestParam("id") Long id) {
+        bannerService.addBannerBrowseCount(id);
+        return success(true);
     }
 
 }

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/banner/vo/AppBannerRespVO.java

@@ -9,6 +9,13 @@ import javax.validation.constraints.NotNull;
 @Data
 public class AppBannerRespVO {
 
+    @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED)
+    private Long id;
+
+    @Schema(description = "标题", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "标题不能为空")
+    private String title;
+
     @Schema(description = "跳转链接", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "跳转链接不能为空")
     private String url;

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/banner/BannerConvert.java

@@ -4,6 +4,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.promotion.controller.admin.banner.vo.BannerCreateReqVO;
 import cn.iocoder.yudao.module.promotion.controller.admin.banner.vo.BannerRespVO;
 import cn.iocoder.yudao.module.promotion.controller.admin.banner.vo.BannerUpdateReqVO;
+import cn.iocoder.yudao.module.promotion.controller.app.banner.vo.AppBannerRespVO;
 import cn.iocoder.yudao.module.promotion.dal.dataobject.banner.BannerDO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
@@ -25,4 +26,6 @@ public interface BannerConvert {
 
     BannerDO convert(BannerUpdateReqVO updateReqVO);
 
+    List<AppBannerRespVO> convertList01(List<BannerDO> bannerList);
+
 }

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/coupon/CouponTemplateConvert.java

@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.promotion.convert.coupon;
 
 import cn.hutool.core.map.MapUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.promotion.api.coupon.dto.CouponTemplateRespDTO;
 import cn.iocoder.yudao.module.promotion.controller.admin.coupon.vo.template.CouponTemplateCreateReqVO;
 import cn.iocoder.yudao.module.promotion.controller.admin.coupon.vo.template.CouponTemplatePageReqVO;
 import cn.iocoder.yudao.module.promotion.controller.admin.coupon.vo.template.CouponTemplateRespVO;
@@ -58,4 +59,6 @@ public interface CouponTemplateConvert {
         }
     }
 
+    List<CouponTemplateRespDTO> convertList(List<CouponTemplateDO> list);
+
 }

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/banner/BannerDO.java

@@ -1,6 +1,8 @@
 package cn.iocoder.yudao.module.promotion.dal.dataobject.banner;
 
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.module.promotion.enums.banner.BannerPositionEnum;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
 
@@ -40,14 +42,25 @@ public class BannerDO extends BaseDO {
     private Integer sort;
 
     /**
-     * 状态 {@link cn.iocoder.yudao.framework.common.enums.CommonStatusEnum}
+     * 状态 {@link CommonStatusEnum}
      */
     private Integer status;
+
+    /**
+     * 定位 {@link BannerPositionEnum}
+     */
+    private Integer position;
+
     /**
      * 备注
      */
     private String memo;
 
-    // TODO 芋艿 点击次数。&& 其他数据相关
+    /**
+     * 点击次数
+     */
+    private Integer browseCount;
+
+    // TODO 芋艿 其他数据相关
 
 }

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/banner/BannerMapper.java

@@ -5,8 +5,11 @@ import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.promotion.controller.admin.banner.vo.BannerPageReqVO;
 import cn.iocoder.yudao.module.promotion.dal.dataobject.banner.BannerDO;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * Banner Mapper
  *
@@ -23,4 +26,14 @@ public interface BannerMapper extends BaseMapperX<BannerDO> {
                 .orderByDesc(BannerDO::getSort));
     }
 
+    default void updateBrowseCount(Long id) {
+        update(null, new LambdaUpdateWrapper<BannerDO>()
+                .eq(BannerDO::getId, id)
+                .setSql("browse_count = browse_count + 1"));
+    }
+
+    default List<BannerDO> selectBannerListByPosition(Integer position) {
+        return selectList(new LambdaQueryWrapperX<BannerDO>().eq(BannerDO::getPosition, position));
+    }
+
 }

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/bargain/BargainActivityMapper.java

@@ -86,7 +86,6 @@ public interface BargainActivityMapper extends BaseMapperX<BargainActivityDO> {
                 .last("LIMIT " + count));
     }
 
-    // TODO @puhui999：是不是返回 BargainActivityDO 更干净哈？分组后返回 DO 的话需要联表查询
     /**
      * 查询出指定 spuId 的 spu 参加的活动最接近现在的一条记录。多个的话，一个 spuId 对应一个最近的活动编号
      *
@@ -102,7 +101,6 @@ public interface BargainActivityMapper extends BaseMapperX<BargainActivityDO> {
                 .groupBy("spu_id"));
     }
 
-    // TODO @puhui999：是不是只要 endTime 小于就可以啦；
     /**
      * 获取指定活动编号的活动列表且
      * 开始时间和结束时间小于给定时间 dateTime 的活动列表
@@ -115,7 +113,7 @@ public interface BargainActivityMapper extends BaseMapperX<BargainActivityDO> {
         return selectList(new LambdaQueryWrapperX<BargainActivityDO>()
                 .in(BargainActivityDO::getId, ids)
                 .lt(BargainActivityDO::getStartTime, dateTime)
-                .lt(BargainActivityDO::getEndTime, dateTime)
+                .gt(BargainActivityDO::getEndTime, dateTime)// 开始时间 < 指定时间 < 结束时间，也就是说获取指定时间段的活动
                 .orderByDesc(BargainActivityDO::getCreateTime));
     }
 

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/combination/CombinationActivityMapper.java

@@ -71,7 +71,7 @@ public interface CombinationActivityMapper extends BaseMapperX<CombinationActivi
         return selectList(new LambdaQueryWrapperX<CombinationActivityDO>()
                 .in(CombinationActivityDO::getId, ids)
                 .lt(CombinationActivityDO::getStartTime, dateTime)
-                .lt(CombinationActivityDO::getEndTime, dateTime)
+                .gt(CombinationActivityDO::getEndTime, dateTime)// 开始时间 < 指定时间 < 结束时间，也就是说获取指定时间段的活动
                 .orderByDesc(CombinationActivityDO::getCreateTime));
     }
 

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/coupon/CouponTemplateMapper.java

@@ -8,10 +8,11 @@ import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.promotion.controller.admin.coupon.vo.template.CouponTemplatePageReqVO;
 import cn.iocoder.yudao.module.promotion.dal.dataobject.coupon.CouponTemplateDO;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
 
 import java.time.LocalDateTime;
+import java.util.Collection;
 import java.util.List;
 import java.util.function.Consumer;
 
@@ -39,7 +40,11 @@ public interface CouponTemplateMapper extends BaseMapperX<CouponTemplateDO> {
                 .orderByDesc(CouponTemplateDO::getId));
     }
 
-    void updateTakeCount(@Param("id") Long id, @Param("incrCount") Integer incrCount);
+    default void updateTakeCount(Long id, Integer incrCount) {
+        update(null, new LambdaUpdateWrapper<CouponTemplateDO>()
+                .eq(CouponTemplateDO::getId, id)
+                .setSql("take_count = take_count + " + incrCount));
+    }
 
     default List<CouponTemplateDO> selectListByTakeType(Integer takeType) {
         return selectList(CouponTemplateDO::getTakeType, takeType);
@@ -70,4 +75,8 @@ public interface CouponTemplateMapper extends BaseMapperX<CouponTemplateDO> {
         return canTakeConsumer;
     }
 
+    default List<CouponTemplateDO> selectListByIds(Collection<Long> ids) {
+        return selectList(new LambdaQueryWrapperX<CouponTemplateDO>().in(CouponTemplateDO::getId, ids));
+    }
+
 }

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/seckill/seckillactivity/SeckillActivityMapper.java

@@ -103,7 +103,7 @@ public interface SeckillActivityMapper extends BaseMapperX<SeckillActivityDO> {
         return selectList(new LambdaQueryWrapperX<SeckillActivityDO>()
                 .in(SeckillActivityDO::getId, ids)
                 .lt(SeckillActivityDO::getStartTime, dateTime)
-                .lt(SeckillActivityDO::getEndTime, dateTime)
+                .gt(SeckillActivityDO::getEndTime, dateTime)// 开始时间 < 指定时间 < 结束时间，也就是说获取指定时间段的活动
                 .orderByDesc(SeckillActivityDO::getCreateTime));
     }
 

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/article/ArticleService.java

@@ -93,6 +93,6 @@ public interface ArticleService {
      *
      * @param id 文章编号
      */
-    void addBrowseCount(Long id);
+    void addArticleBrowseCount(Long id);
 
 }

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/article/ArticleServiceImpl.java

@@ -111,7 +111,7 @@ public class ArticleServiceImpl implements ArticleService {
     }
 
     @Override
-    public void addBrowseCount(Long id) {
+    public void addArticleBrowseCount(Long id) {
         // 校验文章是否存在
         validateArticleExists(id);
         // 增加浏览次数

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/banner/BannerService.java

@@ -46,12 +46,6 @@ public interface BannerService {
      */
     BannerDO getBanner(Long id);
 
-    /**
-     * 获得所有 Banner列表
-     * @return Banner列表
-     */
-    List<BannerDO> getBannerList();
-
     /**
      * 获得 Banner 分页
      *
@@ -60,4 +54,19 @@ public interface BannerService {
      */
     PageResult<BannerDO> getBannerPage(BannerPageReqVO pageReqVO);
 
+    /**
+     * 增加 Banner 点击量
+     *
+     * @param id Banner编号
+     */
+    void addBannerBrowseCount(Long id);
+
+    /**
+     * 获得 Banner 列表
+     *
+     * @param position 定位
+     * @return Banner 列表
+     */
+    List<BannerDO> getBannerListByPosition(Integer position);
+
 }

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/banner/BannerServiceImpl.java

@@ -65,14 +65,22 @@ public class BannerServiceImpl implements BannerService {
         return bannerMapper.selectById(id);
     }
 
-    @Override
-    public List<BannerDO> getBannerList() {
-        return bannerMapper.selectList();
-    }
-
     @Override
     public PageResult<BannerDO> getBannerPage(BannerPageReqVO pageReqVO) {
         return bannerMapper.selectPage(pageReqVO);
     }
 
+    @Override
+    public void addBannerBrowseCount(Long id) {
+        // 校验 Banner 是否存在
+        validateBannerExists(id);
+        // 增加点击次数
+        bannerMapper.updateBrowseCount(id);
+    }
+
+    @Override
+    public List<BannerDO> getBannerListByPosition(Integer position) {
+        return bannerMapper.selectBannerListByPosition(position);
+    }
+
 }

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationRecordServiceImpl.java

@@ -369,8 +369,7 @@ public class CombinationRecordServiceImpl implements CombinationRecordService {
                     keyValue.setValue(keyValue.getValue() + 1);
                 }
             } catch (Exception ignored) { // 处理异常继续循环
-                // TODO @puhui999：拼团过期 or 虚拟成团 可以改成 expireCombinationRecord；因为找方法更容易一些；
-                log.error("[拼团过期 or 虚拟成团][record({}) 处理异常，请进行处理！record 数据是：{}]",
+                log.error("[expireCombinationRecord][record({}) 处理异常，请进行处理！record 数据是：{}]",
                         record.getId(), JsonUtils.toJsonString(record));
             }
         }

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponTemplateService.java

@@ -8,6 +8,7 @@ import cn.iocoder.yudao.module.promotion.dal.dataobject.coupon.CouponTemplateDO;
 import cn.iocoder.yudao.module.promotion.enums.coupon.CouponTakeTypeEnum;
 
 import javax.validation.Valid;
+import java.util.Collection;
 import java.util.List;
 
 /**
@@ -91,4 +92,12 @@ public interface CouponTemplateService {
     List<CouponTemplateDO> getCouponTemplateList(List<Integer> canTakeTypes, Integer productScope,
                                                  Long productScopeValue, Integer count);
 
+    /**
+     * 获得优惠券模版列表
+     *
+     * @param ids 优惠券模版编号
+     * @return 优惠券模版列表
+     */
+    List<CouponTemplateDO> getCouponTemplateListByIds(Collection<Long> ids);
+
 }

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponTemplateServiceImpl.java

@@ -16,6 +16,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
+import java.util.Collection;
 import java.util.List;
 import java.util.Objects;
 
@@ -126,4 +127,9 @@ public class CouponTemplateServiceImpl implements CouponTemplateService {
         return couponTemplateMapper.selectList(canTakeTypes, productScope, productScopeValue, count);
     }
 
+    @Override
+    public List<CouponTemplateDO> getCouponTemplateListByIds(Collection<Long> ids) {
+        return couponTemplateMapper.selectListByIds(ids);
+    }
+
 }

yudao-module-mall/yudao-module-promotion-biz/src/main/resources/mapper/coupon/CouponTemplateMapper.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.iocoder.yudao.module.promotion.dal.mysql.coupon.CouponTemplateMapper">
-
-    <update id="updateTakeCount">
-        UPDATE promotion_coupon_template
-        SET take_count = take_count + #{incrCount}
-        WHERE id = #{id}
-    </update>
-
-</mapper>