diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberController.java
index 01cbed32..b9a22ec4 100644
--- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberController.java
+++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberController.java
@@ -881,7 +881,6 @@ public class CuMemberController extends BaseController {
cvo.setIsConsume(EYesNo.NO.getIntValue());
}
cvo.setCategoryVal(transactionMap.get(EnumsPrefixConstants.ENU_CAT + cvo.getCategory()));
- cvo.setAccountStatusVal(transactionMap.get(EnumsPrefixConstants.ACCOUNT_STATUS + cvo.getAccountStatus()));
cvo.setIsRealNameVal(transactionMap.get(EnumsPrefixConstants.YES_NO_ATTESTATION + cvo.getIsRealName()));
cvo.setOrderSourceVal(transactionMap.get(EnumsPrefixConstants.ORDER_SOURCE + cvo.getOrderSource()));
cvo.setMemberAccountVal(getMemberAccountVal(cmvo, transactionMap));
@@ -997,7 +996,6 @@ public class CuMemberController extends BaseController {
cvo.setIsConsume(EYesNo.NO.getIntValue());
}
cvo.setCategoryVal(transactionMap.get(EnumsPrefixConstants.ENU_CAT + cvo.getCategory()));
- cvo.setAccountStatusVal(transactionMap.get(EnumsPrefixConstants.ACCOUNT_STATUS + cvo.getAccountStatus()));
cvo.setIsRealNameVal(transactionMap.get(EnumsPrefixConstants.YES_NO_ATTESTATION + cvo.getIsRealName()));
cvo.setOrderSourceVal(transactionMap.get(EnumsPrefixConstants.ORDER_SOURCE + cvo.getOrderSource()));
cvo.setMemberAccountVal(getMemberAccountVal(cmvo, transactionMap));
diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/RetailMemberVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/RetailMemberVO.java
index 0793bc93..39db0474 100644
--- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/RetailMemberVO.java
+++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/RetailMemberVO.java
@@ -15,11 +15,7 @@ import java.util.Date;
import java.util.List;
/**
- * @description: 新零售系统会员后台查询会员的实体vo
- * @author: zhang jing
- * @date: 2024/12/9 16:28
- * @param:
- * @return:
+ * 新零售系统会员后台查询会员的实体vo
**/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -69,25 +65,26 @@ public class RetailMemberVO implements Serializable {
private String parMemberName;
/**
- * 级差奖衔
+ * 当月奖衔
*/
- @Transaction(transactionKey = EnumsPrefixConstants.KEY_AWARD)
private Integer pkAwards;
-
- @Excel(name = "级差奖衔")
+ @Excel(name = "当月奖衔")
private String pkAwardsVal;
+ /**
+ * 分红奖衔
+ */
+ private Integer pkRangeAwards;
+ @Excel(name = "分红奖衔")
+ private String pkRangeAwardsVal;
+
/**
* 荣誉奖衔
*/
- @Transaction(transactionKey = EnumsPrefixConstants.KEY_AWARD)
- private Integer pkRangeAwards;
-
- /**
- * 荣誉奖衔显示
- */
+ private Integer pkMaxAwards;
@Excel(name = "荣誉奖衔")
- private String pkRangeAwardsVal;
+ private String pkMaxAwardsVal;
+
/**
* 订单来源 (1=实单注册,2=空单注册)订单状态 EOrderSource
diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml
index 993b6e3e..ae36b406 100644
--- a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml
+++ b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml
@@ -2291,10 +2291,11 @@
cma.transfer_status as transferstatus,
ver.vertex_name as vertexName,
cmt.team_name as teamName,
- gr.GRADE_NAME as pkRegisterGradeVal,
- grr.GRADE_NAME as pkSettleGradeVal,
- awa.AWARDS_NAME as pkAwardsVal,
- awar.AWARDS_NAME as pkRangeAwardsVal,
+ gr.grade_name as pkRegisterGradeVal,
+ grr.grade_name as pkSettleGradeVal,
+ awa.awards_name as pkAwardsVal,
+ awar.awards_name as pkRangeAwardsVal,
+ awm.awards_name as pkMaxAwardsVal,
par.member_code parMemberCode,
par.member_name parMemberName,
pr.NAME giftProvince,
@@ -2306,9 +2307,11 @@
left join cu_member par
ON par.pk_id = cm.pk_parent
left join bd_awards awa
- on awa.pk_id = cm.PK_AWARDS
+ on awa.pk_id = cm.pk_awards
left join bd_awards awar
- on awar.pk_id = cm.PK_RANGE_AWARDS
+ on awar.pk_id = cm.pk_range_awards
+ left join bd_awards awm
+ on awm.pk_id = cm.pk_max_awards
left join bd_grade gr
on gr.pk_id = cm.PK_REGISTER_GRADE
left join bd_grade grr
@@ -2318,7 +2321,7 @@
left join cu_member_team cmt
on cmt.pk_id = cm.pk_team_code
left join CU_MEMBER_RETAIL_REGION cmrr
- on cm.pk_id = cmrr.PK_MEMBER and cmrr.EFFECTIVE=0 and cmrr.del_flag = 0
+ on cm.pk_id = cmrr.PK_MEMBER and cmrr.effective = 0 and cmrr.del_flag = 0
left join BD_AREA pr
on pr.pk_id = cmrr.PROVINCE
left join BD_AREA cty
@@ -2333,18 +2336,12 @@
on cm.pk_id = cma.PK_MEMBER
left join cu_member par
ON par.pk_id = cm.pk_parent
- left join bd_awards awa
- on awa.pk_id = cm.PK_AWARDS
- left join bd_grade gr
- on gr.pk_id = cm.PK_REGISTER_GRADE
- left join bd_grade grr
- on grr.pk_id = cm.PK_SETTLE_GRADE
left join bd_vertex ver
on cm.pk_vertex = ver.pk_id
left join cu_member_team cmt
on cmt.pk_id = cm.pk_team_code
left join CU_MEMBER_RETAIL_REGION cmrr
- on cm.pk_id = cmrr.PK_MEMBER and cmrr.EFFECTIVE=0 and cmrr.del_flag = 0
+ on cm.pk_id = cmrr.PK_MEMBER and cmrr.effective = 0 and cmrr.del_flag = 0
WHERE cm.del_flag = 0
and cm.IS_ACTIVATE = #{isActivate}
@@ -2412,19 +2409,22 @@
and cm.member_name like #{memberName}||'%'
- and cm.phone=#{phone}
+ and cm.phone = #{phone}
- and cm.pk_register_grade =#{pkRegisterGrade}
+ and cm.pk_register_grade = #{pkRegisterGrade}
- and cm.PK_SETTLE_GRADE =#{pkSettleGrade}
+ and cm.pk_settle_grade = #{pkSettleGrade}
- and cm.pk_awards=#{pkAwards}
+ and cm.pk_awards = #{pkAwards}
- and cm.pk_range_awards=#{pkRangeAwards}
+ and cm.pk_range_awards = #{pkRangeAwards}
+
+
+ and cm.pk_max_awards = #{pkMaxAwards}
and cm.DIRECT_PUSH_NUMBER=#{directPushNumber}
diff --git a/bd-business/bd-business-report/src/main/resources/mapper/report/member/CuMemberAwardsStatMapper.xml b/bd-business/bd-business-report/src/main/resources/mapper/report/member/CuMemberAwardsStatMapper.xml
index 1ccb8405..d49f5fea 100644
--- a/bd-business/bd-business-report/src/main/resources/mapper/report/member/CuMemberAwardsStatMapper.xml
+++ b/bd-business/bd-business-report/src/main/resources/mapper/report/member/CuMemberAwardsStatMapper.xml
@@ -278,11 +278,12 @@
vertexname,
creationtime,
endvaliditydate
- from (select cm.pk_id as pkmember,
+ from (
+ select cm.pk_id as pkmember,
cma.period,
- cma.up_type as uptype,
- cm.member_code as membercode,
- cm.member_name as membername,
+ cma.up_type as uptype,
+ cm.member_code as membercode,
+ cm.member_name as membername,
cm.phone,
baa.awards_name as pkAwardsVal,
bam.awards_name as pkMaxAwardsVal,
@@ -326,10 +327,10 @@
AND cma.UP_TYPE = #{upType}
- AND AW.PK_ID = #{pkAwards}
+ AND baa.PK_ID = #{pkAwards}
- AND AWW.PK_ID = #{pkMaxAwards}
+ AND bam.PK_ID = #{pkMaxAwards}
and cmsp.SETTLE_DATE >= to_date(#{startDate}, 'yyyy-mm-dd')