会员卡优惠金额为空判断

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

@@ -562,9 +562,10 @@ public class OrderAdapter {
         if (userDeliveryInfoDto != null) {
             deliveryAmount = getUserRealDeliveryAmount(userDeliveryInfoDto.getStoreDeliveryInfoDto(), userDeliveryInfoDto.getUserLongitude(), userDeliveryInfoDto.getUserLatitude());
         }
+        Long cardDiscountAmount = shoppingCartGoodsDto.getCardDiscountAmount() != null ? shoppingCartGoodsDto.getCardDiscountAmount() : 0L;
         Long packageAmount = shoppingCartGoodsDto.getPackageAmount() == null ? 0L : shoppingCartGoodsDto.getPackageAmount();
         productOrderInfo.setAmount(shoppingCartGoodsDto.getTotalAmount() + deliveryAmount + packageAmount
-                - shoppingCartGoodsDto.getCardOriginalAmount() + shoppingCartGoodsDto.getCardDiscountAmount());
+                - shoppingCartGoodsDto.getCardOriginalAmount() + cardDiscountAmount);
         // 解析购物车信息
         List<ShoppingCartGoodsDto.CartGoodsDetailDto> cartGoodsDetailDtos = shoppingCartGoodsDto.getProducts();
         List<ActivityDiscountsDto> activityDiscountsDtos = shoppingCartGoodsDto.getActivityDiscountsDtos();