Merge branch 'bugfix/20200918_麦咖啡修复订单信息展示问题' into develop

# Conflicts:
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

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

@@ -180,7 +180,7 @@ public class DeliveryAdapter {
                 deliveryProductInfo.setProductCode(productList.getProductId());
                 deliveryProductInfo.setProductName(productList.getProductName());
                 deliveryProductInfo.setProductNumber(productList.getNumber());
-                deliveryProductInfo.setProductPrice(productList.getPrice().intValue());
+                deliveryProductInfo.setProductPrice(productList.getSalePrice().intValue());
                 //餐道使用
                 deliveryProductInfo.setCumulatedTotal(productList.getNumber() * productList.getPrice().intValue());
                 OrderProductAddInfoDto orderProductAddInfoDto = JSON.parseObject(productList.getAddInfo(), OrderProductAddInfoDto.class);
@@ -196,7 +196,7 @@ public class DeliveryAdapter {
                         deliveryComboProductInfo.setProductCode(comboProduct.getProductId());
                         deliveryComboProductInfo.setProductName(comboProduct.getProductName());
                         deliveryComboProductInfo.setProductNumber(comboProduct.getNumber());
-                        deliveryComboProductInfo.setProductPrice(comboProduct.getPrice().intValue());
+                        deliveryComboProductInfo.setProductPrice(comboProduct.getSalePrice().intValue());
                         //餐道使用
                         deliveryComboProductInfo.setCumulatedTotal(comboProduct.getNumber() * comboProduct.getPrice().intValue());
                         OrderProductAddInfoDto orderComboProductAddInfoDto = JSON.parseObject(comboProduct.getAddInfo(), OrderProductAddInfoDto.class);