|
|
@@ -33,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.ArrayList;
|
|
|
import java.util.Arrays;
|
|
|
import java.util.List;
|
|
|
import java.util.concurrent.TimeUnit;
|
|
|
@@ -40,6 +41,7 @@ import javax.validation.Valid;
|
|
|
import lombok.AllArgsConstructor;
|
|
|
import ma.glasnost.orika.MapperFacade;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
+import org.springframework.util.CollectionUtils;
|
|
|
import org.springframework.web.bind.annotation.PostMapping;
|
|
|
import org.springframework.web.bind.annotation.RequestBody;
|
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
@@ -84,11 +86,17 @@ public class UserDeliverOrderController extends BaseApiController {
|
|
|
public TableDataInfo list(@RequestBody JSONObject param) {
|
|
|
Long userId = SecurityUtils.getLoginUser().getUserId();
|
|
|
String status = param.getString("status");
|
|
|
-
|
|
|
+ List<Integer> statusList = new ArrayList<>();
|
|
|
+ if (StringUtils.isNotBlank(status)) {
|
|
|
+ String[] arr = status.split(",");
|
|
|
+ for (int i = 0; i < arr.length; i++) {
|
|
|
+ statusList.add(Integer.valueOf(arr[i]));
|
|
|
+ }
|
|
|
+ }
|
|
|
startPage();
|
|
|
List<UserDeliverOrder> deliverOrders = userDeliverOrderService.list(
|
|
|
new LambdaQueryWrapper<UserDeliverOrder>().eq(UserDeliverOrder::getUserId, userId)
|
|
|
- .in(StringUtils.isNotBlank(status), UserDeliverOrder::getStatus, JSONObject.parseArray(status, String.class))
|
|
|
+ .in(!CollectionUtils.isEmpty(statusList), UserDeliverOrder::getStatus, statusList)
|
|
|
.orderByDesc(UserDeliverOrder::getCreatedTime));
|
|
|
List<DeliverOrderVO> deliverOrderVOList = mapperFacade.mapAsList(deliverOrders, DeliverOrderVO.class);
|
|
|
for (DeliverOrderVO deliverOrderVO : deliverOrderVOList) {
|
chunping