Merge branch 'feature/20201013_麦咖啡p4v1问题修复_xukangg' into qa

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

@@ -228,7 +228,7 @@ public class OrderAdapter {
                     .sequence(orderAccountIndex++)
                     .actualPrice(discountDeliveryAmount)
                     .build();
-            if(hasDeliveryMonthCard) {
+            if(hasDeliveryMonthCard && StringUtils.isNotBlank(storeResponseDto.getBenefitCardDiscountAmount())) {
                 createOrderAccountDto.setActualPrice(Long.valueOf(storeResponseDto.getBenefitCardDiscountAmount()));
             }
             orderAccountDtos.add(createOrderAccountDto);