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/CalculationCommonService.java

@@ -56,17 +56,21 @@ public class CalculationCommonService {
         /**
          * 使用促销算价赋值行记录
          */
-        List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods> goods = discountResult.getGoods();
-        long totalOriginalAmount = 0L,totalAmount = 0L,totalPackageAmount = 0L;
-        long originalAmount = 0L,amount = 0L,packageAmount =0L;
+        List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods> goods = null;
+        if (discountResult != null && CollectionUtils.isNotEmpty(discountResult.getGoods())) {
+            goods = discountResult.getGoods();
+        }
+        long totalOriginalAmount = 0L, totalAmount = 0L, totalPackageAmount = 0L;
+        long originalAmount = 0L, amount = 0L, packageAmount = 0L;
         for (CartGoods cartGoods : cartGoodsList) {
             originalAmount = 0L;
             amount = 0L;
-            packageAmount =0L;
+            packageAmount = 0L;
             CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods find = goods.stream().filter((k) -> k.getCartGoodsUid().equals(cartGoods.getCartGoodsUid())).findFirst().get();
-            if (find==null) continue;
+            if (find == null) continue;
             //成交价行记录
-            amount += find.getRealAmount()*cartGoods.getQty();
+            //amount += find.getRealAmount() * cartGoods.getQty();
+            amount += find.getRealAmount();
             cartGoods.setAmount(amount);
             totalAmount += amount;
             //原价行记录
@@ -454,7 +458,7 @@ public class CalculationCommonService {
         List<Integer> types = new ArrayList<>();
         types.add(ActivityTypeEnum.TYPE_2.getCode());
         types.add(ActivityTypeEnum.TYPE_1.getCode());
-        if (CollectionUtils.isEmpty(discountResult.getGoods())) return;
+        if (discountResult == null || CollectionUtils.isEmpty(discountResult.getGoods())) return;
 
         List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods> goodsList = discountResult.getGoods()
                 .stream()

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

@@ -45,6 +45,9 @@ public class FullSharingService {
             , ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo
             , ActivityQueryDto activityQueryDto) {
 
+        if (discountResult == null || CollectionUtils.isEmpty(discountResult.getGoods())) {
+            return;
+        }
         shoppingCartGoodsResponseVo.setActivityTip(new ActivityTip());
         List<ActivityTypeEnum> activityTypeEnums = new LinkedList<>();
         /**
@@ -323,6 +326,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<>();
         for (CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.SmallMaterial smallMaterial : materialDiscount) {
+            if (CollectionUtils.isEmpty(smallMaterial.getDiscounts())) continue;
             for (CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount discount : smallMaterial.getDiscounts()) {
                 if (typeEnums.contains(discount.getType())) {
                     hashMap.put(discount.getGoodsId(),discount.getDiscount());
@@ -338,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<>();
         for (CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.GroupCombox com : groupCombDiscount) {
+            if (CollectionUtils.isEmpty(com.getDiscounts())) continue;
             for (CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount discount : com.getDiscounts()) {
                 if (typeEnums.contains(discount.getType())) {
                     hashMap.put(discount.getGoodsId(),discount.getDiscount());

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

@@ -46,7 +46,7 @@ public class GiftSharingService {
             , ShoppingCartInfoRequestVo shoppingCartInfoRequestVo
             , ActivityQueryDto activityQueryDto) {
 
-        if (CollectionUtils.isEmpty(discountResult.getSendGoods())) {
+        if (discountResult == null || CollectionUtils.isEmpty(discountResult.getGoods())) {
             return;
         }
         String menuType = shoppingCartInfoRequestVo == null ? null : shoppingCartInfoRequestVo.getMenuType();