From 73015745f133f9c6582130e4ab148cd5d7679388 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E5=AE=87=E5=A5=87?= Date: Tue, 6 May 2025 00:03:50 +0800 Subject: [PATCH] fix --- .../xkt/vo/order/StoreOrderInfoVO.java | 9 +++++++++ .../xkt/vo/order/StoreOrderPageItemVO.java | 9 +++++++++ .../dto/order/StoreOrderDetailInfoDTO.java | 6 ++++++ .../xkt/dto/order/StoreOrderPageItemDTO.java | 10 +--------- .../xkt/mapper/StoreOrderDetailMapper.java | 7 +++++++ .../service/impl/StoreOrderServiceImpl.java | 19 +++++++------------ .../mapper/StoreOrderDetailMapper.xml | 16 ++++++++++++++++ 7 files changed, 55 insertions(+), 21 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderInfoVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderInfoVO.java index 7b699c916..60ccde7bd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderInfoVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderInfoVO.java @@ -398,6 +398,15 @@ public class StoreOrderInfoVO { @ApiModelProperty(value = "商品尺码") private Integer size; + @ApiModelProperty(value = "退货订单明细ID") + private Long refundOrderDetailId; + + @ApiModelProperty(value = "退货订单明细状态[10:已取消 11:待付款 12:待发货 13:已发货 14:已完成 21:售后中 22:售后拒绝 23:平台介入 24:售后完成]") + private Integer refundOrderDetailStatus; + + @ApiModelProperty(value = "退货商品数量") + private Integer refundGoodsQuantity; + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderPageItemVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderPageItemVO.java index c4b60f021..e05b9f228 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderPageItemVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderPageItemVO.java @@ -400,5 +400,14 @@ public class StoreOrderPageItemVO extends StoreOrderDTO { @ApiModelProperty(value = "商品尺码") private Integer size; + + @ApiModelProperty(value = "退货订单明细ID") + private Long refundOrderDetailId; + + @ApiModelProperty(value = "退货订单明细状态[10:已取消 11:待付款 12:待发货 13:已发货 14:已完成 21:售后中 22:售后拒绝 23:平台介入 24:售后完成]") + private Integer refundOrderDetailStatus; + + @ApiModelProperty(value = "退货商品数量") + private Integer refundGoodsQuantity; } } diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/order/StoreOrderDetailInfoDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/order/StoreOrderDetailInfoDTO.java index 34aaa79c7..43f3ce006 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/order/StoreOrderDetailInfoDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/order/StoreOrderDetailInfoDTO.java @@ -14,4 +14,10 @@ import lombok.ToString; public class StoreOrderDetailInfoDTO extends StoreOrderDetailDTO { private String firstMainPicUrl; + + private Long refundOrderDetailId; + + private Integer refundOrderDetailStatus; + + private Integer refundGoodsQuantity; } diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/order/StoreOrderPageItemDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/order/StoreOrderPageItemDTO.java index babe865d6..f0f961749 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/order/StoreOrderPageItemDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/order/StoreOrderPageItemDTO.java @@ -33,14 +33,6 @@ public class StoreOrderPageItemDTO extends StoreOrderDTO { private String destinationCountyName; - private List orderDetails; - - @Data - @EqualsAndHashCode(callSuper = true) - @ToString(callSuper = true) - public static class Detail extends StoreOrderDetailDTO { - - private String firstMainPicUrl; - } + private List orderDetails; } diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreOrderDetailMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreOrderDetailMapper.java index 85f6c8d75..258b60a0d 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreOrderDetailMapper.java +++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreOrderDetailMapper.java @@ -2,12 +2,19 @@ package com.ruoyi.xkt.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.xkt.domain.StoreOrderDetail; +import com.ruoyi.xkt.dto.order.StoreOrderDetailInfoDTO; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; +import java.util.Collection; +import java.util.List; + /** * @author liangyq * @date 2025-04-02 12:48 */ @Repository public interface StoreOrderDetailMapper extends BaseMapper { + + List listInfoByStoreOrderIds(@Param("storeOrderIds") Collection storeOrderIds); } 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 3eff5a961..903b23357 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 @@ -85,6 +85,7 @@ public class StoreOrderServiceImpl implements IStoreOrderService { Long storeId = storeOrderAddDTO.getStoreId(); Long expressId = storeOrderAddDTO.getExpressId(); //校验 + Assert.notNull(orderUserId); Assert.notNull(payChannel); expressService.checkExpress(expressId); checkDelivery(storeOrderAddDTO.getDeliveryType(), storeOrderAddDTO.getDeliveryEndTime()); @@ -354,12 +355,9 @@ public class StoreOrderServiceImpl implements IStoreOrderService { if (order == null) { return null; } - List details = storeOrderDetailMapper.selectList(Wrappers.lambdaQuery(StoreOrderDetail.class) - .eq(StoreOrderDetail::getStoreOrderId, storeOrderId) - .eq(SimpleEntity::getDelFlag, Constants.UNDELETED)); + List detailInfos = storeOrderDetailMapper.listInfoByStoreOrderIds( + Collections.singletonList(storeOrderId)); StoreOrderInfoDTO orderInfo = BeanUtil.toBean(order, StoreOrderInfoDTO.class); - List detailInfos = BeanUtil.copyToList(details, - StoreOrderDetailInfoDTO.class); orderInfo.setOrderDetails(detailInfos); //档口信息 Store store = storeMapper.selectById(order.getStoreId()); @@ -403,17 +401,14 @@ public class StoreOrderServiceImpl implements IStoreOrderService { if (CollUtil.isNotEmpty(page.getResult())) { List list = page.getResult(); Set soIds = list.stream().map(StoreOrderPageItemDTO::getId).collect(Collectors.toSet()); - List orderDetailList = storeOrderDetailMapper.selectList(Wrappers - .lambdaQuery(StoreOrderDetail.class).eq(SimpleEntity::getDelFlag, Constants.UNDELETED) - .in(StoreOrderDetail::getStoreOrderId, soIds)); - List spIds = orderDetailList.stream().map(StoreOrderDetail::getStoreProdId).distinct() + List orderDetailList = storeOrderDetailMapper.listInfoByStoreOrderIds(soIds); + List spIds = orderDetailList.stream().map(StoreOrderDetailInfoDTO::getStoreProdId).distinct() .collect(Collectors.toList()); Map mainPicMap = storeProductFileMapper.selectMainPicByStoreProdIdList(spIds, FileType.MAIN_PIC.getValue(), ORDER_NUM_1).stream() .collect(Collectors.toMap(StoreProdMainPicDTO::getStoreProdId, StoreProdMainPicDTO::getFileUrl, (o, n) -> n)); - Map> orderDetailGroup = BeanUtil.copyToList(orderDetailList, - StoreOrderPageItemDTO.Detail.class) + Map> orderDetailGroup = orderDetailList .stream() .collect(Collectors.groupingBy(StoreOrderDetailDTO::getStoreOrderId)); Map regionMap = expressService.getRegionMapCache(); @@ -432,7 +427,7 @@ public class StoreOrderServiceImpl implements IStoreOrderService { order.setOriginCountyName(Optional.ofNullable(regionMap.get(order.getOriginCountyCode())) .map(ExpressRegionDTO::getParentRegionName).orElse(null)); order.setOrderDetails(orderDetailGroup.get(order.getId())); - for (StoreOrderPageItemDTO.Detail detail : order.getOrderDetails()) { + for (StoreOrderDetailInfoDTO detail : order.getOrderDetails()) { //首图 detail.setFirstMainPicUrl(mainPicMap.get(detail.getStoreProdId())); } diff --git a/xkt/src/main/resources/mapper/StoreOrderDetailMapper.xml b/xkt/src/main/resources/mapper/StoreOrderDetailMapper.xml index a74545802..167fc8b73 100644 --- a/xkt/src/main/resources/mapper/StoreOrderDetailMapper.xml +++ b/xkt/src/main/resources/mapper/StoreOrderDetailMapper.xml @@ -2,4 +2,20 @@ + \ No newline at end of file