diff --git a/yshop-app/src/main/java/co/yixiang/sales/rest/StoreAfterSalesController.java b/yshop-app/src/main/java/co/yixiang/sales/rest/StoreAfterSalesController.java index f16e8848..bfa8a523 100644 --- a/yshop-app/src/main/java/co/yixiang/sales/rest/StoreAfterSalesController.java +++ b/yshop-app/src/main/java/co/yixiang/sales/rest/StoreAfterSalesController.java @@ -87,12 +87,9 @@ public class StoreAfterSalesController { if (StrUtil.isEmpty(key)) { throw new YshopException("参数错误"); } - List storeInfo = storeAfterSalesService.getStoreInfo(key, id, uid); - if (storeInfo.size() < 1) { - throw new YshopException("售后订单不存在"); - } - storeAfterSalesService.handleSales(storeInfo.get(0)); - return ApiResult.ok(storeInfo.get(0)); + StoreAfterSalesVo storeInfo = storeAfterSalesService.getStoreInfoByOrderCodeAndAfterIdAndUid(key, id, uid); + storeAfterSalesService.handleSales(storeInfo); + return ApiResult.ok(storeInfo); } @AppLog(value = "通过订单号搜索", type = 1) @@ -107,10 +104,10 @@ public class StoreAfterSalesController { if (StrUtil.isEmpty(key)) { throw new YshopException("参数错误"); } - List storeInfo = storeAfterSalesService.getStoreInfo(key, null, uid); - for (StoreAfterSalesVo storeAfterSalesVo : storeInfo) { - storeAfterSalesService.handleSales(storeAfterSalesVo); - } + List storeInfo = storeAfterSalesService.getStoreInfoByOrderCodeAndUid(key, uid); + storeInfo.forEach(item -> + storeAfterSalesService.handleSales(item) + ); if (ObjectUtil.isNull(storeInfo)) { throw new YshopException("售后订单不存在"); } diff --git a/yshop-mall/src/main/java/co/yixiang/modules/sales/service/StoreAfterSalesService.java b/yshop-mall/src/main/java/co/yixiang/modules/sales/service/StoreAfterSalesService.java index c229e48a..1276ca84 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/sales/service/StoreAfterSalesService.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/sales/service/StoreAfterSalesService.java @@ -31,6 +31,7 @@ public interface StoreAfterSalesService extends BaseService { /** * 查询订单详情 * @param key 订单号 + * @return */ List checkOrderDetails(String key); @@ -48,10 +49,17 @@ public interface StoreAfterSalesService extends BaseService { /** * 查询详情 * @param key 订单号 - * @param id + * @param id 售后单id * @param uid 用户id */ - List getStoreInfo(String key, Long id, Long uid); + StoreAfterSalesVo getStoreInfoByOrderCodeAndAfterIdAndUid(String key, Long id, Long uid); + + /** + * 查询详情 + * @param key 订单号 + * @param uid 用户id + */ + List getStoreInfoByOrderCodeAndUid(String key, Long uid); /** * diff --git a/yshop-mall/src/main/java/co/yixiang/modules/sales/service/impl/StoreAfterSalesServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/sales/service/impl/StoreAfterSalesServiceImpl.java index 3659b82c..f2b2f260 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/sales/service/impl/StoreAfterSalesServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/sales/service/impl/StoreAfterSalesServiceImpl.java @@ -1,5 +1,6 @@ package co.yixiang.modules.sales.service.impl; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.NumberUtil; import co.yixiang.api.YshopException; import co.yixiang.common.service.impl.BaseServiceImpl; @@ -132,6 +133,8 @@ public class StoreAfterSalesServiceImpl extends BaseServiceImpl checkOrderDetails(String key) { List yxStoreOrderCartInfos = storeOrderCartInfoMapper.selectList(Wrappers.lambdaQuery().eq(YxStoreOrderCartInfo::getOid, key)); YxStoreOrder yxStoreOrder = storeOrderMapper.selectById(key); + //查询 售后信息 + StoreAfterSales storeAfterSales = baseMapper.selectOne(Wrappers.lambdaQuery().eq(StoreAfterSales::getOrderCode, yxStoreOrder.getOrderId())); List yxStoreOrderCartInfoVos = new ArrayList<>(); for (YxStoreOrderCartInfo yxStoreOrderCartInfo : yxStoreOrderCartInfos) { @@ -151,6 +154,8 @@ public class StoreAfterSalesServiceImpl extends BaseServiceImpl getStoreInfo(String key, Long id, Long uid) { - List storeAfterSales = baseMapper.selectList(Wrappers.lambdaQuery().eq(id != null, StoreAfterSales::getId, id).eq(StoreAfterSales::getUserId, uid).eq(StoreAfterSales::getOrderCode, key)); + public StoreAfterSalesVo getStoreInfoByOrderCodeAndAfterIdAndUid(String key, Long id, Long uid) { + StoreAfterSales storeAfterSales = baseMapper.selectOne(Wrappers.lambdaQuery().eq(id != null, StoreAfterSales::getId, id).eq(StoreAfterSales::getUserId, uid).eq(StoreAfterSales::getOrderCode, key)); + StoreAfterSalesVo salesVo = generator.convert(storeAfterSales, StoreAfterSalesVo.class); +// salesVo.setCloseAfterSaleTime(DateUtil.tomorrow().toTimestamp()); + return salesVo; + } + + @Override + public List getStoreInfoByOrderCodeAndUid(String key, Long uid) { + List storeAfterSales = baseMapper.selectList(Wrappers.lambdaQuery().eq(StoreAfterSales::getUserId, uid).eq(StoreAfterSales::getOrderCode, key)); return generator.convert(storeAfterSales, StoreAfterSalesVo.class); } diff --git a/yshop-mall/src/main/java/co/yixiang/modules/sales/service/vo/StoreAfterSalesVo.java b/yshop-mall/src/main/java/co/yixiang/modules/sales/service/vo/StoreAfterSalesVo.java index 402bfb19..dfe8a654 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/sales/service/vo/StoreAfterSalesVo.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/sales/service/vo/StoreAfterSalesVo.java @@ -119,4 +119,9 @@ public class StoreAfterSalesVo { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Timestamp revocationTime; + /** + * 关闭售后时间 + */ + private Timestamp closeAfterSaleTime; + } diff --git a/yshop-mall/src/main/java/co/yixiang/modules/sales/service/vo/YxStoreOrderCartInfoVo.java b/yshop-mall/src/main/java/co/yixiang/modules/sales/service/vo/YxStoreOrderCartInfoVo.java index 5f852428..ba5c5c1c 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/sales/service/vo/YxStoreOrderCartInfoVo.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/sales/service/vo/YxStoreOrderCartInfoVo.java @@ -43,4 +43,7 @@ public class YxStoreOrderCartInfoVo { /** 可退價格 */ private BigDecimal refundablePrice; + /** 申请原因 */ + private String reasons; + }