Merge branch 'feature/1006255' into 'master'

feat:[1006255]落地页选企微活码

See merge request rays/pcloud-book!1474

pcloud-service-book/src/main/java/com/pcloud/book/consumer/erp/ErpConsr.java

@@ -12,6 +12,7 @@ import com.pcloud.book.book.dto.ErpBookInfoDTO;
 import com.pcloud.book.book.dto.ProjectOrderSheetDTO;
 import com.pcloud.book.book.dto.ProjectRelateVO;
 import com.pcloud.book.book.dto.ProjectUploaderDTO;
+import com.pcloud.book.group.vo.CrmContactQrcodeVO;
 import com.pcloud.common.core.aspect.ParamLog;
 import com.pcloud.common.exceptions.BizException;
 import com.pcloud.common.utils.ListUtils;
@@ -378,4 +379,27 @@ public class ErpConsr {
         }
         return new HashMap<>();
     }
+
+    /**
+     * @Description  查企微活码信息
+     * @Author zhuyajie
+     * @Date 14:29 2021/12/10
+     **/
+    public CrmContactQrcodeVO getContactQrcodeNameById4Adviser(Long contactQrcodeId) {
+        Map<String, String> querys = new HashMap<>();
+        querys.put("contactQrcodeId", contactQrcodeId.toString());
+        try {
+            HttpResponse response = HttpUtils.doGet(domain, "/erp/crm/contact/getContactQrcodeById4Adviser", "GET", new HashMap<>(), querys);
+            String entityString = EntityUtils.toString(response.getEntity());
+            JSONObject jsonObject = JSONObject.parseObject(entityString);
+            if(jsonObject.getInteger("errCode") != 0){
+                throw new BizException(jsonObject.getString("message"));
+            }
+            return JSONObject.parseObject(jsonObject.getString("data"), CrmContactQrcodeVO.class);
+        } catch (Exception e){
+            LOGGER.error("根据contactQrcodeId获取活码信息[crm/contact.getContactQrcodeById4Adviser]:" + e.getMessage(), e);
+        }
+        return null;
+    }
+
 }

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

@@ -32,6 +32,7 @@ import com.pcloud.book.consumer.analysisengine.BrowseRecordConsr;
 import com.pcloud.book.consumer.app.AppConsr;
 import com.pcloud.book.consumer.channel.QrcodeSceneConsr;
 import com.pcloud.book.consumer.combinedmarketing.MemberActivityConsr;
+import com.pcloud.book.consumer.erp.ErpConsr;
 import com.pcloud.book.consumer.raystask.AdviserTaskConsr;
 import com.pcloud.book.consumer.reader.ReaderConsr;
 import com.pcloud.book.consumer.resource.ProductConsr;
@@ -87,6 +88,7 @@ import com.pcloud.book.group.entity.ResourcePageWxwork;
 import com.pcloud.book.group.entity.ResourceRecomManage;
 import com.pcloud.book.group.enums.PageLandingPageTypeEnum;
 import com.pcloud.book.group.tools.SendWeixinRequestTools;
+import com.pcloud.book.group.vo.CrmContactQrcodeVO;
 import com.pcloud.book.group.vo.RecommendServeVO;
 import com.pcloud.book.group.vo.ResourceColumnAndServeVO;
 import com.pcloud.book.group.vo.ResourcePageBookstoreVO;
@@ -272,6 +274,8 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
     private ShareImageConsr shareImageConsr;
     @Autowired
     private WxworkConsr wxworkConsr;
+    @Autowired
+    private ErpConsr erpConsr;
 
     @Value("${nft.book}")
     private List<Long> nftBookId;
@@ -3227,9 +3231,9 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
         Long qrcodeId = pageWxwork.getQrcodeId();
         if (!isWechat && null != qrcodeId) {
             String qrcodeName = "";
-            if (ResourcePageConstants.WxworkPageQrcodeTypeEnum.SOP_QRCODE.getCode().equals(qrcodeType)) {
-                WxworkQrcodeBaseDTO wxworkQrcodeBaseDTO = wechatGroupConsr.getWxworkQrcodeBaseById(qrcodeId);
-                qrcodeName = null == wxworkQrcodeBaseDTO ? null : wxworkQrcodeBaseDTO.getQrcodeName();
+            if (ResourcePageConstants.WxworkPageQrcodeTypeEnum.CRM_QRCODE.getCode().equals(qrcodeType)) {
+                CrmContactQrcodeVO crmContactQrcodeVO = erpConsr.getContactQrcodeNameById4Adviser(qrcodeId);
+                qrcodeName = null == crmContactQrcodeVO ? null : crmContactQrcodeVO.getContactQrcodeName();
             } else if (ResourcePageConstants.WxworkPageQrcodeTypeEnum.SOP_GROUP_QRCODE.getCode().equals(qrcodeType)) {
                 WxworkGroupQrcodeBaseDTO groupQrcodeBaseDTO = wechatGroupConsr.getWxworkGroupQrcodeBaseById(qrcodeId);
                 qrcodeName = null == groupQrcodeBaseDTO?null:groupQrcodeBaseDTO.getGroupQrcodeName();

pcloud-service-book/src/main/java/com/pcloud/book/group/constant/ResourcePageConstants.java

@@ -439,15 +439,15 @@ public class ResourcePageConstants {
      **/
     public enum WxworkPageQrcodeTypeEnum{
         /**
-         * 1sop个人活码
+         * 1crm个人活码
          */
-        SOP_QRCODE(1),
+        CRM_QRCODE(1),
         /**
          * 2sop群活码
          */
         SOP_GROUP_QRCODE(2),
         /**
-         * 企微个人码
+         * 编辑端企微个人码
          */
         WXWORK_QRCODE(3);
 

pcloud-service-book/src/main/java/com/pcloud/book/group/vo/CrmContactQrcodeVO.java

+package com.pcloud.book.group.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+import lombok.Data;
+
+/**
+ * CRM 企业微信活码信息
+ */
+@Data
+public class CrmContactQrcodeVO implements Serializable {
+
+    private static final long serialVersionUID = 7917025011133902375L;
+
+    /**
+     * 活码ID
+     */
+    private Long contactQrcodeId;
+
+    /**
+     * 活码地址
+     */
+    private String qrcodeUrl;
+
+    /**
+     * 活码OSS地址
+     */
+    private String qrcodeUrlOss;
+
+    /**
+     * 活码解析地址
+     */
+    private String parseLink;
+
+    /**
+     * 活码名称
+     */
+    private String contactQrcodeName;
+
+    /**
+     * 扫码添加次数
+     */
+    private Integer addCount;
+
+    /**
+     * 扫码添加次数
+     */
+    private Integer addUser;
+
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+
+    /**
+     * 跳过验证标志
+     */
+    private Integer skipVerifyFlag;
+
+    /**
+     * 跳过验证时间标志
+     */
+    private Integer skipVerifyTimeFlag;
+
+    /**
+     * 跳过验证开始时间
+     */
+    @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+8")
+    private Date skipVerifyStart;
+
+    /**
+     * 跳过验证结束时间
+     */
+    @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+8")
+    private Date skipVerifyEnd;
+
+    /**
+     * 水印标志
+     */
+    private Integer watermarkFlag;
+
+    /**
+     * 水印
+     */
+    private String watermark;
+
+
+}