Merge branch 'zyj-fixbug-rightsetting' into 'master'

权益查询

See merge request rays/pcloud-book!663

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

@@ -42,9 +42,81 @@ import com.pcloud.book.group.biz.BookGroupAppBiz;
 import com.pcloud.book.group.biz.BookGroupBiz;
 import com.pcloud.book.group.biz.BookGroupClassifyBiz;
 import com.pcloud.book.group.biz.GroupQrcodeBiz;
-import com.pcloud.book.group.dao.*;
-import com.pcloud.book.group.dto.*;
-import com.pcloud.book.group.entity.*;
+import com.pcloud.book.group.dao.AppClickRecordDao;
+import com.pcloud.book.group.dao.AppTouchRecordDao;
+import com.pcloud.book.group.dao.BookAppletSceneDao;
+import com.pcloud.book.group.dao.BookGroupAgentRecordDao;
+import com.pcloud.book.group.dao.BookGroupAppDao;
+import com.pcloud.book.group.dao.BookGroupCipherUserDao;
+import com.pcloud.book.group.dao.BookGroupClassifyDao;
+import com.pcloud.book.group.dao.BookGroupDao;
+import com.pcloud.book.group.dao.BookGroupFriendGuideDao;
+import com.pcloud.book.group.dao.BookGroupServeDao;
+import com.pcloud.book.group.dao.CopyCipherRecordDao;
+import com.pcloud.book.group.dao.GroupQrcodeDao;
+import com.pcloud.book.group.dao.JoinGroupCipherDao;
+import com.pcloud.book.group.dao.PushBookGroupUpdateDao;
+import com.pcloud.book.group.dao.TempletRelevanceDao;
+import com.pcloud.book.group.dao.WeixinQrcodeDao;
+import com.pcloud.book.group.dao.WeixinQrcodeGenerationDao;
+import com.pcloud.book.group.dao.WxUserWechatRelevanceDao;
+import com.pcloud.book.group.dao.WxWechatUserCorrelationDao;
+import com.pcloud.book.group.dto.AgentStatisticsInfoDTO;
+import com.pcloud.book.group.dto.AltAndCountDTO;
+import com.pcloud.book.group.dto.AltIdAndNameDTO;
+import com.pcloud.book.group.dto.AppStatisticsDTO;
+import com.pcloud.book.group.dto.BookAppletSceneDTO;
+import com.pcloud.book.group.dto.BookGroupCountDTO;
+import com.pcloud.book.group.dto.BookGroupDTO;
+import com.pcloud.book.group.dto.BookGroupIdAndCountDTO;
+import com.pcloud.book.group.dto.BookGroupKeywordResourceDTO;
+import com.pcloud.book.group.dto.BookGroupStatistic4AgentDTO;
+import com.pcloud.book.group.dto.BookGroupStatisticDTO;
+import com.pcloud.book.group.dto.BookGroupStatisticsDTO;
+import com.pcloud.book.group.dto.BookServeDTO;
+import com.pcloud.book.group.dto.BookServeResourceDTO;
+import com.pcloud.book.group.dto.ChangeQrCodeTypeDto;
+import com.pcloud.book.group.dto.ClassifyDTO;
+import com.pcloud.book.group.dto.ClassifyKeywordDTO;
+import com.pcloud.book.group.dto.ClickClassifyDTO;
+import com.pcloud.book.group.dto.CountAndTimeDTO;
+import com.pcloud.book.group.dto.DayCountDTO;
+import com.pcloud.book.group.dto.ErpBookGroupDTO;
+import com.pcloud.book.group.dto.ErpGroupQrcodeDTO;
+import com.pcloud.book.group.dto.GroupCipherDTO;
+import com.pcloud.book.group.dto.GroupStoreMyPayDto;
+import com.pcloud.book.group.dto.GroupUseDTO;
+import com.pcloud.book.group.dto.JoinGroupCipherDTO;
+import com.pcloud.book.group.dto.LabelUserCountDTO;
+import com.pcloud.book.group.dto.LargeTempletDTO;
+import com.pcloud.book.group.dto.OwnAltQrcodeInfoDTO;
+import com.pcloud.book.group.dto.PersonalQrcodeDTO;
+import com.pcloud.book.group.dto.QrcodeNameAndProIdDTO;
+import com.pcloud.book.group.dto.ResourceBrowseParamDto;
+import com.pcloud.book.group.dto.SelfBookGroupStDTO;
+import com.pcloud.book.group.dto.SelfBookGroupStParamDTO;
+import com.pcloud.book.group.dto.SelfRobotBookGroupDTO;
+import com.pcloud.book.group.dto.SelfRobotUserDTO;
+import com.pcloud.book.group.dto.SelfRobtParamDTO;
+import com.pcloud.book.group.dto.StatisticsIncomeDto;
+import com.pcloud.book.group.dto.TopAgentBookGroupDTO;
+import com.pcloud.book.group.dto.UserBookBaseInfoDTO;
+import com.pcloud.book.group.dto.UserSelectParamDTO;
+import com.pcloud.book.group.dto.WechatMessageDTO;
+import com.pcloud.book.group.entity.BookAppletScene;
+import com.pcloud.book.group.entity.BookGroup;
+import com.pcloud.book.group.entity.BookGroupAgentRecord;
+import com.pcloud.book.group.entity.BookGroupCipherUser;
+import com.pcloud.book.group.entity.BookGroupFriendGuide;
+import com.pcloud.book.group.entity.BookGroupServe;
+import com.pcloud.book.group.entity.GroupQrcode;
+import com.pcloud.book.group.entity.JoinGroupCipher;
+import com.pcloud.book.group.entity.PushBookGroupUpdate;
+import com.pcloud.book.group.entity.QrChangeRecord;
+import com.pcloud.book.group.entity.TempletRelevance;
+import com.pcloud.book.group.entity.WeixinQrcodeGeneration;
+import com.pcloud.book.group.entity.WxUserWechatRelevance;
+import com.pcloud.book.group.entity.WxWechatUserCorrelation;
 import com.pcloud.book.group.enums.AppAndProductTypeEnum;
 import com.pcloud.book.group.enums.ChangeOriginTypeEnum;
 import com.pcloud.book.group.enums.CipherTypeEnum;
@@ -138,7 +210,6 @@ 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.base.exception.WechatGroupBizException;
 import com.pcloud.wechatgroup.group.dto.GroupMemberStatisDTO;
 import com.pcloud.wechatgroup.group.dto.GroupRobotDTO;
 import com.pcloud.wechatgroup.group.dto.GroupUserCountDTO;
@@ -4579,22 +4650,18 @@ public class BookGroupBizImpl implements BookGroupBiz {
     public BookAppletSceneDTO getBookGroupAppletByBookGroupId(Long bookGroupId) {
         BookAppletScene bookAppletScene = bookAppletSceneDao.getByBookGroupId(bookGroupId);
         BookAppletSceneDTO dto = new BookAppletSceneDTO();
-        if (null != bookAppletScene){
-            BeanUtils.copyProperties(bookAppletScene,dto);
+        if (null != bookAppletScene) {
+            BeanUtils.copyProperties(bookAppletScene, dto);
         }
-        BookGroupDTO bookGroupDTO = bookGroupDao. getBookBaseInfoById(bookGroupId);
+        BookGroupDTO bookGroupDTO = bookGroupDao.getBookBaseInfoById(bookGroupId);
         dto.setBookName(StringUtil.addBracket(bookGroupDTO.getBookName()));
         //权益
-        BookAdviserDto adviserDto = bookAdviserDao.getBase(bookGroupDTO.getBookId(),bookGroupDTO.getChannelId(),bookGroupDTO.getCreateUser());
-        if (null!=adviserDto){
-            RightsSettingDto rightsSettingDto = rightsSettingBiz.getByLabel(adviserDto.getTempletId(),
-                    adviserDto.getSecondTempletId(),adviserDto.getGraLabelId(),adviserDto.getSubLabelId());
-            if (null!= rightsSettingDto){
+        RightsSettingDto rightsSettingDto = rightsSettingBiz.getRightsSettingByBookId4AppletHome(bookGroupDTO.getBookId(), bookGroupDTO.getCreateUser(), bookGroupDTO.getChannelId());
+        if (null != rightsSettingDto) {
             dto.setRightsSettingDetail(rightsSettingDto.getDetail());
             dto.setRightsSettingIntroduce(rightsSettingDto.getIntroduce());
             dto.setRightsSettingCount(rightsSettingDto.getCount());
         }
-        }
         return dto;
     }