记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit 2decbaca authored by 张国柄's avatar 张国柄
Browse files
Options

fix:NEW优化、分页调整;

parent 28a0d02c
Hide whitespace changes
Inline Side-by-side
Showing with 163 additions and 111 deletions
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/IAdamCollectionService.java
View file @ 2decbaca
package com.liquidnet.service.adam.service;
import com.github.pagehelper.PageInfo;
import com.liquidnet.service.adam.dto.vo.AdamCollectBaseVo;
import com.liquidnet.service.adam.dto.vo.AdamCollectVo;
import com.liquidnet.service.base.PagedResult;
/**
* <p>
......@@ -22,5 +22,5 @@ public interface IAdamCollectionService {
boolean queryState(String uid, String type, String contentId);
PageInfo<AdamCollectVo> queryPage(String uid, String type, int pageNo, int pageSize);
PagedResult<AdamCollectVo> queryPage(String uid, String type, int pageNo, int pageSize);
}
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/IAdamDisposedService.java
View file @ 2decbaca
package com.liquidnet.service.adam.service;
import com.github.pagehelper.PageInfo;
import com.liquidnet.service.adam.dto.vo.AdamDisposedBaseVo;
import com.liquidnet.service.adam.dto.vo.AdamDisposedUserVo;
import com.liquidnet.service.adam.dto.vo.AdamDisposedVo;
import com.liquidnet.service.base.PagedResult;
/**
* <p>
......@@ -23,7 +23,7 @@ public interface IAdamDisposedService {
boolean queryState(String uid, String type, String contentId);
PageInfo<AdamDisposedVo> queryPage(String uid, String type, int pageNo, int pageSize);
PagedResult<AdamDisposedVo> queryPage(String uid, String type, int pageNo, int pageSize);
PageInfo<AdamDisposedUserVo> queryDisposedUsers(String type, String contentId, int pageNo, int pageSize);
PagedResult<AdamDisposedUserVo> queryDisposedUsers(String type, String contentId, int pageNo, int pageSize);
}
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/IAdamMemberOrderService.java
View file @ 2decbaca
package com.liquidnet.service.adam.service;
import com.github.pagehelper.PageInfo;
import com.liquidnet.service.adam.dto.AdamMemberOrderCallbackParam;
import com.liquidnet.service.adam.dto.AdamMemberOrderCodeParam;
import com.liquidnet.service.adam.dto.AdamMemberOrderParam;
import com.liquidnet.service.adam.dto.AdamMemberOrderResult;
import com.liquidnet.service.adam.dto.vo.AdamMemberOrderSimpleVo;
import com.liquidnet.service.base.PagedResult;
import com.liquidnet.service.base.ResponseDto;
/**
......@@ -40,5 +40,5 @@ public interface IAdamMemberOrderService {
* @param pageSize
* @return
*/
PageInfo<AdamMemberOrderSimpleVo> queryPage(String uid, int pageNo, int pageSize);
PagedResult<AdamMemberOrderSimpleVo> queryPage(String uid, int pageNo, int pageSize);
}
liquidnet-bus-common/liquidnet-common-service-base/src/main/java/com/liquidnet/service/base/PagedResult.java
View file @ 2decbaca
/**
* $Id$
* Copyright(C) 2015-2020 kowlone - internet center, All Rights Reserved.
*/
package com.liquidnet.service.base;
import java.io.Serializable;
import java.util.List;
/**
* 分页显示的结果
* @author <a href="mailto:lzm8285@163.com">Li Zhongmin</a>
* @version 1.0 2015年12月08日 17:44:00
*/
public class PagedResult<T> implements Serializable{
private static final long serialVersionUID = 9014763784496485161L;
/** 总页数 */
private int totalPages;
/** 总记录数 */
private int totalRows;
/** 分页数据 */
private T data;
public PagedResult(){}
public PagedResult(T data,Object page) {
this.data = data;
}
public PagedResult(T data,int totalPages,int totalRows) {
this.totalPages = totalPages;
this.totalRows = totalRows;
this.data = data;
}
public T getData() {
return data;
}
public int getTotalPages() {
return totalPages;
}
public int getTotalRows() {
return totalRows;
}
public class PagedResult<T> implements Serializable, Cloneable {
private static final long serialVersionUID = 8141034447809038759L;
/**
* 总页数
*/
private int pages;
/**
* 总记录数
*/
private long total;
/**
* 分页数据
*/
private List<T> list;
public PagedResult() {
}
public int getPages() {
return pages;
}
// public PagedResult<T> setTotalPages(int totalPages) {
// this.totalPages = totalPages;
// return this;
// }
public long getTotal() {
return total;
}
public PagedResult<T> setTotal(long total, int pageSize) {
this.total = total;
if (total == -1L) {
this.pages = 1;
} else {
if (pageSize > 0) {
this.pages = (int) (total / pageSize + (total % pageSize == 0L ? 0 : 1));
} else {
this.pages = 0;
}
}
return this;
}
public List<T> getList() {
return list;
}
public PagedResult<T> setList(List<T> list) {
this.list = list;
return this;
}
@Override
public PagedResult<T> clone() {
try {
return (PagedResult<T>) super.clone();
} catch (CloneNotSupportedException e) {
return new PagedResult<>();
}
}
}
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamCollectionController.java
View file @ 2decbaca
......@@ -7,6 +7,7 @@ import com.liquidnet.commons.lang.util.CurrentUtil;
import com.liquidnet.service.adam.dto.vo.AdamCollectBaseVo;
import com.liquidnet.service.adam.dto.vo.AdamCollectVo;
import com.liquidnet.service.adam.service.IAdamCollectionService;
import com.liquidnet.service.base.PagedResult;
import com.liquidnet.service.base.ResponseDto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
......@@ -19,6 +20,7 @@ import org.springframework.web.bind.annotation.*;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Pattern;
import javax.validation.constraints.Size;
import java.util.List;
/**
* <p>
......@@ -86,10 +88,10 @@ public class AdamCollectionController {
@ApiImplicitParam(type = "form", required = false, dataType = "Integer", name = "pageSize", value = "页展示条数", example = "5"),
})
@PostMapping("list")
public ResponseDto<PageInfo<AdamCollectVo>> list(@Pattern(regexp = "\\b(TICKET|VIDEO)\\b", message = "收藏类型无效")
public ResponseDto<PagedResult<AdamCollectVo>> list(@Pattern(regexp = "\\b(TICKET|VIDEO)\\b", message = "收藏类型无效")
@RequestParam String type,
@RequestParam(defaultValue = "1", required = false) int pageNo,
@RequestParam(defaultValue = "5", required = false) int pageSize) {
@RequestParam(defaultValue = "1", required = false) int pageNo,
@RequestParam(defaultValue = "5", required = false) int pageSize) {
pageNo = pageNo > 0 ? pageNo : 1;
pageSize = pageSize <= 0 || pageSize > 10 ? 5 : pageSize;
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamDisposedController.java
View file @ 2decbaca
package com.liquidnet.service.adam.controller;
import com.github.pagehelper.PageInfo;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import com.liquidnet.commons.lang.util.CurrentUtil;
......@@ -8,6 +7,7 @@ import com.liquidnet.service.adam.dto.vo.AdamDisposedBaseVo;
import com.liquidnet.service.adam.dto.vo.AdamDisposedUserVo;
import com.liquidnet.service.adam.dto.vo.AdamDisposedVo;
import com.liquidnet.service.adam.service.IAdamDisposedService;
import com.liquidnet.service.base.PagedResult;
import com.liquidnet.service.base.ResponseDto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
......@@ -88,10 +88,10 @@ public class AdamDisposedController {
@ApiImplicitParam(type = "form", required = false, dataType = "Integer", name = "pageSize", value = "页展示条数", example = "5"),
})
@PostMapping("list")
public ResponseDto<PageInfo<AdamDisposedVo>> list(@Pattern(regexp = "\\b(TICKET|VIDEO)\\b", message = "想去类型无效")
@RequestParam String type,
@RequestParam(defaultValue = "1", required = false) int pageNo,
@RequestParam(defaultValue = "5", required = false) int pageSize) {
public ResponseDto<PagedResult<AdamDisposedVo>> list(@Pattern(regexp = "\\b(TICKET|VIDEO)\\b", message = "想去类型无效")
@RequestParam String type,
@RequestParam(defaultValue = "1", required = false) int pageNo,
@RequestParam(defaultValue = "5", required = false) int pageSize) {
pageNo = pageNo > 0 ? pageNo : 1;
pageSize = pageSize <= 0 || pageSize > 10 ? 10 : pageSize;
......@@ -107,12 +107,12 @@ public class AdamDisposedController {
@ApiImplicitParam(type = "form", required = false, dataType = "Integer", name = "pageSize", value = "页展示条数", example = "10"),
})
@PostMapping("list/user")
public ResponseDto<PageInfo<AdamDisposedUserVo>> listUser(@Pattern(regexp = "\\b(TICKET|VIDEO)\\b", message = "想去类型无效")
@RequestParam String type,
@Size(min = 1, max = 64, message = "内容ID长度限制1-64位")
@RequestParam String contentId,
@RequestParam(defaultValue = "1", required = false) int pageNo,
@RequestParam(defaultValue = "10", required = false) int pageSize) {
public ResponseDto<PagedResult<AdamDisposedUserVo>> listUser(@Pattern(regexp = "\\b(TICKET|VIDEO)\\b", message = "想去类型无效")
@RequestParam String type,
@Size(min = 1, max = 64, message = "内容ID长度限制1-64位")
@RequestParam String contentId,
@RequestParam(defaultValue = "1", required = false) int pageNo,
@RequestParam(defaultValue = "10", required = false) int pageSize) {
pageNo = pageNo > 0 ? pageNo : 1;
pageSize = pageSize <= 0 || pageSize > 20 ? 20 : pageSize;
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamMemberOrderController.java
View file @ 2decbaca
......@@ -20,6 +20,7 @@ import com.liquidnet.service.adam.service.IAdamMemberOrderService;
import com.liquidnet.service.adam.service.AdamRdmService;
import com.liquidnet.service.adam.service.IAdamUserService;
import com.liquidnet.service.base.ErrorMapping;
import com.liquidnet.service.base.PagedResult;
import com.liquidnet.service.base.ResponseDto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
......@@ -139,13 +140,13 @@ public class AdamMemberOrderController {
@ApiOperation(value = "会员支付回调")
@ApiImplicitParams({
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "status", value = "1-成功｜0-失败", example = "1"),
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "order_code", value = "会员订单号", example = "77062761607274496V"),
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "orderCode", value = "会员订单号", example = "77062761607274496V"),
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "code", value = "支付订单号", example = "20210616153954199964032352974P"),
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "type", value = "购买类型", example = "VIP"),
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "price", value = "支付金额", example = "0.01"),
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "payment_type", value = "支付类型", example = "APPALIPAY"),
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "payment_at", value = "支付时间", example = "2021-06-16 15:40:02"),
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "payment_id", value = "支付ID", example = "2021061622001468121421203878"),
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "paymentType", value = "支付类型", example = "APPALIPAY"),
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "paymentAt", value = "支付时间", example = "2021-06-16 15:40:02"),
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "paymentId", value = "支付ID", example = "2021061622001468121421203878"),
})
@PostMapping("callback")
public String paymentNotifyCallBack() {
......@@ -239,8 +240,8 @@ public class AdamMemberOrderController {
@ApiOperationSupport(order = 5)
@ApiOperation(value = "会员订单列表")
@GetMapping("list")
public ResponseDto<PageInfo<AdamMemberOrderSimpleVo>> list(@RequestParam(defaultValue = "1", required = false) int pageNo,
@RequestParam(defaultValue = "5", required = false) int pageSize) {
public ResponseDto<PagedResult<AdamMemberOrderSimpleVo>> list(@RequestParam(defaultValue = "1", required = false) int pageNo,
@RequestParam(defaultValue = "5", required = false) int pageSize) {
return ResponseDto.success(adamMemberOrderService.queryPage(CurrentUtil.getCurrentUid(), pageNo, pageSize));
}
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamUserController.java
View file @ 2decbaca
......@@ -11,6 +11,7 @@ import com.liquidnet.service.adam.dto.vo.*;
import com.liquidnet.service.adam.service.AdamRdmService;
import com.liquidnet.service.adam.service.IAdamUserInfoService;
import com.liquidnet.service.adam.service.IAdamUserService;
import com.liquidnet.service.adam.util.ObjectUtil;
import com.liquidnet.service.base.ErrorMapping;
import com.liquidnet.service.base.ResponseDto;
import io.swagger.annotations.Api;
......@@ -74,7 +75,7 @@ public class AdamUserController {
// // 已选中的父级标签与系统筛选命中的父级标签数量不同
// return ResponseDto.failure(ErrorMapping.get("10012"));
// }
// List<AdamTagParentVo> tagMeVoList = new ArrayList<>();
// List<AdamTagParentVo> tagMeVoList = ObjectUtil.getAdamTagParentVoArrayList();
// // tagMe子级标签校验处理
// for (AdamTagParentVo parentVo : tagMeVos) {
// // 系统对应的父级标签
......@@ -131,7 +132,7 @@ public class AdamUserController {
public ResponseDto<List<AdamTagParentVo>> getTagsForMusic() {
List<AdamTagParentVo> tagsForMusic = adamRdmService.getTagsForMusic();
if (CollectionUtils.isEmpty(tagsForMusic)) {
tagsForMusic = new ArrayList<>();
tagsForMusic = ObjectUtil.getAdamTagParentVoArrayList();
tagsForMusic.add(AdamTagParentVo.getNew().setVal("MMS01").setDesc("民歌").setTagVos(Arrays.asList(
AdamTagVo.getNew().setVal("MMS0101").setDesc("A"),
AdamTagVo.getNew().setVal("MMS0102").setDesc("B")
......@@ -156,7 +157,7 @@ public class AdamUserController {
public ResponseDto<List<AdamTagVo>> getTagsForSex() {
List<AdamTagVo> tagsForSex = adamRdmService.getTagsForSex();
if (CollectionUtils.isEmpty(tagsForSex)) {
tagsForSex = new ArrayList<>();
tagsForSex = ObjectUtil.getAdamTagVoArrayList();
tagsForSex.add(AdamTagVo.getNew().setVal("MS00").setDesc("保密"));
tagsForSex.add(AdamTagVo.getNew().setVal("MS01").setDesc("男性"));
tagsForSex.add(AdamTagVo.getNew().setVal("MS02").setDesc("女性"));
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamCollectionServiceImpl.java
View file @ 2decbaca
package com.liquidnet.service.adam.service.impl;
import com.github.pagehelper.PageInfo;
import com.liquidnet.commons.lang.util.CollectionUtil;
import com.liquidnet.service.adam.dto.vo.AdamCollectBaseVo;
import com.liquidnet.service.adam.dto.vo.AdamCollectInfoVo;
import com.liquidnet.service.adam.dto.vo.AdamCollectVo;
import com.liquidnet.service.adam.service.AdamRdmService;
import com.liquidnet.service.adam.service.IAdamCollectionService;
import com.liquidnet.service.adam.util.ObjectUtil;
import com.liquidnet.service.adam.util.QueueUtils;
import com.liquidnet.service.base.PagedResult;
import com.liquidnet.service.base.SqlMapping;
import com.liquidnet.service.base.constant.MQConst;
import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
......@@ -99,14 +100,14 @@ public class AdamCollectionServiceImpl implements IAdamCollectionService {
}
@Override
public PageInfo<AdamCollectVo> queryPage(String uid, String type, int pageNo, int pageSize) {
public PagedResult<AdamCollectVo> queryPage(String uid, String type, int pageNo, int pageSize) {
Query query = Query.query(Criteria.where("uid").is(uid).and("type").is(type).and("state").is(1));
long s = System.currentTimeMillis();
long count = mongoTemplate.count(query, AdamCollectBaseVo.class.getSimpleName());
log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
PageInfo<AdamCollectVo> voPageInfo = null;
PagedResult<AdamCollectVo> pagedResult = ObjectUtil.getAdamCollectVoPagedResult();
if (count > 0) {
Pageable pageable = PageRequest.of(pageNo - 1, pageSize, Sort.by(Sort.Direction.DESC, "createdAt"));
......@@ -164,12 +165,9 @@ public class AdamCollectionServiceImpl implements IAdamCollectionService {
log.debug("#COL.RDS.K耗时:{}ms", System.currentTimeMillis() - s);
}
voPageInfo = PageInfo.of(collectVoList);
voPageInfo.setTotal(count);
} else {
voPageInfo = new PageInfo<>();
pagedResult.setList(collectVoList).setTotal(count, pageSize);
}
return voPageInfo;
return pagedResult;
}
}
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamDisposedServiceImpl.java
View file @ 2decbaca
package com.liquidnet.service.adam.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageInfo;
import com.liquidnet.commons.lang.util.CollectionUtil;
import com.liquidnet.service.adam.dto.vo.AdamCollectInfoVo;
import com.liquidnet.service.adam.dto.vo.AdamDisposedBaseVo;
import com.liquidnet.service.adam.dto.vo.AdamDisposedUserVo;
import com.liquidnet.service.adam.dto.vo.AdamDisposedVo;
import com.liquidnet.service.adam.entity.AdamDisposed;
import com.liquidnet.service.adam.mapper.AdamDisposedMapper;
import com.liquidnet.service.adam.service.AdamRdmService;
import com.liquidnet.service.adam.service.IAdamDisposedService;
import com.liquidnet.service.adam.util.ObjectUtil;
import com.liquidnet.service.adam.util.QueueUtils;
import com.liquidnet.service.base.PagedResult;
import com.liquidnet.service.base.SqlMapping;
import com.liquidnet.service.base.constant.MQConst;
import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
......@@ -107,14 +105,14 @@ public class AdamDisposedServiceImpl implements IAdamDisposedService {
}
@Override
public PageInfo<AdamDisposedVo> queryPage(String uid, String type, int pageNo, int pageSize) {
public PagedResult<AdamDisposedVo> queryPage(String uid, String type, int pageNo, int pageSize) {
Query query = Query.query(Criteria.where("uid").is(uid).and("type").is(type).and("state").is(1));
long s = System.currentTimeMillis();
long count = mongoTemplate.count(query, AdamDisposedBaseVo.class.getSimpleName());
log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
PageInfo<AdamDisposedVo> voPageInfo = null;
PagedResult<AdamDisposedVo> pagedResult = ObjectUtil.getAdamDisposedVoPagedResult();
if (count > 0) {
query.with(PageRequest.of(pageNo - 1, pageSize, Sort.by(Sort.Direction.DESC, "createdAt")));
......@@ -179,30 +177,27 @@ public class AdamDisposedServiceImpl implements IAdamDisposedService {
vo.setIsAdvance(performanceVo.getIsAdvance());
}
r.setContentInfo(vo);
PageInfo<AdamDisposedUserVo> disposedUserVoPageInfo = this.queryDisposedUsers(type, r.getContentId(), 1, 3);
if (disposedUserVoPageInfo.getTotal() > 0) r.setUserVos(disposedUserVoPageInfo.getList());
PagedResult<AdamDisposedUserVo> disposedUserVoPagedResult = this.queryDisposedUsers(type, r.getContentId(), 1, 3);
if (disposedUserVoPagedResult.getTotal() > 0) r.setUserVos(disposedUserVoPagedResult.getList());
});
log.debug("#DIS.RDS.MDB.K耗时:{}ms", System.currentTimeMillis() - s);
}
voPageInfo = PageInfo.of(disposedVoList);
voPageInfo.setTotal(count);
} else {
voPageInfo = new PageInfo<>();
pagedResult.setList(disposedVoList).setTotal(count, pageSize);
}
return voPageInfo;
return pagedResult;
}
@Override
public PageInfo<AdamDisposedUserVo> queryDisposedUsers(String type, String contentId, int pageNo, int pageSize) {
public PagedResult<AdamDisposedUserVo> queryDisposedUsers(String type, String contentId, int pageNo, int pageSize) {
Query query = Query.query(Criteria.where("type").is(type).and("contentId").is(contentId).and("state").is(1));
long s = System.currentTimeMillis();
long count = mongoTemplate.count(query, AdamDisposedBaseVo.class.getSimpleName());
log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
PageInfo<AdamDisposedUserVo> voPageInfo = null;
PagedResult<AdamDisposedUserVo> pagedResult = ObjectUtil.getAdamDisposedUserVoPagedResult();
if (count > 0) {
query.with(PageRequest.of(pageNo - 1, pageSize, Sort.by(Sort.Direction.DESC, "createdAt")));
......@@ -210,11 +205,8 @@ public class AdamDisposedServiceImpl implements IAdamDisposedService {
List<AdamDisposedUserVo> disposedUserVoList = mongoTemplate.find(query, AdamDisposedUserVo.class, AdamDisposedBaseVo.class.getSimpleName());
log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
voPageInfo = PageInfo.of(disposedUserVoList);
voPageInfo.setTotal(count);
} else {
voPageInfo = new PageInfo<>();
pagedResult.setList(disposedUserVoList).setTotal(count, pageSize);
}
return voPageInfo;
return pagedResult;
}
}
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamMemberOrderServiceImpl.java
View file @ 2decbaca
package com.liquidnet.service.adam.service.impl;
import com.fasterxml.jackson.databind.JsonNode;
import com.github.pagehelper.PageInfo;
import com.liquidnet.commons.lang.util.*;
import com.liquidnet.service.adam.dto.AdamMemberOrderCallbackParam;
import com.liquidnet.service.adam.dto.AdamMemberOrderCodeParam;
......@@ -12,8 +11,10 @@ import com.liquidnet.service.adam.service.AdamRdmService;
import com.liquidnet.service.adam.service.IAdamMemberOrderService;
import com.liquidnet.service.adam.service.IAdamUserMemberService;
import com.liquidnet.service.adam.util.MemberUtil;
import com.liquidnet.service.adam.util.ObjectUtil;
import com.liquidnet.service.adam.util.QueueUtils;
import com.liquidnet.service.base.ErrorMapping;
import com.liquidnet.service.base.PagedResult;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.base.SqlMapping;
import com.liquidnet.service.base.constant.MQConst;
......@@ -35,7 +36,6 @@ import java.time.LocalDateTime;
import java.time.LocalTime;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@Slf4j
@Service
......@@ -117,7 +117,7 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
payParam.add("expireTime", "5");// 过期时间，单位分钟，默认5
// 生成订单信息
AdamMemberOrderVo memberOrderVo = new AdamMemberOrderVo();
AdamMemberOrderVo memberOrderVo = AdamMemberOrderVo.getNew();
memberOrderVo.setOrderNo(orderNo);
memberOrderVo.setMemberId(param.getMemberId());
memberOrderVo.setDays(memberPriceVo.getDays());
......@@ -435,12 +435,12 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
}
@Override
public PageInfo<AdamMemberOrderSimpleVo> queryPage(String uid, int pageNo, int pageSize) {
public PagedResult<AdamMemberOrderSimpleVo> queryPage(String uid, int pageNo, int pageSize) {
Query query = Query.query(Criteria.where("uid").is(uid).and("state").in(1,5));
long count = mongoTemplate.count(query, AdamMemberOrderVo.class.getSimpleName());
PageInfo<AdamMemberOrderSimpleVo> pageInfo = null;
PagedResult<AdamMemberOrderSimpleVo> pagedResult = ObjectUtil.getAdamMemberOrderSimpleVoPagedResult();
if (count > 0) {
query.with(PageRequest.of(pageNo - 1, pageSize, Sort.by(Sort.Direction.DESC, "createdAt")));
......@@ -448,11 +448,8 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
query, AdamMemberOrderSimpleVo.class, AdamMemberOrderVo.class.getSimpleName()
);
pageInfo = PageInfo.of(voList);
pageInfo.setTotal(count);
} else {
pageInfo = new PageInfo<>();
pagedResult.setList(voList).setTotal(count, pageSize);
}
return pageInfo;
return pagedResult;
}
}
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/util/ObjectUtil.java 0 → 100644
View file @ 2decbaca
package com.liquidnet.service.adam.util;
import com.liquidnet.service.adam.dto.vo.*;
import com.liquidnet.service.base.PagedResult;
import java.util.ArrayList;
import java.util.List;
public class ObjectUtil {
private static final ArrayList<AdamTagParentVo> adamTagParentVoArrayList = new ArrayList<>();
private static final ArrayList<AdamTagVo> adamTagVoArrayList = new ArrayList<>();
private static final PagedResult<AdamCollectVo> adamCollectVoPagedResult = new PagedResult<>();
private static final PagedResult<AdamMemberOrderSimpleVo> adamMemberOrderSimpleVoPagedResult = new PagedResult<>();
private static final PagedResult<AdamDisposedVo> adamDisposedVoPagedResult = new PagedResult<>();
private static final PagedResult<AdamDisposedUserVo> adamDisposedUserVoPagedResult = new PagedResult<>();
public static List<AdamTagParentVo> getAdamTagParentVoArrayList() {
return (List<AdamTagParentVo>) adamTagParentVoArrayList.clone();
}
public static List<AdamTagVo> getAdamTagVoArrayList() {
return (List<AdamTagVo>) adamTagVoArrayList.clone();
}
public static PagedResult<AdamCollectVo> getAdamCollectVoPagedResult() {
return adamCollectVoPagedResult.clone();
}
public static PagedResult<AdamMemberOrderSimpleVo> getAdamMemberOrderSimpleVoPagedResult() {
return adamMemberOrderSimpleVoPagedResult.clone();
}
public static PagedResult<AdamDisposedVo> getAdamDisposedVoPagedResult() {
return adamDisposedVoPagedResult.clone();
}
public static PagedResult<AdamDisposedUserVo> getAdamDisposedUserVoPagedResult() {
return adamDisposedUserVoPagedResult.clone();
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment