Merge branch 'feature/1003470' into 'master'

feat: [1003470] 平台端看到书刊编辑端配置的内容

See merge request rays/pcloud-book!910

pcloud-facade-book/src/main/java/com/pcloud/book/book/dto/BookDto.java

@@ -688,6 +688,11 @@ public class BookDto extends BaseDto {
      */
     private String bookUniqueNumber;
 
+    private String adviserAccount;
+
+    private String adviserPwd;
+
+
     public String getBookUniqueNumber() {
         return bookUniqueNumber;
     }
@@ -1857,6 +1862,22 @@ public class BookDto extends BaseDto {
         this.allBookIncome = allBookIncome;
     }
 
+    public String getAdviserAccount() {
+        return adviserAccount;
+    }
+
+    public void setAdviserAccount(String adviserAccount) {
+        this.adviserAccount = adviserAccount;
+    }
+
+    public String getAdviserPwd() {
+        return adviserPwd;
+    }
+
+    public void setAdviserPwd(String adviserPwd) {
+        this.adviserPwd = adviserPwd;
+    }
+
     @Override
     public String toString() {
         return "BookDto{" +

pcloud-service-book/src/main/java/com/pcloud/book/book/biz/impl/BookBizImpl.java

@@ -1359,6 +1359,8 @@ public class BookBizImpl implements BookBiz {
             bookSet.setAgentName4BookDto(pageBean.getRecordList());
             // 设置图书收益
             bookSet.setBookIncome(pageBean.getRecordList());
+            // 设置编辑账户信息
+            bookSet.setUserLoginInfo(pageBean.getRecordList());
         } else {
             pageBean = new PageBean();
         }

pcloud-service-book/src/main/java/com/pcloud/book/book/set/BookSet.java

@@ -85,6 +85,7 @@ import com.pcloud.usercenter.common.dto.BookCaseParamDto;
 import com.pcloud.usercenter.party.adviser.dto.AdviserBaseInfoDto;
 import com.pcloud.usercenter.party.adviser.entity.Adviser;
 import com.pcloud.usercenter.party.agent.entity.Agent;
+import com.pcloud.usercenter.user.entity.UserLogin;
 import com.pcloud.voicemessage.party.merchant.entity.MerchantVideo;
 
 import org.apache.commons.collections.MapUtils;
@@ -1771,4 +1772,24 @@ public class BookSet {
         }
         LOGGER.info("设置模板名称【END】");
     }
+
+    public void setUserLoginInfo(List<Object> objects) {
+        LOGGER.info("设置编辑登陆信息【START】");
+        List<Long> adviserIds = BookTools.listAdviserIds(objects);
+        Map<Long, UserLogin> userLoginInfoMap= adviserConsr.getUserLoginInfoList(adviserIds);
+        if (MapUtils.isEmpty(userLoginInfoMap)) {
+            return;
+        }
+        // 批量填充编辑名称手机号
+        for (Object object : objects) {
+            BookDto bookDto = (BookDto) object;
+            Long adviserId = bookDto.getAdviserId();
+            if (userLoginInfoMap.containsKey(adviserId)) {
+                UserLogin userLogin = userLoginInfoMap.get(adviserId);
+                bookDto.setAdviserAccount(userLogin!=null ? userLogin.getUserName() :null);
+                bookDto.setAdviserPwd(userLogin!=null ? userLogin.getCurrentPassword() :null);
+            }
+        }
+        LOGGER.info("设置编辑登陆信息【END】");
+    }
 }