angelo
/
java-zk-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

## 分页返回值修改

This commit is contained in:
zhangheng 2025-09-26 16:14:15 +08:00
parent 9718739da4
commit 2384859022
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/api/ApiMemberStructureController.java
View File

@ -126,15 +126,15 @@ public class ApiMemberStructureController extends BaseController {
@Log(module = EOperationModule.MEMBER_RETAIL_TREE_LIST, business = EOperationBusiness.MEMBER_RETAIL_TREE_LIST, method = EOperationMethod.SELECT) @Log(module = EOperationModule.MEMBER_RETAIL_TREE_LIST, business = EOperationBusiness.MEMBER_RETAIL_TREE_LIST, method = EOperationMethod.SELECT)
@GetMapping("/three-framework-list") @GetMapping("/three-framework-list")
public TableDataInfo threeFrameworkList(Integer stage, Integer stageStatus) { public AjaxResult threeFrameworkList(Integer stage, Integer stageStatus) {
if (stage == null) { if (stage == null) {
log.error("参数错误"); log.error("参数错误");
return null; return AjaxResult.error(CommonMsgConstants.MISSING_PARAM);
} }
Long userId = SecurityUtils.getUserId(); Long userId = SecurityUtils.getUserId();
if (userId == null) { if (userId == null) {
log.error("用户登录信息错误"); log.error("用户登录信息错误");
return null; return AjaxResult.error(CommonMsgConstants.MISSING_PARAM);
} }
// 获取当前时间 -1 天 // 获取当前时间 -1 天
String yesterday = LocalDate.now().minusDays(1).format((DateTimeFormatter.ofPattern("yyyy-MM-dd"))); String yesterday = LocalDate.now().minusDays(1).format((DateTimeFormatter.ofPattern("yyyy-MM-dd")));
@ -147,13 +147,13 @@ public class ApiMemberStructureController extends BaseController {
Integer isFind = iCumemberRetailDetailService.getFindCumemberRetailDetail(settleTableName); Integer isFind = iCumemberRetailDetailService.getFindCumemberRetailDetail(settleTableName);
if (isFind == null || isFind != 1) { if (isFind == null || isFind != 1) {
log.error("当前会员日结信息不存在{}",settleTableName); log.error("当前会员日结信息不存在{}",settleTableName);
return null; return AjaxResult.error();
} }
startPage(); startPage();
// 查询当前会员所有子点位信息 // 查询当前会员所有子点位信息
CuMember member = iCuMemberService.getMember(userId); CuMember member = iCuMemberService.getMember(userId);
List<CuMemberThreeFrameworkVO> cuMemberThreeFrameworkVOS = iCumemberRetailDetailService.getCuMemberRetailDetailList(settleTableName,member.getMemberCode(),stage,stageStatus); List<CuMemberThreeFrameworkVO> cuMemberThreeFrameworkVOS = iCumemberRetailDetailService.getCuMemberRetailDetailList(settleTableName,member.getMemberCode(),stage,stageStatus);
return getDataTable(cuMemberThreeFrameworkVOS); return AjaxResult.success(getDataTable(cuMemberThreeFrameworkVOS));
} }
@Log(module = EOperationModule.MEMBER_RETAIL_TREE_LIST, business = EOperationBusiness.MEMBER_RETAIL_TREE_LIST, method = EOperationMethod.SELECT) @Log(module = EOperationModule.MEMBER_RETAIL_TREE_LIST, business = EOperationBusiness.MEMBER_RETAIL_TREE_LIST, method = EOperationMethod.SELECT)

8
bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/manage/MemberStructureController.java
View File

@ -255,10 +255,10 @@ public class MemberStructureController extends BaseController {
*/ */
@Log(module = EOperationModule.MEMBER_RETAIL_TREE_LIST, business = EOperationBusiness.MEMBER_RETAIL_TREE_LIST, method = EOperationMethod.SELECT) @Log(module = EOperationModule.MEMBER_RETAIL_TREE_LIST, business = EOperationBusiness.MEMBER_RETAIL_TREE_LIST, method = EOperationMethod.SELECT)
@GetMapping("/three-framework-list") @GetMapping("/three-framework-list")
public TableDataInfo threeFrameworkList(Long memberSettlePeriodId, String memberCode, Integer stage, Integer stageStatus) { public AjaxResult threeFrameworkList(Long memberSettlePeriodId, String memberCode, Integer stage, Integer stageStatus) {
if (memberSettlePeriodId == null || memberCode == null || stage == null) { if (memberSettlePeriodId == null || memberCode == null || stage == null) {
log.error("参数错误"); log.error("参数错误");
return null; return AjaxResult.error(CommonMsgConstants.MISSING_PARAM);
} }
CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getById(memberSettlePeriodId); CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getById(memberSettlePeriodId);
log.info("日结信息{}",csPeriod); log.info("日结信息{}",csPeriod);
@ -268,12 +268,12 @@ public class MemberStructureController extends BaseController {
Integer isFind = iCumemberRetailDetailService.getFindCumemberRetailDetail(settleTableName); Integer isFind = iCumemberRetailDetailService.getFindCumemberRetailDetail(settleTableName);
if (isFind == null || isFind != 1) { if (isFind == null || isFind != 1) {
log.error("当前表名不存在{}",settleTableName); log.error("当前表名不存在{}",settleTableName);
return null; return AjaxResult.error();
} }
startPage(); startPage();
// 查询当前会员所有子点位信息 // 查询当前会员所有子点位信息
List<CuMemberThreeFrameworkVO> cuMemberThreeFrameworkVOS = iCumemberRetailDetailService.getCuMemberRetailDetailList(settleTableName,memberCode,stage,stageStatus); List<CuMemberThreeFrameworkVO> cuMemberThreeFrameworkVOS = iCumemberRetailDetailService.getCuMemberRetailDetailList(settleTableName,memberCode,stage,stageStatus);
return getDataTable(cuMemberThreeFrameworkVOS); return AjaxResult.success(getDataTable(cuMemberThreeFrameworkVOS));
} }
@Log(module = EOperationModule.MEMBER_RETAIL_TREE_LIST, business = EOperationBusiness.MEMBER_RETAIL_TREE_LIST, method = EOperationMethod.SELECT) @Log(module = EOperationModule.MEMBER_RETAIL_TREE_LIST, business = EOperationBusiness.MEMBER_RETAIL_TREE_LIST, method = EOperationMethod.SELECT)