## 充值明细添加隶属体系查询导出；

bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/manage/CuMemberRechargeController.java

@@ -194,8 +194,7 @@ public class CuMemberRechargeController extends BaseController {
     @PostMapping("/list")
     @ColumnAuthority(perms = "RechargeDetail")
     public TableDataInfo findRechargeList(@RequestBody CuMemberRechargeVO cuMemberRechargeVO) {
-        Integer countryId = SecurityUtils.getPkCountry();
+        cuMemberRechargeVO.setPkCountry(SecurityUtils.getPkCountry());
-        cuMemberRechargeVO.setPkCountry(countryId);
         startPage();
         Object[] objects = cuMemberRechargeService.findRechargeList(cuMemberRechargeVO);
         TableDataInfo tableDataInfo = getDataTable((List<CuMemberRechargeExt>) objects[0]);

bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberBaseVO.java

@@ -10,11 +10,7 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 
 /**
- * @Description: 会员财务基础VO
+ * 会员财务基础VO
- * @Author: ljc
- * @Time: 2022/10/11 11:24
- * @Classname: CuMemberBaseVO
- * @Package_name: com.hzs.member.account.vo
  */
 @Data
 @AllArgsConstructor
@@ -46,11 +42,7 @@ public class CuMemberBaseVO implements Serializable {
     @JsonIgnore
     private Integer pkCountry;
 
-
     @JsonIgnore
     private Integer pkRate;
 
-
-
-
 }

bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberRechargeVO.java

@@ -1,7 +1,6 @@
 package com.hzs.member.account.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.hzs.common.core.annotation.BigDecimalFormat;
 import com.hzs.common.core.annotation.Excel;
 import com.hzs.common.core.annotation.Transaction;
@@ -13,12 +12,6 @@ import java.util.Date;
 
 /**
  * 会员充值VO
- *
- * @Description:
- * @Author: ljc
- * @Time: 2022/10/8 9:30
- * @Classname: CuMemberRechargeVO
- * @Package_name: com.hzs.member.account.vo
  */
 @EqualsAndHashCode(callSuper = true)
 @Builder
@@ -33,13 +26,22 @@ public class CuMemberRechargeVO extends CuMemberBaseVO {
      */
     private Long pkId;
 
+    /**
+     * 体系
+     */
+    private Integer pkVertex;
+    /**
+     * 体系名称
+     */
+    @Excel(name = "隶属体系")
+    private String vertexName;
+
     /**
      * 充值类型
      */
     @Transaction(transactionKey = EnumsPrefixConstants.KEY_ACC)
     private Integer pkAccount;
 
-
     /**
      * 充值类型 翻译
      */
@@ -175,5 +177,4 @@ public class CuMemberRechargeVO extends CuMemberBaseVO {
      */
     private String endApproveTime;
 
-
 }

bd-business/bd-business-member/src/main/java/com/hzs/member/param/MemberParam.java

@@ -10,8 +10,6 @@ import java.util.List;
 
 /**
  * @Description: 后台查询会员的统一入口参数
- * @Author: sui q
- * @Time: 2022/10/13 9:41
  * @Classname: QueryMemberParam
  * @PackageName: com.hzs.member.param
  */
@@ -184,16 +182,4 @@ public class MemberParam implements Serializable {
      */
     private String code;
 
-    @JsonIgnore
-    public List<String > getValidConfirmField(){
-        List<String> fieldList = new ArrayList<>();
-        fieldList.add("memberCode");
-        fieldList.add("memberName");
-        fieldList.add("phone");
-        fieldList.add("parent");
-        fieldList.add("loginPassword");
-        fieldList.add("payPassword");
-        fieldList.add("code");
-        return fieldList;
-    }
 }

bd-business/bd-business-member/src/main/resources/mapper/member/account/CuMemberRechargeMapper.xml

@@ -2,33 +2,6 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hzs.member.account.mapper.CuMemberRechargeMapper">
 
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.hzs.common.domain.member.account.CuMemberRecharge">
-        <result column="DEL_FLAG" property="delFlag"/>
-        <result column="PK_COUNTRY" property="pkCountry"/>
-        <result column="PK_CREATOR" property="pkCreator"/>
-        <result column="CREATION_TIME" property="creationTime"/>
-        <result column="PK_MODIFIED" property="pkModified"/>
-        <result column="MODIFIED_TIME" property="modifiedTime"/>
-        <result column="PK_ID" property="pkId"/>
-        <result column="PK_MEMBER" property="pkMember"/>
-        <result column="RECHARGE_AMOUNT" property="rechargeAmount"/>
-        <result column="PK_ACCOUNT" property="pkAccount"/>
-        <result column="RECHARGE_TYPE" property="rechargeType"/>
-        <result column="RECHARGE_CODE" property="rechargeCode"/>
-        <result column="APPROVE_STATE" property="approveState"/>
-        <result column="APPROVE_TIME" property="approveTime"/>
-        <result column="APPROVER" property="approver"/>
-        <result column="REMARKS" property="remarks"/>
-        <result column="PK_RATE" property="pkRate"/>
-        <result column="PK_ROLE" property="pkRole"/>
-        <result column="ROLE_NAME" property="roleName"/>
-        <result column="APPROVE_REMARKS" property="approveRemarks"/>
-        <result column="BATCH" property="batch"/>
-        <result column="RECHARGE_METHOD" property="rechargeMethod"/>
-        <result column="RECHARGE_SOURCE" property="rechargeSource"/>
-        <result column="MEMBER_REMARKS" property="memberRemarks"/>
-    </resultMap>
     <sql id="select_base">
         select m.member_code            memberCode,
                m.member_name            memberName,
@@ -47,10 +20,14 @@
                r.approver,
                r.approve_time,
                r.approve_remarks,
-               r.approve_state
+               r.approve_state,
-          from cu_member_recharge_detail d, cu_member_recharge r
+               bv.vertex_name
+        from cu_member_recharge_detail d,
+             cu_member_recharge r
                  left join cu_member m
                            on r.pk_member = m.pk_id
+                 left join bd_vertex bv
+                           on bv.pk_id = m.pk_vertex
                  left join sys_user u
                            on u.user_id = r.pk_creator
                  left join sys_user a
@@ -60,7 +37,7 @@
     <sql id="list_where">
         <where>
             r.recharge_code = d.recharge_code
-            and r.del_flag='0'
+            and r.del_flag = 0
             and r.recharge_source = 0
             <if test="memberName != null and memberName != ''">
                 and m.member_name like '%' || #{memberName} || '%'
@@ -68,6 +45,9 @@
             <if test="memberCode != null and memberCode != ''">
                 and m.member_code like '%'|| #{memberCode} || '%'
             </if>
+            <if test="pkVertex != null">
+                and m.pk_vertex = #{pkVertex}
+            </if>
             <if test="paymentBalance != null">
                 and d.PAYMENT_BALANCE = #{paymentBalance}
             </if>
@@ -113,18 +93,6 @@
         </where>
     </sql>
 
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        DEL_FLAG,
-        PK_COUNTRY,
-        PK_CREATOR,
-        CREATION_TIME,
-        PK_MODIFIED,
-        MODIFIED_TIME,
-        PK_ID, MEMBER_CODE, RECHARGE_AMOUNT, PK_ACCOUNT, RECHARGE_TYPE, RECHARGE_CODE, APPROVE_STATE, APPROVE_TIME, APPROVER, REMARKS, PK_RATE, PK_ROLE, ROLE_NAME
-    </sql>
-
-
     <select id="selectfillCountByids" resultType="java.lang.Integer">
         select count(1)
         from cu_member_recharge t
@@ -137,21 +105,24 @@
         </foreach>
     </select>
 
-
     <select id="selectMemberRechargeById" resultType="com.hzs.common.domain.member.account.CuMemberRechargeExt">
         <include refid="select_base"/>
         where r.pk_id = #{pkId}
     </select>
 
-
     <insert id="batchSaveAccountByMemberCode" parameterType="com.hzs.common.domain.member.account.CuMemberRecharge">
         insert into CU_MEMBER_RECHARGE (PK_ID, PK_MEMBER, RECHARGE_AMOUNT, PK_ACCOUNT, RECHARGE_TYPE,
         RECHARGE_CODE, APPROVE_STATE, REMARKS, MEMBER_REMARKS,PK_COUNTRY, CREATION_TIME, PK_RATE,PK_CREATOR,BATCH,RECHARGE_METHOD)
-        SELECT CU_MEMBER_RECHARGE_SEQ.Nextval,r.* FROM
+        SELECT CU_MEMBER_RECHARGE_SEQ.Nextval, r.* FROM
         (
         <foreach collection="cuMemberRecharges" item="item" separator="UNION ALL">
-            SELECT #{item.pkMember} PK_MEMBER ,#{item.rechargeAmount} RECHARGE_AMOUNT ,#{item.pkAccount} PK_ACCOUNT,#{item.rechargeType} RECHARGE_TYPE
+            SELECT
-            ,#{item.rechargeCode} RECHARGE_CODE ,#{item.approveState} APPROVE_STATE
+            #{item.pkMember} PK_MEMBER,
+            #{item.rechargeAmount} RECHARGE_AMOUNT,
+            #{item.pkAccount} PK_ACCOUNT,
+            #{item.rechargeType} RECHARGE_TYPE,
+            #{item.rechargeCode} RECHARGE_CODE,
+            #{item.approveState} APPROVE_STATE
             <choose>
                 <when test="item.remarks != null">
                     ,#{item.remarks} REMARKS
@@ -168,7 +139,8 @@
                     ,null MEMBER_REMARKS
                 </otherwise>
             </choose>
-            ,#{item.pkCountry} PK_COUNTRY,#{item.creationTime} CREATION_TIME,#{item.pkRate} PK_RATE,#{item.pkCreator} PK_CREATOR,#{item.batch} BATCH,#{item.rechargeMethod} RECHARGE_METHOD
+            ,#{item.pkCountry} PK_COUNTRY,#{item.creationTime} CREATION_TIME,#{item.pkRate} PK_RATE,#{item.pkCreator} PK_CREATOR,#{item.batch}
+            BATCH,#{item.rechargeMethod} RECHARGE_METHOD
             FROM dual
         </foreach>
         ) r
@@ -194,7 +166,6 @@
         order by r.creation_time Desc,r.approve_time Desc,r.pk_id DESC
     </select>
 
-
     <select id="selectMemberRechargeListTotal" resultType="com.hzs.common.domain.member.account.CuMemberRechargeExt">
         select sum(d.payment_amount) paymentAmount,
         round(sum(d.payment_amount) / c.in_exchange_rate, 4) settlePaymentAmount
@@ -212,7 +183,6 @@
         group by c.in_exchange_rate
     </select>
 
-
     <select id="selectMemberRechargeListCount" resultType="com.hzs.common.domain.member.account.CuMemberRechargeExt">
         select sum(r.recharge_amount) rechargeAmount
         from cu_member_recharge r
@@ -240,7 +210,6 @@
           and r.batch = #{sourceCode}
     </select>
 
-
     <select id="selectMemberRechargeApproveByUserCode" resultType="String">
         select distinct m.member_code
         from cu_member_recharge r
@@ -258,18 +227,16 @@
         </foreach>
     </select>
 
-
     <select id="selectOperator" resultType="com.hzs.common.domain.member.account.CuMemberRechargeExt">
-         select distinct r.pk_creator pkCreator,u.user_name memberName
+        select distinct r.pk_creator pkCreator, u.user_name memberName
-          from cu_member_recharge r, sys_user u
+        from cu_member_recharge r,
+             sys_user u
         where r.pk_creator = u.user_id
           and r.del_flag = 0
           and u.del_flag = 0
           and r.pk_country = #{pkCountry}
     </select>
 
-
-
     <select id="selectRechargeTotalAmount" resultType="com.hzs.common.domain.member.account.CuMemberRecharge">
         select sum(t.recharge_amount) rechargeAmount
         from CU_MEMBER_RECHARGE t
@@ -284,6 +251,8 @@
         and ((t.recharge_source = 1 and t.approve_state = 2) or
         (t.recharge_source = 0 and t.approve_state = 2))
         and t.modified_time  >= #{startDate}
-        and t.modified_time &lt; #{endDate}
+          and t.modified_time
+         &lt; #{endDate}
     </select>
+
 </mapper>

bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOrderType.java

@@ -9,8 +9,6 @@ import java.util.List;
 
 /**
  * 订单类型枚举类
- *
- * @author hzs
  */
 @AllArgsConstructor
 @Getter

bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPaymentType.java

@@ -91,7 +91,10 @@ public enum EPaymentType {
         return null;
     }
 
-    public static String getEnumLabel(int value) {
+    public static String getEnumLabel(Integer value) {
+        if (null == value) {
+            return "";
+        }
         for (EPaymentType enums : EPaymentType.values()) {
             if (enums.getValue() == value) {
                 return enums.getLabel();

bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESpecialArea.java

@@ -6,8 +6,6 @@ import lombok.Getter;
 
 /**
  * 所属专区枚举类
- *
- * @author hzs
  */
 @AllArgsConstructor
 @Getter

bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EUpgradeType.java

@@ -5,15 +5,12 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 /**
- * @Description: 升级类型
+ * 升级类型
- * @Author: sui q
- * @Time: 2022/8/31 17:09
- * @Classname: EUpgradeType
- * @PackageName: com.hzs.common.core.enums
  */
 @AllArgsConstructor
 @Getter
 public enum EUpgradeType {
+
     /**
      * 1=自动升级 (奖衔),2=手动升级（等级奖衔）,3=购买赠予（奖衔） 4=购买升级（等级前台报单、升级） 5=活动升级（等级）
      */

bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/account/CuMemberRechargeExt.java

@@ -1,9 +1,5 @@
 package com.hzs.common.domain.member.account;
 
-import com.baomidou.mybatisplus.annotation.KeySequence;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.hzs.common.core.annotation.BigDecimalFormat;
-import com.hzs.common.core.annotation.Excel;
 import lombok.*;
 import lombok.experimental.Accessors;
 
@@ -11,12 +7,7 @@ import java.math.BigDecimal;
 import java.util.List;
 
 /**
- * <p>
  * 会员充值表
- * </p>
- *
- * @author hzs
- * @since 2022-09-08
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -47,13 +38,11 @@ public class CuMemberRechargeExt extends CuMemberRecharge {
      */
     private BigDecimal paymentAmount;
 
-
     /**
      * 交款后的余额
      */
     private BigDecimal paymentBalance;
 
-
     /**
      * 交款前的余额
      */
@@ -69,17 +58,20 @@ public class CuMemberRechargeExt extends CuMemberRecharge {
      */
     private String approverName;
 
-
     /**
      * 充值详情
      */
     List<CuMemberRechargeDetail> memberRechargeDetails;
 
-
     /**
      * 充值金额（本币）
      */
     private BigDecimal settlePaymentAmount;
 
+    /**
+     * 体系名称
+     */
+    private String vertexName;
+
 
 }