coco字段判断

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

@@ -22,6 +22,7 @@ import com.freemud.application.sdk.api.log.ApiLog;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.google.common.collect.Lists;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang.ObjectUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
@@ -125,7 +126,7 @@ public class CocoShoppingCartRelationServiceImpl implements ShoppingCartRelation
                         // 只要符合条件就需要设置为空
                         // 因为前端指挥在半价行、赠品行上打标
                         // 前端是从商品活动信息中查找活动，在商品列表中找商品
-                        if(gifeProductIds.contains(product.getGoodsId()) || !Objects.equals(num,0)){
+                        if((gifeProductIds.contains(product.getGoodsId()) && ObjectUtils.equals(product.getActivityType(),ActivityTypeEnum.TYPE_63)) || !Objects.equals(num,0)){
                             product.setGoodsId(null);
                         }