## 会员点位信息分页返回值修改
This commit is contained in:
parent
daa9efe4e5
commit
ac43ec5553
|
@ -11,6 +11,7 @@ import com.hzs.common.core.constant.CountryConstants;
|
||||||
import com.hzs.common.core.constant.EnumsPrefixConstants;
|
import com.hzs.common.core.constant.EnumsPrefixConstants;
|
||||||
import com.hzs.common.core.constant.TableNameConstants;
|
import com.hzs.common.core.constant.TableNameConstants;
|
||||||
import com.hzs.common.core.constant.VertexConstants;
|
import com.hzs.common.core.constant.VertexConstants;
|
||||||
|
import com.hzs.common.core.constant.msg.CommonMsgConstants;
|
||||||
import com.hzs.common.core.constant.msg.MemberMsgConstants;
|
import com.hzs.common.core.constant.msg.MemberMsgConstants;
|
||||||
import com.hzs.common.core.domain.R;
|
import com.hzs.common.core.domain.R;
|
||||||
import com.hzs.common.core.enums.*;
|
import com.hzs.common.core.enums.*;
|
||||||
|
@ -797,10 +798,10 @@ public class CuMemberController extends BaseController {
|
||||||
*/
|
*/
|
||||||
@Log(module = EOperationModule.MEMBER_POINT, business = EOperationBusiness.MEMBER_POINT, method = EOperationMethod.SELECT)
|
@Log(module = EOperationModule.MEMBER_POINT, business = EOperationBusiness.MEMBER_POINT, method = EOperationMethod.SELECT)
|
||||||
@GetMapping("/member-point")
|
@GetMapping("/member-point")
|
||||||
public TableDataInfo memberPoint(String memberCode,Long memberSettlePeriodId) {
|
public AjaxResult memberPoint(String memberCode,Long memberSettlePeriodId) {
|
||||||
if (memberSettlePeriodId == null) {
|
if (memberSettlePeriodId == null) {
|
||||||
log.error("参数错误{}", memberSettlePeriodId);
|
log.error("参数错误{}", memberSettlePeriodId);
|
||||||
return null;
|
return AjaxResult.error();
|
||||||
}
|
}
|
||||||
CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getById(memberSettlePeriodId);
|
CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getById(memberSettlePeriodId);
|
||||||
log.info("会员结算表信息{}",csPeriod);
|
log.info("会员结算表信息{}",csPeriod);
|
||||||
|
@ -810,14 +811,14 @@ public class CuMemberController extends BaseController {
|
||||||
Integer isFind = iCuMemberRetailService.getFindCuMemberRetailDetail(settleTableName);
|
Integer isFind = iCuMemberRetailService.getFindCuMemberRetailDetail(settleTableName);
|
||||||
if (isFind == null || isFind != 1) {
|
if (isFind == null || isFind != 1) {
|
||||||
log.error("当前表名不存在{}",settleTableName);
|
log.error("当前表名不存在{}",settleTableName);
|
||||||
return null;
|
return AjaxResult.error();
|
||||||
}
|
}
|
||||||
List<memberPointVO> list = iCuMemberRetailService.getMemberPointByMemberCode(settleTableName,memberCode);
|
List<memberPointVO> list = iCuMemberRetailService.getMemberPointByMemberCode(settleTableName,memberCode);
|
||||||
list.forEach(item -> {
|
list.forEach(item -> {
|
||||||
item.setMemberSettlePeriod(csPeriod.getSettleDate());
|
item.setMemberSettlePeriod(csPeriod.getSettleDate());
|
||||||
});
|
});
|
||||||
startPage();
|
startPage();
|
||||||
return getDataTable(list);
|
return AjaxResult.success(getDataTable(list));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue