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

Compare commits

base: angelo:34ab0dc925cf7cab87adc5c5064b899392da97ce
Branches Tags
angelo:master
angelo:test
angelo:dev
angelo:online
..
compare: angelo:120f03eccebe28a26632f72b96a97a0e8d693067
Branches Tags
angelo:test
angelo:dev
angelo:online
angelo:master

No commits in common. "34ab0dc925cf7cab87adc5c5064b899392da97ce" and "120f03eccebe28a26632f72b96a97a0e8d693067" have entirely different histories.
34ab0dc925 ... 120f03ecce

4 changed files with 16 additions and 12 deletions
Show Stats Expand all files Collapse all files

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

@ -797,9 +797,10 @@ public class CuMemberController extends BaseController {
*/
@Log(module = EOperationModule.MEMBER_POINT, business = EOperationBusiness.MEMBER_POINT, method = EOperationMethod.SELECT)
@GetMapping("/member-point")
public TableDataInfo memberPoint(String memberCode,Long memberSettlePeriodId,String sort,String sortColumn) {
public AjaxResult memberPoint(String memberCode,Long memberSettlePeriodId,String sort,String sortColumn) {
if (memberSettlePeriodId == null) {
log.error("参数错误{}", memberSettlePeriodId);
return AjaxResult.error(CommonMsgConstants.MISSING_PARAM);
}
CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getById(memberSettlePeriodId);
log.info("会员结算表信息{}",csPeriod);
@ -810,13 +811,14 @@ public class CuMemberController extends BaseController {
Integer isFind = iCuMemberRetailService.getFindCuMemberRetailDetail(settleTableName);
if (isFind == null || isFind != 1) {
log.error("当前表名不存在{}",settleTableName);
return AjaxResult.error("当前会员日结表信息不存在");
}
startPage();
List<MemberPointVO> list = iCuMemberRetailService.getMemberPointByMemberCode(settleDetailTableName,settleTableName,memberCode,sort,sortColumn);
list.forEach(item -> {
item.setMemberSettlePeriod(csPeriod.getSettleDate());
});
return getDataTable(list);
startPage();
return AjaxResult.success(getDataTable(list));
}
/**

4
bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberPointVO.java
View File

@ -8,15 +8,13 @@ import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.Date;
@Data
@AllArgsConstructor
@NoArgsConstructor
@JsonInclude(JsonInclude.Include.ALWAYS)
public class MemberPointVO implements Serializable {
private static final long serialVersionUID = 1L;
public class MemberPointVO {
/**
* 会员编号
*/

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

@ -5,7 +5,6 @@ import com.hzs.common.core.annotation.Log;
import com.hzs.common.core.constant.*;
import com.hzs.common.core.constant.msg.CommonMsgConstants;
import com.hzs.common.core.enums.*;
import com.hzs.common.core.utils.ExceptionUtil;
import com.hzs.common.core.web.controller.BaseController;
import com.hzs.common.core.web.domain.AjaxResult;
import com.hzs.common.core.web.page.TableDataInfo;
@ -122,13 +121,15 @@ public class ApiMemberStructureController extends BaseController {
@Log(module = EOperationModule.MEMBER_RETAIL_TREE_LIST, business = EOperationBusiness.MEMBER_RETAIL_TREE_LIST, method = EOperationMethod.SELECT)
@GetMapping("/three-framework-list")
public TableDataInfo threeFrameworkList(Integer stage, Integer stageStatus) {
public AjaxResult threeFrameworkList(Integer stage, Integer stageStatus) {
if (stage == null) {
log.error("参数错误");
return AjaxResult.error(CommonMsgConstants.MISSING_PARAM);
}
Long userId = SecurityUtils.getUserId();
if (userId == null) {
log.error("用户登录信息错误");
return AjaxResult.error(CommonMsgConstants.MISSING_PARAM);
}
// 获取当前时间 -1 天
String yesterday = LocalDate.now().minusDays(1).format((DateTimeFormatter.ofPattern("yyyy-MM-dd")));
@ -141,12 +142,13 @@ public class ApiMemberStructureController extends BaseController {
Integer isFind = iCumemberRetailDetailService.getFindCumemberRetailDetail(settleTableName);
if (isFind == null || isFind != 1) {
log.error("当前会员日结信息不存在{}",settleTableName);
return AjaxResult.error();
}
startPage();
// 查询当前会员所有子点位信息
CuMember member = iCuMemberService.getMember(userId);
startPage();
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)

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

@ -255,9 +255,10 @@ public class MemberStructureController extends BaseController {
*/
@Log(module = EOperationModule.MEMBER_RETAIL_TREE_LIST, business = EOperationBusiness.MEMBER_RETAIL_TREE_LIST, method = EOperationMethod.SELECT)
@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) {
log.error("参数错误");
return AjaxResult.error(CommonMsgConstants.MISSING_PARAM);
}
CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getById(memberSettlePeriodId);
log.info("日结信息{}",csPeriod);
@ -267,11 +268,12 @@ public class MemberStructureController extends BaseController {
Integer isFind = iCumemberRetailDetailService.getFindCumemberRetailDetail(settleTableName);
if (isFind == null || isFind != 1) {
log.error("当前表名不存在{}",settleTableName);
return AjaxResult.error();
}
startPage();
// 查询当前会员所有子点位信息
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)