feat: 素材落地页信息

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/ExternalClerkRelatedApiService.java

@@ -195,6 +195,15 @@ public interface ExternalClerkRelatedApiService {
     
     com.gic.api.base.commons.ServiceResponse<Boolean> isQwFriend(String enterpriseId, String staffId, String memberId) ;
 
+    /**
+     *
+     * @param enterpriseId
+     * @param clerkId
+     * @param unionId
+     * @return
+     */
+    com.gic.api.base.commons.ServiceResponse<Boolean> isQwFriendWithUnionId(String enterpriseId, String clerkId, String unionId) ;
+
     //无效接口
 //    com.gic.api.base.commons.ServiceResponse<String> getExternalUseridForWxa(String enterpriseId, String staffId, String memberId) ;
     

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanExternalClerkRelatedMapper.java

@@ -264,6 +264,10 @@ public interface TabHaobanExternalClerkRelatedMapper {
                                                           @Param("enterpriseId") String enterpriseId,
                                                           @Param("memberId") String memberId);
 
+    TabHaobanExternalClerkRelated getByUnionIdAndStaffId(@Param("staffId") String staffId,
+                                                          @Param("enterpriseId") String enterpriseId,
+                                                          @Param("unionId") String unionId);
+
     /**
      * 根据企业id分页
      *

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/ExternalClerkRelatedApiServiceImpl.java

@@ -457,7 +457,27 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
         return com.gic.api.base.commons.ServiceResponse.success(externalClerkRelated.getStatusFlag() == 1);
     }
 
-//    @Override
+    /**
+     * @param enterpriseId
+     * @param clerkId
+     * @param unionId
+     * @return
+     */
+    @Override
+    public com.gic.api.base.commons.ServiceResponse<Boolean> isQwFriendWithUnionId(String enterpriseId, String clerkId, String unionId) {
+        StaffClerkRelationDTO staffClerkRelation = staffClerkRelationMapper.getOneByClerkId(clerkId,null);
+        if (staffClerkRelation == null) {
+            return com.gic.api.base.commons.ServiceResponse.success(Boolean.FALSE);
+        }
+        String staffId = staffClerkRelation.getStaffId();
+        TabHaobanExternalClerkRelated externalClerkRelated = tabHaobanExternalClerkRelatedMapper.getByUnionIdAndStaffId(staffId, enterpriseId, unionId);
+        if (externalClerkRelated == null) {
+            return com.gic.api.base.commons.ServiceResponse.success(Boolean.FALSE);
+        }
+        return com.gic.api.base.commons.ServiceResponse.success(externalClerkRelated.getStatusFlag() == 1);
+    }
+
+    //    @Override
 //    public com.gic.api.base.commons.ServiceResponse<String> getExternalUseridForWxa(String enterpriseId, String staffId,
 //            String memberId) {
 //        TabHaobanExternalClerkRelated externalClerkRelated = tabHaobanExternalClerkRelatedMapper.getByMemberIdAndStaffId(staffId, enterpriseId, memberId);

haoban-manage3-service/src/main/resources/mapper/TabHaobanExternalClerkRelatedMapper.xml

@@ -566,6 +566,17 @@
         AND status_flag = 1 limit 1
     </select>
 
+    <select id="getByUnionIdAndStaffId" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from tab_haoban_external_clerk_related
+        where
+        member_id = #{memberId}
+        and enterprise_id = #{enterpriseId}
+        AND unionid = #{unionid}
+        AND status_flag = 1 limit 1
+    </select>
+
 
     <select id="pageExternalByEnterpriseId" resultMap="BaseResultMap">
         select wx_enterprise_id,

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/content/ClerkMaterialShareController.java

@@ -2,7 +2,11 @@ package com.gic.haoban.manage.web.controller.content;
 
 import com.alibaba.fastjson.JSON;
 import com.gic.api.base.commons.ServiceResponse;
+import com.gic.commons.util.EntityUtil;
 import com.gic.commons.webapi.reponse.RestResponse;
+import com.gic.content.api.dto.material.ContentMaterialLandingPageInfoDTO;
+import com.gic.content.api.qdto.material.ContentMaterialLandingPageQDTO;
+import com.gic.content.api.service.ContentMaterialShareApiService;
 import com.gic.haoban.common.utils.StringUtil;
 import com.gic.haoban.manage.api.dto.content.log.ClerkShareMaterialLogDTO;
 import com.gic.haoban.manage.api.enums.content.ShareBizType;
@@ -13,6 +17,7 @@ import com.gic.haoban.manage.web.vo.content.share.ContentMaterialLandingPageVO;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -29,9 +34,12 @@ public class ClerkMaterialShareController {
 
     @Autowired
     private MaterialShareLogApiService materialShareLogApiService;
+    @Autowired
+    private ContentMaterialShareApiService contentMaterialShareApiService;
 
     /**
      * 导购分享素材日志
+     *
      * @return
      */
     @RequestMapping(path = "/clerk/share/material/log", method = RequestMethod.POST)
@@ -47,7 +55,7 @@ public class ClerkMaterialShareController {
         temp.setClerkId(materialShareLogQo.getClerkId());
         temp.setStaffId(materialShareLogQo.getStaffId());
         temp.setShareType(materialShareLogQo.getShareType());
-        temp.setBizId(materialShareLogQo.getContentMaterialId() +"");
+        temp.setBizId(materialShareLogQo.getContentMaterialId() + "");
         temp.setBizType(ShareBizType.MATERIAL.getCode());
 
         ServiceResponse<Long> serviceResponse = materialShareLogApiService.saveClerkShareMaterialLog(temp);
@@ -60,11 +68,21 @@ public class ClerkMaterialShareController {
 
     /**
      * 查询素材落地页信息
+     *
      * @param contentMaterialBaseQO
      * @return
      */
     @RequestMapping(path = "/content/material/share/landing/page/info")
-    public RestResponse<ContentMaterialLandingPageVO> queryMaterialLandingPage(ContentMaterialBaseQO contentMaterialBaseQO){
-        return RestResponse.successResult();
+    public RestResponse<ContentMaterialLandingPageVO> queryMaterialLandingPage(ContentMaterialBaseQO contentMaterialBaseQO) {
+
+        ContentMaterialLandingPageQDTO searchQo = new ContentMaterialLandingPageQDTO();
+        BeanUtils.copyProperties(contentMaterialBaseQO, searchQo);
+        ServiceResponse<ContentMaterialLandingPageInfoDTO> serviceResponse = contentMaterialShareApiService.queryMaterialLandPageInfo(searchQo);
+        if (!serviceResponse.isSuccess()) {
+            log.info("获取素材落地页异常 {}", JSON.toJSONString(serviceResponse));
+            return RestResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
+        }
+        ContentMaterialLandingPageVO materialLandingPageVO = EntityUtil.changeEntityByJSON(ContentMaterialLandingPageVO.class, serviceResponse.getResult());
+        return RestResponse.successResult(materialLandingPageVO);
     }
 }

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/qo/content/ContentMaterialBaseQO.java

@@ -42,6 +42,16 @@ public class ContentMaterialBaseQO extends BasePageInfo {
      */
     private String staffId;
 
+    /**
+     * 会员id
+     */
+    private String memberId;
+
+    /**
+     * 微信unionId
+     */
+    private String unionId;
+
     public String getEnterpriseId() {
         return enterpriseId;
     }
@@ -89,4 +99,20 @@ public class ContentMaterialBaseQO extends BasePageInfo {
     public void setStaffId(String staffId) {
         this.staffId = staffId;
     }
+
+    public String getMemberId() {
+        return memberId;
+    }
+
+    public void setMemberId(String memberId) {
+        this.memberId = memberId;
+    }
+
+    public String getUnionId() {
+        return unionId;
+    }
+
+    public void setUnionId(String unionId) {
+        this.unionId = unionId;
+    }
 }