!311 fix & improve

Merge pull request !311 from OceansDeep/pg

framework/src/main/java/cn/lili/modules/order/cart/render/impl/SkuFreightRender.java

@@ -50,7 +50,7 @@ public class SkuFreightRender implements CartRenderStep {
             return;
         }
         //选择物流的时候计算价格
-        if(DeliveryMethodEnum.LOGISTICS.name().equals(tradeDTO.getCartList().get(0).getDeliveryMethod())){
+        if (DeliveryMethodEnum.LOGISTICS.name().equals(tradeDTO.getCartList().get(0).getDeliveryMethod())) {
             if (memberAddress != null) {
                 //运费分组信息
                 Map<String, List<String>> freightGroups = freightTemplateGrouping(cartSkuVOS);
@@ -116,7 +116,7 @@ public class SkuFreightRender implements CartRenderStep {
                     }
                 }
             }
-        }else{
+        } else {
             //自提清空不配送商品
             tradeDTO.setNotSupportFreight(null);
         }

framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java

@@ -568,11 +568,9 @@ public class CartServiceImpl implements CartService {
         tradeDTO.setStoreRemark(tradeParams.getRemark());
         tradeDTO.setParentOrderSn(tradeParams.getParentOrderSn());
         //订单无收货地址校验
-        if(tradeDTO.getStoreAddress() == null){
-            if (tradeDTO.getMemberAddress() == null) {
+        if (!tradeDTO.getCartTypeEnum().equals(CartTypeEnum.VIRTUAL) && tradeDTO.getStoreAddress() == null && tradeDTO.getMemberAddress() == null) {
             throw new ServiceException(ResultCode.MEMBER_ADDRESS_NOT_EXIST);
         }
-        }
         //构建交易
         Trade trade = tradeBuilder.createTrade(tradeDTO);
         this.cleanChecked(this.readDTO(cartTypeEnum));
@@ -584,10 +582,10 @@ public class CartServiceImpl implements CartService {
         List<String> list = new ArrayList<String>();
         list.add(DeliveryMethodEnum.LOGISTICS.name());
         TradeDTO tradeDTO = this.getCheckedTradeDTO(CartTypeEnum.valueOf(way));
-        if(tradeDTO.getCartList().size()==1){
+        if (tradeDTO.getCartList().size() == 1) {
             for (CartVO cartVO : tradeDTO.getCartList()) {
                 Store store = storeService.getById(cartVO.getStoreId());
-                if(store.getSelfPickFlag() != null && store.getSelfPickFlag()){
+                if (store.getSelfPickFlag() != null && store.getSelfPickFlag()) {
                     list.add(DeliveryMethodEnum.SELF_PICK_UP.name());
                 }
             }