BruceSun
/
RuoYi-Vue
mirror of https://gitee.com/y_project/RuoYi-Vue.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/liu-jiangs-project/RuoYi-Vue

pull/1121/head
liujiang 2025-12-03 16:31:17 +08:00
parent c5943572bf d69ce5a214
commit bfa14a2c1d
3 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
xkt/src/main/java/com/ruoyi/xkt/service/IExpressService.java
View File

@ -21,7 +21,14 @@ public interface IExpressService {
* *
* @param expressId * @param expressId
*/ */
void checkExpress(Long expressId); void checkExpressSystemDeliverAccess(Long expressId);
/**
* 检查快递是否可用
*
* @param expressId
*/
void checkExpressUserRefundAccess(Long expressId);
/** /**
* 获取物流 * 获取物流

10
xkt/src/main/java/com/ruoyi/xkt/service/impl/ExpressServiceImpl.java
View File

@ -63,13 +63,21 @@ public class ExpressServiceImpl implements IExpressService {
private List<ExpressManager> expressManagers; private List<ExpressManager> expressManagers;
@Override @Override
public void checkExpress(Long expressId) { public void checkExpressSystemDeliverAccess(Long expressId) {
Assert.notNull(expressId); Assert.notNull(expressId);
Express express = expressMapper.selectById(expressId); Express express = expressMapper.selectById(expressId);
Assert.isTrue(BeanValidators.exists(express), "快递不存在"); Assert.isTrue(BeanValidators.exists(express), "快递不存在");
Assert.isTrue(express.getSystemDeliverAccess(), "快递不可用"); 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 @Override
public Express getById(Long expressId) { public Express getById(Long expressId) {
return expressMapper.selectById(expressId); return expressMapper.selectById(expressId);

6
xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreOrderServiceImpl.java
View File

@ -101,7 +101,7 @@ public class StoreOrderServiceImpl implements IStoreOrderService {
//校验 //校验
Assert.notNull(orderUserId); Assert.notNull(orderUserId);
Assert.notNull(payChannel); Assert.notNull(payChannel);
expressService.checkExpress(expressId); expressService.checkExpressSystemDeliverAccess(expressId);
checkDelivery(storeOrderAddDTO.getDeliveryType(), storeOrderAddDTO.getDeliveryEndTime()); checkDelivery(storeOrderAddDTO.getDeliveryType(), storeOrderAddDTO.getDeliveryEndTime());
OrderDetailCheckRtn detailCheckRtn = checkOrderDetailThenRtnUsedMap(storeId, storeOrderAddDTO.getDetailList()); OrderDetailCheckRtn detailCheckRtn = checkOrderDetailThenRtnUsedMap(storeId, storeOrderAddDTO.getDetailList());
Map<Long, StoreProductColorSize> spcsMap = detailCheckRtn.getSpcsMap(); Map<Long, StoreProductColorSize> spcsMap = detailCheckRtn.getSpcsMap();
@ -244,7 +244,7 @@ public class StoreOrderServiceImpl implements IStoreOrderService {
throw new ServiceException(CharSequenceUtil.format("订单[{}]已完成支付，无法修改", throw new ServiceException(CharSequenceUtil.format("订单[{}]已完成支付，无法修改",
storeOrderUpdateDTO.getId())); storeOrderUpdateDTO.getId()));
} }
expressService.checkExpress(expressId); expressService.checkExpressSystemDeliverAccess(expressId);
checkDelivery(storeOrderUpdateDTO.getDeliveryType(), storeOrderUpdateDTO.getDeliveryEndTime()); checkDelivery(storeOrderUpdateDTO.getDeliveryType(), storeOrderUpdateDTO.getDeliveryEndTime());
OrderDetailCheckRtn detailCheckRtn = checkOrderDetailThenRtnUsedMap(storeId, OrderDetailCheckRtn detailCheckRtn = checkOrderDetailThenRtnUsedMap(storeId,
storeOrderUpdateDTO.getDetailList()); storeOrderUpdateDTO.getDetailList());
@ -1257,7 +1257,7 @@ public class StoreOrderServiceImpl implements IStoreOrderService {
public AfterSaleApplyResultDTO createAfterSaleOrder(StoreOrderAfterSaleDTO afterSaleDTO) { public AfterSaleApplyResultDTO createAfterSaleOrder(StoreOrderAfterSaleDTO afterSaleDTO) {
Assert.notEmpty(afterSaleDTO.getStoreOrderDetailIds()); Assert.notEmpty(afterSaleDTO.getStoreOrderDetailIds());
if (afterSaleDTO.getExpressId() != null) { if (afterSaleDTO.getExpressId() != null) {
expressService.checkExpress(afterSaleDTO.getExpressId()); expressService.checkExpressUserRefundAccess(afterSaleDTO.getExpressId());
} }
//获取原订单 //获取原订单
StoreOrder originOrder = getAndBaseCheck(afterSaleDTO.getStoreOrderId()); StoreOrder originOrder = getAndBaseCheck(afterSaleDTO.getStoreOrderId());