积分扣减

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/CartGoods.java

@@ -13,6 +13,7 @@
 
 package cn.freemud.entities.vo;
 
+import com.freemud.sdk.api.assortment.shoppingcart.constant.CommonsConstant;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.apache.commons.collections4.CollectionUtils;
@@ -417,10 +418,13 @@ public class CartGoods {
             return true;
         if (o == null || getClass() != o.getClass())
             return false;
-
         // 原始字符串
         StringBuilder originalString = new StringBuilder();
-        originalString.append(goodsId);
+        if (StringUtils.isNotBlank(goodsId) && goodsId.startsWith(CommonsConstant.COUPON_PREFIX)){
+            originalString.append(spuId+skuId);
+        } else {
+            originalString.append(goodsId);
+        }
         originalString.append(couponCode);
 
         if(StringUtils.isNotEmpty(userId)){
@@ -497,7 +501,11 @@ public class CartGoods {
     @Override
     public int hashCode() {
         StringBuilder sb = new StringBuilder();
-        sb.append(goodsId);
+        if (StringUtils.isNotBlank(goodsId) && goodsId.startsWith(CommonsConstant.COUPON_PREFIX)){
+            sb.append(spuId+skuId);
+        } else {
+            sb.append(goodsId);
+        }
         if (CollectionUtils.isNotEmpty(extra)) {
             extra.stream().sorted(Comparator.comparing(CartGoodsExtra::getAttributeId)).forEach(e -> sb.append(e.getAttributeId()));
         }