Merge branch 'zhuyajie' into 'master'

广告数据

See merge request rays/pcloud-book!57

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

@@ -2864,15 +2864,13 @@ public class AdvertisingSpaceBizImpl implements AdvertisingSpaceBiz {
             advertisingPilotRecord.setChannelId(bookGroup.getChannelId());
             advertisingPilotRecord.setAdviserId(bookGroup.getCreateUser());
         } else {
-            //cookie中没有chuannelId adviserId,先从表中查
-            if (null == advertisingPilotRecord.getChannelId()) {
+            //投放书刊
             AdvertisingDistributionBook distributionBook = distributionBookDao.getChannelIdByAdIdBookId(advertisingPilotRecord.getAdId(), advertisingPilotRecord.getBookId());
             if (null != distributionBook) {
                 advertisingPilotRecord.setChannelId(distributionBook.getChannelId());
                 advertisingPilotRecord.setAdviserId(distributionBook.getAdviserId());
             }
         }
-        }
         Long agentId = channelConsr.getParentId(advertisingPilotRecord.getChannelId());
         advertisingPilotRecord.setAgentId(agentId);
         if (!AdPositionEnum.APP_OR_PRODUCT.positionCode.equals(space.getAdPosition())) {
@@ -2900,15 +2898,13 @@ public class AdvertisingSpaceBizImpl implements AdvertisingSpaceBiz {
                     advertisingBrowseRecord.setAdviserId(bookGroup.getCreateUser());
                 }
             } else {
-                //cookie中没有chuannelId adviserId,先从表中查
-                if (null == advertisingBrowseRecord.getChannelId()) {
+                //投放书刊
                 AdvertisingDistributionBook distributionBook = distributionBookDao.getChannelIdByAdIdBookId(advertisingBrowseRecord.getAdId(), advertisingBrowseRecord.getBookId());
                 if (null != distributionBook) {
                     advertisingBrowseRecord.setChannelId(distributionBook.getChannelId());
                     advertisingBrowseRecord.setAdviserId(distributionBook.getAdviserId());
                 }
             }
-            }
             String uuid = UUID.randomUUID().toString();
             advertisingBrowseRecord.setRecordId(uuid);
             advertisingBrowseRecordDao.insert(advertisingBrowseRecord);

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

@@ -295,15 +295,13 @@ public class BmBizImpl implements BmBiz {
             bmRegister.setChannelId(bookGroup.getChannelId());
             bmRegister.setAdviserId(bookGroup.getCreateUser());
         } else {
-            //cookie中没有chuannelId adviserId,先从表中查
-            if (null == bmRegister.getChannelId()) {
+            //投放书刊
             AdvertisingDistributionBook distributionBook = distributionBookDao.getChannelIdByAdIdBookId(adId, bmRegister.getBookId());
             if (null != distributionBook) {
                 bmRegister.setChannelId(distributionBook.getChannelId());
                 bmRegister.setAdviserId(distributionBook.getAdviserId());
             }
         }
-        }
         Long agentId = channelConsr.getParentId(bmRegister.getChannelId());
         bmRegister.setAgentId(agentId);
         WechatUser wechat = readerConsr.getWechatUser(wechatUserId);