Merge branch 'feature/20201214-买一增一赠品价格修改-lcf' into develop

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	assortment-shoppingcart-sdk/pom.xml
#	assortment-shoppingcart-sdk/readme.md
#	call-back-service/pom.xml
#	order-application-service/pom.xml
#	order-management/pom.xml
#	ordercenter-sdk/pom.xml
#	ordercenter-sdk/readme.md
#	shopping-cart-application-service/pom.xml

order-application-service/src/main/java/cn/freemud/adapter/DeliveryAdapter.java

@@ -257,6 +257,10 @@ public class DeliveryAdapter {
                             deliveryComboProductInfo.setProductPrice(comboProduct.getSalePrice().intValue());
                             //餐道使用
                             deliveryComboProductInfo.setCumulatedTotal(comboProduct.getNumber() * comboProduct.getSalePrice().intValue());
+                        } else {
+                            deliveryComboProductInfo.setProductPrice(0);
+                            //餐道使用
+                            deliveryComboProductInfo.setCumulatedTotal(0);
                         }
                         OrderProductAddInfoDto orderComboProductAddInfoDto = JSON.parseObject(comboProduct.getAddInfo(), OrderProductAddInfoDto.class);
                         deliveryComboProductInfo.setTaxId(StringUtils.isNotEmpty(orderComboProductAddInfoDto.getTaxId()) ? orderComboProductAddInfoDto.getTaxId() : "10");
@@ -289,7 +293,7 @@ public class DeliveryAdapter {
                     });
                 }
             });
-            deliveryOrderRequestDto.setProductTotal(productInfos.stream().mapToInt(t -> t.getCumulatedTotal()).sum());
+            deliveryOrderRequestDto.setProductTotal(productInfos.stream().mapToInt(t -> t.getCumulatedTotal()==null?0:t.getCumulatedTotal()).sum());
         }
 
 

order-management/src/main/java/cn/freemud/management/adapter/WaimaiSdkAdapter.java

@@ -102,7 +102,7 @@ public class WaimaiSdkAdapter {
         agreeOrderRequest.setChannel( orderBean.getSource() );
         agreeOrderRequest.setCompanyId(request.getPartnerId());
         agreeOrderRequest.setOrderId(orderBean.getOid());
-        agreeOrderRequest.setShopId(request.getStoreId());
+        agreeOrderRequest.setShopId(orderBean.getShopId());
         agreeOrderRequest.setOperator(request.getOperator());
         agreeOrderRequest.setReason(request.getReason());
         agreeOrderRequest.setAfterSalesCode(orderBean.getRefundList().get(0).getRid());

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

@@ -361,9 +361,9 @@ public class ShoppingCartConvertAdapter {
         cartGoods.setSpuId(cartGood.getSpuId());
         cartGoods.setSkuId(cartGood.getSkuId());
         cartGoods.setSpecProductId(cartGood.getSpecProductId());
-        cartGoods.setOriginalPrice(nowPirce);
+        cartGoods.setOriginalPrice(cartGood.getOriginalPrice());
         cartGoods.setPackPrice(cartGood.getPackPrice());
-        cartGoods.setOriginalAmount(nowPirce);
+        cartGoods.setOriginalAmount(cartGood.getOriginalPrice());
         cartGoods.setAmount(0L);
         cartGoods.setName(cartGood.getName());
         cartGoods.setSpuName(cartGood.getSpuName());