Merge branch 'feature-hongshu' into 'master'

Feature hongshu

See merge request !2129

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/NoticeMessageTypeEnum.java

@@ -95,7 +95,8 @@ public enum NoticeMessageTypeEnum {
 
     CASH_APPLY_OFFLINE_SUCCESS_NOTIFY(7003,"提现通知", NoticeMessageCategoryTypeEnum.OTHER.getType(),"cash_apply_offline_success_notify","/pages/route/index?pageType=","hbapp_withdraw_list","cashApplyOfflineSuccessNotify","haobanNotice"),
 
-    AUTHORIZED_LOGIN_NOTIFY(8001,"账号授权通知", NoticeMessageCategoryTypeEnum.AUTHORIZED.getType(),"authorized_login_notify","/pages/route/index?pageType=","hbapp_video_auth","authorizedLoginNotify","haobanNotice");
+    AUTHORIZED_LOGIN_NOTIFY(8001,"账号授权通知", NoticeMessageCategoryTypeEnum.AUTHORIZED.getType(),"authorized_login_notify","/pages/route/index?pageType=","hbapp_video_auth","authorizedLoginNotify","haobanNotice"),
+    AUTHORIZED_LOGOUT_NOTIFY(8002,"账号异常退出登录通知", NoticeMessageCategoryTypeEnum.AUTHORIZED.getType(),"authorized_logout_notify","/pages/route/index?pageType=","hbapp_video_auth","authorizedLogoutNotify","haobanNotice");
 
     /**
      * 消息类型

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/content/adaptor/MessageConvertHelper.java

@@ -43,6 +43,11 @@ public class MessageConvertHelper {
 
         String cusp = jsonObject.getString("cusp");
         JSONObject cuspJson = JSON.parseObject(cusp);
+        Integer isPreview = cuspJson.getInteger("is_preview");
+        if (Objects.equals(isPreview, 1)) {
+            log.info("预览数据不处理");
+            return null;
+        }
 
         String sysp = jsonObject.getString("sysp");
         JSONObject syspJson = JSON.parseObject(sysp);

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

@@ -9,6 +9,7 @@ import com.gic.content.api.dto.account.AccountAuthorizeDTO;
 import com.gic.content.api.dto.account.AccountAuthorizeResultDTO;
 import com.gic.content.api.dto.account.ContentAccountInfoDTO;
 import com.gic.content.api.enums.ContentAccountQrCodeSourceType;
+import com.gic.content.api.enums.ContentAccountStatusEnum;
 import com.gic.content.api.qdto.account.AccountGenerateQrCodeQDTO;
 import com.gic.content.api.qdto.account.AccountScanQrCodeResultQDTO;
 import com.gic.content.api.qdto.account.ContentAccountQDTO;
@@ -31,6 +32,7 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -86,6 +88,7 @@ public class ContentAccountController {
         contentAccountQDTO.setQueryForClerk(Boolean.TRUE);
         contentAccountQDTO.setUserCodes(clerkCodes);
         contentAccountQDTO.setStoreIds(storeIds);
+        contentAccountQDTO.setBizType(null);
         ServiceResponse<Page<ContentAccountInfoDTO>> serviceResponse =
                 contentAccountApiService.queryAccountList(contentAccountQDTO);
         if (!serviceResponse.isSuccess() || CollectionUtils.isEmpty(serviceResponse.getResult().getResult())) {
@@ -94,6 +97,7 @@ public class ContentAccountController {
         List<ContentAccountInfoVo> contentAccountInfoVos = serviceResponse.getResult()
                 .getResult()
                 .stream()
+                .filter(item -> !Objects.equals(item.getStatus(), ContentAccountStatusEnum.UNBOUND.getCode()))
                 .map(item -> EntityUtil.changeEntityByJSON(ContentAccountInfoVo.class, item))
                 .collect(Collectors.toList());
         return RestResponse.successResult(contentAccountInfoVos);
@@ -114,6 +118,7 @@ public class ContentAccountController {
         accountGenerateQrCodeQDTO.setSourceType(ContentAccountQrCodeSourceType.HAOBAN.getCode());
         accountGenerateQrCodeQDTO.setKey(accountGenerateQrCodeQo.getKey());
         accountGenerateQrCodeQDTO.setAccountId(accountGenerateQrCodeQo.getAccountId());
+        accountGenerateQrCodeQDTO.setBizType(accountGenerateQrCodeQo.getBizType());
         ServiceResponse<AccountAuthorizeDTO> serviceResponse = contentAccountApiService.generateQrCode(accountGenerateQrCodeQDTO);
         if (!serviceResponse.isSuccess()) {
             return RestResponse.failure("500", "生成二维码异常");

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

@@ -52,6 +52,11 @@ public class ContentMaterialShareQO implements Serializable {
      */
     private String goodsDetailSource;
 
+    /**
+     * 是否预览 1是 0否
+     */
+    private Integer isPreview;
+
     public String getEnterpriseId() {
         return enterpriseId;
     }
@@ -115,4 +120,12 @@ public class ContentMaterialShareQO implements Serializable {
     public void setGoodsDetailSource(String goodsDetailSource) {
         this.goodsDetailSource = goodsDetailSource;
     }
+
+    public Integer getIsPreview() {
+        return isPreview;
+    }
+
+    public void setIsPreview(Integer isPreview) {
+        this.isPreview = isPreview;
+    }
 }

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

 package com.gic.haoban.manage.web.qo.content.account;
 
+import com.gic.content.api.enums.ContentAccountBizTypeEnum;
+
 import java.io.Serializable;
 
 /**
@@ -30,6 +32,11 @@ public class AccountGenerateQrCodeQo implements Serializable {
      */
     private String key;
 
+    /**
+     * 渠道类型 1 视频号 2 小红书
+     */
+    private Integer bizType = ContentAccountBizTypeEnum.WX_VIDEO.getCode();
+
     public String getEnterpriseId() {
         return enterpriseId;
     }
@@ -61,4 +68,12 @@ public class AccountGenerateQrCodeQo implements Serializable {
     public void setKey(String key) {
         this.key = key;
     }
+
+    public Integer getBizType() {
+        return bizType;
+    }
+
+    public void setBizType(Integer bizType) {
+        this.bizType = bizType;
+    }
 }

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

 package com.gic.haoban.manage.web.qo.content.account;
 
+import com.gic.content.api.enums.ContentAccountBizTypeEnum;
+
 import java.io.Serializable;
 
 /**
@@ -27,6 +29,11 @@ public class AccountScanResultQo implements Serializable {
      */
     private String enterpriseId;
 
+    /**
+     * 渠道类型 1 视频号 2 小红书
+     */
+    private Integer bizType = ContentAccountBizTypeEnum.WX_VIDEO.getCode();
+
     public String getKey() {
         return key;
     }
@@ -50,4 +57,12 @@ public class AccountScanResultQo implements Serializable {
     public void setEnterpriseId(String enterpriseId) {
         this.enterpriseId = enterpriseId;
     }
+
+    public Integer getBizType() {
+        return bizType;
+    }
+
+    public void setBizType(Integer bizType) {
+        this.bizType = bizType;
+    }
 }

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/content/account/ContentAccountInfoVo.java

@@ -12,7 +12,10 @@ public class ContentAccountInfoVo implements Serializable {
 
     private static final long serialVersionUID = -3355601918337775024L;
 
-
+    /**
+     * 渠道类型 1 视频号 2 小红书
+     */
+    private Integer bizType;
     /**
      * 账号名称
      */
@@ -31,9 +34,18 @@ public class ContentAccountInfoVo implements Serializable {
      * 账号授权状态
      * 1 授权中
      * 2 已过期
+     * 3 已解绑
      */
     private Integer status;
 
+    public Integer getBizType() {
+        return bizType;
+    }
+
+    public void setBizType(Integer bizType) {
+        this.bizType = bizType;
+    }
+
     public String getAccountName() {
         return accountName;
     }