feat: 素材接口调整

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

@@ -9,6 +9,7 @@ import com.gic.content.api.dto.column.ContentColumnListDTO;
 import com.gic.content.api.dto.material.ContentMaterialFrontDTO;
 import com.gic.content.api.dto.material.ContentMaterialShareInfoDTO;
 import com.gic.content.api.enums.ColumnEnum;
+import com.gic.content.api.qdto.column.ContentColumnClerkQDTO;
 import com.gic.content.api.qdto.material.ContentMaterialPageFrontQDTO;
 import com.gic.content.api.qdto.material.ContentMaterialShareQDTO;
 import com.gic.content.api.service.ContentColumnApiService;
@@ -19,6 +20,7 @@ import com.gic.haoban.app.aggregation.api.service.SettingApiService;
 import com.gic.haoban.common.utils.EntityUtil;
 import com.gic.haoban.manage.api.service.StaffApiService;
 import com.gic.haoban.manage.web.qo.content.ContentMaterialBaseQO;
+import com.gic.haoban.manage.web.qo.content.ContentColumnClerkViewQO;
 import com.gic.haoban.manage.web.qo.content.ContentMaterialQO;
 import com.gic.haoban.manage.web.qo.content.ContentMaterialShareQO;
 import com.gic.haoban.manage.web.qo.goods.GoodsSimpleSearchQO;
@@ -79,7 +81,7 @@ public class ContentMaterialController {
         }else {
             storeIdList.add(storeId);
         }
-        ServiceResponse<List<ContentColumnListDTO>> serviceResponse = contentColumnApiService.listColumnFront(enterpriseId, ColumnEnum.MATERIAL.value, storeIdList);
+        ServiceResponse<List<ContentColumnListDTO>> serviceResponse = contentColumnApiService.listColumnFront(enterpriseId, ColumnEnum.MATERIAL.value, storeIdList,clerkId);
         if (!serviceResponse.isSuccess() || CollectionUtils.isEmpty(serviceResponse.getResult())){
             return RestResponse.successResult(Collections.emptyList());
         }
@@ -226,6 +228,24 @@ public class ContentMaterialController {
     }
 
     /**
+     * 导购栏目最后访问记录
+     * @param contentColumnClerkViewQO qo
+     * @return
+     */
+    @RequestMapping(path = "/column-clerk")
+    public RestResponse<Void> viewColumnClerk(@RequestBody ContentColumnClerkViewQO contentColumnClerkViewQO) {
+        if (StringUtils.isBlank(contentColumnClerkViewQO.getEnterpriseId())){
+            return RestResponse.failure("-777", "企业参数异常");
+        }
+        ContentColumnClerkQDTO columnClerkQDTO = EntityUtil.changeEntityByJSON(ContentColumnClerkQDTO.class, contentColumnClerkViewQO);
+        ServiceResponse<Void> serviceResponse = contentColumnApiService.saveOrUpdateColumnClerk(columnClerkQDTO);
+        if (!serviceResponse.isSuccess()){
+            return RestResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
+        }
+        return RestResponse.successResult();
+    }
+
+    /**
      * 查询区经角色下管辖的门店权限
      * @param clerkId
      * @param wxEnterpriseId

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

+package com.gic.haoban.manage.web.qo.content;
+
+import java.io.Serializable;
+
+/**
+ * Created by wangzubo on 2023/3/13.
+ */
+public class ContentColumnClerkViewQO implements Serializable {
+
+    private static final long serialVersionUID = 5327378240314743620L;
+    /**
+     *  栏目ID
+     */
+    private Long contentColumnId;
+
+    /**
+     * 企业ID
+     */
+    private String enterpriseId;
+    /**
+     * 导购id
+     */
+    private String clerkId;
+
+    public Long getContentColumnId() {
+        return contentColumnId;
+    }
+
+    public void setContentColumnId(Long contentColumnId) {
+        this.contentColumnId = contentColumnId;
+    }
+
+    public String getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(String enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public String getClerkId() {
+        return clerkId;
+    }
+
+    public void setClerkId(String clerkId) {
+        this.clerkId = clerkId;
+    }
+}
+

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

@@ -28,9 +28,9 @@ public class ContentColumnInfoVO implements Serializable {
     private String contentColumnName;
 
     /**
-     * 是否有新素材 true有新素材; false 没有新素材
+     * 是否有新素材 1是0否
      */
-    private Boolean hasNewMaterial;
+    private Integer newFlag;
 
     /**
      * 子级栏目
@@ -53,6 +53,14 @@ public class ContentColumnInfoVO implements Serializable {
         this.contentColumnName = contentColumnName;
     }
 
+    public Integer getNewFlag() {
+        return newFlag;
+    }
+
+    public void setNewFlag(Integer newFlag) {
+        this.newFlag = newFlag;
+    }
+
     public List<ContentColumnInfoVO> getChildrenColumn() {
         return childrenColumn;
     }
@@ -61,11 +69,4 @@ public class ContentColumnInfoVO implements Serializable {
         this.childrenColumn = childrenColumn;
     }
 
-    public Boolean getHasNewMaterial() {
-        return hasNewMaterial;
-    }
-
-    public void setHasNewMaterial(Boolean hasNewMaterial) {
-        this.hasNewMaterial = hasNewMaterial;
-    }
 }