商城计算总费用无需加上配送费

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

@@ -187,10 +187,15 @@ public class OrderAdapter {
             }
         }else if( createOrderVo.getMenuType().equals(BusinessTypeEnum.SAAS_MALL.getCode())){
             deliveryAmount = shoppingCartGoodsDto.getDeliveryAmount() == null ? 0 : shoppingCartGoodsDto.getDeliveryAmount();
-            discountDeliveryAmount = null == shoppingCartGoodsDto.getDiscountDeliveryAmount() ? 0 : shoppingCartGoodsDto.getDiscountDeliveryAmount();
+            discountDeliveryAmount = shoppingCartGoodsDto.getDeliveryAmount() == null ? 0 : shoppingCartGoodsDto.getDeliveryAmount();
         }
         Long packageAmount = shoppingCartGoodsDto.getPackageAmount() == null ? 0L : shoppingCartGoodsDto.getPackageAmount();
-        createOrderDto.setAmount(shoppingCartGoodsDto.getTotalAmount() + discountDeliveryAmount + packageAmount);
+        //商城实付无需加上配送费用和包装费
+        if( createOrderVo.getMenuType().equals(BusinessTypeEnum.SAAS_MALL.getCode())) {
+            createOrderDto.setAmount(shoppingCartGoodsDto.getTotalAmount());
+        }else{
+            createOrderDto.setAmount(shoppingCartGoodsDto.getTotalAmount() + discountDeliveryAmount + packageAmount);
+        }
         // 解析购物车信息
         List<ShoppingCartGoodsDto.CartGoodsDetailDto> cartGoodsDetailDtos = shoppingCartGoodsDto.getProducts();
         List<ActivityDiscountsDto> activityDiscountsDtos = shoppingCartGoodsDto.getActivityDiscountsDtos();