Merge branch 'zyj-adtag' into 'master'

微信群标记广告主

See merge request rays/pcloud-book!125

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

@@ -106,4 +106,11 @@ public interface GroupMasterTagBiz {
      * @return
      */
     List<Long> getTagBookIds4AdMatser(Long masterId);
+
+    /**
+     * 已标记的书标记新的群
+     * @param classifyId
+     * @param qrcodeId
+     */
+    public void addTagByBookGroup(Long classifyId, Long qrcodeId);
 }

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

@@ -2367,13 +2367,13 @@ public class AdvertisingSpaceBizImpl implements AdvertisingSpaceBiz {
                 partyConsr.updateLoginAccount(advertisingMaster.getLoginName(), advertisingMaster.getPassword(), loginId);
             }*/
             //账号修改通过子账号完成
-            if (null == loginId) {
-                LOGGER.error("广告主" + masterId + "是品牌方结算，子账号为空");
-            }
+//            if (null == loginId) {
+//                LOGGER.error("广告主" + masterId + "是品牌方结算，子账号为空");
+//            }
         } else {
             if (null != master.getLoginId()) {//删除账号，标记记录
-//                partyConsr.deleteLoginAccount(master.getLoginId());
-                advertisingMaster.setLoginId(null);
+                partyConsr.deleteLoginAccount(master.getLoginId());
+                advertisingMaster.setLoginId(123l);
                 advertisingGroupTagDao.deleteByMasterId(masterId);
             }
         }

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

@@ -17,8 +17,10 @@ import com.pcloud.book.consumer.common.ExportConsr;
 import com.pcloud.book.consumer.label.LabelConsr;
 import com.pcloud.book.consumer.user.AdviserConsr;
 import com.pcloud.book.consumer.wechatgroup.WechatGroupConsr;
+import com.pcloud.book.group.biz.BookGroupClassifyBiz;
 import com.pcloud.book.group.dao.BookGroupDao;
 import com.pcloud.book.group.dao.GroupQrcodeDao;
+import com.pcloud.book.group.vo.ClassifyVO;
 import com.pcloud.common.core.biz.MessageBiz;
 import com.pcloud.common.core.constant.SystemCode;
 import com.pcloud.common.core.dto.SendNotifyDto;
@@ -77,6 +79,8 @@ public class GroupMasterTagBizImpl implements GroupMasterTagBiz {
     private ExportConsr exportConsr;
     @Autowired
     private MessageBiz messageBiz;
+    @Autowired
+    private BookGroupClassifyBiz bookGroupClassifyBiz;
 
     @Override
     public PageBeanNew<GroupMasterDTO> listPageGroupMaster(Integer currentPage, Integer numPerPage, Map<String, Object> paramMap) {
@@ -548,4 +552,26 @@ public class GroupMasterTagBizImpl implements GroupMasterTagBiz {
         List<Long> bookIds = advertisingGroupTagDao.getBookIdsByMasterId(masterId);
         return bookIds;
     }
+
+    @Override
+    public void addTagByBookGroup(Long classifyId, Long qrcodeId) {
+        ClassifyVO classifyVO = bookGroupClassifyBiz.getClassify(classifyId);
+        if (null == classifyVO){
+            return;
+        }
+        Long bookId = classifyVO.getBookId();
+        List<Long> masterIds = advertisingGroupTagDao.getMasterIdsByBookId(bookId);
+        if (ListUtils.isEmpty(masterIds)) {
+            return;
+        }
+        List<AdvertisingGroupTag> list = new ArrayList<>();
+        for (Long masterId : masterIds) {
+            AdvertisingGroupTag tag = new AdvertisingGroupTag();
+            tag.setGroupQrcodeId(qrcodeId);
+            tag.setTagBookId(bookId);
+            tag.setMasterId(masterId);
+            list.add(tag);
+        }
+        advertisingGroupTagDao.insert(list);
+    }
 }

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

@@ -52,4 +52,11 @@ public interface AdvertisingGroupTagDao extends BaseDao<AdvertisingGroupTag> {
      * @return
      */
     List<String> getTagWxGroupIdsByMasterId(Long masterId);
+
+    /**
+     * 根据书查标记的广告主
+     * @param bookId
+     * @return
+     */
+    List<Long> getMasterIdsByBookId(Long bookId);
 }

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

@@ -51,4 +51,9 @@ public class AdvertisingGroupTagDaoImpl extends BaseDaoImpl<AdvertisingGroupTag>
     public List<String> getTagWxGroupIdsByMasterId(Long masterId) {
         return getSessionTemplate().selectList(getStatement("getTagWxGroupIdsByMasterId"), masterId);
     }
+
+    @Override
+    public List<Long> getMasterIdsByBookId(Long bookId) {
+        return getSessionTemplate().selectList(getStatement("getMasterIdsByBookId"), bookId);
+    }
 }

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

@@ -3,6 +3,7 @@ package com.pcloud.book.group.biz.impl;
 import com.google.common.collect.Maps;
 
 import com.pcloud.book.advertising.biz.AdvertisingSpaceBiz;
+import com.pcloud.book.advertising.biz.GroupMasterTagBiz;
 import com.pcloud.book.advertising.dto.QrcodeAdvertisingSpaceCountDTO;
 import com.pcloud.book.base.exception.BookBizException;
 import com.pcloud.book.consumer.label.LabelConsr;
@@ -110,6 +111,8 @@ public class GroupQrcodeBizImpl implements GroupQrcodeBiz {
     private LabelConsr labelConsr;
     @Autowired
     private BookGroupBiz bookGroupBiz;
+    @Autowired
+    private GroupMasterTagBiz groupMasterTagBiz;
 
 
     /**
@@ -214,6 +217,8 @@ public class GroupQrcodeBizImpl implements GroupQrcodeBiz {
     @ParamLog("新增群二维码")
     public Long insert(GroupQrcode groupQrcode) {
         groupQrcodeDao.insert(groupQrcode);
+        //判断广告位标记
+        groupMasterTagBiz.addTagByBookGroup(groupQrcode.getClassifyId(), groupQrcode.getId());
         return groupQrcode.getId();
     }
 

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

@@ -95,4 +95,13 @@
     AND q.weixin_group_id IS NOT NULL
   </select>
 
+  <select id="getMasterIdsByBookId" parameterType="long" resultType="long">
+    SELECT DISTINCT
+    master_id
+    FROM
+    advertising_group_tag
+    WHERE
+    tag_book_id = #{bookId}
+    AND group_qrcode_id = 0
+  </select>
 </mapper>
\ No newline at end of file

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

@@ -103,7 +103,9 @@
                 master_name = #{masterName,jdbcType=VARCHAR},
             </if>
             update_time = NOW(),
+            <if test="loginId != null">
                 login_id = #{loginId},
+            </if>
         </set>
         where id = #{id,jdbcType=BIGINT}
     </update>