商品券调整

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java

@@ -115,13 +115,13 @@ public class ShoppingCartMCoffeeServiceImpl {
 
         String spuId2 = spuId;
         List<Long> productIds = new ArrayList<>();
-        productIds.add(Long.parseLong(goodsId));
-        CartGoods addCartGoods = convent2CartGoods(addShoppingCartGoodsRequestVo);
-
-        if(StringUtils.isNotBlank(couponCode)){
-            String couponCodespq = CommonsConstant.COUPON_PREFIX + couponCode;
-            spuId2 = validCoupon(partnerId, storeId, couponCodespq, productIds,BusinessTypeEnum.getByType(addShoppingCartGoodsRequestVo.getMenuType()).getCode());
+        //商品券校验
+        if(spuId.startsWith(CommonsConstant.COUPON_PREFIX)){
+            couponCode = spuId.substring(CommonsConstant.COUPON_PREFIX.length());
+            spuId2 = validCoupon(partnerId, storeId, spuId, productIds,BusinessTypeEnum.getByType(addShoppingCartGoodsRequestVo.getMenuType()).getCode());
+            goodsId = spuId2;
         }
+        productIds.add(Long.parseLong(goodsId));
         // 获取添加商品的详细信息
         List<ProductBeanDTO> productBeanListSpuClass = assortmentSdkService.getProductsInfoSdk(partnerId, storeId, Collections.singletonList(spuId2), menuType, this.shoppingCartBaseService);
 
@@ -131,10 +131,9 @@ public class ShoppingCartMCoffeeServiceImpl {
             oldCartGoodsList = new ArrayList<>();
         }
 
-
-
         //商品券已添加情况校验
         List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons = checkGoodsCoupon(oldCartGoodsList, operationType, couponCode);
+        CartGoods addCartGoods = convent2CartGoods(addShoppingCartGoodsRequestVo);
         setClassificationAndPrice(addCartGoods, productBeanListSpuClass);
         //查询多个商品库存信息
 //        Integer checkQty = this.checkSkuQty(oldCartGoodsList, addCartGoods);