Merge branches 'feature/20210806_日志问题修复_wuping' and 'qa' of…

Merge branches 'feature/20210806_日志问题修复_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

pom.xml

@@ -113,7 +113,7 @@
             <dependency>
                 <groupId>com.freemud.application.service.sdk</groupId>
                 <artifactId>sdk-common-base</artifactId>
-                <version>2.3.BETA</version>
+                <version>2.0.0-SNAPSHOT</version>
             </dependency>
 
             <!--              mybatis            -->

shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartConvertAdapter.java

@@ -893,7 +893,7 @@ public class ShoppingCartConvertAdapter {
                 for (com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods.MaterialGoods productMaterial :comboxGoods.getProductMaterialList()) {
                     for (ProductTypeBeanDTO.ProductGroupType.GroupDetailType detailType : materialList) {
 //                        productMaterial.setCustomerCode(StringUtils.isNotEmpty(detailType.getCustomerCode()) ? detailType.getCustomerCode() : "");
-                        if (detailType.getProductId().equals(productMaterial.getSpuId())) {
+                        if (Objects.equals(detailType.getProductId(),productMaterial.getSpuId())) {
                             productMaterial.setAmount(null != detailType.getMarkUpPrice() ? detailType.getMarkUpPrice().longValue() : 0);
                             productMaterial.setFinalPrice(null != detailType.getProductFinalPrice() ? detailType.getProductFinalPrice().longValue() : 0);
                             productMaterial.setSpuName(StringUtils.isNotEmpty(detailType.getProductName()) ? detailType.getProductName() : "");
@@ -911,7 +911,6 @@ public class ShoppingCartConvertAdapter {
         }
     }
 
-
     private Map<String, String> getAttributesNew(List<com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods.CartGoodsExtra> extra) {
         if (CollectionUtils.isEmpty(extra)) {
             return new HashMap<>();