cxc/yshopb2c
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

商户管理订单列表展示快递订单

Browse Source
This commit is contained in:
hupeng
2020-05-27 20:45:25 +08:00
parent 620abb583b
commit f8bbc3ad59
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
yshop-api/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java
View File

@ -17,12 +17,7 @@ import co.yixiang.common.service.impl.BaseServiceImpl;
import co.yixiang.common.web.vo.Paging; import co.yixiang.common.web.vo.Paging;
import co.yixiang.constant.ShopConstants; import co.yixiang.constant.ShopConstants;
import co.yixiang.constant.SystemConfigConstants; import co.yixiang.constant.SystemConfigConstants;
import co.yixiang.enums.AppFromEnum; import co.yixiang.enums.*;
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.exception.ErrorRequestException; import co.yixiang.exception.ErrorRequestException;
import co.yixiang.modules.activity.service.YxStoreBargainService; import co.yixiang.modules.activity.service.YxStoreBargainService;
import co.yixiang.modules.activity.service.YxStoreBargainUserService; import co.yixiang.modules.activity.service.YxStoreBargainUserService;
@ -685,8 +680,12 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<YxStoreOrderMapper,
@Override @Override
public List<YxStoreOrderQueryVo> orderList(int uid, int type, int page, int limit) { public List<YxStoreOrderQueryVo> orderList(int uid, int type, int page, int limit) {
QueryWrapper<YxStoreOrder> wrapper= new QueryWrapper<>(); QueryWrapper<YxStoreOrder> wrapper= new QueryWrapper<>();
if(uid > 0) wrapper.eq("uid",uid); if(uid > 0) {
wrapper.eq("is_del",0).orderByDesc("add_time"); 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)){ switch (OrderStatusEnum.toType(type)){
case STATUS_0://未支付 case STATUS_0://未支付