x减

shopping-cart-application-service/src/main/java/cn/freemud/ShoppingCartApplication.java

@@ -38,7 +38,7 @@ import tk.mybatis.spring.annotation.MapperScan;
 @EnableSwagger2
 @EnableCircuitBreaker
 @SpringBootApplication
-@EnableDiscoveryClient
+//@EnableDiscoveryClient
 @EnableAspectJAutoProxy
 @ComponentScan({"cn.freemud", "com.freemud"})
 @MapperScan({"cn.freemud.*.dao",

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

@@ -146,6 +146,7 @@ public class GiftSharingService {
                 sendGoods.setCartGoodType(CalculationGoodsType.TYPE_1.getType());
                 sendGoods.setGoodsQuantity(discount.getActualGoodsNumber());
                 sendGoods.setOriginalPrice(discount.getSignleDiscount());
+                sendGoods.setDiscountAmount(discount.getDiscount());
                 sendGoods.setRealAmount(0L);
 
                 List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount> goodsDiscounts = new ArrayList<>();
@@ -328,7 +329,7 @@ public class GiftSharingService {
         CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount discount = goods.getDiscounts()
                 .stream()
                 .filter(g -> ActivityTypeEnum.TYPE_63.getCode().equals(g.getType()) || ActivityTypeEnum.TYPE_62.getCode().equals(g.getType())
-                        || ActivityTypeEnum.TYPE_61.getCode().equals(g.getType()) ||  ActivityTypeEnum.TYPE_104.getCode().equals(g.getType()))
+                        || ActivityTypeEnum.TYPE_61.getCode().equals(g.getType()) ||  ActivityTypeEnum.TYPE_1040.getCode().equals(g.getType()))
                 .findFirst()
                 .get();
         return discount;