Merge branch 'feature/20210810-开放平台商品券支持sdk升级-liujiming' into qa

# Conflicts:
#	assortment-ordercenter-sdk/readme.md

assortment-ordercenter-sdk/readme.md

@@ -161,4 +161,5 @@
 
 | 3.1.0-SNAPSHOT | needInvoice/immediately字段的规范 | 王世昌 | 2021-07-14 |
 
-| 2.2-RELEASE |  版本升级，内部统一版本 | wuping | 2021-08-03|
+| 2.2-RELEASE |  版本升级，内部统一版本 | wuping | 2021-08-03|
\ No newline at end of file
+| 2.2.1-RELEASE |  版本升级-开放平台支持商品券参数productId | 刘继明 | 2021-08-10|
\ No newline at end of file

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -568,6 +568,7 @@ public class OrderSdkAdapter {
                     //是否线上 false:不是 true:是
                     orderSettlementCreateReq.setIsOnline(true);
                     orderSettlementCreateReq.setExtInfo(accountRequest.getAddInfo());
+                    orderSettlementCreateReq.setProductId(accountRequest.getProductId());
 
                     orderSettlementCreateReqList.add(orderSettlementCreateReq);
                 }

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

@@ -128,7 +128,7 @@ public class CalculationCommonService {
             return;
         }
         CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods find = goods
-                .stream().filter((k) -> k.getCartGoodsUid().equals(cartGoods.getCartGoodsUid()))
+                .stream().filter((k) -> Objects.equals(k.getCartGoodsUid(),cartGoods.getCartGoodsUid()))
                 .findFirst().orElse(null);
 
         if (find == null) return;