|
|
@@ -703,12 +703,12 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
|
|
|
public CommonPage<OmsOrderDetail> list(String status, Integer pageNum, Integer pageSize) {
|
|
|
if (status.equals("-1")) {
|
|
|
status = null;
|
|
|
- }
|
|
|
+ } // 2249608
|
|
|
UmsMember member = memberService.getCurrentMember();
|
|
|
PageHelper.startPage(pageNum, pageSize);
|
|
|
OmsOrderExample orderExample = new OmsOrderExample();
|
|
|
OmsOrderExample.Criteria criteria = orderExample.createCriteria();
|
|
|
- criteria.andDeleteStatusEqualTo(0).andMemberIdEqualTo(member.getId()).andSourceTypeNotIn(Lists.newArrayList(2));
|
|
|
+ criteria.andDeleteStatusEqualTo(0).andMemberIdEqualTo(member.getId()).andSourceTypeNotIn(Arrays.asList(2));
|
|
|
if (status != null && !StringUtil.isEmpty(status)) {
|
|
|
List<Long> list = StringUtil.toLongList(status);
|
|
|
List<Integer> collect = list.stream().map(Long::intValue).collect(Collectors.toList());
|