Merge remote-tracking branch 'remotes/origin/feature/2.0-换购券' into qa

# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/enums/ResponseResult.java

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

@@ -187,7 +187,7 @@ public class ItemServiceImpl implements ItemService {
         }
         // 通过skuid查询spuid
         GetSpuIdsBySkuIdsDto bySkuIdsDto = new GetSpuIdsBySkuIdsDto();
-        bySkuIdsDto.setProductIds(skuIds);
+        bySkuIdsDto.setProductIds(pids);
         bySkuIdsDto.setPartnerId(partnerId);
         ProductListDto productListDto = storeItemClient.getSpuIdsBySkuIds(bySkuIdsDto);
         if (ResponseCodeConstant.RESPONSE_SUCCESS.equals(productListDto.getErrcode())