Merge branch 'zyj-1001413' into 'master'

旧数据处理

See merge request rays/pcloud-book!173

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

@@ -3195,27 +3195,38 @@ public class AdvertisingSpaceBizImpl implements AdvertisingSpaceBiz {
     @Override
     public void dealOldCPAContent() {
         List<AdvertisingSpace> spaceList = advertisingSpaceDao.getCPASpaceList();
-        if (ListUtils.isEmpty(spaceList)) {
-            return;
-        }
-        for (AdvertisingSpace space : spaceList) {
-            Long adId = space.getId();
-            AdvertisingCpa cpa = new AdvertisingCpa();
-            cpa.setDetailMode(space.getAdDetailMode());
-            cpa.setDetailName(space.getAdName());
-            cpa.setCoverPic(space.getAdDetailCoverPic());
-            cpa.setWelfarePic(space.getAdDetailWelfarePic());
-            cpa.setDetailInfo(space.getAdDetailInfo());
-            cpa.setFormMobileCheck(space.getAdFormMobileCheck());
-            cpa.setFormRemark(space.getAdFormRemark());
-            cpa.setFormButton(space.getAdFormButton());
-            cpa.setFormLink(space.getAdFormLink());
-            advertisingCpaDao.insert(cpa);
-            Long cpaId = cpa.getId();
-            //更新到广告位、报名信息、广告详情
-            advertisingSpaceDao.updateCPAId(adId, cpaId);
-            bmOptionDao.updateCPAId(adId, cpaId);
-            detailFileDao.updateCPAId(adId, cpaId);
+        if (!ListUtils.isEmpty(spaceList)) {
+            for (AdvertisingSpace space : spaceList) {
+                Long adId = space.getId();
+                AdvertisingCpa cpa = new AdvertisingCpa();
+                cpa.setDetailMode(space.getAdDetailMode());
+                cpa.setDetailName(space.getAdName());
+                cpa.setCoverPic(space.getAdDetailCoverPic());
+                cpa.setWelfarePic(space.getAdDetailWelfarePic());
+                cpa.setDetailInfo(space.getAdDetailInfo());
+                cpa.setFormMobileCheck(space.getAdFormMobileCheck());
+                cpa.setFormRemark(space.getAdFormRemark());
+                cpa.setFormButton(space.getAdFormButton());
+                cpa.setFormLink(space.getAdFormLink());
+                advertisingCpaDao.insert(cpa);
+                Long cpaId = cpa.getId();
+                //更新到广告位、报名信息、广告详情
+                advertisingSpaceDao.updateCPAId(adId, cpaId);
+                bmOptionDao.updateCPAId(adId, cpaId);
+                detailFileDao.updateCPAId(adId, cpaId);
+            }
+        }
+        List<Long> linkCpaIds = advertisingCpaDao.getNoPreviewLinkCPAList();
+        if (!ListUtils.isEmpty(linkCpaIds)) {
+            for (Long cpaId : linkCpaIds) {
+                //预览链接
+                String previewLink = wechatGroupLinkPrefix + "/ad?cpa_id=" + cpaId;
+                previewLink = UrlUtils.getShortUrl4Own(wechatGroupLinkPrefix + "/link?url=" + URLEncoder.encode(previewLink));
+                AdvertisingCpa cpaUpdate = new AdvertisingCpa();
+                cpaUpdate.setId(cpaId);
+                cpaUpdate.setPreviewLink(previewLink);
+                advertisingCpaDao.update(cpaUpdate);
+            }
         }
     }
 

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

@@ -3,6 +3,8 @@ package com.pcloud.book.advertising.dao;
 import com.pcloud.book.advertising.entity.AdvertisingCpa;
 import com.pcloud.common.core.dao.BaseDao;
 
+import java.util.List;
+
 /**
  * @描述：cpa内容
  * @作者：zhuyajie
@@ -10,4 +12,9 @@ import com.pcloud.common.core.dao.BaseDao;
  * @版本：1.0
  */
 public interface AdvertisingCpaDao extends BaseDao<AdvertisingCpa> {
+    /**
+     * 要更新预览链接的cpa
+     * @return
+     */
+    List<Long> getNoPreviewLinkCPAList();
 }

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

@@ -6,6 +6,8 @@ import com.pcloud.common.core.dao.BaseDaoImpl;
 
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * @描述：cpa内容
  * @作者：zhuyajie
@@ -14,4 +16,8 @@ import org.springframework.stereotype.Component;
  */
 @Component("advertisingCpaDao")
 public class AdvertisingCpaDaoImpl extends BaseDaoImpl<AdvertisingCpa> implements AdvertisingCpaDao {
+    @Override
+    public List<Long> getNoPreviewLinkCPAList() {
+        return getSessionTemplate().selectList(getStatement("getNoPreviewLinkCPAList"));
+    }
 }

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

@@ -115,4 +115,14 @@
     update_time DESC
   </select>
 
+  <select id="getNoPreviewLinkCPAList" resultType="long">
+    SELECT
+        id
+    FROM
+        advertising_cpa
+    WHERE
+        preview_link IS NULL
+    AND detail_mode IS NOT NULL
+  </select>
+
 </mapper>
\ No newline at end of file