v3算价优化券码券列表接口返回参数

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

@@ -490,6 +490,8 @@ public class ActivityAdapter {
         for(ApportionDetails discount : apportionGoods.getApportionDetails()){
             CartProduct.Discount cartProductDiscount = new CartProduct.Discount();
             BeanUtils.copyProperties(discount,cartProductDiscount);
+            cartProductDiscount.setDiscount(discount.getActivityApportionAmount());
+            cartProductDiscount.setType(discount.getActivityType());
             cartProductDiscount.setActualGoodsNumber(cartProduct.getQuantity());
 
             //小料或者可选搭配的优惠金额合并至主商品

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

@@ -3315,7 +3315,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                     , deliveryAmount
                     , null,bizType, accountFlag,sharingDto);
 
-            if(discountResult.getV3Promotion()){//v3
+            if(discountResult!= null && Objects.equals(discountResult.getV3Promotion(),true)){//v3
                 couponAvailableCartInfo = activityAdapter.convert2CouponAvailableCartInfoSharingV3(partnerId, storeId, discountResult, orgCodes);
             }else{//v2
                 couponAvailableCartInfo = activityAdapter.convert2CouponAvailableCartInfoSharing(partnerId, storeId, discountResult, orgCodes);