Merge branch 'dev/2024/0625/update-admin-Y' 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/TradeOrderController.java

@@ -147,6 +147,11 @@ public class TradeOrderController {
         List<TradeOrderLogDO> orderLogs = tradeOrderLogService.getOrderLogListByOrderId(id);
         TradeOrderDetailRespVO convert = TradeOrderConvert.INSTANCE.convert(order, orderItems, orderLogs, user, brokerageUser);
         convert.setSpuType(tradeOrderQueryService.getSpuType(orderItems));
+
+        if(convert.getRefundStatus().equals(TradeOrderRefundStatusEnum.ALL.getStatus())){
+            convert.setStatus(TradeOrderStatusEnum.AFTER_SALE.getStatus());
+        }
+
         return success(convert);
     }
 

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

@@ -153,4 +153,7 @@ public class TradeOrderBaseVO {
 
     @Schema(description = "商品类型,只有购买的商品是虚拟商品的时候才会有返回")
     private Integer spuType;
+
+    @Schema(description = "售后状态", example = "0")
+    private Integer refundStatus;
 }