Skip to content

C
cloud-web
Commit 527d069a by “Kongxiangkun”
Options

增加积分商城相关代码

parent f58fba0b
Showing with 4 additions and 19 deletions
cloud-web-manage/src/main/java/com/yizhi/application/point/controller/PointController.java
...@@ -50,6 +50,7 @@ public class PointController { ...@@ -50,6 +50,7 @@ public class PointController {
@Autowired @Autowired
StatisticsPointClient statisticsPointClient; StatisticsPointClient statisticsPointClient;
@ApiOperation(value = "积分策略列表", notes = "积分策略列表", response = PointVo.class) @ApiOperation(value = "积分策略列表", notes = "积分策略列表", response = PointVo.class)
@GetMapping("/strategy/view") @GetMapping("/strategy/view")
public Response<PointVo> pointList() { public Response<PointVo> pointList() {
...@@ -87,38 +88,22 @@ public class PointController { ...@@ -87,38 +88,22 @@ public class PointController {
@ApiOperation(value = "积分流水明细", notes = "积分流水明细", response = PointDetailsVO.class) @ApiOperation(value = "积分流水明细", notes = "积分流水明细", response = PointDetailsVO.class)
@GetMapping("/details/list") @GetMapping("/details/list")
Response<Object> getManagePointDetails(@ApiParam(value = "活动ID", required = false) @RequestParam(name = "activityId", required = false) Long activityId, Response<Object> getManagePointDetails(@ApiParam(value = "类型", required = false) @RequestParam(name = "learnType", required = false) String learnType,
@ApiParam(value = "用户", required = false) @RequestParam(name = "accountName", required = false) String accountName, @ApiParam(value = "用户", required = false) @RequestParam(name = "accountName", required = false) String accountName,
@ApiParam(value = "查询开始日期，时间戳", required = false) @RequestParam(name = "startTime", required = false) Long startTime, @ApiParam(value = "查询开始日期，时间戳", required = false) @RequestParam(name = "startTime", required = false) Long startTime,
@ApiParam(value = "查询结束日期，时间戳", required = false) @RequestParam(name = "endTime", required = false) Long endTime, @ApiParam(value = "查询结束日期，时间戳", required = false) @RequestParam(name = "endTime", required = false) Long endTime,
@ApiParam(value = "页码", required = false) @RequestParam(name = "pageNo", required = false, defaultValue = "1") Integer pageNo, @ApiParam(value = "页码", required = false) @RequestParam(name = "pageNo", required = false, defaultValue = "1") Integer pageNo,
@ApiParam(value = "每页显示页数", required = false) @RequestParam(name = "pageSize", required = false, defaultValue = "10") Integer pageSize) { @ApiParam(value = "每页显示页数", required = false) @RequestParam(name = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
RequestContext requestContext = ContextHolder.get(); RequestContext requestContext = ContextHolder.get();
if (null == requestContext) { if (null == requestContext) {
Response.fail(); Response.fail();
} }
Long companyId = requestContext.getCompanyId(); Long companyId = requestContext.getCompanyId();
Long siteId = requestContext.getSiteId(); Long siteId = requestContext.getSiteId();
try { try {
// Date startDate = null; Page<PointDetailsVO> page = pointManageFeignClients.getManagePointDetails(learnType, accountName,
// if (null != startTime) {
// startDate = new Date(startTime);
// }
// Date endDate = null;
// if (null != endTime) {
// endDate = new Date(endTime);
// }
Page<PointDetailsVO> page = pointManageFeignClients.getManagePointDetails(activityId, accountName,
startTime, endTime, pageNo, pageSize, companyId, siteId); startTime, endTime, pageNo, pageSize, companyId, siteId);
return Response.ok(page);
Map<String, Integer> pageMap = new HashMap<String, Integer>();
pageMap.put("pageNo", pageNo);
pageMap.put("pageSize", pageSize);
pageMap.put("pageTotal", page.getTotal());
return Response.ok(page.getRecords(), pageMap);
} catch (Exception e) { } catch (Exception e) {
LOG.error("服务出错。", e); LOG.error("服务出错。", e);
return Response.fail(); return Response.fail();
......
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