Merge remote-tracking branch 'origin/feature/mall_product' into brokerate

# Conflicts: # yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/common/PromotionTypeEnum.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderItemDO.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/bo/TradePriceCalculateRespBO.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradePriceCalculatorHelper.java # yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/user/dto/MemberUserRespDTO.java

Merge remote-tracking branch 'origin/feature/mall_product' into brokerate
# Conflicts: # yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/common/PromotionTypeEnum.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderItemDO.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/bo/TradePriceCalculateRespBO.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradePriceCalculatorHelper.java # yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/user/dto/MemberUserRespDTO.java
owen
2 parents 29b806e6 b4587fd7
Showing 73 changed files with 908 additions and 420 deletions
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/LocalDateTimeUtils.java
yudao-module-mall/yudao-module-product-biz/pom.xml
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/api/property/ProductPropertyValueApiImpl.java
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/ProductPropertyValueController.java
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/AppProductSpuController.java
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/spu/ProductSpuConvert.java
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/package-info.java
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/property/ProductPropertyValueServiceImpl.java
yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/api/bargain/BargainActivityApi.java
yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/api/seckill/SeckillActivityApi.java
yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/ErrorCodeConstants.java
yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/common/PromotionTypeEnum.java
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/seckill/SeckillActivityApiImpl.java
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/AppBargainActivityController.java
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/AppCombinationActivityController.java
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/vo/activity/AppCombinationActivityRespVO.java
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/seckill/AppSeckillActivityController.java
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/seckill/AppSeckillConfigController.java
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/seckill/vo/activity/AppSeckillActivityRespVO.java
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/bargain/BargainActivityConvert.java
@@ -43,17 +43,6 @@ public class LocalDateTimeUtils {
         return LocalDateTime.of(year, mouth, day, 0, 0, 0);
     }
-    /**
-     * 创建指定时间
-     *
-     * @param timeStr 时间字符串
-     * @return 指定时间
-     */
-    public static LocalDateTime buildTime(String timeStr) {
-        // TODO @puhui999：这个方法的实现，和 LocalDateTimeUtil.parse() 的差异点是啥呀
-        return LocalDateTime.of(LocalDate.now(), LocalTime.parse(timeStr));
-    }
-
     public static LocalDateTime[] buildBetweenTime(int year1, int mouth1, int day1,
                                                    int year2, int mouth2, int day2) {
         return new LocalDateTime[]{buildTime(year1, mouth1, day1), buildTime(year2, mouth2, day2)};
@@ -23,12 +23,6 @@
             <artifactId>yudao-module-product-api</artifactId>
             <version>${revision}</version>
         </dependency>
-        <!-- TODO 芋艿：看看~~~ -->
-        <dependency>
-            <groupId>cn.iocoder.boot</groupId>
-            <artifactId>yudao-module-trade-api</artifactId>
-            <version>${revision}</version>
-        </dependency>
         <dependency>
             <groupId>cn.iocoder.boot</groupId>
             <artifactId>yudao-module-member-api</artifactId>
 package cn.iocoder.yudao.module.product.api.property;
 import cn.iocoder.yudao.module.product.api.property.dto.ProductPropertyValueDetailRespDTO;
-import cn.iocoder.yudao.module.product.convert.propertyvalue.ProductPropertyValueConvert;
+import cn.iocoder.yudao.module.product.convert.property.ProductPropertyValueConvert;
 import cn.iocoder.yudao.module.product.service.property.ProductPropertyValueService;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 package cn.iocoder.yudao.module.product.controller.admin.property;
-import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.crypto.symmetric.AES;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.product.controller.admin.property.vo.value.ProductPropertyValueCreateReqVO;
 import cn.iocoder.yudao.module.product.controller.admin.property.vo.value.ProductPropertyValuePageReqVO;
 import cn.iocoder.yudao.module.product.controller.admin.property.vo.value.ProductPropertyValueRespVO;
 import cn.iocoder.yudao.module.product.controller.admin.property.vo.value.ProductPropertyValueUpdateReqVO;
-import cn.iocoder.yudao.module.product.convert.propertyvalue.ProductPropertyValueConvert;
+import cn.iocoder.yudao.module.product.convert.property.ProductPropertyValueConvert;
 import cn.iocoder.yudao.module.product.service.property.ProductPropertyValueService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -20,9 +18,6 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import javax.validation.Valid;
-import java.util.Arrays;
-import java.util.List;
-
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 @Tag(name = "管理后台 - 商品属性值")
 package cn.iocoder.yudao.module.product.controller.app.spu;
+import cn.hutool.core.collection.CollUtil;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.member.api.level.MemberLevelApi;
+import cn.iocoder.yudao.module.member.api.level.dto.MemberLevelRespDTO;
+import cn.iocoder.yudao.module.member.api.user.MemberUserApi;
+import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
 import cn.iocoder.yudao.module.product.controller.app.spu.vo.AppProductSpuDetailRespVO;
-import cn.iocoder.yudao.module.product.controller.app.spu.vo.AppProductSpuPageRespVO;
 import cn.iocoder.yudao.module.product.controller.app.spu.vo.AppProductSpuPageReqVO;
+import cn.iocoder.yudao.module.product.controller.app.spu.vo.AppProductSpuPageRespVO;
 import cn.iocoder.yudao.module.product.convert.spu.ProductSpuConvert;
 import cn.iocoder.yudao.module.product.dal.dataobject.sku.ProductSkuDO;
 import cn.iocoder.yudao.module.product.dal.dataobject.spu.ProductSpuDO;
@@ -23,10 +28,12 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
 import javax.validation.Valid;
+import java.util.Collections;
 import java.util.List;
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
 import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.SPU_NOT_ENABLE;
 import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.SPU_NOT_EXISTS;
@@ -41,6 +48,11 @@ public class AppProductSpuController {
     @Resource
     private ProductSkuService productSkuService;
+    @Resource
+    private MemberLevelApi memberLevelApi;
+    @Resource
+    private MemberUserApi memberUserApi;
+
     @GetMapping("/list")
     @Operation(summary = "获得商品 SPU 列表")
     @Parameters({
@@ -51,14 +63,32 @@ public class AppProductSpuController {
             @RequestParam("recommendType") String recommendType,
             @RequestParam(value = "count", defaultValue = "10") Integer count) {
         List<ProductSpuDO> list = productSpuService.getSpuList(recommendType, count);
-        return success(ProductSpuConvert.INSTANCE.convertListForGetSpuList(list));
+        if (CollUtil.isEmpty(list)) {
+            return success(Collections.emptyList());
+        }
+
+        // 拼接返回
+        List<AppProductSpuPageRespVO> voList = ProductSpuConvert.INSTANCE.convertListForGetSpuList(list);
+        // 处理 vip 价格
+        MemberLevelRespDTO memberLevel = getMemberLevel();
+        voList.forEach(vo -> vo.setVipPrice(calculateVipPrice(vo.getPrice(), memberLevel)));
+        return success(voList);
     }
     @GetMapping("/page")
     @Operation(summary = "获得商品 SPU 分页")
     public CommonResult<PageResult<AppProductSpuPageRespVO>> getSpuPage(@Valid AppProductSpuPageReqVO pageVO) {
         PageResult<ProductSpuDO> pageResult = productSpuService.getSpuPage(pageVO);
-        return success(ProductSpuConvert.INSTANCE.convertPageForGetSpuPage(pageResult));
+        if (CollUtil.isEmpty(pageResult.getList())) {
+            return success(PageResult.empty(pageResult.getTotal()));
+        }
+
+        // 拼接返回
+        PageResult<AppProductSpuPageRespVO> voPageResult = ProductSpuConvert.INSTANCE.convertPageForGetSpuPage(pageResult);
+        // 处理 vip 价格
+        MemberLevelRespDTO memberLevel = getMemberLevel();
+        voPageResult.getList().forEach(vo -> vo.setVipPrice(calculateVipPrice(vo.getPrice(), memberLevel)));
+        return success(voPageResult);
     }
     @GetMapping("/get-detail")
@@ -74,10 +104,40 @@ public class AppProductSpuController {
             throw exception(SPU_NOT_ENABLE);
         }
-        // 查询商品 SKU
+        // 拼接返回
         List<ProductSkuDO> skus = productSkuService.getSkuListBySpuId(spu.getId());
-        // 拼接
-        return success(ProductSpuConvert.INSTANCE.convertForGetSpuDetail(spu, skus));
+        AppProductSpuDetailRespVO detailVO = ProductSpuConvert.INSTANCE.convertForGetSpuDetail(spu, skus);
+        // 处理 vip 价格
+        MemberLevelRespDTO memberLevel = getMemberLevel();
+        detailVO.setVipPrice(calculateVipPrice(detailVO.getPrice(), memberLevel));
+        return success(detailVO);
+    }
+
+    private MemberLevelRespDTO getMemberLevel() {
+        Long userId = getLoginUserId();
+        if (userId == null) {
+            return null;
+        }
+        MemberUserRespDTO user = memberUserApi.getUser(userId);
+        if (user.getLevelId() == null || user.getLevelId() <= 0) {
+            return null;
+        }
+        return memberLevelApi.getMemberLevel(user.getLevelId());
+    }
+
+    /**
+     * 计算会员 VIP 优惠价格
+     *
+     * @param price 原价
+     * @param memberLevel 会员等级
+     * @return 优惠价格
+     */
+    public Integer calculateVipPrice(Integer price, MemberLevelRespDTO memberLevel) {
+        if (memberLevel == null || memberLevel.getDiscountPercent() == null) {
+            return 0;
+        }
+        Integer newPrice = price * memberLevel.getDiscountPercent() / 100;
+        return price - newPrice;
     }
 }
-package cn.iocoder.yudao.module.product.convert.propertyvalue;
+package cn.iocoder.yudao.module.product.convert.property;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
@@ -79,8 +79,6 @@ public interface ProductSpuConvert {
             ProductSpuDO spu = list.get(i);
             AppProductSpuPageRespVO spuVO = voList.get(i);
             spuVO.setUnitName(DictFrameworkUtils.getDictDataLabel(DictTypeConstants.PRODUCT_UNIT, spu.getUnit()));
-            // 计算 vip 价格 TODO 芋艿：临时的逻辑，等 vip 支持后
-            spuVO.setVipPrice((int) (spuVO.getPrice() * 0.9));
         }
         return voList;
     }
@@ -95,11 +93,6 @@ public interface ProductSpuConvert {
                 .setUnitName(DictFrameworkUtils.getDictDataLabel(DictTypeConstants.PRODUCT_UNIT, spu.getUnit()));
         // 处理 SKU
         spuVO.setSkus(convertListForGetSpuDetail(skus));
-        // 计算 vip 价格 TODO 芋艿：临时的逻辑，等 vip 支持后
-        if (true) {
-            spuVO.setVipPrice((int) (spuVO.getPrice() * 0.9));
-            spuVO.getSkus().forEach(sku -> sku.setVipPrice((int) (sku.getPrice() * 0.9)));
-        }
         return spuVO;
     }
 /**
- * trade 模块，主要实现交易相关功能
+ * product 模块，主要实现交易相关功能
  * 例如：订单、退款、购物车等功能。
  *
  * 1. Controller URL：以 /product/ 开头，避免和其它 Module 冲突
@@ -5,7 +5,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.product.controller.admin.property.vo.value.ProductPropertyValueCreateReqVO;
 import cn.iocoder.yudao.module.product.controller.admin.property.vo.value.ProductPropertyValuePageReqVO;
 import cn.iocoder.yudao.module.product.controller.admin.property.vo.value.ProductPropertyValueUpdateReqVO;
-import cn.iocoder.yudao.module.product.convert.propertyvalue.ProductPropertyValueConvert;
+import cn.iocoder.yudao.module.product.convert.property.ProductPropertyValueConvert;
 import cn.iocoder.yudao.module.product.dal.dataobject.property.ProductPropertyDO;
 import cn.iocoder.yudao.module.product.dal.dataobject.property.ProductPropertyValueDO;
 import cn.iocoder.yudao.module.product.dal.mysql.property.ProductPropertyValueMapper;
@@ -11,7 +11,7 @@ public interface BargainActivityApi {
      * 更新砍价活动库存
      *
      * @param id 砍价活动编号
-     * @param count      购买数量
+     * @param count 购买数量
      */
     void updateBargainActivityStock(Long id, Integer count);
@@ -7,14 +7,13 @@ package cn.iocoder.yudao.module.promotion.api.seckill;
  */
 public interface SeckillActivityApi {
-    // TODO @puhui999：activityId 改成 id 好点哈；
     /**
      * 更新秒杀库存
      *
-     * @param activityId 活动编号
+     * @param id 活动编号
      * @param skuId      sku 编号
      * @param count      数量
      */
-    void updateSeckillStock(Long activityId, Long skuId, Integer count);
+    void updateSeckillStock(Long id, Long skuId, Integer count);
 }
@@ -56,7 +56,6 @@ public interface ErrorCodeConstants {
     ErrorCode SECKILL_ACTIVITY_DELETE_FAIL_STATUS_NOT_CLOSED_OR_END = new ErrorCode(1013008004, "秒杀活动未关闭或未结束，不能删除");
     ErrorCode SECKILL_ACTIVITY_CLOSE_FAIL_STATUS_CLOSED = new ErrorCode(1013008005, "秒杀活动已关闭，不能重复关闭");
     ErrorCode SECKILL_ACTIVITY_UPDATE_STOCK_FAIL = new ErrorCode(1013008006, "秒杀失败，原因秒杀库存不足");
-    ErrorCode SECKILL_ACTIVITY_FAIL_STATUS_CLOSED = new ErrorCode(1013008007, "秒杀活动已关闭");
     // ========== 秒杀时段 1013009000 ==========
     ErrorCode SECKILL_CONFIG_NOT_EXISTS = new ErrorCode(1013009000, "秒杀时段不存在");
@@ -22,7 +22,7 @@ public enum PromotionTypeEnum implements IntArrayValuable {
     DISCOUNT_ACTIVITY(4, "限时折扣"),
     REWARD_ACTIVITY(5, "满减送"),
-    MEMBER(6, "会员折扣"),
+    MEMBER_LEVEL(6, "会员折扣"),
     COUPON(7, "优惠劵"),
     POINT(8, "积分")
     ;
@@ -17,8 +17,8 @@ public class SeckillActivityApiImpl implements SeckillActivityApi {
     private SeckillActivityService activityService;
     @Override
-    public void updateSeckillStock(Long activityId, Long skuId, Integer count) {
-        activityService.updateSeckillStock(activityId, skuId, count);
+    public void updateSeckillStock(Long id, Long skuId, Integer count) {
+        activityService.updateSeckillStock(id, skuId, count);
     }
 }
@@ -23,6 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
 import java.util.List;
+import static cn.hutool.core.util.ObjectUtil.defaultIfNull;
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
@@ -39,7 +40,7 @@ public class AppBargainActivityController {
     @GetMapping("/page")
     @Operation(summary = "获得砍价活动分页")
     public CommonResult<PageResult<AppBargainActivityRespVO>> getBargainActivityPage(PageParam pageReqVO) {
-        PageResult<BargainActivityDO> result = bargainActivityService.getBargainActivityPageForApp(pageReqVO);
+        PageResult<BargainActivityDO> result = bargainActivityService.getBargainActivityPage(pageReqVO);
         if (CollUtil.isEmpty(result.getList())) {
             return success(PageResult.empty(result.getTotal()));
         }
@@ -54,7 +55,7 @@ public class AppBargainActivityController {
     @Parameter(name = "count", description = "需要展示的数量", example = "6")
     public CommonResult<List<AppBargainActivityRespVO>> getBargainActivityList(
             @RequestParam(name = "count", defaultValue = "6") Integer count) {
-        List<BargainActivityDO> list = bargainActivityService.getBargainActivityListForApp(count);
+        List<BargainActivityDO> list = bargainActivityService.getBargainActivityListByCount(defaultIfNull(count, 6));
         if (CollUtil.isEmpty(list)) {
             return success(BargainActivityConvert.INSTANCE.convertAppList(list));
         }
 package cn.iocoder.yudao.module.promotion.controller.app.combination;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.product.api.spu.ProductSpuApi;
+import cn.iocoder.yudao.module.product.api.spu.dto.ProductSpuRespDTO;
 import cn.iocoder.yudao.module.promotion.controller.app.combination.vo.activity.AppCombinationActivityDetailRespVO;
 import cn.iocoder.yudao.module.promotion.controller.app.combination.vo.activity.AppCombinationActivityRespVO;
+import cn.iocoder.yudao.module.promotion.convert.combination.CombinationActivityConvert;
+import cn.iocoder.yudao.module.promotion.dal.dataobject.combination.CombinationActivityDO;
+import cn.iocoder.yudao.module.promotion.dal.dataobject.combination.CombinationProductDO;
+import cn.iocoder.yudao.module.promotion.service.combination.CombinationActivityService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -14,11 +23,13 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
+import javax.annotation.Resource;
+import java.util.Collections;
 import java.util.List;
+import static cn.hutool.core.util.ObjectUtil.defaultIfNull;
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
 @Tag(name = "用户 APP - 拼团活动")
 @RestController
@@ -26,104 +37,51 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 @Validated
 public class AppCombinationActivityController {
+    @Resource
+    private CombinationActivityService activityService;
+    @Resource
+    private ProductSpuApi spuApi;
+
+    // TODO 芋艿：增加 Spring Cache
     @GetMapping("/list")
     @Operation(summary = "获得拼团活动列表", description = "用于小程序首页")
-    // TODO 芋艿：增加 Spring Cache
-    // TODO 芋艿：缺少 swagger 注解
+    @Parameter(name = "count", description = "需要展示的数量", example = "6")
     public CommonResult<List<AppCombinationActivityRespVO>> getCombinationActivityList(
             @RequestParam(name = "count", defaultValue = "6") Integer count) {
-        List<AppCombinationActivityRespVO> activityList = new ArrayList<>();
-        AppCombinationActivityRespVO activity1 = new AppCombinationActivityRespVO();
-        activity1.setId(1L);
-        activity1.setName("618 大拼团");
-        activity1.setUserSize(3);
-        activity1.setSpuId(2048L);
-        activity1.setPicUrl("https://static.iocoder.cn/mall/a79f5d2ea6bf0c3c11b2127332dfe2df.jpg");
-        activity1.setMarketPrice(50);
-        activity1.setCombinationPrice(100);
-        activityList.add(activity1);
-
-        AppCombinationActivityRespVO activity2 = new AppCombinationActivityRespVO();
-        activity2.setId(2L);
-        activity2.setName("双十一拼团");
-        activity2.setUserSize(5);
-        activity2.setSpuId(4096L);
-        activity2.setPicUrl("https://static.iocoder.cn/mall/132.jpeg");
-        activity2.setMarketPrice(100);
-        activity2.setCombinationPrice(200);
-        activityList.add(activity2);
-
-        return success(activityList);
+        List<CombinationActivityDO> list = activityService.getCombinationActivityListByCount(defaultIfNull(count, 6));
+        if (CollUtil.isEmpty(list)) {
+            return success(Collections.emptyList());
+        }
+        // 拼接返回
+        List<ProductSpuRespDTO> spuList = spuApi.getSpuList(convertList(list, CombinationActivityDO::getSpuId));
+        return success(CombinationActivityConvert.INSTANCE.convertAppList(list, spuList));
     }
     @GetMapping("/page")
     @Operation(summary = "获得拼团活动分页")
     public CommonResult<PageResult<AppCombinationActivityRespVO>> getCombinationActivityPage(PageParam pageParam) {
-        List<AppCombinationActivityRespVO> activityList = new ArrayList<>();
-        AppCombinationActivityRespVO activity1 = new AppCombinationActivityRespVO();
-        activity1.setId(1L);
-        activity1.setName("618 大拼团");
-        activity1.setUserSize(3);
-        activity1.setSpuId(2048L);
-        activity1.setPicUrl("商品图片地址");
-        activity1.setMarketPrice(50);
-        activity1.setCombinationPrice(100);
-        activityList.add(activity1);
-
-        AppCombinationActivityRespVO activity2 = new AppCombinationActivityRespVO();
-        activity2.setId(2L);
-        activity2.setName("双十一拼团");
-        activity2.setUserSize(5);
-        activity2.setSpuId(4096L);
-        activity2.setPicUrl("商品图片地址");
-        activity2.setMarketPrice(100);
-        activity2.setCombinationPrice(200);
-        activityList.add(activity2);
-
-        return success(new PageResult<>(activityList, 2L));
+        PageResult<CombinationActivityDO> result = activityService.getCombinationActivityPage(pageParam);
+        if (CollUtil.isEmpty(result.getList())) {
+            return success(PageResult.empty(result.getTotal()));
+        }
+        // 拼接返回
+        List<ProductSpuRespDTO> spuList = spuApi.getSpuList(convertList(result.getList(), CombinationActivityDO::getSpuId));
+        return success(CombinationActivityConvert.INSTANCE.convertAppPage(result, spuList));
     }
     @GetMapping("/get-detail")
     @Operation(summary = "获得拼团活动明细")
     @Parameter(name = "id", description = "活动编号", required = true, example = "1024")
     public CommonResult<AppCombinationActivityDetailRespVO> getCombinationActivityDetail(@RequestParam("id") Long id) {
-        // TODO 芋艿：如果禁用的时候，需要抛出异常；
-        AppCombinationActivityDetailRespVO obj = new AppCombinationActivityDetailRespVO();
-        // 设置其属性的值
-        obj.setId(id);
-        obj.setName("晚九点限时秒杀");
-        obj.setStatus(1);
-        obj.setStartTime(LocalDateTime.of(2023, 6, 15, 0, 0, 0));
-        obj.setEndTime(LocalDateTime.of(2023, 6, 20, 23, 59, 0));
-        obj.setUserSize(2);
-        obj.setSuccessCount(100);
-        obj.setSpuId(633L);
-        obj.setSingleLimitCount(2);
-        obj.setTotalLimitCount(3);
-
-        // 创建一个Product对象的列表
-        List<AppCombinationActivityDetailRespVO.Product> productList = new ArrayList<>();
-        // 创建三个新的Product对象并设置其属性的值
-        AppCombinationActivityDetailRespVO.Product product1 = new AppCombinationActivityDetailRespVO.Product();
-        product1.setSkuId(1L);
-        product1.setCombinationPrice(100);
-        // 将第一个Product对象添加到列表中
-        productList.add(product1);
-        // 创建第二个Product对象并设置其属性的值
-        AppCombinationActivityDetailRespVO.Product product2 = new AppCombinationActivityDetailRespVO.Product();
-        product2.setSkuId(2L);
-        product2.setCombinationPrice(200);
-        // 将第二个Product对象添加到列表中
-        productList.add(product2);
-        // 创建第三个Product对象并设置其属性的值
-        AppCombinationActivityDetailRespVO.Product product3 = new AppCombinationActivityDetailRespVO.Product();
-        product3.setSkuId(3L);
-        product3.setCombinationPrice(300);
-        // 将第三个Product对象添加到列表中
-        productList.add(product3);
-        // 将Product列表设置为对象的属性值
-        obj.setProducts(productList);
-        return success(obj);
+        // 1、获取活动
+        CombinationActivityDO combinationActivity = activityService.getCombinationActivity(id);
+        if (combinationActivity == null
+            || ObjectUtil.equal(combinationActivity.getStatus(), CommonStatusEnum.DISABLE.getStatus())) {
+            return success(null);
+        }
+        // 2、获取活动商品
+        List<CombinationProductDO> products = activityService.getCombinationProductsByActivityId(combinationActivity.getId());
+        return success(CombinationActivityConvert.INSTANCE.convert3(combinationActivity, products));
     }
 }
@@ -28,7 +28,6 @@ public class AppCombinationActivityRespVO {
     private Integer marketPrice;
     @Schema(description = "拼团金额，单位：分", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
-    // 从拼团商品里取最低价
     private Integer combinationPrice;
 }
 package cn.iocoder.yudao.module.promotion.controller.app.seckill;
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
@@ -27,14 +28,10 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
-import java.util.Arrays;
 import java.util.List;
-import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
-import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.isBetween;
-import static cn.iocoder.yudao.module.promotion.enums.ErrorCodeConstants.SECKILL_ACTIVITY_FAIL_STATUS_CLOSED;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
 @Tag(name = "用户 App - 秒杀活动")
 @RestController
@@ -50,27 +47,21 @@ public class AppSeckillActivityController {
     @Resource
     private ProductSpuApi spuApi;
-    @GetMapping("/get-now")
-    @Operation(summary = "获得当前秒杀活动") // 提供给首页使用
     // TODO 芋艿：需要增加 spring cache
+    @GetMapping("/get-now")
+    @Operation(summary = "获得当前秒杀活动", description = "获取当前正在进行的活动，提供给首页使用")
     public CommonResult<AppSeckillActivityNowRespVO> getNowSeckillActivity() {
         // 1. 获取当前时间处在哪个秒杀阶段
-        // TODO @puhui999：可以考虑在 service 写个方法；这样 controller 不用关注过多逻辑
-        List<SeckillConfigDO> configList = configService.getSeckillConfigList();
-        SeckillConfigDO filteredConfig = findFirst(configList, config -> ObjectUtil.equal(config.getStatus(),
-                CommonStatusEnum.ENABLE.getStatus()) && isBetween(config.getStartTime(), config.getEndTime()));
-        if (filteredConfig == null) { // 时段不存在直接返回 null
+        SeckillConfigDO configList = configService.getSeckillConfigListByStatusOnCurrentTime(CommonStatusEnum.ENABLE.getStatus());
+        if (configList == null) { // 时段不存在直接返回 null
             return success(null);
         }
         // 2. 查询满足当前阶段的活动
-        // TODO @puhui999：最好直接返回开启的；不多查询数据
-        List<SeckillActivityDO> activityList = activityService.getSeckillActivityListByConfigIds(Arrays.asList(filteredConfig.getId()));
-        List<SeckillActivityDO> filteredList = filterList(activityList, item -> ObjectUtil.equal(item.getStatus(), CommonStatusEnum.ENABLE.getStatus()));
-
-        // 3. 拼接数据
-        List<ProductSpuRespDTO> spuList = spuApi.getSpuList(convertList(filteredList, SeckillActivityDO::getSpuId));
-        return success(SeckillActivityConvert.INSTANCE.convert(filteredConfig, filteredList, spuList));
+        List<SeckillActivityDO> activityList = activityService.getSeckillActivityListByConfigIdAndStatus(configList.getId(), CommonStatusEnum.ENABLE.getStatus());
+        // 3 获取 spu 信息
+        List<ProductSpuRespDTO> spuList = spuApi.getSpuList(convertList(activityList, SeckillActivityDO::getSpuId));
+        return success(SeckillActivityConvert.INSTANCE.convert(configList, activityList, spuList));
     }
     @GetMapping("/page")
@@ -78,7 +69,9 @@ public class AppSeckillActivityController {
     public CommonResult<PageResult<AppSeckillActivityRespVO>> getSeckillActivityPage(AppSeckillActivityPageReqVO pageReqVO) {
         // 1. 查询满足当前阶段的活动
         PageResult<SeckillActivityDO> pageResult = activityService.getSeckillActivityAppPageByConfigId(pageReqVO);
-
+        if (CollUtil.isEmpty(pageResult.getList())) {
+            return success(PageResult.empty(pageResult.getTotal()));
+        }
         // 2. 拼接数据
         List<ProductSpuRespDTO> spuList = spuApi.getSpuList(convertList(pageResult.getList(), SeckillActivityDO::getSpuId));
         return success(SeckillActivityConvert.INSTANCE.convertPage(pageResult, spuList));
@@ -88,28 +81,22 @@ public class AppSeckillActivityController {
     @Operation(summary = "获得秒杀活动明细")
     @Parameter(name = "id", description = "活动编号", required = true, example = "1024")
     public CommonResult<AppSeckillActivityDetailRespVO> getSeckillActivity(@RequestParam("id") Long id) {
-        // 1、获取当前时间处在哪个秒杀阶段
-        // TODO puhui999：这里，和 58 行是雷同的
-        List<SeckillConfigDO> configList = configService.getSeckillConfigList();
-        SeckillConfigDO filteredConfig = findFirst(configList, config -> ObjectUtil.equal(config.getStatus(),
-                CommonStatusEnum.ENABLE.getStatus()) && isBetween(config.getStartTime(), config.getEndTime()));
-        if (filteredConfig == null) { // 时段不存在直接返回 null
+        // 1. 获取当前时间处在哪个秒杀阶段
+        SeckillConfigDO configList = configService.getSeckillConfigListByStatusOnCurrentTime(CommonStatusEnum.ENABLE.getStatus());
+        if (configList == null) { // 时段不存在直接返回 null
             return success(null);
         }
         // 2. 获取活动
         SeckillActivityDO seckillActivity = activityService.getSeckillActivity(id);
-        if (seckillActivity == null) {
+        if (seckillActivity == null
+                || ObjectUtil.equal(seckillActivity.getStatus(), CommonStatusEnum.DISABLE.getStatus())) {
             return success(null);
         }
-        // TODO 芋艿：如果禁用的时候，需要抛出异常；
-        if (ObjectUtil.equal(seckillActivity.getStatus(), CommonStatusEnum.DISABLE.getStatus())) {
-            throw exception(SECKILL_ACTIVITY_FAIL_STATUS_CLOSED);
-        }
         // 3. 拼接数据
-        List<SeckillProductDO> products = activityService.getSeckillProductListByActivityId(seckillActivity.getId());
-        return success(SeckillActivityConvert.INSTANCE.convert3(seckillActivity, products, filteredConfig));
+        List<SeckillProductDO> productList = activityService.getSeckillProductListByActivityId(seckillActivity.getId());
+        return success(SeckillActivityConvert.INSTANCE.convert3(seckillActivity, productList, configList));
     }
 }
 package cn.iocoder.yudao.module.promotion.controller.app.seckill;
-import cn.hutool.core.collection.CollectionUtil;
 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.module.promotion.controller.app.seckill.vo.config.AppSeckillConfigRespVO;
 import cn.iocoder.yudao.module.promotion.convert.seckill.seckillconfig.SeckillConfigConvert;
-import cn.iocoder.yudao.module.promotion.dal.dataobject.seckill.seckillconfig.SeckillConfigDO;
 import cn.iocoder.yudao.module.promotion.service.seckill.SeckillConfigService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -15,7 +13,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
-import java.util.Collections;
 import java.util.List;
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@@ -31,13 +28,8 @@ public class AppSeckillConfigController {
     @GetMapping("/list")
     @Operation(summary = "获得秒杀时间段列表")
     public CommonResult<List<AppSeckillConfigRespVO>> getSeckillConfigList() {
-        List<SeckillConfigDO> list = configService.getSeckillConfigListByStatus(CommonStatusEnum.ENABLE.getStatus());
-        // TODO @puhui999：如果这种，不用判空也问题不大；
-        if (CollectionUtil.isEmpty(list)) {
-            return success(Collections.emptyList());
-        }
-
-        return success(SeckillConfigConvert.INSTANCE.convertList2(list));
+        return success(SeckillConfigConvert.INSTANCE.convertList2(
+                configService.getSeckillConfigListByStatus(CommonStatusEnum.ENABLE.getStatus())));
     }
 }
@@ -25,6 +25,9 @@ public class AppSeckillActivityRespVO {
     // 从 SPU 的 marketPrice 读取
     private Integer marketPrice;
+    @Schema(description = "秒杀活动状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    private Integer status;
+
     @Schema(description = "秒杀库存（剩余）", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
     private Integer stock;
     @Schema(description = "秒杀库存（总共）", requiredMode = Schema.RequiredMode.REQUIRED, example = "200")
@@ -46,9 +46,7 @@ public interface BargainActivityConvert {
         Map<Long, ProductSpuRespDTO> spuMap = convertMap(spuList, ProductSpuRespDTO::getId);
         List<BargainActivityRespVO> list = CollectionUtils.convertList(result.getList(), item -> {
             findAndThen(spuMap, item.getSpuId(), spu -> {
-                // TODO @puhui999：这里可以使用链式哈
-                item.setPicUrl(spu.getPicUrl());
-                item.setSpuName(spu.getName());
+                item.setPicUrl(spu.getPicUrl()).setSpuName(spu.getName());
             });
             return item;
         });
@@ -75,11 +73,7 @@ public interface BargainActivityConvert {
         // 拼接关联属性
         Map<Long, ProductSpuRespDTO> spuMap = convertMap(spuList, ProductSpuRespDTO::getId);
         List<AppBargainActivityRespVO> list = CollectionUtils.convertList(result.getList(), item -> {
-            findAndThen(spuMap, item.getSpuId(), spu -> {
-                // TODO @puhui999：这里可以使用链式哈
-                item.setPicUrl(spu.getPicUrl());
-                item.setMarketPrice(spu.getMarketPrice());
-            });
+            findAndThen(spuMap, item.getSpuId(), spu -> item.setPicUrl(spu.getPicUrl()).setMarketPrice(spu.getMarketPrice()));
             return item;
         });
         result.setList(list);
@@ -92,11 +86,7 @@ public interface BargainActivityConvert {
         List<AppBargainActivityRespVO> activityList = convertAppList(list);
         Map<Long, ProductSpuRespDTO> spuMap = convertMap(spuList, ProductSpuRespDTO::getId);
         return CollectionUtils.convertList(activityList, item -> {
-            findAndThen(spuMap, item.getSpuId(), spu -> {
-                // TODO @puhui999：这里可以使用链式哈
-                item.setPicUrl(spu.getPicUrl());
-                item.setMarketPrice(spu.getMarketPrice());
-            });
+            findAndThen(spuMap, item.getSpuId(), spu -> item.setPicUrl(spu.getPicUrl()).setMarketPrice(spu.getMarketPrice()));
             return item;
         });
     }
@@ -13,6 +13,8 @@ import cn.iocoder.yudao.module.promotion.controller.admin.combination.vo.activit
 import cn.iocoder.yudao.module.promotion.controller.admin.combination.vo.activity.CombinationActivityUpdateReqVO;
 import cn.iocoder.yudao.module.promotion.controller.admin.combination.vo.product.CombinationProductBaseVO;
 import cn.iocoder.yudao.module.promotion.controller.admin.combination.vo.product.CombinationProductRespVO;
+import cn.iocoder.yudao.module.promotion.controller.app.combination.vo.activity.AppCombinationActivityDetailRespVO;
+import cn.iocoder.yudao.module.promotion.controller.app.combination.vo.activity.AppCombinationActivityRespVO;
 import cn.iocoder.yudao.module.promotion.dal.dataobject.combination.CombinationActivityDO;
 import cn.iocoder.yudao.module.promotion.dal.dataobject.combination.CombinationProductDO;
 import cn.iocoder.yudao.module.promotion.dal.dataobject.combination.CombinationRecordDO;
@@ -25,6 +27,7 @@ import java.util.List;
 import java.util.Map;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap;
+import static cn.iocoder.yudao.framework.common.util.collection.MapUtils.findAndThen;
 /**
  * 拼团活动 Convert
@@ -58,10 +61,7 @@ public interface CombinationActivityConvert {
         Map<Long, ProductSpuRespDTO> spuMap = convertMap(spuList, ProductSpuRespDTO::getId);
         PageResult<CombinationActivityRespVO> pageResult = convertPage(page);
         pageResult.getList().forEach(item -> {
-            MapUtils.findAndThen(spuMap, item.getSpuId(), spu -> {
-                item.setSpuName(spu.getName());
-                item.setPicUrl(spu.getPicUrl());
-            });
+            MapUtils.findAndThen(spuMap, item.getSpuId(), spu -> item.setSpuName(spu.getName()).setPicUrl(spu.getPicUrl()));
             item.setProducts(convertList2(productList));
         });
         return pageResult;
@@ -97,18 +97,51 @@ public interface CombinationActivityConvert {
     default CombinationRecordDO convert(CombinationRecordCreateReqDTO reqDTO,
                                         CombinationActivityDO activity, MemberUserRespDTO user,
                                         ProductSpuRespDTO spu, ProductSkuRespDTO sku) {
-        // TODO @puhui999：搞成链式的 set；这样会更规整一点；
-        CombinationRecordDO record = convert(reqDTO);
-        record.setVirtualGroup(false);
-        record.setExpireTime(record.getStartTime().plusHours(activity.getLimitDuration()));
-        record.setUserSize(activity.getUserSize());
-        record.setNickname(user.getNickname());
-        record.setAvatar(user.getAvatar());
-        record.setSpuName(spu.getName());
-        record.setPicUrl(sku.getPicUrl());
-        return record;
+        // TODO @puhui999：订单付款后需要设置开始时间和结束时间；
+        return convert(reqDTO)
+                .setVirtualGroup(false)
+                .setExpireTime(activity.getStartTime().plusHours(activity.getLimitDuration()))
+                .setUserSize(activity.getUserSize())
+                .setNickname(user.getNickname())
+                .setAvatar(user.getAvatar())
+                .setSpuName(spu.getName())
+                .setPicUrl(sku.getPicUrl());
     }
     List<CombinationRecordRespDTO> convert(List<CombinationRecordDO> bean);
+    List<AppCombinationActivityRespVO> convertAppList(List<CombinationActivityDO> list);
+
+    default List<AppCombinationActivityRespVO> convertAppList(List<CombinationActivityDO> list, List<ProductSpuRespDTO> spuList) {
+        List<AppCombinationActivityRespVO> activityList = convertAppList(list);
+        Map<Long, ProductSpuRespDTO> spuMap = convertMap(spuList, ProductSpuRespDTO::getId);
+        return CollectionUtils.convertList(activityList, item -> {
+            findAndThen(spuMap, item.getSpuId(), spu -> item.setPicUrl(spu.getPicUrl()).setMarketPrice(spu.getMarketPrice()));
+            return item;
+        });
+    }
+
+    PageResult<AppCombinationActivityRespVO> convertAppPage(PageResult<CombinationActivityDO> result);
+
+    default PageResult<AppCombinationActivityRespVO> convertAppPage(PageResult<CombinationActivityDO> result, List<ProductSpuRespDTO> spuList) {
+        PageResult<AppCombinationActivityRespVO> appPage = convertAppPage(result);
+        Map<Long, ProductSpuRespDTO> spuMap = convertMap(spuList, ProductSpuRespDTO::getId);
+        List<AppCombinationActivityRespVO> list = CollectionUtils.convertList(appPage.getList(), item -> {
+            findAndThen(spuMap, item.getSpuId(), spu -> {
+                item.setPicUrl(spu.getPicUrl()).setMarketPrice(spu.getMarketPrice());
+            });
+            return item;
+        });
+        appPage.setList(list);
+        return appPage;
+    }
+
+    AppCombinationActivityDetailRespVO convert2(CombinationActivityDO combinationActivity);
+
+    List<AppCombinationActivityDetailRespVO.Product> convertList1(List<CombinationProductDO> products);
+
+    default AppCombinationActivityDetailRespVO convert3(CombinationActivityDO combinationActivity, List<CombinationProductDO> products) {
+        return convert2(combinationActivity).setProducts(convertList1(products));
+    }
+
 }
 package cn.iocoder.yudao.module.promotion.convert.seckill.seckillactivity;
+import cn.hutool.core.date.LocalDateTimeUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
 import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
@@ -29,7 +30,6 @@ import java.util.Map;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap;
 import static cn.iocoder.yudao.framework.common.util.collection.MapUtils.findAndThen;
-import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildTime;
 /**
  * 秒杀活动 Convert
@@ -98,10 +98,9 @@ public interface SeckillActivityConvert {
         Map<Long, ProductSpuRespDTO> spuMap = convertMap(spuList, ProductSpuRespDTO::getId);
         respVO.setActivities(CollectionUtils.convertList(convertList3(activityList), item -> {
             findAndThen(spuMap, item.getSpuId(), spu -> {
-                // TODO @puhui999：可以尝试链式 set 哈；
-                item.setPicUrl(spu.getPicUrl());
-                item.setMarketPrice(spu.getMarketPrice());
-                item.setUnitName(DictFrameworkUtils.getDictDataLabel(DictTypeConstants.PRODUCT_UNIT, spu.getUnit()));
+                item.setPicUrl(spu.getPicUrl())
+                        .setMarketPrice(spu.getMarketPrice())
+                        .setUnitName(DictFrameworkUtils.getDictDataLabel(DictTypeConstants.PRODUCT_UNIT, spu.getUnit()));
             });
             return item;
         }));
@@ -114,12 +113,8 @@ public interface SeckillActivityConvert {
         PageResult<AppSeckillActivityRespVO> result = convertPage1(pageResult);
         Map<Long, ProductSpuRespDTO> spuMap = convertMap(spuList, ProductSpuRespDTO::getId);
         List<AppSeckillActivityRespVO> list = CollectionUtils.convertList(result.getList(), item -> {
-            findAndThen(spuMap, item.getSpuId(), spu -> {
-                // TODO @puhui999：可以尝试链式 set 哈；
-                item.setPicUrl(spu.getPicUrl());
-                item.setMarketPrice(spu.getMarketPrice());
-                item.setUnitName(DictFrameworkUtils.getDictDataLabel(DictTypeConstants.PRODUCT_UNIT, spu.getUnit()));
-            });
+            findAndThen(spuMap, item.getSpuId(), spu -> item.setPicUrl(spu.getPicUrl()).setMarketPrice(spu.getMarketPrice())
+                    .setUnitName(DictFrameworkUtils.getDictDataLabel(DictTypeConstants.PRODUCT_UNIT, spu.getUnit())));
             return item;
         });
         result.setList(list);
@@ -131,12 +126,13 @@ public interface SeckillActivityConvert {
     List<AppSeckillActivityDetailRespVO.Product> convertList1(List<SeckillProductDO> products);
     default AppSeckillActivityDetailRespVO convert3(SeckillActivityDO seckillActivity, List<SeckillProductDO> products, SeckillConfigDO filteredConfig) {
-        AppSeckillActivityDetailRespVO respVO = convert2(seckillActivity);
-        respVO.setProducts(convertList1(products));
-        // TODO @puhui999：可以尝试链式 set 哈；
-        respVO.setStartTime(buildTime(filteredConfig.getStartTime()));
-        respVO.setEndTime(buildTime(filteredConfig.getEndTime()));
-        return respVO;
+        return convert2(seckillActivity)
+                .setProducts(convertList1(products))
+                // TODO @puhui999：要不要在里面 default 一个方法，处理这个事件；简洁一点；
+                .setStartTime(LocalDateTimeUtil.parse(LocalDateTimeUtil.format(seckillActivity.getStartTime(), "yyyy-MM-dd") + " " + filteredConfig.getStartTime(),
+                        "yyyy-MM-dd HH:mm:ss")) // 活动开始日期和时段结合
+                .setEndTime(LocalDateTimeUtil.parse(LocalDateTimeUtil.format(seckillActivity.getEndTime(), "yyyy-MM-dd") + " " + filteredConfig.getEndTime(),
+                        "yyyy-MM-dd HH:mm:ss")); // 活动结束日期和时段结合
     }
 }
@@ -38,18 +38,41 @@ public interface BargainActivityMapper extends BaseMapperX&lt;BargainActivityDO&gt; {
      * @param count 扣减的库存数量
      * @return 影响的行数
      */
-    default int updateActivityStock(Long id, int count) {
+    default int updateStock(Long id, int count) {
         return update(null, new LambdaUpdateWrapper<BargainActivityDO>()
                 .eq(BargainActivityDO::getId, id)
                 .ge(BargainActivityDO::getStock, count)
                 .setSql("stock = stock - " + count));
     }
-    default PageResult<BargainActivityDO> selectAppPage(PageParam pageReqVO, Integer status, LocalDateTime now) {
+    /**
+     * 查询处在 now 日期时间且是 status 状态的活动分页
+     *
+     * @param pageReqVO 分页参数
+     * @param status    状态
+     * @param now       当前日期时间
+     * @return 活动分页
+     */
+    default PageResult<BargainActivityDO> selectPage(PageParam pageReqVO, Integer status, LocalDateTime now) {
         return selectPage(pageReqVO, new LambdaQueryWrapperX<BargainActivityDO>()
                 .eq(BargainActivityDO::getStatus, status)
                 .le(BargainActivityDO::getStartTime, now)
                 .ge(BargainActivityDO::getEndTime, now));
     }
+    /**
+     * 查询处在 now 日期时间且是 status 状态的活动分页
+     *
+     * @param status 状态
+     * @param now    当前日期时间
+     * @return 活动分页
+     */
+    default List<BargainActivityDO> selectList(Integer count, Integer status, LocalDateTime now) {
+        return selectList(new LambdaQueryWrapperX<BargainActivityDO>()
+                .eq(BargainActivityDO::getStatus, status)
+                .le(BargainActivityDO::getStartTime, now)
+                .ge(BargainActivityDO::getEndTime, now)
+                .last("LIMIT " + count));
+    }
+
 }
 package cn.iocoder.yudao.module.promotion.dal.mysql.combination;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
@@ -28,4 +29,15 @@ public interface CombinationActivityMapper extends BaseMapperX&lt;CombinationActivi
         return selectList(CombinationActivityDO::getStatus, status);
     }
+    default PageResult<CombinationActivityDO> selectPage(PageParam pageParam, Integer status) {
+        return selectPage(pageParam, new LambdaQueryWrapperX<CombinationActivityDO>()
+                .eq(CombinationActivityDO::getStatus, status));
+    }
+
+    default List<CombinationActivityDO> selectListByStatus(Integer status, Integer count) {
+        return selectList(new LambdaQueryWrapperX<CombinationActivityDO>()
+                .eq(CombinationActivityDO::getStatus, status)
+                .last("LIMIT " + count));
+    }
+
 }
@@ -41,7 +41,7 @@ public interface SeckillActivityMapper extends BaseMapperX&lt;SeckillActivityDO&gt; {
      * @param count 扣减的库存数量
      * @return 影响的行数
      */
-    default int updateActivityStock(Long id, int count) {
+    default int updateStock(Long id, int count) {
         return update(null, new LambdaUpdateWrapper<SeckillActivityDO>()
                 .eq(SeckillActivityDO::getId, id)
                 .gt(SeckillActivityDO::getTotalStock, 0)
@@ -16,8 +16,13 @@ import java.util.List;
 @Mapper
 public interface SeckillProductMapper extends BaseMapperX<SeckillProductDO> {
-    default List<SeckillProductDO> selectListByActivityId(Long id) {
-        return selectList(SeckillProductDO::getActivityId, id);
+    default List<SeckillProductDO> selectListByActivityId(Long activityId) {
+        return selectList(SeckillProductDO::getActivityId, activityId);
+    }
+
+    default SeckillProductDO selectByActivityIdAndSkuId(Long activityId, Long skuId) {
+        return selectOne(SeckillProductDO::getActivityId, activityId,
+                SeckillProductDO::getSkuId, skuId);
     }
     default List<SeckillProductDO> selectListByActivityId(Collection<Long> ids) {
@@ -31,7 +36,7 @@ public interface SeckillProductMapper extends BaseMapperX&lt;SeckillProductDO&gt; {
      * @param count 扣减的库存数量
      * @return 影响的行数
      */
-    default int updateActivityStock(Long id, int count) {
+    default int updateStock(Long id, int count) {
         return update(null, new LambdaUpdateWrapper<SeckillProductDO>()
                 .eq(SeckillProductDO::getId, id)
                 .gt(SeckillProductDO::getStock, count)
@@ -63,22 +63,20 @@ public interface BargainActivityService {
      */
     PageResult<BargainActivityDO> getBargainActivityPage(BargainActivityPageReqVO pageReqVO);
-    // TODO @puhui999：这里可以改成进行中的活动；尽量避免专门为 app 定制，或者类似的名字哈；mapper 那也是
-
     /**
-     * 获取 APP 端活动分页数据
+     * 获取正在进行的活动分页数据
      *
      * @param pageReqVO 分页请求
      * @return 砍价活动分页
      */
-    PageResult<BargainActivityDO> getBargainActivityPageForApp(PageParam pageReqVO);
+    PageResult<BargainActivityDO> getBargainActivityPage(PageParam pageReqVO);
     /**
-     * 获取 APP 端活动展示数据
+     * 获取正在进行的活动分页数据
      *
      * @param count 需要的数量
      * @return 砍价活动分页
      */
-    List<BargainActivityDO> getBargainActivityListForApp(Integer count);
+    List<BargainActivityDO> getBargainActivityListByCount(Integer count);
 }
@@ -75,16 +75,18 @@ public class BargainActivityServiceImpl implements BargainActivityService {
     }
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public void updateBargainActivityStock(Long id, Integer count) {
         // 查询砍价活动
         BargainActivityDO activity = getBargainActivity(id);
         if (activity == null) {
             throw exception(BARGAIN_ACTIVITY_NOT_EXISTS);
         }
+        if (count > activity.getStock()) {
+            throw exception(BARGAIN_ACTIVITY_UPDATE_STOCK_FAIL);
+        }
         // 更新砍价库存
-        int updateCount = bargainActivityMapper.updateActivityStock(id, count);
+        int updateCount = bargainActivityMapper.updateStock(id, count);
         if (updateCount == 0) {
             throw exception(BARGAIN_ACTIVITY_UPDATE_STOCK_FAIL);
         }
@@ -114,7 +116,7 @@ public class BargainActivityServiceImpl implements BargainActivityService {
     public void deleteBargainActivity(Long id) {
         // 校验存在
         BargainActivityDO activityDO = validateBargainActivityExists(id);
-        // 校验状态
+        // 校验状态 TODO puhui: 测试完成后需要恢复校验
         //if (ObjectUtil.equal(activityDO.getStatus(), CommonStatusEnum.ENABLE.getStatus())) {
         //    throw exception(BARGAIN_ACTIVITY_DELETE_FAIL_STATUS_NOT_CLOSED_OR_END);
         //}
@@ -142,21 +144,14 @@ public class BargainActivityServiceImpl implements BargainActivityService {
     }
     @Override
-    public PageResult<BargainActivityDO> getBargainActivityPageForApp(PageParam pageReqVO) {
+    public PageResult<BargainActivityDO> getBargainActivityPage(PageParam pageReqVO) {
         // 只查询进行中，且在时间范围内的
-        return bargainActivityMapper.selectAppPage(pageReqVO, CommonStatusEnum.ENABLE.getStatus(), LocalDateTime.now());
+        return bargainActivityMapper.selectPage(pageReqVO, CommonStatusEnum.ENABLE.getStatus(), LocalDateTime.now());
     }
     @Override
-    public List<BargainActivityDO> getBargainActivityListForApp(Integer count) {
-        // TODO @puhui999：这种 default count 的逻辑，可以放到 controller 哈；然后可以使用 ObjectUtils.default 方法
-        if (count == null) {
-            count = 6;
-        }
-        // TODO @puhui999：这种不要用 page；会浪费一次 count；
-        PageResult<BargainActivityDO> result = bargainActivityMapper.selectAppPage(new PageParam().setPageSize(count),
-                CommonStatusEnum.ENABLE.getStatus(), LocalDateTime.now());
-        return result.getList();
+    public List<BargainActivityDO> getBargainActivityListByCount(Integer count) {
+        return bargainActivityMapper.selectList(count, CommonStatusEnum.ENABLE.getStatus(), LocalDateTime.now());
     }
 }
 package cn.iocoder.yudao.module.promotion.service.combination;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.promotion.controller.admin.combination.vo.activity.CombinationActivityCreateReqVO;
 import cn.iocoder.yudao.module.promotion.controller.admin.combination.vo.activity.CombinationActivityPageReqVO;
@@ -9,6 +10,7 @@ import cn.iocoder.yudao.module.promotion.dal.dataobject.combination.CombinationP
 import javax.validation.Valid;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 /**
@@ -67,6 +69,16 @@ public interface CombinationActivityService {
     /**
      * 获得拼团活动商品列表
      *
+     * @param activityId 拼团活动 id
+     * @return 拼团活动的商品列表
+     */
+    default List<CombinationProductDO> getCombinationProductsByActivityId(Long activityId) {
+        return getCombinationProductsByActivityIds(Collections.singletonList(activityId));
+    }
+
+    /**
+     * 获得拼团活动商品列表
+     *
      * @param activityIds 拼团活动 ids
      * @return 拼团活动的商品列表
      */
@@ -83,4 +95,20 @@ public interface CombinationActivityService {
      */
     void validateCombination(Long activityId, Long userId, Long skuId, Integer count);
+    /**
+     * 获取正在进行的活动分页数据
+     *
+     * @param count 需要的数量
+     * @return 拼团活动分页
+     */
+    List<CombinationActivityDO> getCombinationActivityListByCount(Integer count);
+
+    /**
+     * 获取正在进行的活动分页数据
+     *
+     * @param pageParam 分页请求
+     * @return 拼团活动分页
+     */
+    PageResult<CombinationActivityDO> getCombinationActivityPage(PageParam pageParam);
+
 }
@@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.promotion.service.combination;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
 import cn.iocoder.yudao.module.product.api.sku.ProductSkuApi;
@@ -223,8 +224,7 @@ public class CombinationActivityServiceImpl implements CombinationActivityServic
             throw exception(COMBINATION_ACTIVITY_STATUS_DISABLE);
         }
         // 1.3 校验是否超出单次限购数量
-        // TODO puhui999：count > activity.getSingleLimitCount() 会更好理解点；
-        if (activity.getSingleLimitCount() < count) {
+        if (count > activity.getSingleLimitCount()) {
             throw exception(COMBINATION_RECORD_FAILED_SINGLE_LIMIT_COUNT_EXCEED);
         }
@@ -245,4 +245,14 @@ public class CombinationActivityServiceImpl implements CombinationActivityServic
         }
     }
+    @Override
+    public List<CombinationActivityDO> getCombinationActivityListByCount(Integer count) {
+        return combinationActivityMapper.selectListByStatus(CommonStatusEnum.ENABLE.getStatus(), count);
+    }
+
+    @Override
+    public PageResult<CombinationActivityDO> getCombinationActivityPage(PageParam pageParam) {
+        return combinationActivityMapper.selectPage(pageParam, CommonStatusEnum.ENABLE.getStatus());
+    }
+
 }
@@ -96,12 +96,15 @@ public class CombinationRecordServiceImpl implements CombinationRecordService {
         return recordDO;
     }
+    // TODO @puhui999：有一个应该在创建那要做下；就是当前 activityId 已经有未支付的订单，不允许在发起新的；要么支付，要么去掉先；
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void createCombinationRecord(CombinationRecordCreateReqDTO reqDTO) {
         // 1.1 校验拼团活动
         CombinationActivityDO activity = combinationActivityService.validateCombinationActivityExists(reqDTO.getActivityId());
         // 1.2 需要校验下，他当前是不是已经参加了该拼团；
+        // TODO @puhui999：拼团应该可以重复参加；应该去校验总共的上限哈，就是 activity.totalLimitCount
         CombinationRecordDO recordDO = recordMapper.selectByUserIdAndOrderId(reqDTO.getUserId(), reqDTO.getOrderId());
         if (recordDO != null) {
             throw exception(COMBINATION_RECORD_EXISTS);
@@ -111,6 +114,7 @@ public class CombinationRecordServiceImpl implements CombinationRecordService {
         if (CollUtil.isNotEmpty(recordDOList)) {
             throw exception(COMBINATION_RECORD_FAILED_HAVE_JOINED);
         }
+        // TODO @puhui999：有个开始时间未校验
         // 1.4 校验当前活动是否过期
         if (LocalDateTime.now().isAfter(activity.getEndTime())) {
             throw exception(COMBINATION_RECORD_FAILED_TIME_END);
@@ -128,6 +132,8 @@ public class CombinationRecordServiceImpl implements CombinationRecordService {
             }
         }
+        // TODO @puhui999：单次限购
+
         // 2. 创建拼团记录
         MemberUserRespDTO user = memberUserApi.getUser(reqDTO.getUserId());
         ProductSpuRespDTO spu = productSpuApi.getSpu(reqDTO.getSpuId());
@@ -37,11 +37,11 @@ public interface SeckillActivityService {
     /**
      * 更新秒杀库存
      *
-     * @param activityId 活动编号
+     * @param id 活动编号
      * @param skuId      sku 编号
      * @param count      数量
      */
-    void updateSeckillStock(Long activityId, Long skuId, Integer count);
+    void updateSeckillStock(Long id, Long skuId, Integer count);
     /**
      * 关闭秒杀活动
@@ -98,6 +98,15 @@ public interface SeckillActivityService {
     List<SeckillActivityDO> getSeckillActivityListByConfigIds(Collection<Long> ids);
     /**
+     * 通过活动时段编号获取指定 status 的秒杀活动
+     *
+     * @param configId 时段配置编号
+     * @param status   状态
+     * @return 秒杀活动列表
+     */
+    List<SeckillActivityDO> getSeckillActivityListByConfigIdAndStatus(Long configId, Integer status);
+
+    /**
      * 通过活动时段获取秒杀活动
      *
      * @param pageReqVO 请求
@@ -3,7 +3,6 @@ package cn.iocoder.yudao.module.promotion.service.seckill;
 import cn.hutool.core.util.ObjectUtil;
 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
 import cn.iocoder.yudao.module.product.api.sku.ProductSkuApi;
 import cn.iocoder.yudao.module.product.api.sku.dto.ProductSkuRespDTO;
 import cn.iocoder.yudao.module.product.api.spu.ProductSpuApi;
@@ -31,6 +30,7 @@ import java.util.Map;
 import static cn.hutool.core.collection.CollUtil.isNotEmpty;
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
+import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.isBetween;
 import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.SKU_NOT_EXISTS;
 import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.SPU_NOT_EXISTS;
 import static cn.iocoder.yudao.module.promotion.enums.ErrorCodeConstants.*;
@@ -148,32 +148,26 @@ public class SeckillActivityServiceImpl implements SeckillActivityService {
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void updateSeckillStock(Long activityId, Long skuId, Integer count) {
-        // 1、校验秒杀活动是否存在
-        SeckillActivityDO seckillActivity = getSeckillActivity(activityId);
-        // 1.1、校验库存是否充足
-        if (seckillActivity.getTotalStock() < count) {
+    public void updateSeckillStock(Long id, Long skuId, Integer count) {
+        // 1.1 校验活动库存是否充足
+        SeckillActivityDO seckillActivity = getSeckillActivity(id);
+        if (count > seckillActivity.getTotalStock()) {
             throw exception(SECKILL_ACTIVITY_UPDATE_STOCK_FAIL);
         }
-
-        // 2、获取活动商品
-        List<SeckillProductDO> products = getSeckillProductListByActivityId(activityId);
-        // 2.1、过滤出购买的商品
-        SeckillProductDO product = findFirst(products, item -> ObjectUtil.equal(skuId, item.getSkuId()));
-        // 2.2、检查活动商品库存是否充足
-        boolean isSufficient = product == null || (product.getStock() == 0 || (product.getStock() < count) || (product.getStock() - count) < 0);
-        if (isSufficient) {
+        // 1.2 校验商品库存是否充足
+        SeckillProductDO product = seckillProductMapper.selectByActivityIdAndSkuId(id, skuId);
+        if (product == null || count > product.getStock()) {
             throw exception(SECKILL_ACTIVITY_UPDATE_STOCK_FAIL);
         }
-        // 3、更新活动商品库存
-        int updateCount = seckillProductMapper.updateActivityStock(product.getId(), count);
+        // 2.1 更新活动商品库存
+        int updateCount = seckillProductMapper.updateStock(product.getId(), count);
         if (updateCount == 0) {
             throw exception(SECKILL_ACTIVITY_UPDATE_STOCK_FAIL);
         }
-        // 4、更新活动库存
-        updateCount = seckillActivityMapper.updateActivityStock(seckillActivity.getId(), count);
+        // 2.2 更新活动库存
+        updateCount = seckillActivityMapper.updateStock(seckillActivity.getId(), count);
         if (updateCount == 0) {
             throw exception(SECKILL_ACTIVITY_UPDATE_STOCK_FAIL);
         }
@@ -268,8 +262,15 @@ public class SeckillActivityServiceImpl implements SeckillActivityService {
     @Override
     public List<SeckillActivityDO> getSeckillActivityListByConfigIds(Collection<Long> ids) {
-        return CollectionUtils.filterList(seckillActivityMapper.selectList(),
-                item -> CollectionUtils.anyMatch(item.getConfigIds(), ids::contains));
+        return filterList(seckillActivityMapper.selectList(),
+                item -> anyMatch(item.getConfigIds(), ids::contains));
+    }
+
+    @Override
+    public List<SeckillActivityDO> getSeckillActivityListByConfigIdAndStatus(Long configId, Integer status) {
+        return filterList(seckillActivityMapper.selectList(SeckillActivityDO::getStatus, status),
+                item -> anyMatch(item.getConfigIds(), id -> ObjectUtil.equal(id, configId)) // 校验时段
+                        && isBetween(item.getStartTime(), item.getEndTime())); // 追加当前日期是否处在活动日期之间的校验条件
     }
     @Override
@@ -54,6 +54,7 @@ public interface SeckillConfigService {
      */
     List<SeckillConfigDO> getSeckillConfigList();
+
     /**
      * 校验秒杀时段是否存在
      *
@@ -85,4 +86,12 @@ public interface SeckillConfigService {
      */
     void updateSeckillConfigStatus(Long id, Integer status);
+    /**
+     * 获取当前日期时间处于的秒杀时段且状态为 status
+     *
+     * @param status 状态
+     * @return 时段
+     */
+    SeckillConfigDO getSeckillConfigListByStatusOnCurrentTime(Integer status);
+
 }
@@ -20,6 +20,8 @@ import java.util.Collection;
 import java.util.List;
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.findFirst;
+import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.isBetween;
 import static cn.iocoder.yudao.module.promotion.enums.ErrorCodeConstants.*;
 /**
@@ -68,6 +70,12 @@ public class SeckillConfigServiceImpl implements SeckillConfigService {
     }
     @Override
+    public SeckillConfigDO getSeckillConfigListByStatusOnCurrentTime(Integer status) {
+        return findFirst(seckillConfigMapper.selectList(SeckillConfigDO::getStatus, status),
+                config -> isBetween(config.getStartTime(), config.getEndTime()));
+    }
+
+    @Override
     public void deleteSeckillConfig(Long id) {
         // 校验存在
         validateSeckillConfigExists(id);
@@ -12,12 +12,6 @@ import cn.iocoder.yudao.framework.common.exception.ErrorCode;
 public interface ErrorCodeConstants {
     // ========== Order 模块 1011000000 ==========
-    ErrorCode ORDER_CREATE_SKU_NOT_FOUND = new ErrorCode(1011000001, "商品 SKU 不存在");
-    ErrorCode ORDER_CREATE_SPU_NOT_SALE = new ErrorCode(1011000002, "商品 SPU 不可售卖");
-    ErrorCode ORDER_CREATE_SKU_STOCK_NOT_ENOUGH = new ErrorCode(1011000004, "商品 SKU 库存不足");
-    ErrorCode ORDER_CREATE_SPU_NOT_FOUND = new ErrorCode(1011000005, "商品 SPU 不可售卖");
-    ErrorCode ORDER_CREATE_ADDRESS_NOT_FOUND = new ErrorCode(1011000006, "收货地址不存在");
-
     ErrorCode ORDER_ITEM_NOT_FOUND = new ErrorCode(1011000010, "交易订单项不存在");
     ErrorCode ORDER_NOT_FOUND = new ErrorCode(1011000011, "交易订单不存在");
     ErrorCode ORDER_ITEM_UPDATE_AFTER_SALE_STATUS_FAIL = new ErrorCode(1011000012, "交易订单项更新售后状态失败，请重试");
@@ -37,6 +31,7 @@ public interface ErrorCodeConstants {
     ErrorCode ORDER_UPDATE_PRICE_FAIL_PAID = new ErrorCode(1011000026, "支付订单调价失败，原因：支付订单已付款,不能调价");
     ErrorCode ORDER_UPDATE_PRICE_FAIL_EQUAL = new ErrorCode(1011000027, "支付订单调价失败，原因：价格没有变化");
     ErrorCode ORDER_UPDATE_PRICE_FAIL_NOT_ITEM = new ErrorCode(1011000028, "支付订单调价失败，原因：订单项不存在");
+    ErrorCode ORDER_DELETE_FAIL_STATUS_NOT_CANCEL = new ErrorCode(1011000029, "交易订单删除失败，订单不是【已取消】状态");
     // ========== After Sale 模块 1011000100 ==========
     ErrorCode AFTER_SALE_NOT_FOUND = new ErrorCode(1011000100, "售后单不存在");
@@ -58,9 +53,8 @@ public interface ErrorCodeConstants {
     // ========== Price 相关 1011003000 ============
     ErrorCode PRICE_CALCULATE_PAY_PRICE_ILLEGAL = new ErrorCode(1011003000, "支付价格计算异常，原因：价格小于等于 0");
-    ErrorCode PRICE_CALCULATE_DELIVERY_PRICE_USER_ADDRESS_IS_EMPTY = new ErrorCode(1011003001, "计算快递运费异常，收件人地址编号为空");
     ErrorCode PRICE_CALCULATE_DELIVERY_PRICE_TEMPLATE_NOT_FOUND = new ErrorCode(1011003002, "计算快递运费异常，找不到对应的运费模板");
-    ErrorCode PRICE_CALCULATE_DELIVERY_PRICE_PICK_UP_STORE_IS_EMPTY = new ErrorCode(1011003003, "计算快递运费异常，自提点为空");
+    ErrorCode PRICE_CALCULATE_COUPON_NOT_MATCH_NORMAL_ORDER = new ErrorCode(1011003004, "参与秒杀、拼团、砍价的营销商品，无法使用优惠劵");
     // ========== 物流 Express 模块 1011004000 ==========
     ErrorCode EXPRESS_NOT_EXISTS = new ErrorCode(1011004000, "快递公司不存在");
@@ -14,7 +14,10 @@ import lombok.RequiredArgsConstructor;
 public enum TradeOrderOperateTypeEnum {
     MEMBER_CREATE(1, "用户下单"),
-    TEST(2, "用户({nickname})做了({thing})"),
+    MEMBER_RECEIVE(30, "用户已收货"),
+    MEMBER_COMMENT(31, "用户评价"),
+    MEMBER_CANCEL(40, "取消订单"),
+    MEMBER_DELETE(41, "删除订单"),
     ;
     /**
@@ -8,11 +8,11 @@ import cn.iocoder.yudao.module.member.api.user.MemberUserApi;
 import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
 import cn.iocoder.yudao.module.pay.api.notify.dto.PayRefundNotifyReqDTO;
 import cn.iocoder.yudao.module.trade.controller.admin.aftersale.vo.*;
+import cn.iocoder.yudao.module.trade.controller.admin.aftersale.vo.log.TradeAfterSaleLogRespVO;
 import cn.iocoder.yudao.module.trade.convert.aftersale.TradeAfterSaleConvert;
 import cn.iocoder.yudao.module.trade.dal.dataobject.aftersale.TradeAfterSaleDO;
 import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderDO;
 import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderItemDO;
-import cn.iocoder.yudao.module.trade.framework.aftersalelog.core.dto.TradeAfterSaleLogRespDTO;
 import cn.iocoder.yudao.module.trade.framework.aftersalelog.core.service.AfterSaleLogService;
 import cn.iocoder.yudao.module.trade.service.aftersale.TradeAfterSaleService;
 import cn.iocoder.yudao.module.trade.service.order.TradeOrderQueryService;
@@ -87,13 +87,13 @@ public class TradeAfterSaleController {
         // 拼接数据
         MemberUserRespDTO user = memberUserApi.getUser(afterSale.getUserId());
         // 获取售后日志
-        List<TradeAfterSaleLogRespDTO> logs = afterSaleLogService.getLog(afterSale.getId());
+        List<TradeAfterSaleLogRespVO> logs = afterSaleLogService.getLog(afterSale.getId());
         // TODO 方便测试看效果，review 后移除
         if (logs == null) {
             logs = new ArrayList<>();
         }
         for (int i = 1; i <= 6; i++) {
-            TradeAfterSaleLogRespDTO respVO = new TradeAfterSaleLogRespDTO();
+            TradeAfterSaleLogRespVO respVO = new TradeAfterSaleLogRespVO();
             respVO.setId((long) i);
             respVO.setUserId((long) i);
             respVO.setUserType(i % 2 == 0 ? 2 : 1);
@@ -156,7 +156,7 @@ public class AppTradeOrderController {
     @Operation(summary = "删除交易订单")
     @Parameter(name = "id", description = "交易订单编号")
     public CommonResult<Boolean> deleteOrder(@RequestParam("id") Long id) {
-        // TODO @芋艿：未实现，mock 用
+        tradeOrderUpdateService.deleteOrder(getLoginUserId(), id);
         return success(true);
     }
@@ -82,6 +82,9 @@ public class AppTradeOrderSettlementRespVO {
         @Schema(description = "积分抵扣的金额，单位：分", requiredMode = Schema.RequiredMode.REQUIRED, example = "50")
         private Integer pointPrice;
+        @Schema(description = "VIP 减免金额，单位：分", requiredMode = Schema.RequiredMode.REQUIRED, example = "30")
+        private Integer vipPrice;
+
         @Schema(description = "实际支付金额（总），单位：分", requiredMode = Schema.RequiredMode.REQUIRED, example = "450")
         private Integer payPrice;
@@ -16,7 +16,6 @@ import cn.iocoder.yudao.module.trade.dal.dataobject.aftersale.TradeAfterSaleDO;
 import cn.iocoder.yudao.module.trade.dal.dataobject.aftersale.TradeAfterSaleLogDO;
 import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderDO;
 import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderItemDO;
-import cn.iocoder.yudao.module.trade.framework.aftersalelog.core.dto.TradeAfterSaleLogRespDTO;
 import cn.iocoder.yudao.module.trade.framework.order.config.TradeOrderProperties;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
@@ -68,10 +67,10 @@ public interface TradeAfterSaleConvert {
     PageResult<AppTradeAfterSaleRespVO> convertPage02(PageResult<TradeAfterSaleDO> page);
-    List<TradeAfterSaleLogRespDTO> convertList(List<TradeAfterSaleLogDO> list);
-    
+    List<TradeAfterSaleLogRespVO> convertList(List<TradeAfterSaleLogDO> list);
+
     default TradeAfterSaleDetailRespVO convert(TradeAfterSaleDO afterSale, TradeOrderDO order, List<TradeOrderItemDO> orderItems,
-                                               MemberUserRespDTO user, List<TradeAfterSaleLogRespDTO> logs) {
+                                               MemberUserRespDTO user, List<TradeAfterSaleLogRespVO> logs) {
         TradeAfterSaleDetailRespVO respVO = convert(afterSale, orderItems);
         // 处理用户信息
         respVO.setUser(convert(user));
@@ -81,7 +80,8 @@ public interface TradeAfterSaleConvert {
         respVO.setLogs(convertList1(logs));
         return respVO;
     }
-    List<TradeAfterSaleLogRespVO> convertList1(List<TradeAfterSaleLogRespDTO> list);
+
+    List<TradeAfterSaleLogRespVO> convertList1(List<TradeAfterSaleLogRespVO> list);
     @Mapping(target = "id", source = "afterSale.id")
     TradeAfterSaleDetailRespVO convert(TradeAfterSaleDO afterSale, List<TradeOrderItemDO> orderItems);
     TradeOrderBaseVO convert(TradeOrderDO order);
@@ -65,6 +65,7 @@ public interface TradeOrderConvert {
             @Mapping(source = "calculateRespBO.price.deliveryPrice", target = "deliveryPrice"),
             @Mapping(source = "calculateRespBO.price.couponPrice", target = "couponPrice"),
             @Mapping(source = "calculateRespBO.price.pointPrice", target = "pointPrice"),
+            @Mapping(source = "calculateRespBO.price.vipPrice", target = "vipPrice"),
             @Mapping(source = "calculateRespBO.price.payPrice", target = "payPrice")
     })
     TradeOrderDO convert(Long userId, String userIp, AppTradeOrderCreateReqVO createReqVO,
@@ -168,6 +168,7 @@ public class TradeOrderDO extends BaseDO {
      * - {@link #discountPrice}
      * + {@link #deliveryPrice}
      * + {@link #adjustPrice}
+     * - {@link #vipPrice}
      */
     private Integer payPrice;
@@ -273,5 +274,9 @@ public class TradeOrderDO extends BaseDO {
      * 退还的使用的积分
      */
     private Integer refundPoint;
+    /**
+     * VIP 减免金额，单位：分
+     */
+    private Integer vipPrice;
 }
@@ -126,6 +126,7 @@ public class TradeOrderItemDO extends BaseDO {
      * - {@link #discountPrice}
      * + {@link #deliveryPrice}
      * + {@link #adjustPrice}
+     * - {@link #vipPrice}
      */
     private Integer payPrice;
@@ -151,6 +152,10 @@ public class TradeOrderItemDO extends BaseDO {
      * 赠送的积分
      */
     private Integer givePoint;
+    /**
+     * VIP 减免金额，单位：分
+     */
+    private Integer vipPrice;
     // TODO @芋艿：如果商品 vip 折扣时，到底是新增一个 vipPrice 记录优惠记录，还是 vipDiscountPrice，记录 vip 的优惠；还是直接使用 vipPrice；
     // 目前 crmeb 的选择，单独一个 vipPrice 记录优惠价格；感觉不一定合理，可以在看看有赞的；
-package cn.iocoder.yudao.module.trade.framework.aftersalelog.core.dto;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import javax.validation.constraints.NotNull;
-import java.time.LocalDateTime;
-
-// TODO @puhui999：这个是不是应该搞成 vo 啊？
-/**
- * 贸易售后日志详情 DTO
- *
- * @author HUIHUI
- */
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class TradeAfterSaleLogRespDTO {
-
-    @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "20669")
-    private Long id;
-
-    @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "22634")
-    @NotNull(message = "用户编号不能为空")
-    private Long userId;
-
-    @Schema(description = "用户类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
-    @NotNull(message = "用户类型不能为空")
-    private Integer userType;
-
-    @Schema(description = "售后编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "3023")
-    @NotNull(message = "售后编号不能为空")
-    private Long afterSaleId;
-
-    @Schema(description = "订单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "25870")
-    @NotNull(message = "订单编号不能为空")
-    private Long orderId;
-
-    @Schema(description = "订单项编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "23154")
-    @NotNull(message = "订单项编号不能为空")
-    private Long orderItemId;
-
-    @Schema(description = "售后状态（之前）", example = "2")
-    private Integer beforeStatus;
-
-    @Schema(description = "售后状态（之后）", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @NotNull(message = "售后状态（之后）不能为空")
-    private Integer afterStatus;
-
-    @Schema(description = "操作明细", requiredMode = Schema.RequiredMode.REQUIRED, example = "维权完成，退款金额：¥37776.00")
-    @NotNull(message = "操作明细不能为空")
-    private String content;
-
-    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
-    private LocalDateTime createTime;
-
-}
 package cn.iocoder.yudao.module.trade.framework.aftersalelog.core.service;
+import cn.iocoder.yudao.module.trade.controller.admin.aftersale.vo.log.TradeAfterSaleLogRespVO;
 import cn.iocoder.yudao.module.trade.framework.aftersalelog.core.dto.TradeAfterSaleLogCreateReqDTO;
-import cn.iocoder.yudao.module.trade.framework.aftersalelog.core.dto.TradeAfterSaleLogRespDTO;
 import java.util.List;
@@ -29,6 +29,6 @@ public interface AfterSaleLogService {
      * @param afterSaleId 售后编号
      * @return 售后日志
      */
-    List<TradeAfterSaleLogRespDTO> getLog(Long afterSaleId);
+    List<TradeAfterSaleLogRespVO> getLog(Long afterSaleId);
 }
@@ -63,6 +63,9 @@ public class TradeOrderLogAspect {
             Long userId = getUserId();
             // 1.2 订单信息
             Long orderId = ORDER_ID.get();
+            if (orderId == null) { // 如果未设置，只有注解，说明不需要记录订单日志
+                return;
+            }
             Integer beforeStatus = BEFORE_STATUS.get();
             Integer afterStatus = AFTER_STATUS.get();
             Map<String, Object> exts = ObjectUtil.defaultIfNull(EXTS.get(), emptyMap());
@@ -11,6 +11,7 @@ import cn.iocoder.yudao.module.pay.api.refund.dto.PayRefundCreateReqDTO;
 import cn.iocoder.yudao.module.trade.controller.admin.aftersale.vo.TradeAfterSaleDisagreeReqVO;
 import cn.iocoder.yudao.module.trade.controller.admin.aftersale.vo.TradeAfterSalePageReqVO;
 import cn.iocoder.yudao.module.trade.controller.admin.aftersale.vo.TradeAfterSaleRefuseReqVO;
+import cn.iocoder.yudao.module.trade.controller.admin.aftersale.vo.log.TradeAfterSaleLogRespVO;
 import cn.iocoder.yudao.module.trade.controller.app.aftersale.vo.AppTradeAfterSaleCreateReqVO;
 import cn.iocoder.yudao.module.trade.controller.app.aftersale.vo.AppTradeAfterSaleDeliveryReqVO;
 import cn.iocoder.yudao.module.trade.convert.aftersale.TradeAfterSaleConvert;
@@ -26,7 +27,6 @@ import cn.iocoder.yudao.module.trade.enums.aftersale.TradeAfterSaleWayEnum;
 import cn.iocoder.yudao.module.trade.enums.order.TradeOrderItemAfterSaleStatusEnum;
 import cn.iocoder.yudao.module.trade.enums.order.TradeOrderStatusEnum;
 import cn.iocoder.yudao.module.trade.framework.aftersalelog.core.dto.TradeAfterSaleLogCreateReqDTO;
-import cn.iocoder.yudao.module.trade.framework.aftersalelog.core.dto.TradeAfterSaleLogRespDTO;
 import cn.iocoder.yudao.module.trade.framework.aftersalelog.core.service.AfterSaleLogService;
 import cn.iocoder.yudao.module.trade.framework.order.config.TradeOrderProperties;
 import cn.iocoder.yudao.module.trade.service.order.TradeOrderQueryService;
@@ -449,8 +449,9 @@ public class TradeAfterSaleServiceImpl implements TradeAfterSaleService, AfterSa
         }
     }
+    // TODO @puhui999：应该返回 do 哈。
     @Override
-    public List<TradeAfterSaleLogRespDTO> getLog(Long afterSaleId) {
+    public List<TradeAfterSaleLogRespVO> getLog(Long afterSaleId) {
         // TODO 不熟悉流程先这么滴
         List<TradeAfterSaleLogDO> saleLogDOs = tradeAfterSaleLogMapper.selectList(TradeAfterSaleLogDO::getAfterSaleId, afterSaleId);
         return TradeAfterSaleConvert.INSTANCE.convertList(saleLogDOs);
@@ -106,7 +106,7 @@ public class TradeOrderQueryServiceImpl implements TradeOrderQueryService {
         if (order == null) {
             throw exception(ORDER_NOT_FOUND);
         }
-
+        // 查询物流
         return getExpressTrackList(order);
     }
@@ -117,7 +117,7 @@ public class TradeOrderQueryServiceImpl implements TradeOrderQueryService {
         if (order == null) {
             throw exception(ORDER_NOT_FOUND);
         }
-
+        // 查询物流
         return getExpressTrackList(order);
     }
@@ -63,6 +63,22 @@ public interface TradeOrderUpdateService {
     void receiveOrder(Long userId, Long id);
     /**
+     * 【会员】取消订单
+     *
+     * @param userId 用户编号
+     * @param id     订单编号
+     */
+    void cancelOrder(Long userId, Long id);
+
+    /**
+     * 【会员】删除订单
+     *
+     * @param userId 用户编号
+     * @param id     订单编号
+     */
+    void deleteOrder(Long userId, Long id);
+
+    /**
      * 【管理员】交易订单备注
      *
      * @param reqVO 请求
@@ -117,11 +133,4 @@ public interface TradeOrderUpdateService {
      */
     Long createOrderItemComment(Long userId, AppTradeOrderItemCommentCreateReqVO createReqVO);
-    /**
-     * 【会员】取消订单
-     *
-     * @param userId 用户ID
-     * @param id     订单编号
-     */
-    void cancelOrder(Long userId, Long id);
 }
@@ -49,6 +49,7 @@ import cn.iocoder.yudao.module.trade.enums.delivery.DeliveryTypeEnum;
 import cn.iocoder.yudao.module.trade.enums.order.*;
 import cn.iocoder.yudao.module.trade.framework.order.config.TradeOrderProperties;
 import cn.iocoder.yudao.module.trade.framework.order.core.annotations.TradeOrderLog;
+import cn.iocoder.yudao.module.trade.framework.order.core.utils.TradeOrderLogUtils;
 import cn.iocoder.yudao.module.trade.service.brokerage.BrokerageRecordService;
 import cn.iocoder.yudao.module.trade.service.brokerage.bo.BrokerageAddReqBO;
 import cn.iocoder.yudao.module.trade.service.cart.CartService;
@@ -299,6 +300,9 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
         // 5. 生成预支付
         createPayOrder(order, orderItems, calculateRespBO);
+        // 6. 插入订单日志
+        TradeOrderLogUtils.setOrderInfo(order.getId(), null, order.getStatus());
+
         // TODO @LeeYan9: 是可以思考下, 订单的营销优惠记录, 应该记录在哪里, 微信讨论起来!
     }
@@ -482,6 +486,7 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
     @Override
     @Transactional(rollbackFor = Exception.class)
+    @TradeOrderLog(operateType = TradeOrderOperateTypeEnum.MEMBER_RECEIVE)
     public void receiveOrder(Long userId, Long id) {
         // 校验并获得交易订单（可收货）
         TradeOrderDO order = validateOrderReceivable(userId, id);
@@ -492,7 +497,6 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
         if (updateCount == 0) {
             throw exception(ORDER_RECEIVE_FAIL_STATUS_NOT_DELIVERED);
         }
-        // TODO 芋艿：OrderLog
         // TODO 芋艿：lili 发送订单变化的消息
@@ -500,7 +504,8 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
         // TODO 芋艿：销售佣金的记录；
-        // TODO 芋艿：获得积分；
+        // 插入订单日志
+        TradeOrderLogUtils.setOrderInfo(order.getId(), order.getStatus(), TradeOrderStatusEnum.COMPLETED.getStatus());
     }
     @Override
@@ -541,41 +546,49 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
         tradeOrderMapper.updateById(update);
         // TODO @芋艿：改价时，赠送的积分，要不要做改动？？？
-        // TODO @puhui999：应该是按照 payPrice 分配；并且要考虑取余问题；payPrice 也要考虑，item 里的
-        // TODO：先按 adjustPrice 实现，没明白 payPrice 怎么搞哈哈哈
-        // TODO @puhui999：就是对比新老 adjustPrice 的差值，然后计算补充的 adjustPrice 最终值；另外，可以不用区分 items.size 是不是 > 1 哈；应该是一致的逻辑；分摊的逻辑，有点类似 dividePrice 方法噢；
         // 5、更新 TradeOrderItem
-        if (items.size() > 1) {
-            // TradeOrderItemDO 需要做 adjustPrice 的分摊
-            int price = reqVO.getAdjustPrice() / items.size();
-            int remainderPrice = reqVO.getAdjustPrice() % items.size();
-            List<TradeOrderItemDO> orders = new ArrayList<>();
-            for (int i = 0; i < items.size(); i++) {
-                // 把平摊后剩余的金额加到第一个订单项
-                if (remainderPrice != 0 && i == 0) {
-                    orders.add(convertOrderItemPrice(items.get(i), price + remainderPrice));
-                }
-                orders.add(convertOrderItemPrice(items.get(i), price));
-            }
-            tradeOrderItemMapper.updateBatch(orders);
-        } else {
-            TradeOrderItemDO orderItem = items.get(0);
-            TradeOrderItemDO updateItem = convertOrderItemPrice(orderItem, reqVO.getAdjustPrice());
-            tradeOrderItemMapper.updateById(updateItem);
+        // TradeOrderItemDO 需要做 adjustPrice 的分摊
+        List<Integer> dividePrices = dividePrice(items, orderPayPrice);
+        List<TradeOrderItemDO> updateItems = new ArrayList<>();
+        for (int i = 0; i < items.size(); i++) {
+            TradeOrderItemDO item = items.get(i);
+            Integer adjustPrice = item.getPrice() - dividePrices.get(i); // 计算调整的金额
+            updateItems.add(new TradeOrderItemDO().setId(item.getId()).setAdjustPrice(adjustPrice)
+                    .setPayPrice(item.getPayPrice() - adjustPrice));
         }
+        tradeOrderItemMapper.updateBatch(updateItems);
+
         // 6、更新支付订单
         payOrderApi.updatePayOrderPrice(order.getPayOrderId(), update.getPayPrice());
     }
-    private TradeOrderItemDO convertOrderItemPrice(TradeOrderItemDO orderItem, Integer price) {
-        TradeOrderItemDO newOrderItem = new TradeOrderItemDO();
-        newOrderItem.setId(orderItem.getId());
-        newOrderItem.setAdjustPrice(price);
-        int payPrice = orderItem.getAdjustPrice() != null ? (orderItem.getPayPrice() - orderItem.getAdjustPrice())
-                + price : orderItem.getPayPrice() + price;
-        newOrderItem.setPayPrice(payPrice);
-        return newOrderItem;
+    /**
+     * 计算订单调价价格分摊
+     *
+     * @param items         订单项
+     * @param orderPayPrice 订单支付金额
+     * @return 分摊金额数组，和传入的 orderItems 一一对应
+     */
+    private List<Integer> dividePrice(List<TradeOrderItemDO> items, Integer orderPayPrice) {
+        Integer total = getSumValue(items, TradeOrderItemDO::getPrice, Integer::sum);
+        assert total != null;
+        // 遍历每一个，进行分摊
+        List<Integer> prices = new ArrayList<>(items.size());
+        int remainPrice = orderPayPrice;
+        for (int i = 0; i < items.size(); i++) {
+            TradeOrderItemDO orderItem = items.get(i);
+            int partPrice;
+            if (i < items.size() - 1) { // 减一的原因，是因为拆分时，如果按照比例，可能会出现.所以最后一个，使用反减
+                partPrice = (int) (orderPayPrice * (1.0D * orderItem.getPayPrice() / total));
+                remainPrice -= partPrice;
+            } else {
+                partPrice = remainPrice;
+            }
+            Assert.isTrue(partPrice >= 0, "分摊金额必须大于等于 0");
+            prices.add(partPrice);
+        }
+        return prices;
     }
     @Override
@@ -671,6 +684,7 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
     @Override
     @Transactional(rollbackFor = Exception.class)
+    @TradeOrderLog(operateType = TradeOrderOperateTypeEnum.MEMBER_COMMENT)
     public Long createOrderItemComment(Long userId, AppTradeOrderItemCommentCreateReqVO createReqVO) {
         // 先通过订单项 ID，查询订单项是否存在
         TradeOrderItemDO orderItem = tradeOrderItemMapper.selectByIdAndUserId(createReqVO.getOrderItemId(), userId);
@@ -698,24 +712,27 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
         List<TradeOrderItemDO> orderItems = tradeOrderItemMapper.selectListByOrderId(order.getId());
         if (!anyMatch(orderItems, item -> Objects.equals(item.getCommentStatus(), Boolean.FALSE))) {
             tradeOrderMapper.updateById(new TradeOrderDO().setId(order.getId()).setCommentStatus(Boolean.TRUE));
-            // TODO 待实现：已完成评价，要不要写一条订单日志？目前 crmeb 会写，有赞可以研究下
+            // 增加订单日志
+            TradeOrderLogUtils.setOrderInfo(order.getId(), order.getStatus(), order.getStatus());
         }
         return comment;
     }
     @Override
+    @Transactional(rollbackFor = Exception.class)
+    @TradeOrderLog(operateType = TradeOrderOperateTypeEnum.MEMBER_CANCEL)
     public void cancelOrder(Long userId, Long id) {
-        // 校验存在
+        // 1.1 校验存在
         TradeOrderDO order = tradeOrderMapper.selectOrderByIdAndUserId(id, userId);
         if (order == null) {
             throw exception(ORDER_NOT_FOUND);
         }
-        // 校验状态
+        // 1.2 校验状态
         if (ObjectUtil.notEqual(order.getStatus(), TradeOrderStatusEnum.UNPAID.getStatus())) {
             throw exception(ORDER_CANCEL_FAIL_STATUS_NOT_UNPAID);
         }
-        // 1.更新 TradeOrderDO 状态为已取消
+        // 2. 更新 TradeOrderDO 状态为已取消
         int updateCount = tradeOrderMapper.updateByIdAndStatus(id, order.getStatus(),
                 new TradeOrderDO().setStatus(TradeOrderStatusEnum.CANCELED.getStatus())
                         .setCancelTime(LocalDateTime.now())
@@ -724,22 +741,43 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
             throw exception(ORDER_CANCEL_FAIL_STATUS_NOT_UNPAID);
         }
-        // TODO 活动相关库存回滚需要活动 id，活动 id 怎么获取？app 端能否传过来
+        // 3. TODO 活动相关库存回滚需要活动 id，活动 id 怎么获取？app 端能否传过来；回复：从订单里拿呀
         tradeOrderHandlers.forEach(handler -> handler.rollback());
-        // 2.回滚库存
+        // 4. 回滚库存
         List<TradeOrderItemDO> orderItems = tradeOrderItemMapper.selectListByOrderId(id);
         productSkuApi.updateSkuStock(TradeOrderConvert.INSTANCE.convert(orderItems));
-        // 3.回滚优惠券
-        couponApi.returnUsedCoupon(order.getCouponId());
+        // 5. 回滚优惠券
+        if (order.getCouponId() > 0) {
+            couponApi.returnUsedCoupon(order.getCouponId());
+        }
-        // 4.回滚积分（抵扣的）
+        // 6. 回滚积分（抵扣的）
         addUserPoint(order.getUserId(), order.getUsePoint(), MemberPointBizTypeEnum.ORDER_CANCEL, order.getId());
-        // TODO 芋艿：OrderLog
+        // 7. 增加订单日志
+        TradeOrderLogUtils.setOrderInfo(order.getId(), order.getStatus(), TradeOrderStatusEnum.CANCELED.getStatus());
+    }
-        // TODO 芋艿：lili 发送订单变化的消息
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    @TradeOrderLog(operateType = TradeOrderOperateTypeEnum.MEMBER_DELETE)
+    public void deleteOrder(Long userId, Long id) {
+        // 1.1 校验存在
+        TradeOrderDO order = tradeOrderMapper.selectOrderByIdAndUserId(id, userId);
+        if (order == null) {
+            throw exception(ORDER_NOT_FOUND);
+        }
+        // 1.2 校验状态
+        if (ObjectUtil.notEqual(order.getStatus(), TradeOrderStatusEnum.CANCELED.getStatus())) {
+            throw exception(ORDER_DELETE_FAIL_STATUS_NOT_CANCEL);
+        }
+        // 2. 删除订单
+        tradeOrderMapper.deleteById(id);
+
+        // 3. 记录日志
+        TradeOrderLogUtils.setOrderInfo(order.getId(), order.getStatus(), order.getStatus());
     }
     /**
@@ -766,6 +804,20 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
         memberLevelApi.addExperience(userId, -refundPrice, bizType, String.valueOf(afterSaleId));
     }
+    /**
+     * 添加用户积分
+     * <p>
+     * 目前是支付成功后，就会创建积分记录。
+     * <p>
+     * 业内还有两种做法，可以根据自己的业务调整：
+     * 1. 确认收货后，才创建积分记录
+     * 2. 支付 or 下单成功时，创建积分记录（冻结），确认收货解冻或者 n 天后解冻
+     *
+     * @param userId  用户编号
+     * @param point   增加积分数量
+     * @param bizType 业务编号
+     * @param bizId   业务编号
+     */
     protected void addUserPoint(Long userId, Integer point, MemberPointBizTypeEnum bizType, Long bizId) {
         if (point != null && point > 0) {
             memberPointApi.addPoint(userId, point, bizType.getType(), String.valueOf(bizId));
@@ -778,15 +830,27 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
         }
     }
+    /**
+     * 创建分销记录
+     *
+     * 目前是支付成功后，就会创建分销记录。
+     *
+     * 业内还有两种做法，可以根据自己的业务调整：
+     *  1. 确认收货后，才创建分销记录
+     *  2. 支付 or 下单成功时，创建分销记录（冻结），确认收货解冻或者 n 天后解冻
+     *
+     * @param userId 用户编号
+     * @param orderId 订单编号
+     */
     @Async
     protected void addBrokerageAsync(Long userId, Long orderId) {
         MemberUserRespDTO user = memberUserApi.getUser(userId);
         Assert.notNull(user);
-
+        // 每一个订单项，都会去生成分销记录
         List<TradeOrderItemDO> orderItems = tradeOrderItemMapper.selectListByOrderId(orderId);
-        List<BrokerageAddReqBO> list = convertList(orderItems,
+        List<BrokerageAddReqBO> addList = convertList(orderItems,
                 item -> TradeOrderConvert.INSTANCE.convert(user, item, productSkuApi.getSku(item.getSkuId())));
-        brokerageRecordService.addBrokerage(userId, BrokerageRecordBizTypeEnum.ORDER, list);
+        brokerageRecordService.addBrokerage(userId, BrokerageRecordBizTypeEnum.ORDER, addList);
     }
     @Async
 package cn.iocoder.yudao.module.trade.service.order.bo;
+import cn.iocoder.yudao.module.trade.enums.order.TradeOrderTypeEnum;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -14,36 +15,73 @@ import javax.validation.constraints.NotNull;
 @Data
 public class TradeBeforeOrderCreateReqBO {
-    // TODO @puhui999：注释也写下哈；bo 还是写注释噢
-
+    /**
+     * 订单类型
+     *
+     * 枚举 {@link TradeOrderTypeEnum}
+     */
     @NotNull(message = "订单类型不能为空")
     private Integer orderType;
+    /**
+     * 用户编号
+     *
+     * 关联 MemberUserDO 的 id 编号
+     */
+    @NotNull(message = "用户编号不能为空")
+    private Long userId;
+
     // ========== 秒杀活动相关字段 ==========
+    /**
+     *
+     */
     @Schema(description = "秒杀活动编号", example = "1024")
     private Long seckillActivityId;
     // ========== 拼团活动相关字段 ==========
+    /**
+     * 拼团活动编号
+     */
     @Schema(description = "拼团活动编号", example = "1024")
     private Long combinationActivityId;
+    /**
+     * 拼团团长编号
+     */
     @Schema(description = "拼团团长编号", example = "2048")
     private Long combinationHeadId;
+    // ========== 砍价活动相关字段 ==========
+
+    /**
+     * 砍价活动编号
+     */
     @Schema(description = "砍价活动编号", example = "123")
     private Long bargainActivityId;
+    // ========== 活动购买商品相关字段 ==========
+
+    /**
+     * 商品 SPU 编号
+     *
+     * 关联 ProductSkuDO 的 spuId 编号
+     */
     @NotNull(message = "SPU 编号不能为空")
     private Long spuId;
+    /**
+     * 商品 SKU 编号
+     *
+     * 关联 ProductSkuDO 的 id 编号
+     */
     @NotNull(message = "SKU 编号活动商品不能为空")
     private Long skuId;
-    @NotNull(message = "用户编号不能为空")
-    private Long userId;
-
+    /**
+     * 购买的商品数量
+     */
     @NotNull(message = "购买数量不能为空")
     private Integer count;
@@ -20,14 +20,17 @@ public class TradeBargainHandler implements TradeOrderHandler {
     @Resource
     private BargainActivityApi bargainActivityApi;
+    // TODO @puhui999：先临时写在这里；在价格计算时，如果是秒杀商品，需要校验如下条件：
+    // 1. 商品存在、库存充足、单次限购；
+    // 2. 活动进行中、时间段符合
+
     @Override
     public void beforeOrderCreate(TradeBeforeOrderCreateReqBO reqBO) {
         // 如果是砍价订单
         if (ObjectUtil.notEqual(TradeOrderTypeEnum.BARGAIN.getType(), reqBO.getOrderType())) {
             return;
         }
-
-        // 额外扣减砍价的库存
+        // 扣减砍价活动的库存
         bargainActivityApi.updateBargainActivityStock(reqBO.getBargainActivityId(), reqBO.getCount());
     }
@@ -24,9 +24,12 @@ public interface TradeOrderHandler {
      */
     void afterOrderCreate(TradeAfterOrderCreateReqBO reqBO);
+    // TODO @puhui999：这个搞成订单取消
     /**
      * 回滚
      */
     void rollback();
+    // TODO @puhui999：再搞个订单项取消哈
+
 }
@@ -20,13 +20,17 @@ public class TradeSeckillHandler implements TradeOrderHandler {
     @Resource
     private SeckillActivityApi seckillActivityApi;
+    // TODO @puhui999：先临时写在这里；在价格计算时，如果是秒杀商品，需要校验如下条件：
+    // 1. 商品存在、库存充足、单次限购；
+    // 2. 活动进行中、时间段符合
+
     @Override
     public void beforeOrderCreate(TradeBeforeOrderCreateReqBO reqBO) {
         // 如果是秒杀订单：额外扣减秒杀的库存；
         if (ObjectUtil.notEqual(TradeOrderTypeEnum.SECKILL.getType(), reqBO.getOrderType())) {
             return;
         }
-
+        // 扣减秒杀活动的库存
         seckillActivityApi.updateSeckillStock(reqBO.getSeckillActivityId(), reqBO.getSkuId(), reqBO.getCount());
     }
@@ -95,6 +95,10 @@ public class TradePriceCalculateRespBO {
          */
         private Integer pointPrice;
         /**
+         * VIP 减免金额，单位：分
+         */
+        private Integer vipPrice;
+        /**
          * 最终购买金额（总），单位：分
          *
          * = {@link #totalPrice}
@@ -102,6 +106,7 @@ public class TradePriceCalculateRespBO {
          * - {@link #pointPrice}
          * - {@link #discountPrice}
          * + {@link #deliveryPrice}
+         * - {@link #vipPrice}
          */
         private Integer payPrice;
@@ -168,6 +173,10 @@ public class TradePriceCalculateRespBO {
          */
         private Integer usePoint;
         /**
+         * VIP 减免金额，单位：分
+         */
+        private Integer vipPrice;
+        /**
          * 应付金额（总），单位：分
          *
          * = {@link #price} * {@link #count}
@@ -175,6 +184,7 @@ public class TradePriceCalculateRespBO {
          * - {@link #pointPrice}
          * - {@link #discountPrice}
          * + {@link #deliveryPrice}
+         * - {@link #vipPrice}
          */
         private Integer payPrice;
@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.trade.service.price.calculator;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.iocoder.yudao.module.promotion.api.coupon.CouponApi;
 import cn.iocoder.yudao.module.promotion.api.coupon.dto.CouponRespDTO;
@@ -9,6 +10,7 @@ import cn.iocoder.yudao.module.promotion.api.coupon.dto.CouponValidReqDTO;
 import cn.iocoder.yudao.module.promotion.enums.common.PromotionDiscountTypeEnum;
 import cn.iocoder.yudao.module.promotion.enums.common.PromotionProductScopeEnum;
 import cn.iocoder.yudao.module.promotion.enums.common.PromotionTypeEnum;
+import cn.iocoder.yudao.module.trade.enums.order.TradeOrderTypeEnum;
 import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateReqBO;
 import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateRespBO;
 import org.springframework.core.annotation.Order;
@@ -22,6 +24,7 @@ import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionU
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.filterList;
 import static cn.iocoder.yudao.module.promotion.enums.ErrorCodeConstants.COUPON_NO_MATCH_MIN_PRICE;
 import static cn.iocoder.yudao.module.promotion.enums.ErrorCodeConstants.COUPON_NO_MATCH_SPU;
+import static cn.iocoder.yudao.module.trade.enums.ErrorCodeConstants.PRICE_CALCULATE_COUPON_NOT_MATCH_NORMAL_ORDER;
 /**
  * 优惠劵的 {@link TradePriceCalculator} 实现类
@@ -44,6 +47,10 @@ public class TradeCouponPriceCalculator implements TradePriceCalculator {
         CouponRespDTO coupon = couponApi.validateCoupon(new CouponValidReqDTO()
                 .setId(param.getCouponId()).setUserId(param.getUserId()));
         Assert.notNull(coupon, "校验通过的优惠劵({})，不能为空", param.getCouponId());
+        // 1.2 只有【普通】订单，才允许使用优惠劵
+        if (ObjectUtil.notEqual(result.getType(), TradeOrderTypeEnum.NORMAL.getType())) {
+            throw exception(PRICE_CALCULATE_COUPON_NOT_MATCH_NORMAL_ORDER);
+        }
         // 2.1 获得匹配的商品 SKU 数组
         List<TradePriceCalculateRespBO.OrderItem> orderItems = filterMatchCouponOrderItems(result, coupon);
@@ -64,7 +64,8 @@ public class TradeDeliveryPriceCalculator implements TradePriceCalculator {
     private void calculateByPickUp(TradePriceCalculateReqBO param) {
         if (param.getPickUpStoreId() == null) {
-            throw exception(PRICE_CALCULATE_DELIVERY_PRICE_PICK_UP_STORE_IS_EMPTY);
+            // 价格计算时，如果为空就不算~最终下单，会校验该字段不允许空
+            return;
         }
         DeliveryPickUpStoreDO pickUpStore = deliveryPickUpStoreService.getDeliveryPickUpStore(param.getPickUpStoreId());
         if (pickUpStore == null || CommonStatusEnum.DISABLE.getStatus().equals(pickUpStore.getStatus())) {
@@ -77,7 +78,8 @@ public class TradeDeliveryPriceCalculator implements TradePriceCalculator {
     private void calculateExpress(TradePriceCalculateReqBO param, TradePriceCalculateRespBO result) {
         // 0. 得到收件地址区域
         if (param.getAddressId() == null) {
-            throw exception(PRICE_CALCULATE_DELIVERY_PRICE_USER_ADDRESS_IS_EMPTY);
+            // 价格计算时，如果为空就不算~最终下单，会校验该字段不允许空
+            return;
         }
         AddressRespDTO address = addressApi.getAddress(param.getAddressId(), param.getUserId());
         Assert.notNull(address, "收件人({})的地址，不能为空", param.getUserId());
 package cn.iocoder.yudao.module.trade.service.price.calculator;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.iocoder.yudao.module.promotion.api.discount.DiscountActivityApi;
 import cn.iocoder.yudao.module.promotion.api.discount.dto.DiscountProductRespDTO;
 import cn.iocoder.yudao.module.promotion.enums.common.PromotionDiscountTypeEnum;
 import cn.iocoder.yudao.module.promotion.enums.common.PromotionTypeEnum;
+import cn.iocoder.yudao.module.trade.enums.order.TradeOrderTypeEnum;
 import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateReqBO;
 import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateRespBO;
 import org.springframework.core.annotation.Order;
@@ -33,6 +35,10 @@ public class TradeDiscountActivityPriceCalculator implements TradePriceCalculato
     @Override
     public void calculate(TradePriceCalculateReqBO param, TradePriceCalculateRespBO result) {
+        // 0. 只有【普通】订单，才计算该优惠
+        if (ObjectUtil.notEqual(result.getType(), TradeOrderTypeEnum.NORMAL.getType())) {
+            return;
+        }
         // 获得 SKU 对应的限时折扣活动
         List<DiscountProductRespDTO> discountProducts = discountActivityApi.getMatchDiscountProductList(
                 convertSet(result.getItems(), TradePriceCalculateRespBO.OrderItem::getSkuId));
+package cn.iocoder.yudao.module.trade.service.price.calculator;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.iocoder.yudao.module.member.api.level.MemberLevelApi;
+import cn.iocoder.yudao.module.member.api.level.dto.MemberLevelRespDTO;
+import cn.iocoder.yudao.module.member.api.user.MemberUserApi;
+import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
+import cn.iocoder.yudao.module.promotion.enums.common.PromotionTypeEnum;
+import cn.iocoder.yudao.module.trade.enums.order.TradeOrderTypeEnum;
+import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateReqBO;
+import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateRespBO;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+
+import static cn.iocoder.yudao.module.trade.service.price.calculator.TradePriceCalculatorHelper.formatPrice;
+
+/**
+ * 会员 VIP 折扣的 {@link TradePriceCalculator} 实现类
+ *
+ * @author 芋道源码
+ */
+@Component
+@Order(TradePriceCalculator.ORDER_MEMBER_LEVEL)
+public class TradeMemberLevelPriceCalculator implements TradePriceCalculator {
+
+    @Resource
+    private MemberLevelApi memberLevelApi;
+    @Resource
+    private MemberUserApi memberUserApi;
+
+    @Override
+    public void calculate(TradePriceCalculateReqBO param, TradePriceCalculateRespBO result) {
+        // 0. 只有【普通】订单，才计算该优惠
+        if (ObjectUtil.notEqual(result.getType(), TradeOrderTypeEnum.NORMAL.getType())) {
+            return;
+        }
+        // 1. 获得用户的会员等级
+        MemberUserRespDTO user = memberUserApi.getUser(param.getUserId());
+        if (user.getLevelId() == null || user.getLevelId() <= 0) {
+            return;
+        }
+        MemberLevelRespDTO level = memberLevelApi.getMemberLevel(user.getLevelId());
+        if (level == null || level.getDiscountPercent() == null) {
+            return;
+        }
+
+        // 2. 计算每个 SKU 的优惠金额
+        result.getItems().forEach(orderItem -> {
+            // 2.1 计算优惠金额
+            Integer vipPrice = calculateVipPrice(orderItem.getPayPrice(), level.getDiscountPercent());
+            if (vipPrice <= 0) {
+                return;
+            }
+
+            // 2.2 记录优惠明细
+            if (orderItem.getSelected()) {
+                // 注意，只有在选中的情况下，才会记录到优惠明细。否则仅仅是更新 SKU 优惠金额，用于展示
+                TradePriceCalculatorHelper.addPromotion(result, orderItem,
+                        level.getId(), level.getName(), PromotionTypeEnum.MEMBER_LEVEL.getType(),
+                        String.format("会员等级折扣：省 %s 元", formatPrice(vipPrice)),
+                        vipPrice);
+            }
+
+            // 2.3 更新 SKU 的优惠金额
+            orderItem.setVipPrice(vipPrice);
+            TradePriceCalculatorHelper.recountPayPrice(orderItem);
+        });
+        TradePriceCalculatorHelper.recountAllPrice(result);
+    }
+
+    /**
+     * 计算会员 VIP 优惠价格
+     *
+     * @param price 原价
+     * @param discountPercent 折扣
+     * @return 优惠价格
+     */
+    public Integer calculateVipPrice(Integer price, Integer discountPercent) {
+        if (discountPercent == null) {
+            return 0;
+        }
+        Integer newPrice = price * discountPercent / 100;
+        return price - newPrice;
+    }
+
+}
@@ -13,6 +13,7 @@ import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateRespBO;
  */
 public interface TradePriceCalculator {
+    int ORDER_MEMBER_LEVEL = 5;
     int ORDER_DISCOUNT_ACTIVITY = 10;
     int ORDER_REWARD_ACTIVITY = 20;
     int ORDER_COUPON = 30;
@@ -52,7 +52,7 @@ public class TradePriceCalculatorHelper {
                     .setCount(item.getCount()).setCartId(item.getCartId()).setSelected(item.getSelected());
             // sku 价格
             orderItem.setPrice(sku.getPrice()).setPayPrice(sku.getPrice() * item.getCount())
-                    .setDiscountPrice(0).setDeliveryPrice(0).setCouponPrice(0).setPointPrice(0);
+                    .setDiscountPrice(0).setDeliveryPrice(0).setCouponPrice(0).setPointPrice(0).setVipPrice(0);
             // sku 信息
             orderItem.setPicUrl(sku.getPicUrl()).setProperties(sku.getProperties())
                     .setWeight(sku.getWeight()).setVolume(sku.getVolume());
@@ -98,7 +98,7 @@ public class TradePriceCalculatorHelper {
         // 先重置
         TradePriceCalculateRespBO.Price price = result.getPrice();
         price.setTotalPrice(0).setDiscountPrice(0).setDeliveryPrice(0)
-                .setCouponPrice(0).setPointPrice(0).setPayPrice(0);
+                .setCouponPrice(0).setPointPrice(0).setVipPrice(0).setPayPrice(0);
         // 再合计 item
         result.getItems().forEach(item -> {
             if (!item.getSelected()) {
@@ -109,6 +109,7 @@ public class TradePriceCalculatorHelper {
             price.setDeliveryPrice(price.getDeliveryPrice() + item.getDeliveryPrice());
             price.setCouponPrice(price.getCouponPrice() + item.getCouponPrice());
             price.setPointPrice(price.getPointPrice() + item.getPointPrice());
+            price.setVipPrice(price.getVipPrice() + item.getVipPrice());
             price.setPayPrice(price.getPayPrice() + item.getPayPrice());
         });
     }
@@ -132,7 +133,9 @@ public class TradePriceCalculatorHelper {
                 - orderItem.getDiscountPrice()
                 + orderItem.getDeliveryPrice()
                 - orderItem.getCouponPrice()
-                - orderItem.getPointPrice());
+                - orderItem.getPointPrice()
+                - orderItem.getVipPrice()
+        );
     }
     /**
@@ -162,6 +165,9 @@ public class TradePriceCalculatorHelper {
             if (orderItem.getGivePoint() == null) {
                 orderItem.setGivePoint(0);
             }
+            if (orderItem.getVipPrice() == null) {
+                orderItem.setVipPrice(0);
+            }
             recountPayPrice(orderItem);
         });
     }
 package cn.iocoder.yudao.module.trade.service.price.calculator;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.iocoder.yudao.module.promotion.api.reward.RewardActivityApi;
 import cn.iocoder.yudao.module.promotion.api.reward.dto.RewardActivityMatchRespDTO;
 import cn.iocoder.yudao.module.promotion.enums.common.PromotionConditionTypeEnum;
 import cn.iocoder.yudao.module.promotion.enums.common.PromotionTypeEnum;
+import cn.iocoder.yudao.module.trade.enums.order.TradeOrderTypeEnum;
 import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateReqBO;
 import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateRespBO;
 import org.springframework.core.annotation.Order;
@@ -32,6 +34,10 @@ public class TradeRewardActivityPriceCalculator implements TradePriceCalculator 
     @Override
     public void calculate(TradePriceCalculateReqBO param, TradePriceCalculateRespBO result) {
+        // 0. 只有【普通】订单，才计算该优惠
+        if (ObjectUtil.notEqual(result.getType(), TradeOrderTypeEnum.NORMAL.getType())) {
+            return;
+        }
         // 获得 SKU 对应的满减送活动
         List<RewardActivityMatchRespDTO> rewardActivities = rewardActivityApi.getMatchRewardActivityList(
                 convertSet(result.getItems(), TradePriceCalculateRespBO.OrderItem::getSpuId));
@@ -7,6 +7,7 @@ import cn.iocoder.yudao.module.promotion.api.coupon.dto.CouponValidReqDTO;
 import cn.iocoder.yudao.module.promotion.enums.common.PromotionDiscountTypeEnum;
 import cn.iocoder.yudao.module.promotion.enums.common.PromotionProductScopeEnum;
 import cn.iocoder.yudao.module.promotion.enums.common.PromotionTypeEnum;
+import cn.iocoder.yudao.module.trade.enums.order.TradeOrderTypeEnum;
 import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateReqBO;
 import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateRespBO;
 import org.junit.jupiter.api.Test;
@@ -47,6 +48,7 @@ public class TradeCouponPriceCalculatorTest extends BaseMockitoUnitTest {
                         new TradePriceCalculateReqBO.Item().setSkuId(40L).setCount(5).setSelected(false) // 匹配优惠劵，但是未选中
                     ));
         TradePriceCalculateRespBO result = new TradePriceCalculateRespBO()
+                .setType(TradeOrderTypeEnum.NORMAL.getType())
                 .setPrice(new TradePriceCalculateRespBO.Price())
                 .setPromotions(new ArrayList<>())
                 .setItems(asList(
@@ -5,6 +5,7 @@ import cn.iocoder.yudao.module.promotion.api.discount.DiscountActivityApi;
 import cn.iocoder.yudao.module.promotion.api.discount.dto.DiscountProductRespDTO;
 import cn.iocoder.yudao.module.promotion.enums.common.PromotionDiscountTypeEnum;
 import cn.iocoder.yudao.module.promotion.enums.common.PromotionTypeEnum;
+import cn.iocoder.yudao.module.trade.enums.order.TradeOrderTypeEnum;
 import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateReqBO;
 import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateRespBO;
 import org.junit.jupiter.api.Test;
@@ -42,6 +43,7 @@ public class TradeDiscountActivityPriceCalculatorTest extends BaseMockitoUnitTes
                         new TradePriceCalculateReqBO.Item().setSkuId(20L).setCount(3).setSelected(false) // 匹配活动，但未选中
                 ));
         TradePriceCalculateRespBO result = new TradePriceCalculateRespBO()
+                .setType(TradeOrderTypeEnum.NORMAL.getType())
                 .setPrice(new TradePriceCalculateRespBO.Price())
                 .setPromotions(new ArrayList<>())
                 .setItems(asList(
+package cn.iocoder.yudao.module.trade.service.price.calculator;
+
+import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest;
+import cn.iocoder.yudao.module.member.api.level.MemberLevelApi;
+import cn.iocoder.yudao.module.member.api.level.dto.MemberLevelRespDTO;
+import cn.iocoder.yudao.module.member.api.user.MemberUserApi;
+import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
+import cn.iocoder.yudao.module.promotion.enums.common.PromotionTypeEnum;
+import cn.iocoder.yudao.module.trade.enums.order.TradeOrderTypeEnum;
+import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateReqBO;
+import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateRespBO;
+import org.junit.jupiter.api.Test;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+
+import java.util.ArrayList;
+
+import static java.util.Arrays.asList;
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.when;
+
+/**
+ * {@link TradeMemberLevelPriceCalculator} 的单元测试类
+ *
+ * @author 芋道源码
+ */
+public class TradeMemberLevelPriceCalculatorTest extends BaseMockitoUnitTest {
+
+    @InjectMocks
+    private TradeMemberLevelPriceCalculator memberLevelPriceCalculator;
+
+    @Mock
+    private MemberLevelApi memberLevelApi;
+    @Mock
+    private MemberUserApi memberUserApi;
+
+    @Test
+    public void testCalculate() {
+        // 准备参数
+        TradePriceCalculateReqBO param = new TradePriceCalculateReqBO()
+                .setUserId(1024L)
+                .setItems(asList(
+                        new TradePriceCalculateReqBO.Item().setSkuId(10L).setCount(2).setSelected(true), // 匹配活动，且已选中
+                        new TradePriceCalculateReqBO.Item().setSkuId(20L).setCount(3).setSelected(false) // 匹配活动，但未选中
+                ));
+        TradePriceCalculateRespBO result = new TradePriceCalculateRespBO()
+                .setType(TradeOrderTypeEnum.NORMAL.getType())
+                .setPrice(new TradePriceCalculateRespBO.Price())
+                .setPromotions(new ArrayList<>())
+                .setItems(asList(
+                        new TradePriceCalculateRespBO.OrderItem().setSkuId(10L).setCount(2).setSelected(true)
+                                .setPrice(100),
+                        new TradePriceCalculateRespBO.OrderItem().setSkuId(20L).setCount(3).setSelected(false)
+                                .setPrice(50)
+                ));
+        // 保证价格被初始化上
+        TradePriceCalculatorHelper.recountPayPrice(result.getItems());
+        TradePriceCalculatorHelper.recountAllPrice(result);
+
+        // mock 方法（会员等级）
+        when(memberUserApi.getUser(eq(1024L))).thenReturn(new MemberUserRespDTO().setLevelId(2048L));
+        when(memberLevelApi.getMemberLevel(eq(2048L))).thenReturn(
+                new MemberLevelRespDTO().setId(2048L).setName("VIP 会员").setDiscountPercent(60));
+
+        // 调用
+        memberLevelPriceCalculator.calculate(param, result);
+        // 断言：Price 部分
+        TradePriceCalculateRespBO.Price price = result.getPrice();
+        assertEquals(price.getTotalPrice(), 200);
+        assertEquals(price.getDiscountPrice(), 0);
+        assertEquals(price.getPointPrice(), 0);
+        assertEquals(price.getDeliveryPrice(), 0);
+        assertEquals(price.getCouponPrice(), 0);
+        assertEquals(price.getVipPrice(), 80);
+        assertEquals(price.getPayPrice(), 120);
+        assertNull(result.getCouponId());
+        // 断言：SKU 1
+        assertEquals(result.getItems().size(), 2);
+        TradePriceCalculateRespBO.OrderItem orderItem01 = result.getItems().get(0);
+        assertEquals(orderItem01.getSkuId(), 10L);
+        assertEquals(orderItem01.getCount(), 2);
+        assertEquals(orderItem01.getPrice(), 100);
+        assertEquals(orderItem01.getDiscountPrice(), 0);
+        assertEquals(orderItem01.getDeliveryPrice(), 0);
+        assertEquals(orderItem01.getCouponPrice(), 0);
+        assertEquals(orderItem01.getPointPrice(), 0);
+        assertEquals(orderItem01.getVipPrice(), 80);
+        assertEquals(orderItem01.getPayPrice(), 120);
+        // 断言：SKU 2
+        TradePriceCalculateRespBO.OrderItem orderItem02 = result.getItems().get(1);
+        assertEquals(orderItem02.getSkuId(), 20L);
+        assertEquals(orderItem02.getCount(), 3);
+        assertEquals(orderItem02.getPrice(), 50);
+        assertEquals(orderItem02.getDiscountPrice(), 0);
+        assertEquals(orderItem02.getDeliveryPrice(), 0);
+        assertEquals(orderItem02.getCouponPrice(), 0);
+        assertEquals(orderItem02.getPointPrice(), 0);
+        assertEquals(orderItem02.getVipPrice(), 60);
+        assertEquals(orderItem02.getPayPrice(), 90);
+        // 断言：Promotion 部分
+        assertEquals(result.getPromotions().size(), 1);
+        TradePriceCalculateRespBO.Promotion promotion01 = result.getPromotions().get(0);
+        assertEquals(promotion01.getId(), 2048L);
+        assertEquals(promotion01.getName(), "VIP 会员");
+        assertEquals(promotion01.getType(), PromotionTypeEnum.MEMBER_LEVEL.getType());
+        assertEquals(promotion01.getTotalPrice(), 200);
+        assertEquals(promotion01.getDiscountPrice(), 80);
+        assertTrue(promotion01.getMatch());
+        assertEquals(promotion01.getDescription(), "会员等级折扣：省 0.80 元");
+        TradePriceCalculateRespBO.PromotionItem promotionItem01 = promotion01.getItems().get(0);
+        assertEquals(promotion01.getItems().size(), 1);
+        assertEquals(promotionItem01.getSkuId(), 10L);
+        assertEquals(promotionItem01.getTotalPrice(), 200);
+        assertEquals(promotionItem01.getDiscountPrice(), 80);
+    }
+
+}
@@ -5,6 +5,7 @@ import cn.iocoder.yudao.module.promotion.api.reward.RewardActivityApi;
 import cn.iocoder.yudao.module.promotion.api.reward.dto.RewardActivityMatchRespDTO;
 import cn.iocoder.yudao.module.promotion.enums.common.PromotionConditionTypeEnum;
 import cn.iocoder.yudao.module.promotion.enums.common.PromotionTypeEnum;
+import cn.iocoder.yudao.module.trade.enums.order.TradeOrderTypeEnum;
 import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateReqBO;
 import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateRespBO;
 import org.junit.jupiter.api.Test;
@@ -44,6 +45,7 @@ public class TradeRewardActivityPriceCalculatorTest extends BaseMockitoUnitTest 
                         new TradePriceCalculateReqBO.Item().setSkuId(30L).setCount(4).setSelected(true) // 匹配活动 2
                 ));
         TradePriceCalculateRespBO result = new TradePriceCalculateRespBO()
+                .setType(TradeOrderTypeEnum.NORMAL.getType())
                 .setPrice(new TradePriceCalculateRespBO.Price())
                 .setPromotions(new ArrayList<>())
                 .setItems(asList(
@@ -157,6 +159,7 @@ public class TradeRewardActivityPriceCalculatorTest extends BaseMockitoUnitTest 
                         new TradePriceCalculateReqBO.Item().setSkuId(30L).setCount(4).setSelected(true)
                 ));
         TradePriceCalculateRespBO result = new TradePriceCalculateRespBO()
+                .setType(TradeOrderTypeEnum.NORMAL.getType())
                 .setPrice(new TradePriceCalculateRespBO.Price())
                 .setPromotions(new ArrayList<>())
                 .setItems(asList(
 package cn.iocoder.yudao.module.member.api.level;
+import cn.iocoder.yudao.module.member.api.level.dto.MemberLevelRespDTO;
 import cn.iocoder.yudao.module.member.enums.MemberExperienceBizTypeEnum;
 /**
@@ -10,6 +11,14 @@ import cn.iocoder.yudao.module.member.enums.MemberExperienceBizTypeEnum;
 public interface MemberLevelApi {
     /**
+     * 获得会员等级
+     *
+     * @param id 会员等级编号
+     * @return 会员等级
+     */
+    MemberLevelRespDTO getMemberLevel(Long id);
+
+    /**
      * 增加会员经验
      *
      * @param userId     会员ID
+package cn.iocoder.yudao.module.member.api.level.dto;
+
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
+import lombok.Data;
+
+/**
+ * 会员等级 Resp DTO
+ *
+ * @author 芋道源码
+ */
+@Data
+public class MemberLevelRespDTO {
+
+    /**
+     * 编号
+     */
+    private Long id;
+    /**
+     * 等级名称
+     */
+    private String name;
+    /**
+     * 等级
+     */
+    private Integer level;
+    /**
+     * 升级经验
+     */
+    private Integer experience;
+    /**
+     * 享受折扣
+     */
+    private Integer discountPercent;
+    /**
+     * 状态
+     *
+     * 枚举 {@link CommonStatusEnum}
+     */
+    private Integer status;
+
+}
@@ -33,6 +33,14 @@ public class MemberUserRespDTO {
      * 手机
      */
     private String mobile;
+
+    // ========== 其它信息 ==========
+
+    /**
+     * 会员级别编号
+     */
+    private Long levelId;
+
     /**
      * 积分
      */
 package cn.iocoder.yudao.module.member.api.level;
+import cn.iocoder.yudao.module.member.api.level.dto.MemberLevelRespDTO;
+import cn.iocoder.yudao.module.member.convert.level.MemberLevelConvert;
 import cn.iocoder.yudao.module.member.enums.MemberExperienceBizTypeEnum;
 import cn.iocoder.yudao.module.member.service.level.MemberLevelService;
 import org.springframework.stereotype.Service;
@@ -23,6 +25,11 @@ public class MemberLevelApiImpl implements MemberLevelApi {
     private MemberLevelService memberLevelService;
     @Override
+    public MemberLevelRespDTO getMemberLevel(Long id) {
+        return MemberLevelConvert.INSTANCE.convert02(memberLevelService.getLevel(id));
+    }
+
+    @Override
     public void addExperience(Long userId, Integer experience, Integer bizType, String bizId) {
         MemberExperienceBizTypeEnum bizTypeEnum = MemberExperienceBizTypeEnum.getByType(bizType);
         if (bizTypeEnum == null) {
 package cn.iocoder.yudao.module.member.convert.level;
+import cn.iocoder.yudao.module.member.api.level.dto.MemberLevelRespDTO;
 import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelCreateReqVO;
 import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelRespVO;
 import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelSimpleRespVO;
@@ -33,4 +34,6 @@ public interface MemberLevelConvert {
     List<AppMemberLevelRespVO> convertList02(List<MemberLevelDO> list);
+    MemberLevelRespDTO convert02(MemberLevelDO bean);
+
 }