From 7a4486ed8d2fea211d0c345de82ca9f56b919bbb Mon Sep 17 00:00:00 2001 From: bynt <13586541001@163.com> Date: Thu, 11 Jan 2024 18:36:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=A6=81=E7=94=A8=E5=89=8D?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/baiye/modules/agent/entity/ChannelCustom.java | 8 ++++++++ .../agent/service/impl/CustomManageServiceImpl.java | 4 +++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/agent/entity/ChannelCustom.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/agent/entity/ChannelCustom.java index af4cc551..ba538e64 100644 --- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/agent/entity/ChannelCustom.java +++ b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/agent/entity/ChannelCustom.java @@ -61,6 +61,10 @@ public class ChannelCustom implements Serializable { @Column(name = "surplus_num") private Integer surplusNum = 0; + @ApiModelProperty(value = "禁用前剩余数量") + @Column(name = "pre_disabled_num") + private Integer preDisabledNum = 0; + @ApiModelProperty(value = "用户状态 1 正常 2-待开通-3 禁用") @Column(name = "status") private Integer status; @@ -97,6 +101,10 @@ public class ChannelCustom implements Serializable { @Column(name = "surplus_phone_bill") private Integer surplusPhoneBill = 0; + @ApiModelProperty(value = "禁用前剩余数量") + @Column(name = "pre_surplus_phone_bill") + private Integer preSurplusPhoneNum = 0; + @ApiModelProperty(value = "子账号") @Transient private List children; diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/agent/service/impl/CustomManageServiceImpl.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/agent/service/impl/CustomManageServiceImpl.java index a610cda1..3daea3f6 100644 --- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/agent/service/impl/CustomManageServiceImpl.java +++ b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/agent/service/impl/CustomManageServiceImpl.java @@ -595,6 +595,9 @@ public class CustomManageServiceImpl implements CustomManageService { custom.setSurplusPhoneBill(0); custom.setTotalPhoneBill(0); custom.setTotalNum(0); + // change params date 2024-1-11 + custom.setPreDisabledNum(custom.getSurplusNum()); + custom.setPreSurplusPhoneNum(custom.getSurplusPhoneBill()); channelCustoms.add(custom); //代理商 if (custom.getType() == 1) { @@ -606,5 +609,4 @@ public class CustomManageServiceImpl implements CustomManageService { } } } - }