Bladeren bron

调整

master
zouhantao 5 dagen geleden
bovenliggende
commit
3a869e1374

+ 2
- 1
gly-base-core/src/main/java/cn/com/taiji/core/repo/request/ass/selfServiceOrder/SelfServiceOrderPageRequest.java Bestand weergeven

hql.append(" and receiveStatus = null"); hql.append(" and receiveStatus = null");
}else if (receiveStatus == 3){ }else if (receiveStatus == 3){
// 待处理 // 待处理
hql.append(" and receiveStatus = null");
hql.append(" and receiveStatus = 1");
hql.append(" and orderStatus = 0");
hql.append(" and receiveId = :receiveId", receiveId); hql.append(" and receiveId = :receiveId", receiveId);
}else { }else {



+ 3
- 1
zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/ass/selfService/SelfServiceManagerImpl.java Bestand weergeven

BeanTools.copyProperties(reqDto, pageRequest); BeanTools.copyProperties(reqDto, pageRequest);
Pagination page = new Pagination(); Pagination page = new Pagination();
if (reqDto.getOrderSource() == SourceType.SERVICE_HALL || reqDto.getOrderSource() == SourceType.WEB){ if (reqDto.getOrderSource() == SourceType.SERVICE_HALL || reqDto.getOrderSource() == SourceType.WEB){
if (reqDto.getReceiveStatus() == 3) pageRequest.setReceiveId(findOpenIdByToken(reqDto.getAccessToken()));
if (reqDto.getReceiveStatus() == 3) {
pageRequest.setReceiveId(findOpenIdByToken(reqDto.getAccessToken()));
}
pageRequest.setOrderSource(reqDto.getSourceTypePage()); pageRequest.setOrderSource(reqDto.getSourceTypePage());
pageRequest.setOpenId(null); pageRequest.setOpenId(null);
page = orderRepo.page(pageRequest); page = orderRepo.page(pageRequest);

Laden…
Annuleren
Opslaan