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

Merge remote-tracking branch 'origin/test' into test

This commit is contained in:
sangelxiu1 2025-09-28 11:12:38 +08:00
parent 994b670493 7374400936
commit 3b5a79806f
8 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberRetailRangeMapper.xml
View File

@ -949,7 +949,7 @@
gift_pay_time, gift_pay_time,
bw.awards_value, bw.awards_value,
bw.awards_name bw.awards_name
from #{rangeTableName} a from ${rangeTableName} a
inner join bd_awards bw inner join bd_awards bw
on bw.pk_id = a.pk_awards on bw.pk_id = a.pk_awards
left join bd_vertex bv left join bd_vertex bv

4
bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/ApiMemberController.java
View File

@ -465,11 +465,11 @@ public class ApiMemberController extends BaseController {
log.error("当前表名不存在{}",settleTableName); log.error("当前表名不存在{}",settleTableName);
return AjaxResult.error("数据查询错误,请联系客服处理"); return AjaxResult.error("数据查询错误,请联系客服处理");
} }
List<memberPointVO> list = iCuMemberRetailService.getMemberPointByUserId(settleTableName,userId); List<MemberPointVO> list = iCuMemberRetailService.getMemberPointByUserId(settleTableName,userId);
if (CollectionUtil.isEmpty(list)) { if (CollectionUtil.isEmpty(list)) {
return AjaxResult.success(); return AjaxResult.success();
} }
memberPointVO memberPointVO = list.get(0); MemberPointVO memberPointVO = list.get(0);
memberPointVO.setMemberSettlePeriod(csPeriod.getSettleDate()); memberPointVO.setMemberSettlePeriod(csPeriod.getSettleDate());
startPage(); startPage();
return AjaxResult.success(memberPointVO); return AjaxResult.success(memberPointVO);

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

@ -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.*;
@ -799,7 +800,7 @@ public class CuMemberController extends BaseController {
public AjaxResult memberPoint(String memberCode,Long memberSettlePeriodId,String sort,String sortColumn) { public AjaxResult memberPoint(String memberCode,Long memberSettlePeriodId,String sort,String sortColumn) {
if (memberSettlePeriodId == null) { if (memberSettlePeriodId == null) {
log.error("参数错误{}", memberSettlePeriodId); log.error("参数错误{}", memberSettlePeriodId);
return AjaxResult.error(); return AjaxResult.error(CommonMsgConstants.MISSING_PARAM);
} }
CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getById(memberSettlePeriodId); CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getById(memberSettlePeriodId);
log.info("会员结算表信息{}",csPeriod); log.info("会员结算表信息{}",csPeriod);
@ -809,9 +810,9 @@ 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 AjaxResult.error(); return AjaxResult.error("当前会员日结表信息不存在");
} }
List<memberPointVO> list = iCuMemberRetailService.getMemberPointByMemberCode(settleTableName,memberCode,sort,sortColumn); List<MemberPointVO> list = iCuMemberRetailService.getMemberPointByMemberCode(settleTableName,memberCode,sort,sortColumn);
list.forEach(item -> { list.forEach(item -> {
item.setMemberSettlePeriod(csPeriod.getSettleDate()); item.setMemberSettlePeriod(csPeriod.getSettleDate());
}); });
@ -830,11 +831,11 @@ public class CuMemberController extends BaseController {
log.info("会员结算表信息{}",csPeriod); log.info("会员结算表信息{}",csPeriod);
String settleTableName = TableNameConstants.CU_MEMBER_RETAIL_RANGE + csPeriod.getPkId(); String settleTableName = TableNameConstants.CU_MEMBER_RETAIL_RANGE + csPeriod.getPkId();
log.info("会员结算表名称{}",settleTableName); log.info("会员结算表名称{}",settleTableName);
List<memberPointVO> list = iCuMemberRetailService.getMemberPointByMemberCode(settleTableName,param.getMemberCode(),param.getSort(),param.getSortColumn()); List<MemberPointVO> list = iCuMemberRetailService.getMemberPointByMemberCode(settleTableName,param.getMemberCode(),param.getSort(),param.getSortColumn());
list.forEach(item -> { list.forEach(item -> {
item.setMemberSettlePeriod(csPeriod.getSettleDate()); item.setMemberSettlePeriod(csPeriod.getSettleDate());
}); });
ExcelUtil<memberPointVO> util = new ExcelUtil<>(memberPointVO.class); ExcelUtil<MemberPointVO> util = new ExcelUtil<>(MemberPointVO.class);
util.exportExcel(response, list, "会员点位信息"); util.exportExcel(response, list, "会员点位信息");
} }

6
bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberRetailMapper.java
View File

@ -3,7 +3,7 @@ package com.hzs.member.base.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hzs.common.domain.member.base.CuMemberRetail; import com.hzs.common.domain.member.base.CuMemberRetail;
import com.hzs.member.base.vo.memberPointVO; import com.hzs.member.base.vo.MemberPointVO;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
@ -20,7 +20,7 @@ public interface CuMemberRetailMapper extends BaseMapper<CuMemberRetail> {
Integer getFindCumemberRetailDetail(@Param("settleTableName") String settleTableName); Integer getFindCumemberRetailDetail(@Param("settleTableName") String settleTableName);
List<memberPointVO> getMemberPointByMemberCode(@Param("settleTableName") String settleTableName, @Param("memberCode") String memberCode,@Param("sort") String sort,@Param("sortColumn") String sortColumn); List<MemberPointVO> getMemberPointByMemberCode(@Param("settleTableName") String settleTableName, @Param("memberCode") String memberCode, @Param("sort") String sort, @Param("sortColumn") String sortColumn);
List<memberPointVO> getMemberPointByUserId(@Param("settleTableName") String settleTableName, @Param("userId") Long userId); List<MemberPointVO> getMemberPointByUserId(@Param("settleTableName") String settleTableName, @Param("userId") Long userId);
} }

6
bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberRetailService.java
View File

@ -1,7 +1,7 @@
package com.hzs.member.base.service; package com.hzs.member.base.service;
import com.hzs.member.base.vo.memberPointVO; import com.hzs.member.base.vo.MemberPointVO;
import java.util.List; import java.util.List;
@ -17,7 +17,7 @@ public interface ICuMemberRetailService{
Integer getFindCuMemberRetailDetail(String settleTableName); Integer getFindCuMemberRetailDetail(String settleTableName);
List<memberPointVO> getMemberPointByMemberCode(String settleTableName, String memberCode,String sort,String sortColumn); List<MemberPointVO> getMemberPointByMemberCode(String settleTableName, String memberCode, String sort, String sortColumn);
List<memberPointVO> getMemberPointByUserId(String settleTableName, Long userId); List<MemberPointVO> getMemberPointByUserId(String settleTableName, Long userId);
} }

6
bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberRetailServiceImpl.java
View File

@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.hzs.common.domain.member.base.CuMemberRetail; import com.hzs.common.domain.member.base.CuMemberRetail;
import com.hzs.member.base.mapper.CuMemberRetailMapper; import com.hzs.member.base.mapper.CuMemberRetailMapper;
import com.hzs.member.base.service.ICuMemberRetailService; import com.hzs.member.base.service.ICuMemberRetailService;
import com.hzs.member.base.vo.memberPointVO; import com.hzs.member.base.vo.MemberPointVO;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
@ -26,12 +26,12 @@ public class CuMemberRetailServiceImpl extends ServiceImpl<CuMemberRetailMapper,
} }
@Override @Override
public List<memberPointVO> getMemberPointByMemberCode(String settleTableName, String memberCode, String sort, String sortColumn) { public List<MemberPointVO> getMemberPointByMemberCode(String settleTableName, String memberCode, String sort, String sortColumn) {
return baseMapper.getMemberPointByMemberCode(settleTableName,memberCode,sort,sortColumn); return baseMapper.getMemberPointByMemberCode(settleTableName,memberCode,sort,sortColumn);
} }
@Override @Override
public List<memberPointVO> getMemberPointByUserId(String settleTableName, Long userId) { public List<MemberPointVO> getMemberPointByUserId(String settleTableName, Long userId) {
return baseMapper.getMemberPointByUserId(settleTableName,userId); return baseMapper.getMemberPointByUserId(settleTableName,userId);
} }
} }

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

@ -11,7 +11,7 @@ import java.util.Date;
@Data @Data
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
public class memberPointVO { public class MemberPointVO {
/** /**
* 会员编号 * 会员编号
*/ */

4
bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberRetailMapper.xml
View File

@ -69,7 +69,7 @@
from user_tables from user_tables
where table_name = upper(#{settleTableName}) where table_name = upper(#{settleTableName})
</select> </select>
<select id="getMemberPointByMemberCode" resultType="com.hzs.member.base.vo.memberPointVO"> <select id="getMemberPointByMemberCode" resultType="com.hzs.member.base.vo.MemberPointVO">
SELECT SELECT
cmr.MEMBER_CODE, cmr.MEMBER_CODE,
cmr.MEMBER_NAME, cmr.MEMBER_NAME,
@ -87,7 +87,7 @@
ORDER BY cmr.${sortColumn} ${sort} ORDER BY cmr.${sortColumn} ${sort}
</if> </if>
</select> </select>
<select id="getMemberPointByUserId" resultType="com.hzs.member.base.vo.memberPointVO"> <select id="getMemberPointByUserId" resultType="com.hzs.member.base.vo.MemberPointVO">
SELECT SELECT
cmr.MEMBER_CODE, cmr.MEMBER_CODE,
cmr.MEMBER_NAME, cmr.MEMBER_NAME,