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

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

@@ -325,6 +325,7 @@ public class FullSharingService {
      */
     public HashMap<String, Long>  drawnFullDiscount(List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.SmallMaterial> materialDiscount,List<Integer> typeEnums,int type) {
         HashMap<String, Long> hashMap = new HashMap<>();
+        if (CollectionUtils.isEmpty(materialDiscount)) return hashMap;
         for (CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.SmallMaterial smallMaterial : materialDiscount) {
             if (CollectionUtils.isEmpty(smallMaterial.getDiscounts())) continue;
             for (CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount discount : smallMaterial.getDiscounts()) {
@@ -341,6 +342,7 @@ public class FullSharingService {
      */
     public HashMap<String, Long>  drawnFullDiscount(List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.GroupCombox> groupCombDiscount,List<Integer> typeEnums) {
         HashMap<String, Long> hashMap = new HashMap<>();
+        if (CollectionUtils.isEmpty(groupCombDiscount)) return hashMap;
         for (CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.GroupCombox com : groupCombDiscount) {
             if (CollectionUtils.isEmpty(com.getDiscounts())) continue;
             for (CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount discount : com.getDiscounts()) {

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

@@ -657,7 +657,9 @@ public class ShoppingCartMCoffeeServiceImpl {
             cartGoods.setQty(orderItem.getProductQuantity());
             cartGoods.setSpuId(orderItem.getProductId());
             cartGoods.setSkuId(orderItem.getProductSpec());
-            cartGoods.setGoodsType(orderItem.getProductType());
+            if(6 == orderItem.getProductType()) {
+                cartGoods.setGoodsType(3);
+            }
             if(("早餐啡常搭".equals(orderItem.getProductName()) && "早餐啡常搭".equals(orderItem.getProductSpecName()))
                 || ("啡常搭".equals(orderItem.getProductName()) && "啡常搭".equals(orderItem.getProductSpecName()))) {
                 cartGoods.setName(orderItem.getProductName());