|
@@ -5,11 +5,9 @@ import cn.com.ctop.common.module.entity.CtopOauthToken;
|
|
import cn.com.ctop.common.module.service.ICtopOauthTokenService;
|
|
import cn.com.ctop.common.module.service.ICtopOauthTokenService;
|
|
import cn.com.ctop.common.module.utils.Check;
|
|
import cn.com.ctop.common.module.utils.Check;
|
|
import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouCampaign;
|
|
import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouCampaign;
|
|
|
|
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouGroup;
|
|
import cn.com.ctop.kuaishou.modules.batch.entity.vo.SpendVo;
|
|
import cn.com.ctop.kuaishou.modules.batch.entity.vo.SpendVo;
|
|
-import cn.com.ctop.kuaishou.modules.batch.service.IBatchService;
|
|
|
|
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouCampaignService;
|
|
|
|
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouUpdateService;
|
|
|
|
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
|
|
|
|
|
|
+import cn.com.ctop.kuaishou.modules.batch.service.*;
|
|
import com.alibaba.fastjson.JSONArray;
|
|
import com.alibaba.fastjson.JSONArray;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
@@ -43,6 +41,9 @@ public class BatchController {
|
|
@Autowired
|
|
@Autowired
|
|
private ICtopOauthTokenService tokenService;
|
|
private ICtopOauthTokenService tokenService;
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
+ private IKuaiShouGroupService kuaiShouGroupService;
|
|
|
|
+
|
|
|
|
|
|
/**
|
|
/**
|
|
* 获取花费信息
|
|
* 获取花费信息
|
|
@@ -98,6 +99,7 @@ public class BatchController {
|
|
HttpServletRequest req) {
|
|
HttpServletRequest req) {
|
|
Result<IPage<KuaiShouCampaign>> result = new Result<IPage<KuaiShouCampaign>>();
|
|
Result<IPage<KuaiShouCampaign>> result = new Result<IPage<KuaiShouCampaign>>();
|
|
QueryWrapper<KuaiShouCampaign> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouCampaign, req.getParameterMap());
|
|
QueryWrapper<KuaiShouCampaign> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouCampaign, req.getParameterMap());
|
|
|
|
+ queryWrapper.orderByDesc("put_create_time");
|
|
Page<KuaiShouCampaign> page = new Page<KuaiShouCampaign>(pageNo, pageSize);
|
|
Page<KuaiShouCampaign> page = new Page<KuaiShouCampaign>(pageNo, pageSize);
|
|
IPage<KuaiShouCampaign> pageList = kuaiShouCampaignService.page(page, queryWrapper);
|
|
IPage<KuaiShouCampaign> pageList = kuaiShouCampaignService.page(page, queryWrapper);
|
|
result.setSuccess(true);
|
|
result.setSuccess(true);
|
|
@@ -146,4 +148,18 @@ public class BatchController {
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
+ @PostMapping(value = "/getUnitList")
|
|
|
|
+ public Result<IPage<KuaiShouGroup>> getUnitList(KuaiShouGroup kuaiShouGroup,
|
|
|
|
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
|
|
|
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
|
|
|
+ HttpServletRequest req) {
|
|
|
|
+ Result<IPage<KuaiShouGroup>> result = new Result<IPage<KuaiShouGroup>>();
|
|
|
|
+ QueryWrapper<KuaiShouGroup> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouGroup, req.getParameterMap());
|
|
|
|
+ Page<KuaiShouGroup> page = new Page<KuaiShouGroup>(pageNo, pageSize);
|
|
|
|
+ IPage<KuaiShouGroup> pageList = kuaiShouGroupService.page(page, queryWrapper);
|
|
|
|
+ result.setSuccess(true);
|
|
|
|
+ result.setResult(pageList);
|
|
|
|
+ return result;
|
|
|
|
+ }
|
|
|
|
+
|
|
}
|
|
}
|