|
|
@@ -1,6 +1,8 @@
|
|
|
package com.qs.mp.web.controller.api.user;
|
|
|
|
|
|
+import com.alibaba.fastjson.JSONArray;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
+import com.alibaba.fastjson.serializer.SerializerFeature;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.qs.mp.channel.domain.ChannelOrder;
|
|
|
import com.qs.mp.channel.domain.ChannelOrderItem;
|
|
|
@@ -13,6 +15,7 @@ import com.qs.mp.common.enums.BizTypeEnum;
|
|
|
import com.qs.mp.common.enums.PrizeStorageStatusEnum;
|
|
|
import com.qs.mp.common.exception.ServiceException;
|
|
|
import com.qs.mp.common.service.IDeliveryCompanyService;
|
|
|
+import com.qs.mp.common.utils.StringUtils;
|
|
|
import com.qs.mp.framework.redis.RedisKey;
|
|
|
import com.qs.mp.pay.service.IWalletService;
|
|
|
import com.qs.mp.user.domain.UserAddr;
|
|
|
@@ -30,6 +33,7 @@ import com.qs.mp.utils.SecurityUtils;
|
|
|
import com.qs.mp.web.controller.common.BaseApiController;
|
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
+import java.util.Arrays;
|
|
|
import java.util.List;
|
|
|
import java.util.concurrent.TimeUnit;
|
|
|
import javax.validation.Valid;
|
|
|
@@ -79,11 +83,12 @@ public class UserDeliverOrderController extends BaseApiController {
|
|
|
@ApiOperation(value = "订单列表" , notes = "获取所有订单信息")
|
|
|
public TableDataInfo list(@RequestBody JSONObject param) {
|
|
|
Long userId = SecurityUtils.getLoginUser().getUserId();
|
|
|
- Integer status = param.getInteger("status");
|
|
|
+ String status = param.getString("status");
|
|
|
+
|
|
|
startPage();
|
|
|
List<UserDeliverOrder> deliverOrders = userDeliverOrderService.list(
|
|
|
new LambdaQueryWrapper<UserDeliverOrder>().eq(UserDeliverOrder::getUserId, userId)
|
|
|
- .eq(null != status, UserDeliverOrder::getStatus, status)
|
|
|
+ .in(StringUtils.isNotBlank(status), UserDeliverOrder::getStatus, JSONObject.parseArray(status, String.class))
|
|
|
.orderByDesc(UserDeliverOrder::getCreatedTime));
|
|
|
List<DeliverOrderVO> deliverOrderVOList = mapperFacade.mapAsList(deliverOrders, DeliverOrderVO.class);
|
|
|
for (DeliverOrderVO deliverOrderVO : deliverOrderVOList) {
|
chunping