|
@@ -24,6 +24,7 @@ import com.yonge.cooleshow.sdk.req.OrderPayReq;
|
|
|
import com.yonge.cooleshow.sdk.res.OrderCloseRes;
|
|
|
import com.yonge.cooleshow.sdk.res.OrderPayRes;
|
|
|
import com.yonge.cooleshow.service.PaymentService;
|
|
|
+import com.yonge.toolset.utils.string.StringUtil;
|
|
|
import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -359,8 +360,8 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public CommonPage<OmsOrderDetail> list(Integer status, Integer pageNum, Integer pageSize) {
|
|
|
- if(status==-1){
|
|
|
+ public CommonPage<OmsOrderDetail> list(String status, Integer pageNum, Integer pageSize) {
|
|
|
+ if(status.equals("-1")){
|
|
|
status = null;
|
|
|
}
|
|
|
UmsMember member = memberService.getCurrentMember();
|
|
@@ -369,8 +370,10 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
|
|
|
OmsOrderExample.Criteria criteria = orderExample.createCriteria();
|
|
|
criteria.andDeleteStatusEqualTo(0)
|
|
|
.andMemberIdEqualTo(member.getId());
|
|
|
- if(status!=null){
|
|
|
- criteria.andStatusEqualTo(status);
|
|
|
+ if(StringUtil.isEmpty(status)) {
|
|
|
+ List<Long> list = StringUtil.toLongList(status);
|
|
|
+ List<Integer> collect = list.stream().map(Long::intValue).collect(Collectors.toList());
|
|
|
+ criteria.andStatusIn(collect);
|
|
|
}
|
|
|
orderExample.setOrderByClause("create_time desc");
|
|
|
List<OmsOrder> orderList = orderMapper.selectByExample(orderExample);
|