爱马哥低碳活动 活动结束即可删除此代码

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

@@ -534,7 +534,7 @@ public class OrderAdapterServiceImpl {
     private boolean isGoodInActivity(String partnerId,List<ProductBeanV1> productList){
         List<String> partnerList = Arrays.asList(weixinPayGoods.split(","));
         if(CollectionUtils.isNotEmpty(partnerList) && CollectionUtils.isNotEmpty(productList)){
-            return productList.stream().anyMatch(productBeanV1 -> partnerList.contains(partnerId+"@"+productBeanV1.getProductId()));
+            return productList.stream().anyMatch(productBeanV1 -> partnerList.contains(partnerId+"@"+(StringUtils.isBlank(productBeanV1.getSpecification())?productBeanV1.getProductId():productBeanV1.getSpecification())));
         }
         return false;
     }