Merge branch 'zhuyajie' into 'master'

合并

See merge request rays/pcloud-book!56

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

@@ -164,6 +164,8 @@ public class AdvertisingSpaceBizImpl implements AdvertisingSpaceBiz {
     private AdvertisingPilotRecordDao advertisingPilotRecordDao;
     @Autowired
     private AdvertisingBrowseRecordDao advertisingBrowseRecordDao;
+    @Autowired
+    private AdvertisingDistributionBookDao distributionBookDao;
 
 
     private static final String ADVERTISING_PUT_PLAN_SCHEDULE_PRE = "ADVERTISING_PUT_PALN_";
@@ -2861,6 +2863,15 @@ public class AdvertisingSpaceBizImpl implements AdvertisingSpaceBiz {
             advertisingPilotRecord.setBookId(bookGroup.getBookId());
             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);
@@ -2888,6 +2899,15 @@ public class AdvertisingSpaceBizImpl implements AdvertisingSpaceBiz {
                     advertisingBrowseRecord.setChannelId(bookGroup.getChannelId());
                     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);

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

 package com.pcloud.book.advertising.biz.impl;
 
 import com.pcloud.book.advertising.biz.BmBiz;
+import com.pcloud.book.advertising.dao.AdvertisingDistributionBookDao;
 import com.pcloud.book.advertising.dao.AdvertisingSpaceDao;
 import com.pcloud.book.advertising.dao.BmOptionDao;
 import com.pcloud.book.advertising.dao.BmOptionItemDao;
@@ -14,6 +15,7 @@ import com.pcloud.book.advertising.entity.AdvertisingBmOption;
 import com.pcloud.book.advertising.entity.AdvertisingBmOptionItem;
 import com.pcloud.book.advertising.entity.AdvertisingBmRegister;
 import com.pcloud.book.advertising.entity.AdvertisingBmRegisterItem;
+import com.pcloud.book.advertising.entity.AdvertisingDistributionBook;
 import com.pcloud.book.advertising.entity.AdvertisingSpace;
 import com.pcloud.book.advertising.enums.AdPositionEnum;
 import com.pcloud.book.base.exception.BookBizException;
@@ -83,6 +85,8 @@ public class BmBizImpl implements BmBiz {
     private BookGroupDao bookGroupDao;
     @Autowired
     private ChannelConsr channelConsr;
+    @Autowired
+    private AdvertisingDistributionBookDao distributionBookDao;
 
     /**
      * 获取报名商品选项类型
@@ -290,6 +294,15 @@ public class BmBizImpl implements BmBiz {
             bmRegister.setBookId(bookGroup.getBookId());
             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);

pcloud-service-book/src/main/java/com/pcloud/book/advertising/dao/AdvertisingDistributionBookDao.java

@@ -41,4 +41,12 @@ public interface AdvertisingDistributionBookDao extends BaseDao<AdvertisingDistr
      * @return
      */
     Map<Long, QrcodeAdvertisingSpaceCountDTO> mapAdvertisingSpaceNum(List<Long> qrcodeIds);
+
+    /**
+     * 查渠道编辑id
+     * @param adId
+     * @param bookId
+     * @return
+     */
+    public AdvertisingDistributionBook getChannelIdByAdIdBookId(Long adId, Long bookId);
 }

pcloud-service-book/src/main/java/com/pcloud/book/advertising/dao/impl/AdvertisingDistributionBookDaoImpl.java

@@ -7,6 +7,7 @@ import com.pcloud.common.core.dao.BaseDaoImpl;
 
 import org.springframework.stereotype.Repository;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -46,4 +47,12 @@ public class AdvertisingDistributionBookDaoImpl extends BaseDaoImpl<AdvertisingD
     public Map<Long, QrcodeAdvertisingSpaceCountDTO> mapAdvertisingSpaceNum(List<Long> qrcodeIds) {
         return this.getSqlSession().selectMap(this.getStatement("mapAdvertisingSpaceNum"), qrcodeIds, "qrcodeId");
     }
+
+    @Override
+    public AdvertisingDistributionBook getChannelIdByAdIdBookId(Long adId, Long bookId) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("adId", adId);
+        map.put("bookId", bookId);
+        return getSessionTemplate().selectOne(getStatement("getChannelIdByAdIdBookId"), map);
+    }
 }

pcloud-service-book/src/main/resources/mapper/advertising/AdvertisingDistributionBookMapper.xml

@@ -298,4 +298,14 @@
         distribution_time DESC
     </select>
 
+    <select id="getChannelIdByAdIdBookId" resultMap="BaseResultMap" parameterType="map">
+        select
+        <include refid="Base_Column_List"/>
+        from advertising_distribution_book
+        where ad_id = #{adId}
+        and  book_id = #{bookId,jdbcType=BIGINT}
+        limit 1
+    </select>
+
+
 </mapper>
\ No newline at end of file