Merge remote-tracking branch 'origin/develop' into develop

computility-module-mall/computility-module-trade/src/main/java/com/luhu/computility/module/trade/controller/app/order/vo/AppTradeOrderPageReqVO.java

@@ -14,7 +14,7 @@ public class AppTradeOrderPageReqVO extends PageParam {
     @InEnum(value = TradeOrderStatusEnum.class, message = "订单状态必须是 {value}")
     @InEnum(value = TradeOrderStatusEnum.class, message = "订单状态必须是 {value}")
     private Integer status;
     private Integer status;
 
 
-    @Schema(description = "是否评价", example = "true")
-    private Boolean commentStatus;
+    @Schema(description = "分类id", example = "true")
+    private Long categoryId;
 
 
 }
 }

computility-module-mall/computility-module-trade/src/main/java/com/luhu/computility/module/trade/dal/mysql/order/TradeOrderMapper.java

 package com.luhu.computility.module.trade.dal.mysql.order;
 package com.luhu.computility.module.trade.dal.mysql.order;
 
 
+import cn.hutool.core.util.ObjectUtil;
 import com.luhu.computility.framework.common.pojo.PageResult;
 import com.luhu.computility.framework.common.pojo.PageResult;
 import com.luhu.computility.framework.mybatis.core.mapper.BaseMapperX;
 import com.luhu.computility.framework.mybatis.core.mapper.BaseMapperX;
 import com.luhu.computility.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.luhu.computility.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.luhu.computility.framework.mybatis.core.query.MPJLambdaWrapperX;
 import com.luhu.computility.framework.mybatis.core.query.MPJLambdaWrapperX;
+import com.luhu.computility.module.product.dal.dataobject.category.ProductCategoryDO;
+import com.luhu.computility.module.product.dal.dataobject.spu.ProductSpuDO;
 import com.luhu.computility.module.trade.controller.admin.order.vo.TradeOrderPageReqVO;
 import com.luhu.computility.module.trade.controller.admin.order.vo.TradeOrderPageReqVO;
 import com.luhu.computility.module.trade.controller.app.order.vo.AppTradeOrderPageReqVO;
 import com.luhu.computility.module.trade.controller.app.order.vo.AppTradeOrderPageReqVO;
+import com.luhu.computility.module.trade.controller.app.order.vo.AppTradeOrderPageRespVO;
 import com.luhu.computility.module.trade.dal.dataobject.order.TradeOrderDO;
 import com.luhu.computility.module.trade.dal.dataobject.order.TradeOrderDO;
+import com.luhu.computility.module.trade.dal.dataobject.order.TradeOrderItemDO;
 import com.luhu.computility.module.trade.enums.order.TradeOrderTypeEnum;
 import com.luhu.computility.module.trade.enums.order.TradeOrderTypeEnum;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Mapper;
@@ -83,10 +88,14 @@ public interface TradeOrderMapper extends BaseMapperX<TradeOrderDO> {
     }
     }
 
 
     default PageResult<TradeOrderDO> selectPage(AppTradeOrderPageReqVO reqVO, Long userId) {
     default PageResult<TradeOrderDO> selectPage(AppTradeOrderPageReqVO reqVO, Long userId) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<TradeOrderDO>()
+        return selectJoinPage(reqVO, TradeOrderDO.class, new MPJLambdaWrapperX<TradeOrderDO>()
+                .selectAll(TradeOrderDO.class)
+                .leftJoin(TradeOrderItemDO.class, TradeOrderItemDO::getOrderId, TradeOrderDO::getId)
+                .leftJoin(ProductSpuDO.class, ProductSpuDO::getId, TradeOrderItemDO::getSpuId)
+                .leftJoin(ProductCategoryDO.class, ProductCategoryDO::getId, ProductSpuDO::getCategoryId)
+                .eq(!ObjectUtil.isEmpty(reqVO.getCategoryId()), ProductCategoryDO::getId, reqVO.getCategoryId())
                 .eq(TradeOrderDO::getUserId, userId)
                 .eq(TradeOrderDO::getUserId, userId)
                 .eqIfPresent(TradeOrderDO::getStatus, reqVO.getStatus())
                 .eqIfPresent(TradeOrderDO::getStatus, reqVO.getStatus())
-                .eqIfPresent(TradeOrderDO::getCommentStatus, reqVO.getCommentStatus())
                 .orderByDesc(TradeOrderDO::getId)); // TODO 芋艿：未来不同的 status，不同的排序
                 .orderByDesc(TradeOrderDO::getId)); // TODO 芋艿：未来不同的 status，不同的排序
     }
     }