|
|
@@ -1,7 +1,6 @@
|
|
|
package com.cyksj.web.controller.manage.distribute;
|
|
|
|
|
|
import cn.dev33.satoken.annotation.SaCheckPermission;
|
|
|
-import cn.dev33.satoken.stp.StpUtil;
|
|
|
import cn.hutool.core.bean.BeanUtil;
|
|
|
import cn.hutool.core.collection.CollUtil;
|
|
|
import cn.hutool.core.date.DateTime;
|
|
|
@@ -34,6 +33,7 @@ import com.cyksj.service.mange.business.UserBusinessRateService;
|
|
|
import com.cyksj.service.mange.statistics.StatisticsDataService;
|
|
|
import com.cyksj.service.sys.SysConfigService;
|
|
|
import com.cyksj.service.user.UserBenefitsService;
|
|
|
+import com.cyksj.web.util.StpAbroadUtil;
|
|
|
import com.ejlchina.searcher.BeanSearcher;
|
|
|
import com.ejlchina.searcher.SearchResult;
|
|
|
import com.ejlchina.searcher.param.Operator;
|
|
|
@@ -236,7 +236,7 @@ public class DistributeController {
|
|
|
*/
|
|
|
@GetMapping
|
|
|
public Result<SearchResult<UserDistributeViews>> distributeList(String nickname, String showId, String startTime, String endTime, Boolean isSpecialEp) {
|
|
|
- long adminId = StpUtil.getLoginIdAsLong();
|
|
|
+ long adminId = StpAbroadUtil.getLoginIdAsLong();
|
|
|
MapBuilder builder = MapUtils.flatBuilder(request.getParameterMap());
|
|
|
//是否是商务人员
|
|
|
if (userBusinessRateService.isBusiness(adminId)) {
|
|
|
@@ -521,7 +521,7 @@ public class DistributeController {
|
|
|
*/
|
|
|
@GetMapping("/get/business/list")
|
|
|
public Result<SearchResult<DistributeBusinessView>> getDistributeBusinessView() {
|
|
|
- long adminId = StpUtil.getLoginIdAsLong();
|
|
|
+ long adminId = StpAbroadUtil.getLoginIdAsLong();
|
|
|
MapBuilder builder = MapUtils.flatBuilder(request.getParameterMap());
|
|
|
DateTime beginOfMonth = DateUtil.beginOfMonth(DateTime.now());
|
|
|
String thisMonth = beginOfMonth.toString("yyyy-MM");
|
|
|
@@ -543,7 +543,7 @@ public class DistributeController {
|
|
|
*/
|
|
|
@GetMapping("/get/businessList")
|
|
|
public Result<List<DistributeBusinessListVo>> getBusinessList() {
|
|
|
- long adminId = StpUtil.getLoginIdAsLong();
|
|
|
+ long adminId = StpAbroadUtil.getLoginIdAsLong();
|
|
|
MapBuilder builder = MapUtils.flatBuilder(request.getParameterMap());
|
|
|
//是否是商务人员
|
|
|
if (userBusinessRateService.isBusiness(adminId)) {
|
|
|
@@ -558,7 +558,7 @@ public class DistributeController {
|
|
|
*/
|
|
|
@GetMapping("/get/takeMoney/detail")
|
|
|
public Result<SearchResult<BusinessTakeMoneyDetail>> getTakeMoneyDetail(String firstMonthDate, String secondMonthDate) {
|
|
|
- long adminId = StpUtil.getLoginIdAsLong();
|
|
|
+ long adminId = StpAbroadUtil.getLoginIdAsLong();
|
|
|
MapBuilder builder = MapUtils.flatBuilder(request.getParameterMap());
|
|
|
//是否是商务人员
|
|
|
if (userBusinessRateService.isBusiness(adminId)) {
|
|
|
@@ -592,7 +592,7 @@ public class DistributeController {
|
|
|
*/
|
|
|
@GetMapping("/get/business/headData")
|
|
|
public Result<BusinessTakeMoneyHeadView> getTakeMoneyHeadDetail(String firstMonthDate, String secondMonthDate) {
|
|
|
- long adminId = StpUtil.getLoginIdAsLong();
|
|
|
+ long adminId = StpAbroadUtil.getLoginIdAsLong();
|
|
|
MapBuilder builder = MapUtils.flatBuilder(request.getParameterMap());
|
|
|
//是否是商务人员
|
|
|
if (userBusinessRateService.isBusiness(adminId)) {
|
|
|
@@ -794,7 +794,7 @@ public class DistributeController {
|
|
|
@GetMapping("/get/business/data")
|
|
|
@SaCheckPermission("business:dataView")
|
|
|
public Result<SearchResult<BusinessDistributesDataView>> getBusinessDistributesData(String startTime, String endTime) {
|
|
|
- long adminId = StpUtil.getLoginIdAsLong();
|
|
|
+ long adminId = StpAbroadUtil.getLoginIdAsLong();
|
|
|
MapBuilder builder = MapUtils.flatBuilder(request.getParameterMap());
|
|
|
String time1Sql = StrUtil.EMPTY;
|
|
|
String time2Sql = StrUtil.EMPTY;
|
zoujiajian