Merge branch 'feature/20200915_麦咖啡p2v3活动入机增加TENDERID字段' into qa

order-application-service/src/main/java/cn/freemud/service/impl/CheckMCCafeOrder.java

@@ -578,6 +578,9 @@ public class CheckMCCafeOrder {
                 });
             }
         }
+        if(shoppingCartGoodsDto.getDeliveryAmount().longValue() != shoppingCartGoodsDto.getDiscountDeliveryAmount().longValue()) {
+            shoppingCartGoodsDto.setIsDiscountDelivery(true);
+        }
         return shoppingCartGoodsDto;
     }