Merge branch 'dev/2024/0411/update-admin' of Harper/feifan-backend-zx-admin into master

修改订单查看售后异常

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/order/TradeOrderDetailController.java

@@ -3,7 +3,6 @@ package cn.newfeifan.mall.module.trade.controller.admin.order;
 import cn.newfeifan.mall.framework.common.pojo.CommonResult;
 import cn.newfeifan.mall.module.member.api.user.MemberUserApi;
 import cn.newfeifan.mall.module.member.api.user.dto.MemberUserRespDTO;
-//import cn.newfeifan.mall.module.pay.dal.dataobject.order.PayOrderDO;
 import cn.newfeifan.mall.module.pay.dal.dataobject.order.PayOrderDO;
 import cn.newfeifan.mall.module.pay.service.order.PayOrderService;
 import cn.newfeifan.mall.module.trade.controller.admin.aftersale.vo.AfterSaleBaseVO;
@@ -37,9 +36,6 @@ import javax.annotation.Resource;
 import java.util.List;
 
 import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-import static cn.newfeifan.mall.framework.common.util.collection.CollectionUtils.convertList;
-import static cn.newfeifan.mall.framework.common.util.collection.CollectionUtils.convertSet;
-import static cn.newfeifan.mall.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
 
 @Tag(name = "管理后台 - 订单详情")
 @RestController
@@ -93,15 +89,15 @@ public class TradeOrderDetailController {
     @Operation(summary = "新增接口20240229-售后信息")
     @Parameter(name = "id", description = "订单编号", required = true, example = "1")
     @PreAuthorize("@ss.hasPermission('trade:order:query')")
-    public CommonResult<AfterSaleBaseVO> afterSale(@RequestParam("id") Long id) {
+    public CommonResult<? extends List<? extends AfterSaleBaseVO>> afterSale(@RequestParam("id") Long id) {
         // 查询订单
         TradeOrderDO order = tradeOrderQueryService.getOrder(id);
         if (order == null) {
             return success(null);
         }
         // 查询售后订单
-        AfterSaleDO afterSaleByOrderNo = afterSaleService.getAfterSaleByOrderNo(order.getNo());
-        return success(AfterSaleConvert.INSTANCE.convert02(afterSaleByOrderNo));
+        List<AfterSaleDO> afterSales = afterSaleService.getAfterSaleByOrderId(order.getId());
+        return success(AfterSaleConvert.INSTANCE.convertList2(afterSales));
     }
 
     @GetMapping("/delivery")

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/convert/aftersale/AfterSaleConvert.java

@@ -22,6 +22,7 @@ import org.mapstruct.Mapping;
 import org.mapstruct.Mappings;
 import org.mapstruct.factory.Mappers;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -81,6 +82,18 @@ public interface AfterSaleConvert {
     }
 
     List<AfterSaleLogRespVO> convertList1(List<AfterSaleLogDO> list);
+    default List<AfterSaleDetailRespVO> convertList2(List<AfterSaleDO> list){
+        if ( list == null ) {
+            return null;
+        }
+
+        List<AfterSaleDetailRespVO> list1 = new ArrayList<>( list.size() );
+        for ( AfterSaleDO afterSaleDO : list ) {
+            list1.add( convert02( afterSaleDO ) );
+        }
+
+        return list1;
+    }
     AfterSaleDetailRespVO convert02(AfterSaleDO bean);
     AfterSaleDetailRespVO.OrderItem convert02(TradeOrderItemDO bean);
     TradeOrderBaseVO convert(TradeOrderDO bean);

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/service/aftersale/AfterSaleService.java

@@ -9,6 +9,8 @@ import cn.newfeifan.mall.module.trade.controller.app.aftersale.vo.AppAfterSaleCr
 import cn.newfeifan.mall.module.trade.controller.app.aftersale.vo.AppAfterSaleDeliveryReqVO;
 import cn.newfeifan.mall.module.trade.dal.dataobject.aftersale.AfterSaleDO;
 
+import java.util.List;
+
 /**
  * 售后订单 Service 接口
  *
@@ -52,10 +54,10 @@ public interface AfterSaleService {
     /**
      * 【管理员】获得售后单 通过订单编号
      *
-     * @param orderNo 售后编号
+     * @param orderId 订单编号
      * @return 售后订单
      */
-    AfterSaleDO getAfterSaleByOrderNo(String orderNo);
+    List<AfterSaleDO> getAfterSaleByOrderId(Long orderId);
 
     /**
      * 【会员】创建售后订单

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/service/aftersale/AfterSaleServiceImpl.java

@@ -42,6 +42,7 @@ import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
+import java.util.List;
 
 import static cn.newfeifan.mall.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.newfeifan.mall.module.trade.enums.ErrorCodeConstants.*;
@@ -95,8 +96,8 @@ public class AfterSaleServiceImpl implements AfterSaleService {
     }
 
     @Override
-    public AfterSaleDO getAfterSaleByOrderNo(String orderNo) {
-        return tradeAfterSaleMapper.selectOne(new LambdaQueryWrapper<AfterSaleDO>().eq(AfterSaleDO::getOrderNo,orderNo));
+    public List<AfterSaleDO> getAfterSaleByOrderId(Long orderId) {
+        return tradeAfterSaleMapper.selectList(new LambdaQueryWrapper<AfterSaleDO>().eq(AfterSaleDO::getOrderId,orderId));
     }
 
     @Override