|
|
@@ -6,18 +6,22 @@ import com.ydtech.core.page.HttpResult;
|
|
|
import com.ydtech.modules.admin.model.dto.DeptBalanceDto;
|
|
|
import com.ydtech.modules.admin.model.dto.SysPartnerConsoleDto;
|
|
|
import com.ydtech.modules.admin.model.dto.SysPartnerInfoConsoleDto;
|
|
|
-import com.ydtech.modules.admin.model.vo.AppSysPartnerVo;
|
|
|
import com.ydtech.modules.admin.model.vo.DeptBalanceVo;
|
|
|
import com.ydtech.modules.admin.model.vo.KztGetDeptUtilsDto;
|
|
|
import com.ydtech.modules.admin.model.vo.PartnerBalanceVo;
|
|
|
import com.ydtech.modules.admin.service.DeptBalanceService;
|
|
|
+import com.ydtech.modules.admin.service.PartnerWalletService;
|
|
|
import com.ydtech.modules.admin.utils.KztGetDeptUtils;
|
|
|
import com.ydtech.modules.admin.utils.SliceUpDateUtil;
|
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
+import lombok.RequiredArgsConstructor;
|
|
|
import org.apache.commons.lang3.ObjectUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
-import org.springframework.web.bind.annotation.*;
|
|
|
+import org.springframework.web.bind.annotation.PostMapping;
|
|
|
+import org.springframework.web.bind.annotation.RequestBody;
|
|
|
+import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
+import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
import java.util.Date;
|
|
|
@@ -27,11 +31,12 @@ import java.util.List;
|
|
|
@Api(tags = "机构管理费统计")
|
|
|
@RequestMapping("/deptBalance")
|
|
|
@RestController
|
|
|
+@RequiredArgsConstructor
|
|
|
public class DeptBalanceController {
|
|
|
|
|
|
- @Autowired
|
|
|
- private DeptBalanceService deptBalanceService;
|
|
|
+ private final DeptBalanceService deptBalanceService;
|
|
|
|
|
|
+ private final PartnerWalletService partnerWalletService;
|
|
|
|
|
|
/**
|
|
|
* @version
|
|
|
@@ -46,9 +51,10 @@ public class DeptBalanceController {
|
|
|
deptBalanceVo.setBeginDate(map.get("startDate"));
|
|
|
deptBalanceVo.setEndDate(map.get("endDate"));
|
|
|
KztGetDeptUtils kztGetDeptUtils = new KztGetDeptUtils();
|
|
|
- KztGetDeptUtilsDto kztGetDeptUtilsDto = kztGetDeptUtils.KztGetDeptIds(httpServerRequest.getRequestURL().toString());
|
|
|
- if(ObjectUtils.isNotEmpty(kztGetDeptUtilsDto)){
|
|
|
- if("1".equals(kztGetDeptUtilsDto.getType())){
|
|
|
+ KztGetDeptUtilsDto kztGetDeptUtilsDto = kztGetDeptUtils.KztGetDeptIds(httpServerRequest.getRequestURL()
|
|
|
+ .toString());
|
|
|
+ if (ObjectUtils.isNotEmpty(kztGetDeptUtilsDto)) {
|
|
|
+ if ("1".equals(kztGetDeptUtilsDto.getType())) {
|
|
|
deptBalanceVo.setDeptIds(kztGetDeptUtilsDto.getIds());
|
|
|
} else if ("2".equals(kztGetDeptUtilsDto.getType())) {
|
|
|
deptBalanceVo.setUserIds(kztGetDeptUtilsDto.getIds());
|
|
|
@@ -71,16 +77,16 @@ public class DeptBalanceController {
|
|
|
deptBalanceVo.setBeginDate(map.get("startDate"));
|
|
|
deptBalanceVo.setEndDate(map.get("endDate"));
|
|
|
KztGetDeptUtils kztGetDeptUtils = new KztGetDeptUtils();
|
|
|
- KztGetDeptUtilsDto kztGetDeptUtilsDto = kztGetDeptUtils.KztGetDeptIds(httpServerRequest.getRequestURL().toString());
|
|
|
- if(ObjectUtils.isNotEmpty(kztGetDeptUtilsDto)){
|
|
|
- if("1".equals(kztGetDeptUtilsDto.getType())){
|
|
|
+ KztGetDeptUtilsDto kztGetDeptUtilsDto = kztGetDeptUtils.KztGetDeptIds(httpServerRequest.getRequestURL()
|
|
|
+ .toString());
|
|
|
+ if (ObjectUtils.isNotEmpty(kztGetDeptUtilsDto)) {
|
|
|
+ if ("1".equals(kztGetDeptUtilsDto.getType())) {
|
|
|
deptBalanceVo.setDeptIds(kztGetDeptUtilsDto.getIds());
|
|
|
} else if ("2".equals(kztGetDeptUtilsDto.getType())) {
|
|
|
deptBalanceVo.setUserIds(kztGetDeptUtilsDto.getIds());
|
|
|
}
|
|
|
}
|
|
|
- HttpResult<IPage<SysPartnerConsoleDto>> result = deptBalanceService.queryPartnerStatistics(deptBalanceVo);
|
|
|
- return result;
|
|
|
+ return partnerWalletService.queryPartnerStatistics(deptBalanceVo);
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -92,6 +98,9 @@ public class DeptBalanceController {
|
|
|
@PostMapping("queryPartnerInfo")
|
|
|
@ApiOperation(value = "合伙人详情")
|
|
|
public HttpResult<List<SysPartnerConsoleDto>> queryPartnerInfo(@RequestBody DeptBalanceVo deptBalanceVo) {
|
|
|
+ HashMap<String, String> map = getDateMapByType(deptBalanceVo.getDays(), deptBalanceVo.getBeginDate(), deptBalanceVo.getEndDate());
|
|
|
+ deptBalanceVo.setBeginDate(map.get("startDate"));
|
|
|
+ deptBalanceVo.setEndDate(map.get("endDate"));
|
|
|
List<SysPartnerConsoleDto> result = deptBalanceService.queryPartnerInfo(deptBalanceVo);
|
|
|
return HttpResult.ok(result);
|
|
|
}
|
|
|
@@ -104,12 +113,14 @@ public class DeptBalanceController {
|
|
|
@PostMapping("queryStudioInfo")
|
|
|
@ApiOperation(value = "工作室详情")
|
|
|
public HttpResult<List<SysPartnerConsoleDto>> queryStudioInfo(@RequestBody DeptBalanceVo deptBalanceVo) {
|
|
|
+ HashMap<String, String> map = getDateMapByType(deptBalanceVo.getDays(), deptBalanceVo.getBeginDate(), deptBalanceVo.getEndDate());
|
|
|
+ deptBalanceVo.setBeginDate(map.get("startDate"));
|
|
|
+ deptBalanceVo.setEndDate(map.get("endDate"));
|
|
|
List<SysPartnerConsoleDto> result = deptBalanceService.queryPartnerInfo(deptBalanceVo);
|
|
|
return HttpResult.ok(result);
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
/**
|
|
|
* @version
|
|
|
* @author: whp
|
|
|
@@ -118,6 +129,9 @@ public class DeptBalanceController {
|
|
|
@PostMapping("info")
|
|
|
@ApiOperation(value = "合伙人详情")
|
|
|
public HttpResult<SysPartnerInfoConsoleDto> queryInfo(@RequestBody DeptBalanceVo deptBalanceVo) {
|
|
|
+ HashMap<String, String> map = getDateMapByType(deptBalanceVo.getDays(), deptBalanceVo.getBeginDate(), deptBalanceVo.getEndDate());
|
|
|
+ deptBalanceVo.setBeginDate(map.get("startDate"));
|
|
|
+ deptBalanceVo.setEndDate(map.get("endDate"));
|
|
|
SysPartnerInfoConsoleDto result = deptBalanceService.queryInfo(deptBalanceVo);
|
|
|
return HttpResult.ok(result);
|
|
|
}
|
|
|
@@ -131,6 +145,9 @@ public class DeptBalanceController {
|
|
|
@PostMapping("/getTeamInfo")
|
|
|
@ApiOperation(value = "查看机构下团队信息")
|
|
|
public HttpResult<SysPartnerInfoConsoleDto> getTeamInfo(@RequestBody DeptBalanceVo deptBalanceVo) {
|
|
|
+ HashMap<String, String> map = getDateMapByType(deptBalanceVo.getDays(), deptBalanceVo.getBeginDate(), deptBalanceVo.getEndDate());
|
|
|
+ deptBalanceVo.setBeginDate(map.get("startDate"));
|
|
|
+ deptBalanceVo.setEndDate(map.get("endDate"));
|
|
|
SysPartnerInfoConsoleDto result = deptBalanceService.getTeamInfo(deptBalanceVo);
|
|
|
return HttpResult.ok(result);
|
|
|
}
|
|
|
@@ -144,6 +161,9 @@ public class DeptBalanceController {
|
|
|
@PostMapping("/getTeamUserInfo")
|
|
|
@ApiOperation(value = "查看团队下人员信息")
|
|
|
public HttpResult<SysPartnerInfoConsoleDto> getTeamUserInfo(@RequestBody DeptBalanceVo deptBalanceVo) {
|
|
|
+ HashMap<String, String> map = getDateMapByType(deptBalanceVo.getDays(), deptBalanceVo.getBeginDate(), deptBalanceVo.getEndDate());
|
|
|
+ deptBalanceVo.setBeginDate(map.get("startDate"));
|
|
|
+ deptBalanceVo.setEndDate(map.get("endDate"));
|
|
|
SysPartnerInfoConsoleDto result = deptBalanceService.getTeamUserInfo(deptBalanceVo);
|
|
|
return HttpResult.ok(result);
|
|
|
}
|
|
|
@@ -162,7 +182,6 @@ public class DeptBalanceController {
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
/**
|
|
|
* @version
|
|
|
* @author: whp
|
|
|
@@ -176,9 +195,10 @@ public class DeptBalanceController {
|
|
|
deptBalanceVo.setBeginDate(map.get("startDate"));
|
|
|
deptBalanceVo.setEndDate(map.get("endDate"));
|
|
|
KztGetDeptUtils kztGetDeptUtils = new KztGetDeptUtils();
|
|
|
- KztGetDeptUtilsDto kztGetDeptUtilsDto = kztGetDeptUtils.KztGetDeptIds(httpServerRequest.getRequestURL().toString());
|
|
|
- if(ObjectUtils.isNotEmpty(kztGetDeptUtilsDto)){
|
|
|
- if("1".equals(kztGetDeptUtilsDto.getType())){
|
|
|
+ KztGetDeptUtilsDto kztGetDeptUtilsDto = kztGetDeptUtils.KztGetDeptIds(httpServerRequest.getRequestURL()
|
|
|
+ .toString());
|
|
|
+ if (ObjectUtils.isNotEmpty(kztGetDeptUtilsDto)) {
|
|
|
+ if ("1".equals(kztGetDeptUtilsDto.getType())) {
|
|
|
deptBalanceVo.setDeptIds(kztGetDeptUtilsDto.getIds());
|
|
|
} else if ("2".equals(kztGetDeptUtilsDto.getType())) {
|
|
|
deptBalanceVo.setUserIds(kztGetDeptUtilsDto.getIds());
|
|
|
@@ -190,35 +210,35 @@ public class DeptBalanceController {
|
|
|
|
|
|
|
|
|
/**
|
|
|
- * @version
|
|
|
- * @author: hxl
|
|
|
- * @Date: 2024/6/19 11:57
|
|
|
- * @Description: 通过时间类型判断
|
|
|
+ * @version
|
|
|
+ * @author: hxl
|
|
|
+ * @Date: 2024/6/19 11:57
|
|
|
+ * @Description: 通过时间类型判断
|
|
|
*/
|
|
|
- private static HashMap<String,String> getDateMapByType(String type, String startDate, String endDate) {
|
|
|
- HashMap<String,String> map =new HashMap<>();
|
|
|
- String startDateStr="";
|
|
|
- String endDateStr="";
|
|
|
- if(org.apache.commons.lang3.StringUtils.isNotBlank(startDate) && org.apache.commons.lang3.StringUtils.isNotBlank(endDate)){
|
|
|
- startDateStr= org.apache.commons.lang3.StringUtils.isNotBlank(startDate)?startDate+" 00:00:00":null;
|
|
|
- endDateStr= org.apache.commons.lang3.StringUtils.isNotBlank(endDate)?endDate+" 23:59:59":null;
|
|
|
- }else{
|
|
|
- if("1".equals(type)){
|
|
|
+ private static HashMap<String, String> getDateMapByType(String type, String startDate, String endDate) {
|
|
|
+ HashMap<String, String> map = new HashMap<>();
|
|
|
+ String startDateStr = "";
|
|
|
+ String endDateStr = "";
|
|
|
+ if (org.apache.commons.lang3.StringUtils.isNotBlank(startDate) && org.apache.commons.lang3.StringUtils.isNotBlank(endDate)) {
|
|
|
+ startDateStr = org.apache.commons.lang3.StringUtils.isNotBlank(startDate) ? startDate + " 00:00:00" : null;
|
|
|
+ endDateStr = org.apache.commons.lang3.StringUtils.isNotBlank(endDate) ? endDate + " 23:59:59" : null;
|
|
|
+ } else {
|
|
|
+ if ("1".equals(type)) {
|
|
|
// 近1天
|
|
|
- startDateStr= SliceUpDateUtil.getBeforeDay(new Date(),0)+" 00:00:00";
|
|
|
- endDateStr=SliceUpDateUtil.getBeforeDay(new Date(),0)+" 23:59:59";
|
|
|
- }else if("2".equals(type)){
|
|
|
+ startDateStr = SliceUpDateUtil.getBeforeDay(new Date(), 0) + " 00:00:00";
|
|
|
+ endDateStr = SliceUpDateUtil.getBeforeDay(new Date(), 0) + " 23:59:59";
|
|
|
+ } else if ("2".equals(type)) {
|
|
|
// 近7天
|
|
|
- startDateStr=SliceUpDateUtil.getBeforeDay(new Date(),1)+" 00:00:00";
|
|
|
- endDateStr=SliceUpDateUtil.getBeforeDay(new Date(),0)+" 23:59:59";
|
|
|
- }else if("3".equals(type)){
|
|
|
+ startDateStr = SliceUpDateUtil.getBeforeDay(new Date(), 1) + " 00:00:00";
|
|
|
+ endDateStr = SliceUpDateUtil.getBeforeDay(new Date(), 0) + " 23:59:59";
|
|
|
+ } else if ("3".equals(type)) {
|
|
|
// 近30天
|
|
|
- startDateStr=SliceUpDateUtil.getBeforeDay(new Date(),6)+" 00:00:00";
|
|
|
- endDateStr=SliceUpDateUtil.getBeforeDay(new Date(),0)+" 23:59:59";
|
|
|
+ startDateStr = SliceUpDateUtil.getBeforeDay(new Date(), 6) + " 00:00:00";
|
|
|
+ endDateStr = SliceUpDateUtil.getBeforeDay(new Date(), 0) + " 23:59:59";
|
|
|
}
|
|
|
}
|
|
|
- map.put("startDate",startDateStr);
|
|
|
- map.put("endDate",endDateStr);
|
|
|
+ map.put("startDate", startDateStr);
|
|
|
+ map.put("endDate", endDateStr);
|
|
|
return map;
|
|
|
}
|
|
|
|