Merge branch 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

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

@@ -147,7 +147,7 @@ public class GiftSharingService {
             , List<ShoppingCartGoodsDto.CartGoodsDetailDto> cartGoodsDetailDtoList
             , ActivityQueryDto activityQueryDto
             , String menuType) {
-        if (CollectionUtils.isEmpty(discountResult.getGoods())) {
+        if (discountResult == null || CollectionUtils.isEmpty(discountResult.getGoods())) {
             return;
         }
         List<ProductBeanDTO> beanDTOList = this.drawGiftInfo(discountResult, activityQueryDto, menuType);

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

@@ -111,6 +111,7 @@ public class CocoShoppingCartRelationServiceImpl implements ShoppingCartRelation
                             // 复制商品加到购物车
                             discountAmount = discount.getDiscount();
                             Long newPrice = product.getOriginalPrice() - discountAmount;
+                            // 构建半价行
                             CartGoods cartGoods = buildNewLine(product,ActivityTypeEnum.TYPE_53.getCode(),1,newPrice);
                             halfProduct.add(cartGoods);
                         }