From 2232e143e2dfa2e5b626794788cec1a2ece8f6b8 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Mon, 12 May 2025 10:20:54 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E5=85=85=E5=80=BC=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=9A=B6=E5=B1=9E=E4=BD=93=E7=B3=BB=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=AF=BC=E5=87=BA=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/CuMemberRechargeController.java | 3 +- .../hzs/member/account/vo/CuMemberBaseVO.java | 10 +- .../member/account/vo/CuMemberRechargeVO.java | 23 +-- .../com/hzs/member/param/MemberParam.java | 14 -- .../member/account/CuMemberRechargeMapper.xml | 151 +++++++----------- .../com/hzs/common/core/enums/EOrderType.java | 2 - .../hzs/common/core/enums/EPaymentType.java | 5 +- .../hzs/common/core/enums/ESpecialArea.java | 2 - .../hzs/common/core/enums/EUpgradeType.java | 7 +- .../member/account/CuMemberRechargeExt.java | 18 +-- 10 files changed, 85 insertions(+), 150 deletions(-) diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/manage/CuMemberRechargeController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/manage/CuMemberRechargeController.java index 996a2029..5b5e7987 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/manage/CuMemberRechargeController.java +++ b/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(countryId); + cuMemberRechargeVO.setPkCountry(SecurityUtils.getPkCountry()); startPage(); Object[] objects = cuMemberRechargeService.findRechargeList(cuMemberRechargeVO); TableDataInfo tableDataInfo = getDataTable((List) objects[0]); diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberBaseVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberBaseVO.java index 979109e5..d4421b6b 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberBaseVO.java +++ b/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 - * @Author: ljc - * @Time: 2022/10/11 11:24 - * @Classname: CuMemberBaseVO - * @Package_name: com.hzs.member.account.vo + * 会员财务基础VO */ @Data @AllArgsConstructor @@ -46,11 +42,7 @@ public class CuMemberBaseVO implements Serializable { @JsonIgnore private Integer pkCountry; - @JsonIgnore private Integer pkRate; - - - } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberRechargeVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberRechargeVO.java index 54c06c92..e61456f7 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberRechargeVO.java +++ b/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; - /** * 充值类型 翻译 */ @@ -119,7 +121,7 @@ public class CuMemberRechargeVO extends CuMemberBaseVO { * 操作备注 */ @Excel(name = "操作备注") - private String remarks; + private String remarks; /** * 审核人 @@ -156,7 +158,7 @@ public class CuMemberRechargeVO extends CuMemberBaseVO { /** * 用户ID */ - private Long pkMember; + private Long pkMember; /** * 开始时间 @@ -175,5 +177,4 @@ public class CuMemberRechargeVO extends CuMemberBaseVO { */ private String endApproveTime; - } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/param/MemberParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/param/MemberParam.java index 0d25b29b..c2d0666f 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/param/MemberParam.java +++ b/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 getValidConfirmField(){ - List 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; - } } diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/account/CuMemberRechargeMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/account/CuMemberRechargeMapper.xml index 340d6816..18c702a6 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/member/account/CuMemberRechargeMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/member/account/CuMemberRechargeMapper.xml @@ -2,33 +2,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - select m.member_code memberCode, m.member_name memberName, @@ -47,20 +20,24 @@ r.approver, r.approve_time, r.approve_remarks, - r.approve_state - from cu_member_recharge_detail d, cu_member_recharge r - left join cu_member m - on r.pk_member = m.pk_id - left join sys_user u - on u.user_id = r.pk_creator - left join sys_user a - on a.user_id = r.approver + r.approve_state, + 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 + on a.user_id = r.approver r.recharge_code = d.recharge_code - and r.del_flag='0' + and r.del_flag = 0 and r.recharge_source = 0 and m.member_name like '%' || #{memberName} || '%' @@ -68,6 +45,9 @@ and m.member_code like '%'|| #{memberCode} || '%' + + and m.pk_vertex = #{pkVertex} + and d.PAYMENT_BALANCE = #{paymentBalance} @@ -78,7 +58,7 @@ and r.APPROVE_STATE = #{approveState} - and r.BATCH like '%' || #{batch} || '%' + and r.BATCH like '%' || #{batch} || '%' and r.APPROVER like '%' || #{approver} || '%' @@ -113,18 +93,6 @@ - - - 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 - - - - - 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 ( - SELECT #{item.pkMember} PK_MEMBER ,#{item.rechargeAmount} RECHARGE_AMOUNT ,#{item.pkAccount} PK_ACCOUNT,#{item.rechargeType} RECHARGE_TYPE - ,#{item.rechargeCode} RECHARGE_CODE ,#{item.approveState} APPROVE_STATE + SELECT + #{item.pkMember} PK_MEMBER, + #{item.rechargeAmount} RECHARGE_AMOUNT, + #{item.pkAccount} PK_ACCOUNT, + #{item.rechargeType} RECHARGE_TYPE, + #{item.rechargeCode} RECHARGE_CODE, + #{item.approveState} APPROVE_STATE ,#{item.remarks} REMARKS - ,null REMARKS + ,null REMARKS @@ -168,7 +139,8 @@ ,null MEMBER_REMARKS - ,#{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 ) r @@ -194,7 +166,6 @@ order by r.creation_time Desc,r.approve_time Desc,r.pk_id DESC - - select r.recharge_amount, r.approve_state - from cu_member_recharge r - where r.del_flag = 0 - and r.recharge_code = #{rechargeCode} - and r.pk_creator = #{pkMember} + from cu_member_recharge r + where r.del_flag = 0 + and r.recharge_code = #{rechargeCode} + and r.pk_creator = #{pkMember} - - - - + diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOrderType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOrderType.java index 2d792823..99da88ed 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOrderType.java +++ b/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 diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPaymentType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPaymentType.java index b49b26cc..72f5f6cf 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPaymentType.java +++ b/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(); diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESpecialArea.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESpecialArea.java index 9b63f4ce..7ceafdd9 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESpecialArea.java +++ b/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 diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EUpgradeType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EUpgradeType.java index 36f23ba4..e959102e 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EUpgradeType.java +++ b/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=活动升级（等级） */ diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/account/CuMemberRechargeExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/account/CuMemberRechargeExt.java index 24b7b114..dff6c142 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/account/CuMemberRechargeExt.java +++ b/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; /** - *

* 会员充值表 - *

- * - * @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 memberRechargeDetails; - /** * 充值金额（本币） */ private BigDecimal settlePaymentAmount; + /** + * 体系名称 + */ + private String vertexName; + }