szz
/
ShiShiYiBan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of gitee.com:peng-ou/haoka-server into develop

This commit is contained in:
Owen 2024-12-31 12:35:31 +08:00
parent 708053adf8 3f8340b4b8
commit ef2c585013
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/orders/vo/OrdersPageReqVO.java
View File

@ -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<Long> status;
@Schema(description = "标旗")
private Long flag;

13
yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/mysql/orders/OrdersMapper.java
View File

@ -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<OrdersDO> {
default PageResult<OrdersDO> selectPage(OrdersPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<OrdersDO>()
List<Long> status = reqVO.getStatus();
LambdaQueryWrapperX<OrdersDO> lambdaQueryWrapperX = new LambdaQueryWrapperX<OrdersDO>()
.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<OrdersDO> {
.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);
}
}