增加积分商城相关代码

cloud-web-manage/src/main/java/com/yizhi/application/point/controller/PointController.java

@@ -50,6 +50,7 @@ public class PointController {
     @Autowired
     StatisticsPointClient statisticsPointClient;
 
+
     @ApiOperation(value = "积分策略列表", notes = "积分策略列表", response = PointVo.class)
     @GetMapping("/strategy/view")
     public Response<PointVo> pointList() {
@@ -87,38 +88,22 @@ public class PointController {
 
     @ApiOperation(value = "积分流水明细", notes = "积分流水明细", response = PointDetailsVO.class)
     @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 = "startTime", required = false) Long startTime,
                                            @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 = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
-
         RequestContext requestContext = ContextHolder.get();
         if (null == requestContext) {
             Response.fail();
         }
-
         Long companyId = requestContext.getCompanyId();
         Long siteId = requestContext.getSiteId();
-
         try {
-//            Date startDate = null;
-//            if (null != startTime) {
-//                startDate = new Date(startTime);
-//            }
-//            Date endDate = null;
-//            if (null != endTime) {
-//                endDate = new Date(endTime);
-//            }
-            Page<PointDetailsVO> page = pointManageFeignClients.getManagePointDetails(activityId, accountName,
+            Page<PointDetailsVO> page = pointManageFeignClients.getManagePointDetails(learnType, accountName,
                     startTime, endTime, pageNo, pageSize, companyId, siteId);
-
-            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);
+            return Response.ok(page);
         } catch (Exception e) {
             LOG.error("服务出错。", e);
             return Response.fail();