券码核销添加

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/CalculationCommonService.java

@@ -112,6 +112,7 @@ public class CalculationCommonService {
         if (find == null) return;
         cartGoods.setAmount(find.getRealAmount());
         cartGoods.setCurrentCouponDiscount(0);
+        cartGoods.setFinalPrice(find.getNowPrice());
         if (CollectionUtils.isNotEmpty(find.getDiscounts())){
             CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount goodsDiscount = find.getDiscounts().stream()
                     .filter(p -> p.getActivityCode().equals(couponCode)).findFirst().orElse(null);

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/CalculationSharingCartService.java

@@ -8,6 +8,7 @@ import cn.freemud.entities.vo.CartGoods;
 import cn.freemud.entities.vo.CouponPromotionVO;
 import cn.freemud.entities.vo.ShoppingCartGoodsResponseVo;
 import cn.freemud.entities.vo.ShoppingCartInfoRequestVo;
+import cn.freemud.enums.OrderChannelType;
 import cn.freemud.service.impl.calculate.promotion.*;
 import com.freemud.sdk.api.assortment.shoppingcart.enums.BusinessTypeEnum;
 import lombok.extern.slf4j.Slf4j;
@@ -101,7 +102,9 @@ public class CalculationSharingCartService {
          * 积分抵扣
          */
         scoreSharingService.scoreResponse(discountResult, shoppingCartGoodsResponseVo, userLoginInfoDto, shoppingCartInfoRequestVo);
-        if (BusinessTypeEnum.SAAS_DELIVERY.getCode().equals(menuType)) {
+        if (BusinessTypeEnum.SAAS_DELIVERY.getCode().equals(menuType) && OrderChannelType.SAASMALL.getCode().equalsIgnoreCase(shoppingCartInfoRequestVo.getChannelType())) {
+            deliverySharingService.mallDeliveryResponse(shoppingCartGoodsResponseVo, deliveryAmount);
+        }else{
             deliverySharingService.deliveryResponse(discountResult, activityQueryDto, shoppingCartGoodsResponseVo, deliveryAmount);
         }
 

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/promotion/DeliverySharingService.java

@@ -96,4 +96,9 @@ public class DeliverySharingService {
         }
 
     }
+
+    public void mallDeliveryResponse(ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo, Long deliveryAmount) {
+        shoppingCartGoodsResponseVo.setTotalAmount(shoppingCartGoodsResponseVo.getTotalAmount() + deliveryAmount);
+        shoppingCartGoodsResponseVo.setOriginalTotalAmount(shoppingCartGoodsResponseVo.getOriginalTotalAmount() + deliveryAmount);
+    }
 }