Merge branch '20211129-购物车赠品显示bug修复-zhiwei.zha' into qa

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -39,11 +39,7 @@ import cn.freemud.entities.dto.shoppingCart.NewShoppingCartClearDto;
 import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
 import cn.freemud.entities.dto.store.StoreMixResponseDto;
 import cn.freemud.entities.vo.*;
-import cn.freemud.entities.vo.order.CreateOrderInvoiceRequest;
-import cn.freemud.entities.vo.order.GetInvoiceConfigRequest;
-import cn.freemud.entities.vo.order.CreateOrderUnionPayCardVo;
-import cn.freemud.entities.vo.order.OrderAppealVo;
-import cn.freemud.entities.vo.order.QueryOrderAppealResponseVo;
+import cn.freemud.entities.vo.order.*;
 import cn.freemud.enums.OrderType;
 import cn.freemud.enums.*;
 import cn.freemud.handler.WeChatLiveMsgHandle;
@@ -136,7 +132,6 @@ import java.text.MessageFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import static cn.freemud.constant.OrderRefundConstant.ALLOW_REFUND;
@@ -985,7 +980,7 @@ public class OrderServiceImpl implements Orderservice {
                     }
 
                 } catch (Exception e) {
-                    AppLogUtil.errorLog("queryOrders_activity_error", gson.toJson(queryOrdersDto), gson.toJson(queryOrderResponseVo), e);
+                    AppLogUtil.errorLog("queryOrders_activity_error", gson.toJson(queryOrderResponseVo), gson.toJson(e), e);
                 }
             });
         }

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

@@ -29,11 +29,7 @@ import org.apache.commons.lang.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.function.Function;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Service("platformActiveService")
@@ -86,17 +82,17 @@ public class PlatformActiveServiceImpl implements ActiveService {
                            String storeId,
                            String userId,
                            Integer flag) {
-
-        Map<String, Goods> discountForGift = this.getDiscountForGift(discountResult);
+        Map<String, ProductBean> productMap = products.stream().collect(Collectors.toMap(ProductBean::getPid, k -> k, (k1, k2) -> k1));
         List<CartGoods> list = new ArrayList<>();
-        for (ProductBean product : products) {
-            Goods goods = discountForGift.get(product.getPid());
+        for (Goods goods : discountResult.getGoods()) {
+            // 过滤掉非赠品的商品
+            if (! CalculationGoodsType.TYPE_1.getType().equals(goods.getCartGoodType())) continue;
+            ProductBean product = productMap.get(goods.getGoodsId());
             GoodsDiscount discount = goods.getDiscounts()
                     .stream()
                     .filter(g -> ActivityTypeEnum.TYPE_63.getCode().equals(g.getType()) ||ActivityTypeEnum.TYPE_62.getCode().equals(g.getType()) || ActivityTypeEnum.TYPE_61.getCode().equals(g.getType()) ||  ActivityTypeEnum.TYPE_230.getCode().equals(g.getType()))
                     .findFirst()
                     .get();
-
             CartGoods cartGood = new CartGoods();
             cartGood.setGoodsId(goods.getGoodsId());
             cartGood.setGoodsType(1);
@@ -128,13 +124,4 @@ public class PlatformActiveServiceImpl implements ActiveService {
         addcartGoodsList.addAll(giftCacheManager.resetGiftCache(list, null, partnerId, storeId, userId));
     }
 
-    public Map<String, Goods> getDiscountForGift(CalculationDiscountResult discountResult) {
-
-        Map<String, Goods> gifts = discountResult.getGoods()
-                .stream()
-                .filter(d -> CalculationGoodsType.TYPE_1.getType().equals(d.getCartGoodType()))
-                .collect(Collectors.toMap(Goods::getGoodsId, Function.identity(), (k1, k2) -> k1));
-        return gifts;
-    }
-
 }