Merge branch 'feat-1001792new' into 'master'

C1001792

See merge request rays/pcloud-book!191

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

@@ -128,6 +128,7 @@ import com.pcloud.settlementcenter.record.dto.GetGroupQrcodeIncomeDTO;
 import com.pcloud.settlementcenter.record.dto.GroupRescourceIncomeParamDTO;
 import com.pcloud.settlementcenter.record.dto.ProductStaticUnderAppMapDTO;
 import com.pcloud.settlementcenter.record.service.SettlementService;
+import com.pcloud.usercenter.party.adviser.dto.AdviserBaseInfoDto;
 import com.pcloud.videolesson.schedule.service.ScheduleService;
 import com.pcloud.wechatgroup.group.dto.GroupMemberStatisDTO;
 import com.pcloud.wechatgroup.group.service.GroupMemberService;
@@ -365,11 +366,25 @@ public class BookGroupBizImpl implements BookGroupBiz {
     @Override
     public BookGroupDTO getBookGroupInfo4Wechat(Long bookGroupId) throws BizException {
         BookGroupDTO bookGroupDTO = bookGroupDao.getDTOById(bookGroupId);
-        if (bookGroupDTO != null && bookGroupDTO.getBookId() != null
-                && bookGroupDTO.getIsShowBookName() != null && bookGroupDTO.getIsShowBookName()) {
-            BookDto bookDto = bookDao.getBaseById(bookGroupDTO.getBookId());
-            if (bookDto != null) {
-                bookGroupDTO.setBookName(bookDto.getBookName());
+        if (bookGroupDTO != null) {
+            Long adviserId = bookGroupDTO.getCreateUser();
+            if (adviserId!=null){
+                Map<Long, AdviserBaseInfoDto> adviserInfoDtoMap = adviserConsr.getAdviserId2AdviserInfoDtoMap(Arrays.asList(adviserId));
+                if (adviserInfoDtoMap != null) {
+                    AdviserBaseInfoDto adviserBaseInfoDto = adviserInfoDtoMap.get(adviserId);
+                    if (adviserBaseInfoDto != null) {
+                        bookGroupDTO.setAgentId(adviserBaseInfoDto.getAgentId());
+                        bookGroupDTO.setAgentName(adviserBaseInfoDto.getAgentName());
+                    }
+                }
+            }
+            if (bookGroupDTO.getBookId() != null) {
+                BookDto bookDto = bookDao.getBaseById(bookGroupDTO.getBookId());
+                if (bookDto != null) {
+                    bookGroupDTO.setBookName(bookDto.getBookName());
+                    bookGroupDTO.setBookImg(bookDto.getCoverImg());
+                    bookGroupDTO.setPublish(bookDto.getPublish());
+                }
             }
         }
         return bookGroupDTO;

pcloud-service-book/src/main/java/com/pcloud/book/group/dto/BookGroupDTO.java

@@ -172,6 +172,21 @@ public class BookGroupDTO extends BaseDto {
      */
     private String bookGroupCipher;
 
+    /**
+     * 出版社id(编辑所属)
+     */
+    private Long agentId;
+    /**
+     * 出版社名称(编辑所属)
+     */
+    private String agentName;
+
+    /**
+     * 出版社(书所属)
+     */
+    private String publish;
+
+
     public String getUrl() {
         return url;
     }
@@ -438,6 +453,30 @@ public class BookGroupDTO extends BaseDto {
         this.bookGroupCipher = bookGroupCipher;
     }
 
+    public Long getAgentId() {
+        return agentId;
+    }
+
+    public void setAgentId(Long agentId) {
+        this.agentId = agentId;
+    }
+
+    public String getAgentName() {
+        return agentName;
+    }
+
+    public void setAgentName(String agentName) {
+        this.agentName = agentName;
+    }
+
+    public String getPublish() {
+        return publish;
+    }
+
+    public void setPublish(String publish) {
+        this.publish = publish;
+    }
+
     @Override
     public String toString() {
         return "BookGroupDTO{" +
@@ -474,6 +513,9 @@ public class BookGroupDTO extends BaseDto {
                 ", customerServiceName='" + customerServiceName + '\'' +
                 ", isInviteGroup=" + isInviteGroup +
                 ", bookGroupCipher='" + bookGroupCipher + '\'' +
+                ", agentId=" + agentId +
+                ", agentName='" + agentName + '\'' +
+                ", publish='" + publish + '\'' +
                 "} " + super.toString();
     }
 }
\ No newline at end of file