迁移 cart 的 web api

解决 promotion-service 模块的启动
YunaiV · Aug 7, 2020 · 84cc272 · 84cc272
1 parent 5714ddc
commit 84cc272
Show file tree

Hide file tree

Showing 22 changed files with 346 additions and 128 deletions.
diff --git a/...-app/src/main/java/cn/iocoder/mall/orderservice/dal/mysql/mapper/cart/CartItemMapper.java b/...-app/src/main/java/cn/iocoder/mall/orderservice/dal/mysql/mapper/cart/CartItemMapper.java
@@ -8,6 +8,7 @@
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.math.BigDecimal;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -37,7 +38,7 @@ default Integer selectSumQuantityByUserId(Integer userId) {
                 .select("SUM(quantity) AS sumQuantity")
                 .eq("user_id", userId));
         // 获得数量
-        return (Integer) result.get(0).get("sumQuantity");
+        return ((BigDecimal) result.get(0).get("sumQuantity")).intValue();
     }
 
     default List<CartItemDO> selectList(CartItemListQueryBO queryBO) {

diff --git a/...rder-service-app/src/main/java/cn/iocoder/mall/orderservice/manager/cart/CartManager.java b/...rder-service-app/src/main/java/cn/iocoder/mall/orderservice/manager/cart/CartManager.java
@@ -38,7 +38,7 @@ public void addCartItem(CartItemAddReqDTO addReqDTO) {
         // 校验商品 SKU 是否合法
         ProductSkuRespDTO skuDTO = this.checkProductSku(addReqDTO.getSkuId());
         // 添加购物车项
-        cartService.addCartItem(CartConvert.INSTANCE.convert(addReqDTO), skuDTO.getQuantity());
+        cartService.addCartItem(CartConvert.INSTANCE.convert(addReqDTO).setSpuId(skuDTO.getSpuId()), skuDTO.getQuantity());
     }
 
     /**

diff --git a/...service-app/src/main/java/cn/iocoder/mall/orderservice/service/cart/bo/CartItemAddBO.java b/...service-app/src/main/java/cn/iocoder/mall/orderservice/service/cart/bo/CartItemAddBO.java
@@ -10,7 +10,7 @@
  * 购物车添加购物项 Request DTO
  */
 @Data
-@Accessors
+@Accessors(chain = true)
 public class CartItemAddBO {
 
     /**

diff --git a/order-service-project/order-service-app/src/main/resources/application.yaml b/order-service-project/order-service-app/src/main/resources/application.yaml
@@ -39,6 +39,8 @@ dubbo:
   consumer:
     ErrorCodeRpc:
       version: 1.0.0
+    ProductSkuRpc:
+      version: 1.0.0
 
 # RocketMQ 配置项
 rocketmq:

diff --git a/...er-rest/src/main/java/cn/iocoder/mall/order/rest/controller/cart/UsersCartController.java b/...er-rest/src/main/java/cn/iocoder/mall/order/rest/controller/cart/UsersCartController.java
@@ -16,14 +16,7 @@ public class UsersCartController {
 //    @Reference(validation = "true", version = "${dubbo.consumer.CouponService.version}")
 //    private CouponService couponService;
 //
-//    @PostMapping("add")
-//    public CommonResult<Integer> add(@RequestParam("skuId") Integer skuId,
-//                                     @RequestParam("quantity") Integer quantity) {
-//        // 添加到购物车
-//        cartService.add(UserSecurityContextHolder.getContext().getUserId(), skuId, quantity);
-//        // 获得目前购物车商品总数量
-//        return success(cartService.count(UserSecurityContextHolder.getContext().getUserId()));
-//    }
+
 //
 //    @PostMapping("update_quantity")
 //    public CommonResult<UsersCartDetailVO> updateQuantity(@RequestParam("skuId") Integer skuId, // TODO 芋艿，先暂用这个 VO 。等促销活动出来后，做调整
@@ -43,11 +36,7 @@ public class UsersCartController {
 //        // 获得目前购物车明细
 //        return getCartDetail();
 //    }
-//
-//    @GetMapping("count")
-//    public CommonResult<Integer> count() {
-//        return success(cartService.count(UserSecurityContextHolder.getContext().getUserId()));
-//    }
+
 //
 //    @GetMapping("/list")
 //    public CommonResult<UsersCartDetailVO> list() { // TODO 芋艿，先暂用这个 VO 。等促销活动出来后，做调整

diff --git a/...r/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/service/CartServiceImpl.java b/...r/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/service/CartServiceImpl.java
@@ -239,7 +239,7 @@ private Integer modifyPriceByCouponCard(Integer userId, Integer couponCardId, Li
         // 判断是否符合条件
         int originalTotal = items.stream().mapToInt(CalcOrderPriceBO.Item::getPresentTotal).sum(); // 此处，指的是以优惠劵视角的原价
         if (originalTotal == 0 || originalTotal < couponCard.getPriceAvailable()) {
-            throw ServiceExceptionUtil.exception(PromotionErrorCodeEnum.COUPON_CARD_NOT_MATCH.getCode()); // TODO 芋艿，这种情况，会出现错误码的提示，无法格式化出来。另外，这块的最佳实践，找人讨论下。
+            throw ServiceExceptionUtil.exception(PromotionErrorCodeConstants.COUPON_CARD_NOT_MATCH.getCode()); // TODO 芋艿，这种情况，会出现错误码的提示，无法格式化出来。另外，这块的最佳实践，找人讨论下。
         }
         // 计算价格
         // 获得到优惠信息，进行价格计算

diff --git a/pom.xml b/pom.xml
@@ -16,10 +16,8 @@
     <modules>
         <module>order</module>
         <module>common</module>
-<!--        <module>system</module>-->
 <!--        <module>ops</module>-->
 <!--        <module>pay</module>-->
-<!--        <module>promotion</module>-->
         <module>mall-dependencies</module>
         <module>user-service-project</module>
         <module>user-web-app</module>
@@ -28,7 +26,7 @@
         <module>management-web-app</module>
         <module>shop-web-app</module>
         <module>product-service-project</module>
-<!--        <module>promotion-service-project</module>-->
+        <module>promotion-service-project</module>
         <module>search-service-project</module>
         <module>order-service-project</module>
     </modules>

diff --git a/promotion-service-project/promotion-service-api/pom.xml b/promotion-service-project/promotion-service-api/pom.xml
@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>promotion</artifactId>
+        <artifactId>promotion-service-project</artifactId>
         <groupId>cn.iocoder.mall</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>

diff --git a/...ce-api/src/main/java/cn/iocoder/mall/promotion/api/enums/PromotionErrorCodeConstants.java b/...ce-api/src/main/java/cn/iocoder/mall/promotion/api/enums/PromotionErrorCodeConstants.java
@@ -0,0 +1,37 @@
+package cn.iocoder.mall.promotion.api.enums;
+
+import cn.iocoder.common.framework.exception.ErrorCode;
+
+/**
+ * 错误码枚举类
+ *
+ * 营销系统，使用 1-006-000-000 段
+ */
+public interface PromotionErrorCodeConstants {
+
+    // ========== Banner 模块 ==========
+    ErrorCode BANNER_NOT_EXISTS = new ErrorCode(1006000000, "账号不存在");
+
+    // ========== PRODUCT RECOMMEND 模块 ==========
+    ErrorCode PRODUCT_RECOMMEND_NOT_EXISTS = new ErrorCode(1006001000, "商品推荐不存在");
+    ErrorCode PRODUCT_RECOMMEND_PRODUCT_NOT_EXISTS = new ErrorCode(1006001001, "商品不存在");
+    ErrorCode PRODUCT_RECOMMEND_EXISTS = new ErrorCode(1006001002, "该商品推荐已经存在");
+
+
+    // ========== COUPON TEMPLATE 模块 ==========
+    ErrorCode COUPON_TEMPLATE_NOT_EXISTS = new ErrorCode(1006002000, "优惠劵模板（码）不存在");
+    ErrorCode COUPON_TEMPLATE_NOT_CARD = new ErrorCode(1006002001, "不是优惠劵模板");
+    ErrorCode COUPON_TEMPLATE_NOT_CODE = new ErrorCode(1006002002, "不是优惠码模板");
+    ErrorCode COUPON_TEMPLATE_TOTAL_CAN_NOT_REDUCE = new ErrorCode(1006002003, "优惠劵（码）模板的发放数量不能减小");
+    ErrorCode COUPON_TEMPLATE_STATUS_NOT_ENABLE = new ErrorCode(1006002004, "优惠劵模板（码）未开启");
+    ErrorCode COUPON_TEMPLATE_TOTAL_NOT_ENOUGH = new ErrorCode(1006002005, "优惠劵（码）模板的发放量不足");
+    ErrorCode COUPON_TEMPLATE_CARD_ADD_EXCEED_QUOTA = new ErrorCode(1006002006, "优惠劵领取到达上限");
+
+    // ========== COUPON CARD 模块 ==========
+    ErrorCode COUPON_CARD_NOT_EXISTS = new ErrorCode(1006003000, "优惠劵不存在");
+    ErrorCode COUPON_CARD_ERROR_USER = new ErrorCode(1006003001, "优惠劵不属于当前用户");
+    ErrorCode COUPON_CARD_NOT_MATCH = new ErrorCode(1006003002, "优惠劵不匹配，无法使用");
+    ErrorCode COUPON_CARD_STATUS_NOT_UNUSED = new ErrorCode(1006003003, "优惠劵不处于待使用状态");
+    ErrorCode COUPON_CARD_STATUS_NOT_USED = new ErrorCode( 1006003004, "优惠劵不处于已使用状态");
+
+}
diff --git a/...service-api/src/main/java/cn/iocoder/mall/promotion/api/enums/PromotionErrorCodeEnum.java b/...service-api/src/main/java/cn/iocoder/mall/promotion/api/enums/PromotionErrorCodeEnum.java
diff --git a/promotion-service-project/promotion-service-app/pom.xml b/promotion-service-project/promotion-service-app/pom.xml
@@ -12,26 +12,45 @@
     <artifactId>promotion-service-app</artifactId>
 
     <dependencies>
-
+        <!-- RPC 相关 -->
         <dependency>
             <groupId>cn.iocoder.mall</groupId>
             <artifactId>mall-spring-boot-starter-dubbo</artifactId>
         </dependency>
 
         <dependency>
+            <!-- 系统服务 -->
+            <groupId>cn.iocoder.mall</groupId>
+            <artifactId>system-service-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <!-- 商品服务 -->
+            <groupId>cn.iocoder.mall</groupId>
+            <artifactId>product-service-api</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <!-- 营销服务 -->
             <groupId>cn.iocoder.mall</groupId>
             <artifactId>promotion-service-api</artifactId>
         </dependency>
 
+        <!-- Web 相关 -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot</artifactId>
+            <artifactId>spring-boot-starter-web</artifactId> <!-- 需要开启 Web 容器，因为 Actuator 需要使用到 -->
         </dependency>
+
+        <!-- Registry 和 Config 相关 -->
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-autoconfigure</artifactId>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
         </dependency>
 
+        <!-- DB 相关 -->
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
@@ -46,12 +65,44 @@
             <groupId>cn.iocoder.mall</groupId>
             <artifactId>mall-spring-boot-starter-mybatis</artifactId>
         </dependency>
+
+        <!-- 工具类相关 -->
         <dependency>
-            <groupId>cn.iocoder.mall</groupId>
-            <artifactId>product-service-api</artifactId>
-            <version>1.0-SNAPSHOT</version>
-            <scope>compile</scope>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.mapstruct</groupId>
+            <artifactId>mapstruct</artifactId> <!-- use mapstruct-jdk8 for Java 8 or higher -->
+        </dependency>
+        <dependency>
+            <groupId>org.mapstruct</groupId>
+            <artifactId>mapstruct-jdk8</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.aspectj</groupId>
+            <artifactId>aspectjweaver</artifactId>
+            <version>1.9.6</version>
         </dependency>
     </dependencies>
 
-</project>
+    <build>
+        <!-- 设置构建的 jar 包名 -->
+        <finalName>${project.artifactId}</finalName>
+        <!-- 使用 spring-boot-maven-plugin 插件打包 -->
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/...vice-app/src/main/java/cn/iocoder/mall/promotionservice/service/banner/BannerService.java b/...vice-app/src/main/java/cn/iocoder/mall/promotionservice/service/banner/BannerService.java
@@ -3,24 +3,17 @@
 import cn.iocoder.common.framework.enums.CommonStatusEnum;
 import cn.iocoder.common.framework.exception.util.ServiceExceptionUtil;
 import cn.iocoder.mall.mybatis.core.enums.DeletedStatusEnum;
-import cn.iocoder.mall.promotion.api.enums.PromotionActivityTypeEnum;
-import cn.iocoder.mall.promotion.api.enums.PromotionErrorCodeEnum;
-import cn.iocoder.mall.promotion.api.enums.RangeTypeEnum;
+import cn.iocoder.mall.promotion.api.enums.PromotionErrorCodeConstants;
 import cn.iocoder.mall.promotion.api.rpc.banner.dto.BannerPageDTO;
-import cn.iocoder.mall.promotionservice.convert.activity.PromotionActivityConvert;
 import cn.iocoder.mall.promotionservice.convert.banner.BannerConvert;
-import cn.iocoder.mall.promotionservice.dal.mysql.dataobject.activity.PromotionActivityDO;
 import cn.iocoder.mall.promotionservice.dal.mysql.dataobject.banner.BannerDO;
-import cn.iocoder.mall.promotionservice.dal.mysql.mapper.activity.PromotionActivityMapper;
 import cn.iocoder.mall.promotionservice.dal.mysql.mapper.banner.BannerMapper;
-import cn.iocoder.mall.promotionservice.service.activity.bo.PromotionActivityPageBO;
 import cn.iocoder.mall.promotionservice.service.banner.bo.BannerAddBO;
 import cn.iocoder.mall.promotionservice.service.banner.bo.BannerBO;
 import cn.iocoder.mall.promotionservice.service.banner.bo.BannerPageBO;
 import cn.iocoder.mall.promotionservice.service.banner.bo.BannerUpdateBO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.util.Assert;
 import org.springframework.validation.annotation.Validated;
 
 import java.util.*;
@@ -61,7 +54,7 @@ public BannerBO addBanner(Integer adminId, BannerAddBO bannerAddDTO) {
     public Boolean updateBanner(Integer adminId, BannerUpdateBO bannerUpdateDTO) {
         // 校验 Banner 存在
         if (bannerMapper.selectById(bannerUpdateDTO.getId()) == null) {
-            throw ServiceExceptionUtil.exception(PromotionErrorCodeEnum.BANNER_NOT_EXISTS.getCode());
+            throw ServiceExceptionUtil.exception(PromotionErrorCodeConstants.BANNER_NOT_EXISTS.getCode());
         }
         // 更新到数据库
         BannerDO updateBanner = BannerConvert.INSTANCE.convert(bannerUpdateDTO);
@@ -73,7 +66,7 @@ public Boolean updateBanner(Integer adminId, BannerUpdateBO bannerUpdateDTO) {
     public Boolean updateBannerStatus(Integer adminId, Integer bannerId, Integer status) {
         // 校验 Banner 存在
         if (bannerMapper.selectById(bannerId) == null) {
-            throw ServiceExceptionUtil.exception(PromotionErrorCodeEnum.BANNER_NOT_EXISTS.getCode());
+            throw ServiceExceptionUtil.exception(PromotionErrorCodeConstants.BANNER_NOT_EXISTS.getCode());
         }
         // 更新到数据库
         BannerDO updateBanner = new BannerDO().setId(bannerId).setStatus(status);
@@ -85,7 +78,7 @@ public Boolean updateBannerStatus(Integer adminId, Integer bannerId, Integer sta
     public Boolean deleteBanner(Integer adminId, Integer bannerId) {
         // 校验 Banner 存在
         if (bannerMapper.selectById(bannerId) == null) {
-            throw ServiceExceptionUtil.exception(PromotionErrorCodeEnum.BANNER_NOT_EXISTS.getCode());
+            throw ServiceExceptionUtil.exception(PromotionErrorCodeConstants.BANNER_NOT_EXISTS.getCode());
         }
         // 更新到数据库
         BannerDO updateBanner = new BannerDO().setId(bannerId);