From f8bbc3ad598a0a1542a1768942890c08ec124c32 Mon Sep 17 00:00:00 2001 From: hupeng Date: Wed, 27 May 2020 20:45:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E6=88=B7=E7=AE=A1=E7=90=86=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA=E5=BF=AB=E9=80=92?= =?UTF-8?q?=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/YxStoreOrderServiceImpl.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/yshop-api/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java index 6334690c..71b43975 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java @@ -17,12 +17,7 @@ import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.common.web.vo.Paging; import co.yixiang.constant.ShopConstants; import co.yixiang.constant.SystemConfigConstants; -import co.yixiang.enums.AppFromEnum; -import co.yixiang.enums.BillDetailEnum; -import co.yixiang.enums.BillEnum; -import co.yixiang.enums.OrderCountEnum; -import co.yixiang.enums.OrderInfoEnum; -import co.yixiang.enums.OrderStatusEnum; +import co.yixiang.enums.*; import co.yixiang.exception.ErrorRequestException; import co.yixiang.modules.activity.service.YxStoreBargainService; import co.yixiang.modules.activity.service.YxStoreBargainUserService; @@ -685,8 +680,12 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl orderList(int uid, int type, int page, int limit) { QueryWrapper wrapper= new QueryWrapper<>(); - if(uid > 0) wrapper.eq("uid",uid); - wrapper.eq("is_del",0).orderByDesc("add_time"); + if(uid > 0) { + wrapper.eq("uid",uid); + }else{ + wrapper.eq("shipping_type", OrderInfoEnum.SHIPPIING_TYPE_1.getValue()); + } + wrapper.eq("is_del",CommonEnum.DEL_STATUS_0.getValue()).orderByDesc("add_time"); switch (OrderStatusEnum.toType(type)){ case STATUS_0://未支付