feature: 暂存

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

@@ -636,7 +636,7 @@ public class HaobanRoleApiServiceImpl implements HaobanRoleApiService {
                 // 查询企微下 导购、店长、区经 的role_id
                 String wxEnterpriseId = wxEnterpris.getWxEnterpriseId();
                 // 处理商户权限
-                // 运维 + 好办后台
+                // 运维
                 List<HaobanRoleBO> haobanRoleBOS = haobanRoleService.getListByWxEnterpriseId(wxEnterpriseId, null);
                 if (CollectionUtils.isEmpty(haobanRoleBOS)) {
                     logger.info("【flushRightOneTime】企业{} 企微 {} 下没有角色 ", contentMaterialROleInitQDTO.getEnterpriseId(), wxEnterpriseId);

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

+package com.gic.haoban.manage.web.controller.content;
+
+import com.gic.api.base.commons.Page;
+import com.gic.api.base.commons.ServiceResponse;
+import com.gic.commons.webapi.reponse.RestResponse;
+import com.gic.content.api.qdto.comment.ListMobileCommentQDTO;
+import com.gic.content.api.service.ContentMaterialCommentApiService;
+import com.gic.haoban.manage.web.qo.content.comment.CommentCountQO;
+import com.gic.haoban.manage.web.qo.content.comment.CommentInfoVO;
+import com.gic.haoban.manage.web.qo.content.comment.SaveCommentQO;
+import com.gic.haoban.manage.web.qo.content.comment.SonCommentInfoVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 知识库-评论
+ * @Author MUSI
+ * @Date 2023/9/19 3:16 PM
+ * @Description
+ * @Version
+ **/
+@RestController
+@RequestMapping(path = "/comment")
+public class CommentController {
+
+    @Autowired
+    private ContentMaterialCommentApiService contentMaterialCommentApiService;
+
+    /**
+     * 评论总数（包含子评论）
+     * @return
+     */
+    @RequestMapping(path = "/count-comment")
+    public RestResponse<Integer> countContentComment(CommentCountQO commentCountQO) {
+
+        ListMobileCommentQDTO mobileCommentQDTO = new ListMobileCommentQDTO();
+        mobileCommentQDTO.setEnterpriseId(commentCountQO.getEnterpriseId());
+        mobileCommentQDTO.setContentMaterialCommentId(commentCountQO.getContentMaterialId());
+        mobileCommentQDTO.setMaterialPurpose(3);
+        ServiceResponse<Integer> serviceResponse = contentMaterialCommentApiService.countCommentForWechat(mobileCommentQDTO);
+        return RestResponse.successResult(serviceResponse.getResult());
+    }
+
+    /**
+     * 评论列表
+     * @param commentCountQO
+     * @return
+     */
+    @RequestMapping(path = "/list-comment")
+    public RestResponse<Page<CommentInfoVO>> listCommentInfoVo(CommentCountQO commentCountQO) {
+        return RestResponse.successResult();
+    }
+
+    /**
+     * 子评论列表
+     * @return
+     */
+    @RequestMapping(path = "/list-son-comment")
+    public RestResponse<Page<SonCommentInfoVO>> listSonComment(CommentCountQO commentCountQO) {
+        return RestResponse.successResult();
+    }
+
+    /**
+     * 添加评论
+     * @param saveCommentQO
+     * @return
+     */
+    @RequestMapping(path = "/save-comment")
+    public RestResponse<?> saveComment(SaveCommentQO saveCommentQO) {
+        return RestResponse.successResult();
+    }
+}

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

+package com.gic.haoban.manage.web.qo.content.comment;
+
+import com.gic.api.base.commons.BasePageInfo;
+import lombok.Data;
+
+/**
+ * @Author MUSI
+ * @Date 2023/9/19 3:25 PM
+ * @Description
+ * @Version
+ **/
+@Data
+public class CommentCountQO extends BasePageInfo {
+
+    private static final long serialVersionUID = -4989542424690624006L;
+
+    /**
+     * 企业ID
+     */
+    private String enterpriseId;
+
+    /**
+     * 素材ID
+     */
+    private Long contentMaterialId;
+
+    /**
+     * 导购id
+     */
+    private String clerkId;
+}

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

+package com.gic.haoban.manage.web.qo.content.comment;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Author MUSI
+ * @Date 2023/9/19 4:41 PM
+ * @Description
+ * @Version
+ **/
+@Data
+public class CommentInfoVO implements Serializable {
+
+    private static final long serialVersionUID = -8820263048755899343L;
+
+    /**
+     * 素材评论id
+     */
+    private Long contentMaterialCommentId;
+
+    /**
+     * 素材id
+     */
+    private Long contentMaterialId;
+
+    /**
+     * 评论内容
+     */
+    private String commentContent;
+
+    /**
+     * 审核状态0未审核1未通过2已通过
+     */
+    private Integer auditStatus;
+
+    /**
+     * 是否置顶0不置顶1置顶
+     */
+    private Integer topFlag;
+
+    /**
+     * 是否公开展示0隐藏1公开
+     */
+    private Integer showFlag;
+
+    /**
+     * 会员ID
+     */
+    private String memberId;
+
+    /**
+     * 会员昵称
+     */
+    private String memberNick;
+
+    /**
+     * 会员头像
+     */
+    private String memberHeadImage;
+
+    /**
+     * 会员删除标记 0:未删除 1：已删除
+     */
+    private Integer memberDeleteFlag = 0;
+
+    /**
+     * 子评论
+     */
+    private List<SonCommentInfoVO> sonComments;
+
+    /**
+     * 子评论数量（已经减去了展示的子评论）
+     */
+    private Integer sonCommentNum;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+}

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

+package com.gic.haoban.manage.web.qo.content.comment;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author MUSI
+ * @Date 2023/9/19 5:00 PM
+ * @Description
+ * @Version
+ **/
+@Data
+public class SaveCommentQO implements Serializable {
+
+
+    private static final long serialVersionUID = -1584226631161349430L;
+
+
+    /**
+     * 父级素材评论id
+     */
+    private Long parentContentMaterialCommentId;
+
+    /**
+     * 素材id
+     */
+    private Long contentMaterialId;
+
+    /**
+     * 评论内容
+     */
+    private String commentContent;
+
+    /**
+     * 回复的导购ID
+     */
+    private String replyClerkId;
+
+    /**
+     * 导购ID
+     */
+    private String clerkId;
+
+    /**
+     * 企业ID
+     */
+    private String enterpriseId;
+}

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

+package com.gic.haoban.manage.web.qo.content.comment;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Author MUSI
+ * @Date 2023/9/19 4:42 PM
+ * @Description
+ * @Version
+ **/
+
+@Data
+public class SonCommentInfoVO implements Serializable {
+
+    private static final long serialVersionUID = 2419520239887917983L;
+
+    /**
+     * 素材评论id
+     */
+    private Long contentMaterialCommentId;
+
+    /**
+     * 父级素材评论id
+     */
+    private Long parentContentMaterialCommentId;
+
+    /**
+     * 素材id
+     */
+    private Long contentMaterialId;
+
+    /**
+     * 评论内容
+     */
+    private String commentContent;
+
+    /**
+     * 审核状态0未审核1未通过2已通过
+     */
+    private Integer auditStatus;
+
+    /**
+     * 是否置顶0不置顶1置顶
+     */
+    private Integer topFlag;
+
+    /**
+     * 是否公开展示0隐藏1公开
+     */
+    private Integer showFlag;
+
+    /**
+     * 会员ID
+     */
+    private String memberId;
+
+    /**
+     * 会员昵称
+     */
+    private String memberNick;
+
+    /**
+     * 会员删除标记 0:未删除 1：已删除
+     */
+    private Integer memberDeleteFlag = 0;
+
+    /**
+     * 会员头像
+     */
+    private String memberHeadImage;
+
+    /**
+     * 回复的会员ID
+     */
+    private String replyMemberId;
+
+    /**
+     * 回复的会员昵称
+     */
+    private String replyMemberNick;
+
+    /**
+     * 回复的会员头像
+     */
+    private String replyMemberHeadImage;
+
+    /**
+     * 会员删除标记 0:未删除 1：已删除
+     */
+    private Integer replyMemberDeleteFlag = 0;
+
+    private Boolean isMainComment = false;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+}

haoban-manage3-wx/src/main/webapp/WEB-INF/dubbo-haoban-manage-wx.xml

@@ -149,5 +149,7 @@
                      id="goodsCenterApiService" timeout="10000" retries="0" check="false" />
     <dubbo:reference interface="com.gic.haoban.commission.api.service.local.CommissionSettleDetailApiService"
                      id="commissionSettleDetailApiService" timeout="10000" retries="0" check="false" />
+    <dubbo:reference interface="com.gic.content.api.service.ContentMaterialCommentApiService"
+                     id="contentMaterialCommentApiService" timeout="10000" retries="0" check="false" />
 
 </beans>