Kroytz/yshop-drink
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

订单列表搜索增加系统删除条件

Browse Source
This commit is contained in:
hupeng committed 2025-07-30 14:40:54 +08:00
1 parent 77b3399bf0
commit 7e56c80171
1 file changed
+13 -7
Download Patch File Download Diff File Expand all files Collapse all files
yshop-drink-boot3/yshop-module-mall/yshop-module-order-biz/src/main/java/co/yixiang/yshop/module/order/dal/mysql/storeorder/StoreOrderMapper.java
+13 -7
View File
@@ -43,7 +43,7 @@ public interface StoreOrderMapper extends BaseMapperX<StoreOrderDO> {
.betweenIfPresent(StoreOrderDO::getCreateTime, reqVO.getCreateTime()); .betweenIfPresent(StoreOrderDO::getCreateTime, reqVO.getCreateTime());
//.orderByDesc(StoreOrderDO::getId); //.orderByDesc(StoreOrderDO::getId);
if( OrderTypeEnum.TYPE_WORK.getValue().equals(reqVO.getType())){ if( OrderTypeEnum.TYPE_WORK.getValue().equals(reqVO.getType())){
wrapper.orderByAsc(StoreOrderDO::getCreateTime); wrapper.ne(StoreOrderDO::getIsSystemDel, ShopCommonEnum.DELETE_1.getValue()).orderByAsc(StoreOrderDO::getCreateTime);
}else{ }else{
wrapper.orderByDesc(StoreOrderDO::getCreateTime); wrapper.orderByDesc(StoreOrderDO::getCreateTime);
} }
@@ -51,13 +51,15 @@ public interface StoreOrderMapper extends BaseMapperX<StoreOrderDO> {
switch (AdminOrderStatusEnum.toType(reqVO.getOrderStatus())) { switch (AdminOrderStatusEnum.toType(reqVO.getOrderStatus())) {
//未支付 //未支付
case STATUS_0: case STATUS_0:
wrapper.eq(StoreOrderDO::getPaid, OrderInfoEnum.PAY_STATUS_0.getValue()) wrapper.ne(StoreOrderDO::getIsSystemDel, ShopCommonEnum.DELETE_1.getValue())
.eq(StoreOrderDO::getPaid, OrderInfoEnum.PAY_STATUS_0.getValue())
.eq(StoreOrderDO::getRefundStatus, OrderInfoEnum.REFUND_STATUS_0.getValue()) .eq(StoreOrderDO::getRefundStatus, OrderInfoEnum.REFUND_STATUS_0.getValue())
.eq(StoreOrderDO::getStatus, OrderInfoEnum.STATUS_0.getValue()); .eq(StoreOrderDO::getStatus, OrderInfoEnum.STATUS_0.getValue());
break; break;
//待发货 //待发货
case STATUS_1: case STATUS_1:
wrapper.eq(StoreOrderDO::getRefundStatus, OrderInfoEnum.REFUND_STATUS_0.getValue()) wrapper.ne(StoreOrderDO::getIsSystemDel, ShopCommonEnum.DELETE_1.getValue())
.eq(StoreOrderDO::getRefundStatus, OrderInfoEnum.REFUND_STATUS_0.getValue())
.eq(StoreOrderDO::getStatus, OrderInfoEnum.STATUS_0.getValue()); .eq(StoreOrderDO::getStatus, OrderInfoEnum.STATUS_0.getValue());
if( OrderTypeEnum.TYPE_WORK.getValue().equals(reqVO.getType())){ if( OrderTypeEnum.TYPE_WORK.getValue().equals(reqVO.getType())){
wrapper.and(i->i.eq(StoreOrderDO::getPaid, OrderInfoEnum.PAY_STATUS_1.getValue()) wrapper.and(i->i.eq(StoreOrderDO::getPaid, OrderInfoEnum.PAY_STATUS_1.getValue())
@@ -69,26 +71,30 @@ public interface StoreOrderMapper extends BaseMapperX<StoreOrderDO> {
break; break;
//待收货 //待收货
case STATUS_2: case STATUS_2:
wrapper.eq(StoreOrderDO::getPaid, OrderInfoEnum.PAY_STATUS_1.getValue()) wrapper.ne(StoreOrderDO::getIsSystemDel, ShopCommonEnum.DELETE_1.getValue())
.eq(StoreOrderDO::getPaid, OrderInfoEnum.PAY_STATUS_1.getValue())
.eq(StoreOrderDO::getRefundStatus, OrderInfoEnum.REFUND_STATUS_0.getValue()) .eq(StoreOrderDO::getRefundStatus, OrderInfoEnum.REFUND_STATUS_0.getValue())
.eq(StoreOrderDO::getStatus, OrderInfoEnum.STATUS_1.getValue()); .eq(StoreOrderDO::getStatus, OrderInfoEnum.STATUS_1.getValue());
break; break;
//待评价 //待评价
case STATUS_3: case STATUS_3:
wrapper.eq(StoreOrderDO::getPaid, OrderInfoEnum.PAY_STATUS_1.getValue()) wrapper.ne(StoreOrderDO::getIsSystemDel, ShopCommonEnum.DELETE_1.getValue())
.eq(StoreOrderDO::getPaid, OrderInfoEnum.PAY_STATUS_1.getValue())
.eq(StoreOrderDO::getRefundStatus, OrderInfoEnum.REFUND_STATUS_0.getValue()) .eq(StoreOrderDO::getRefundStatus, OrderInfoEnum.REFUND_STATUS_0.getValue())
.eq(StoreOrderDO::getStatus, OrderInfoEnum.STATUS_2.getValue()); .eq(StoreOrderDO::getStatus, OrderInfoEnum.STATUS_2.getValue());
break; break;
//已完成 //已完成
case STATUS_4: case STATUS_4:
wrapper.eq(StoreOrderDO::getPaid, OrderInfoEnum.PAY_STATUS_1.getValue()) wrapper.ne(StoreOrderDO::getIsSystemDel, ShopCommonEnum.DELETE_1.getValue())
.eq(StoreOrderDO::getPaid, OrderInfoEnum.PAY_STATUS_1.getValue())
.eq(StoreOrderDO::getRefundStatus, OrderInfoEnum.REFUND_STATUS_0.getValue()) .eq(StoreOrderDO::getRefundStatus, OrderInfoEnum.REFUND_STATUS_0.getValue())
.eq(StoreOrderDO::getStatus, OrderInfoEnum.STATUS_3.getValue()); .eq(StoreOrderDO::getStatus, OrderInfoEnum.STATUS_3.getValue());
break; break;
//退款单 //退款单
case STATUS_5: case STATUS_5:
String[] strs = {"1", "2"}; String[] strs = {"1", "2"};
wrapper.in(StoreOrderDO::getRefundStatus, strs); wrapper.ne(StoreOrderDO::getIsSystemDel, ShopCommonEnum.DELETE_1.getValue())
.in(StoreOrderDO::getRefundStatus, strs);
break; break;
//已删除 //已删除
case STATUS_6: case STATUS_6: