diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/IExpressService.java b/xkt/src/main/java/com/ruoyi/xkt/service/IExpressService.java index d07cf0ee8..5dd282f2a 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/IExpressService.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/IExpressService.java @@ -21,7 +21,14 @@ public interface IExpressService { * * @param expressId */ - void checkExpress(Long expressId); + void checkExpressSystemDeliverAccess(Long expressId); + + /** + * 检查快递是否可用 + * + * @param expressId + */ + void checkExpressUserRefundAccess(Long expressId); /** * 获取物流 diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/ExpressServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/ExpressServiceImpl.java index c5e2ecdef..b0921f09f 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/ExpressServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/ExpressServiceImpl.java @@ -63,13 +63,21 @@ public class ExpressServiceImpl implements IExpressService { private List expressManagers; @Override - public void checkExpress(Long expressId) { + public void checkExpressSystemDeliverAccess(Long expressId) { Assert.notNull(expressId); Express express = expressMapper.selectById(expressId); Assert.isTrue(BeanValidators.exists(express), "快递不存在"); Assert.isTrue(express.getSystemDeliverAccess(), "快递不可用"); } + @Override + public void checkExpressUserRefundAccess(Long expressId) { + Assert.notNull(expressId); + Express express = expressMapper.selectById(expressId); + Assert.isTrue(BeanValidators.exists(express), "快递不存在"); + Assert.isTrue(express.getUserRefundAccess(), "快递不可用"); + } + @Override public Express getById(Long expressId) { return expressMapper.selectById(expressId); diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreOrderServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreOrderServiceImpl.java index 4bf8308e0..86aaf8254 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreOrderServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreOrderServiceImpl.java @@ -101,7 +101,7 @@ public class StoreOrderServiceImpl implements IStoreOrderService { //校验 Assert.notNull(orderUserId); Assert.notNull(payChannel); - expressService.checkExpress(expressId); + expressService.checkExpressSystemDeliverAccess(expressId); checkDelivery(storeOrderAddDTO.getDeliveryType(), storeOrderAddDTO.getDeliveryEndTime()); OrderDetailCheckRtn detailCheckRtn = checkOrderDetailThenRtnUsedMap(storeId, storeOrderAddDTO.getDetailList()); Map spcsMap = detailCheckRtn.getSpcsMap(); @@ -244,7 +244,7 @@ public class StoreOrderServiceImpl implements IStoreOrderService { throw new ServiceException(CharSequenceUtil.format("订单[{}]已完成支付,无法修改", storeOrderUpdateDTO.getId())); } - expressService.checkExpress(expressId); + expressService.checkExpressSystemDeliverAccess(expressId); checkDelivery(storeOrderUpdateDTO.getDeliveryType(), storeOrderUpdateDTO.getDeliveryEndTime()); OrderDetailCheckRtn detailCheckRtn = checkOrderDetailThenRtnUsedMap(storeId, storeOrderUpdateDTO.getDetailList()); @@ -1257,7 +1257,7 @@ public class StoreOrderServiceImpl implements IStoreOrderService { public AfterSaleApplyResultDTO createAfterSaleOrder(StoreOrderAfterSaleDTO afterSaleDTO) { Assert.notEmpty(afterSaleDTO.getStoreOrderDetailIds()); if (afterSaleDTO.getExpressId() != null) { - expressService.checkExpress(afterSaleDTO.getExpressId()); + expressService.checkExpressUserRefundAccess(afterSaleDTO.getExpressId()); } //获取原订单 StoreOrder originOrder = getAndBaseCheck(afterSaleDTO.getStoreOrderId());