围餐

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -2452,6 +2452,10 @@ public class OrderAdapter {
         previewOrderInfoVo.setPayStatus(queryOrderResponseVo.getPayStatus());
         previewOrderInfoVo.setPayStatusDesc(queryOrderResponseVo.getPayStatusDesc());
         previewOrderInfoVo.setShopName(queryOrderResponseVo.getShopName());
+        previewOrderInfoVo.setFullDiscount(queryOrderResponseVo.getFullDiscountAmount());
+        if (queryOrderResponseVo.getCouponInfo() != null) {
+            previewOrderInfoVo.setCouponDiscount(queryOrderResponseVo.getCouponInfo().getCouponAmount());
+        }
         return previewOrderInfoVo;
     }
 

order-application-service/src/main/java/cn/freemud/adapter/PromotionAdapter.java

@@ -15,10 +15,7 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.ObjectUtils;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -206,6 +203,7 @@ public class PromotionAdapter {
     public static void addCalculationDiscountGoods(List<CalculationDiscountGoodsDto> calculationDiscountGoodsList,
                                                    String goodsId, Integer goodsQuantity, Integer originalPrice) {
         CalculationDiscountGoodsDto calculationDiscountGoods = new CalculationDiscountGoodsDto();
+        calculationDiscountGoods.setCartGoodsUid(UUID.randomUUID().toString());
         calculationDiscountGoods.setGoodsId(goodsId);
         calculationDiscountGoods.setGoodsQuantity(goodsQuantity);
         calculationDiscountGoods.setOriginalPrice(originalPrice);

order-application-service/src/main/java/cn/freemud/entities/dto/promotion/CalculationDiscountGoodsDto.java

@@ -10,6 +10,9 @@ import java.util.Map;
 
 @Data
 public class CalculationDiscountGoodsDto {
+
+    private String cartGoodsUid;
+
     @NotNull(message = "不可为空")
     private String goodsId;
     /**

order-application-service/src/main/java/cn/freemud/entities/vo/encircle/PreviewOrderInfoVo.java

@@ -92,10 +92,6 @@ public class PreviewOrderInfoVo {
      */
     private Integer productNum;
     /**
-     * 订单享受的促销活动
-     */
-    List<ActivityDiscountsDto> activityDiscountsDtos;
-    /**
      * 可用优惠券列表
      */
     private ActivityClassifyCouponBean availableCoupon;

order-application-service/src/main/java/cn/freemud/service/impl/ActivityCalculationDiscountService.java

@@ -174,7 +174,6 @@ public class ActivityCalculationDiscountService {
         }
         previewOrderInfoVo.setDiscountTotalAmount(shoppingCartGoodsResponse.getTotalDiscountAmount());
         previewOrderInfoVo.setAmount(shoppingCartGoodsResponse.getTotalAmount());
-        previewOrderInfoVo.setActivityDiscountsDtos(shoppingCartGoodsResponse.getActivityDiscountsDtos());
         previewOrderInfoVo.setAvailableCoupon(shoppingCartGoodsResponse.getAvailableCoupon());
         previewOrderInfoVo.setFullDiscount(shoppingCartGoodsResponse.getFullDiscount());
         previewOrderInfoVo.setCouponDiscount(shoppingCartGoodsResponse.getCouponDiscount());