From 1c05a45d5e7d32dfff97d874c09a2ce096979a99 Mon Sep 17 00:00:00 2001
From: wjt <wujingtao_t@126.com>
Date: Mon, 22 May 2023 11:31:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=BB=98=E8=AE=A4=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/agent/entity/ChannelCustom.java   |  8 ++--
 .../service/impl/CustomManageServiceImpl.java | 43 ++++++++++---------
 2 files changed, 27 insertions(+), 24 deletions(-)

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 c43f1d9d..af4cc551 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
@@ -83,19 +83,19 @@ public class ChannelCustom implements Serializable {
 
     @ApiModelProperty(value = "创建代理商账号数量")
     @Column(name = "channel_limit_num")
-    private Integer channelLimitNum;
+    private Integer channelLimitNum = 1;
 
     @ApiModelProperty(value = "创建直客账号数量")
     @Column(name = "custom_limit_num")
-    private Integer customLimitNum;
+    private Integer customLimitNum = 100;
 
     @ApiModelProperty(value = "总话费")
     @Column(name = "total_phone_bill")
-    private Integer totalPhoneBill;
+    private Integer totalPhoneBill = 0;
 
     @ApiModelProperty(value = "剩余话费")
     @Column(name = "surplus_phone_bill")
-    private Integer surplusPhoneBill;
+    private Integer surplusPhoneBill = 0;
 
     @ApiModelProperty(value = "子账号")
     @Transient
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 5fefa951..fb805fca 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
@@ -120,26 +120,7 @@ public class CustomManageServiceImpl implements CustomManageService {
 
         //这里如果是代理商 直接同步
         if (channelCustom.getType() == DefaultNumberConstants.ONE_NUMBER) {
-            CreateUserDTO createUserDTO = new CreateUserDTO().addCreateUserDTO(channelCustom.getChannelName(), channelCustom.getPhone());
-            createUserDTO.setPassword(passwordEncoder.encode
-                    (StringUtils.isNotBlank(createUserDTO.getPassword())
-                            ? createUserDTO.getPassword() : "123456"));
-            User user = new User();
-            BeanUtil.copyProperties(createUserDTO, user);
-            user.setUsername(user.getUsername().trim());
-            //这个地方注意,代理商的创建人为admin。这whichUserId属性会在之前的逻辑里面用到，这里写死了
-            user.setWhichUserId(1L);
-            user.setIsReview(Boolean.FALSE);
-            Set<Role> roles = new HashSet<>();
-            Role role = new Role();
-            role.setId(channelId);
-            roles.add(role);
-            user.setRoles(roles);
-            Long userId = create(user).getId();
-            channelCustom.setUserId(userId);
-            channelCustom.setStatus(1);
-            channelCustom.setChannelLimitNum(1);
-            channelCustom.setCustomLimitNum(100);
+            addChannelCustom(channelCustom);
         }
         channelCustom.setCreateTime(DateUtil.date());
         channelCustom.setCustomLimitNum(100);
@@ -162,6 +143,28 @@ public class CustomManageServiceImpl implements CustomManageService {
         return CommonResponse.createBySuccess();
     }
 
+    private void addChannelCustom(ChannelCustom channelCustom) {
+        CreateUserDTO createUserDTO = new CreateUserDTO().addCreateUserDTO(channelCustom.getChannelName(), channelCustom.getPhone());
+        createUserDTO.setPassword(passwordEncoder.encode
+                (StringUtils.isNotBlank(createUserDTO.getPassword())
+                        ? createUserDTO.getPassword() : "123456"));
+        User user = new User();
+        BeanUtil.copyProperties(createUserDTO, user);
+        user.setUsername(user.getUsername().trim());
+        //这个地方注意,代理商的创建人为admin。这whichUserId属性会在之前的逻辑里面用到，这里写死了
+        user.setWhichUserId(1L);
+        user.setIsReview(Boolean.FALSE);
+        Set<Role> roles = new HashSet<>();
+        Role role = new Role();
+        role.setId(channelId);
+        roles.add(role);
+        user.setRoles(roles);
+        Long userId = create(user).getId();
+        channelCustom.setUserId(userId);
+        channelCustom.setStatus(1);
+    }
+
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public CommonResponse<Object> assignNum(Long customId, Integer assignNum, Integer assignBill) {