diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/orders/vo/OrdersPageReqVO.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/orders/vo/OrdersPageReqVO.java index 3f608fa517..ebe2dcb76b 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/orders/vo/OrdersPageReqVO.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/orders/vo/OrdersPageReqVO.java @@ -21,6 +21,9 @@ public class OrdersPageReqVO extends PageParam { @Schema(description = "商品编码") private String supplierProductSku; + @Schema(description = "商品名称") + private String supplierProductName; + @Schema(description = "订单来源") private String source; @@ -78,7 +81,7 @@ public class OrdersPageReqVO extends PageParam { private String merchantName; @Schema(description = "订单状态", example = "1") - private Long status; + private List status; @Schema(description = "标旗") private Long flag; diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/mysql/orders/OrdersMapper.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/mysql/orders/OrdersMapper.java index 76fc5f6943..67088163d6 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/mysql/orders/OrdersMapper.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/mysql/orders/OrdersMapper.java @@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.haoka.dal.mysql.orders; import java.util.*; +import cn.hutool.core.collection.CollectionUtil; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; @@ -18,9 +19,11 @@ import cn.iocoder.yudao.module.haoka.controller.admin.orders.vo.*; public interface OrdersMapper extends BaseMapperX { default PageResult selectPage(OrdersPageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() + List status = reqVO.getStatus(); + LambdaQueryWrapperX lambdaQueryWrapperX = new LambdaQueryWrapperX() .eqIfPresent(OrdersDO::getId, reqVO.getId()) .likeIfPresent(OrdersDO::getSupplierProductSku, reqVO.getSupplierProductSku()) + .likeIfPresent(OrdersDO::getSupplierProductName, reqVO.getSupplierProductName()) .eqIfPresent(OrdersDO::getSource, reqVO.getSource()) .betweenIfPresent(OrdersDO::getOrderedAt, reqVO.getOrderedAt()) .betweenIfPresent(OrdersDO::getProducedAt, reqVO.getProducedAt()) @@ -38,10 +41,14 @@ public interface OrdersMapper extends BaseMapperX { .eqIfPresent(OrdersDO::getAddressMobile, reqVO.getAddressMobile()) .eqIfPresent(OrdersDO::getTrackingNumber, reqVO.getTrackingNumber()) .likeIfPresent(OrdersDO::getMerchantName, reqVO.getMerchantName()) - .eqIfPresent(OrdersDO::getStatus, reqVO.getStatus()) .eqIfPresent(OrdersDO::getFlag, reqVO.getFlag()) .betweenIfPresent(OrdersDO::getCreateTime, reqVO.getCreateTime()) - .orderByDesc(OrdersDO::getId)); + .orderByDesc(OrdersDO::getId); + if(CollectionUtil.isNotEmpty(status)){ + lambdaQueryWrapperX.in(OrdersDO::getStatus, status); + } + + return selectPage(reqVO, lambdaQueryWrapperX); } } \ No newline at end of file