caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 去除虚拟订单收货地址校验

Browse Source
This commit is contained in:
misworga831 2023-10-23 11:42:22 +08:00
parent 96cfb8a8ce
commit 3d6eb7b4fa
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

2
framework/src/main/java/cn/lili/modules/order/order/serviceimpl/TradeServiceImpl.java
View File

File diff suppressed because one or more lines are too long