fix重复优惠

shopping-cart-application-service/src/main/java/cn/freemud/demo/service/impl/DistributeServiceImpl.java

@@ -100,7 +100,7 @@ public class DistributeServiceImpl implements DistributeService {
 
         ActivityBO activityBO = promotionManager.queryActivityByType(getActivityBO, baseRequestDTO.getManagerService().getPromotionService());
         fullReduction.setActivityBO(activityBO);
-        if (discountResult == null || activityBO == null){
+        if (discountResult == null){
             return fullReduction;
         }
 
@@ -227,6 +227,8 @@ public class DistributeServiceImpl implements DistributeService {
         if (find == null) return;
         cartGoods.setAmount(find.getRealAmount());
         //cartGoods.setOriginalAmount(find.getOriginalPrice());
+
+
         /**
          * 套餐的原价
          */