feat: 素材接口调整

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

@@ -18,11 +18,14 @@ import com.gic.haoban.app.aggregation.api.dto.GoodsSettingDTO;
 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.ContentMaterialQO;
 import com.gic.haoban.manage.web.qo.content.ContentMaterialShareQO;
+import com.gic.haoban.manage.web.qo.goods.GoodsSimpleSearchQO;
 import com.gic.haoban.manage.web.vo.content.ContentColumnInfoVO;
 import com.gic.haoban.manage.web.vo.content.ContentMaterialInfoVO;
 import com.gic.haoban.manage.web.vo.content.ContentMaterialShareInfoVO;
+import com.gic.haoban.manage.web.vo.content.MaterialIndexDataVO;
 import com.gic.haoban.manage.web.vo.content.SimpleGoodsInfoVO;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -41,11 +44,9 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 /**
- * @Author MUSI
- * @Date 2022/11/14 6:06 PM
- * @Description
- * @Version
- **/
+ *
+ * @author MUSI
+ */
 @RestController
 public class ContentMaterialController {
 
@@ -243,4 +244,25 @@ public class ContentMaterialController {
         }
         return storeIds;
     }
+
+
+    /**
+     * 获取素材首页数据
+     * @param contentMaterialBaseQO
+     * @return
+     */
+    @RequestMapping(path = "/content/material/index/data")
+    public RestResponse<MaterialIndexDataVO> queryMaterialIndexData(@RequestBody ContentMaterialBaseQO contentMaterialBaseQO){
+        return RestResponse.successResult();
+    }
+
+    /**
+     * 查询商品数据
+     * @param goodsSimpleSearchQO
+     * @return
+     */
+    @RequestMapping(path = "/goods/list")
+    public RestResponse<List<SimpleGoodsInfoVO>> querySimpleGoodsList(@RequestBody GoodsSimpleSearchQO goodsSimpleSearchQO){
+        return RestResponse.successResult();
+    }
 }

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

+package com.gic.haoban.manage.web.qo.content;
+
+import com.gic.api.base.commons.BasePageInfo;
+
+/**
+ * @Author MUSI
+ * @Date 2023/3/13 3:27 PM
+ * @Description
+ * @Version
+ **/
+public class ContentMaterialBaseQO extends BasePageInfo {
+
+    private static final long serialVersionUID = -5229489071555258161L;
+
+    /**
+     * 企业id
+     */
+    private String enterpriseId;
+
+    /**
+     * 微信企业id
+     */
+    private String wxEnterpriseId;
+
+    /**
+     * 门店id
+     */
+    private String storeId;
+
+    /**
+     * 导购id
+     */
+    private String clerkId;
+
+    public String getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(String enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public String getWxEnterpriseId() {
+        return wxEnterpriseId;
+    }
+
+    public void setWxEnterpriseId(String wxEnterpriseId) {
+        this.wxEnterpriseId = wxEnterpriseId;
+    }
+
+    public String getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(String storeId) {
+        this.storeId = storeId;
+    }
+
+    public String getClerkId() {
+        return clerkId;
+    }
+
+    public void setClerkId(String clerkId) {
+        this.clerkId = clerkId;
+    }
+}

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

@@ -51,6 +51,11 @@ public class ContentMaterialQO extends PageQo {
      */
     private Long contentColumnId;
 
+    /**
+     * 商品id
+     */
+    private String goodsId;
+
 
     public Integer getSortType() {
         return sortType;
@@ -115,4 +120,12 @@ public class ContentMaterialQO extends PageQo {
     public void setMaterialType(Integer materialType) {
         this.materialType = materialType;
     }
+
+    public String getGoodsId() {
+        return goodsId;
+    }
+
+    public void setGoodsId(String goodsId) {
+        this.goodsId = goodsId;
+    }
 }

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/qo/goods/GoodsSimpleSearchQO.java

+package com.gic.haoban.manage.web.qo.goods;
+
+import com.gic.haoban.manage.web.qo.content.ContentMaterialBaseQO;
+
+/**
+ * @Author MUSI
+ * @Date 2023/3/13 3:51 PM
+ * @Description
+ * @Version
+ **/
+public class GoodsSimpleSearchQO extends ContentMaterialBaseQO {
+
+
+    private static final long serialVersionUID = 7155061890443032441L;
+
+    /**
+     * 搜索字段
+     */
+    private String search;
+
+    public String getSearch() {
+        return search;
+    }
+
+    public void setSearch(String search) {
+        this.search = search;
+    }
+}

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

@@ -15,6 +15,7 @@ import java.util.List;
  **/
 public class ContentColumnInfoVO implements Serializable {
 
+    private static final long serialVersionUID = -2026406533078749880L;
     /**
      * 栏目id
      */
@@ -27,6 +28,11 @@ public class ContentColumnInfoVO implements Serializable {
     private String contentColumnName;
 
     /**
+     * 是否有新素材 true有新素材; false 没有新素材
+     */
+    private Boolean hasNewMaterial;
+
+    /**
      * 子级栏目
      */
     private List<ContentColumnInfoVO> childrenColumn;
@@ -54,4 +60,12 @@ public class ContentColumnInfoVO implements Serializable {
     public void setChildrenColumn(List<ContentColumnInfoVO> childrenColumn) {
         this.childrenColumn = childrenColumn;
     }
+
+    public Boolean getHasNewMaterial() {
+        return hasNewMaterial;
+    }
+
+    public void setHasNewMaterial(Boolean hasNewMaterial) {
+        this.hasNewMaterial = hasNewMaterial;
+    }
 }

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

+package com.gic.haoban.manage.web.vo.content;
+
+import java.io.Serializable;
+
+/**
+ * @Author MUSI
+ * @Date 2023/3/13 3:32 PM
+ * @Description
+ * @Version
+ **/
+public class MaterialIndexDataVO implements Serializable {
+
+    private static final long serialVersionUID = 7362625836544624683L;
+
+    /**
+     * 使用素材导购数
+     */
+    private Integer useMaterialClerkNum;
+
+    /**
+     * 未使用素材导购数
+     */
+    private Integer unUseMaterialClerkNum;
+
+    /**
+     * 转换金额
+     */
+    private String conversionAmount;
+
+    /**
+     *
+     */
+    private Integer newMaterialNum;
+
+    public Integer getUseMaterialClerkNum() {
+        return useMaterialClerkNum;
+    }
+
+    public void setUseMaterialClerkNum(Integer useMaterialClerkNum) {
+        this.useMaterialClerkNum = useMaterialClerkNum;
+    }
+
+    public Integer getUnUseMaterialClerkNum() {
+        return unUseMaterialClerkNum;
+    }
+
+    public void setUnUseMaterialClerkNum(Integer unUseMaterialClerkNum) {
+        this.unUseMaterialClerkNum = unUseMaterialClerkNum;
+    }
+
+    public String getConversionAmount() {
+        return conversionAmount;
+    }
+
+    public void setConversionAmount(String conversionAmount) {
+        this.conversionAmount = conversionAmount;
+    }
+}

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

@@ -10,6 +10,7 @@ import java.io.Serializable;
  **/
 public class SimpleGoodsInfoVO implements Serializable {
 
+    private static final long serialVersionUID = 55351872009970484L;
     /**
      * 商品id
      */
@@ -44,6 +45,11 @@ public class SimpleGoodsInfoVO implements Serializable {
      */
     private String brandName;
 
+    /**
+     * 商品销售价格
+     */
+    private String salePrice;
+
     public String getGoodsId() {
         return goodsId;
     }
@@ -99,4 +105,13 @@ public class SimpleGoodsInfoVO implements Serializable {
     public void setBrandName(String brandName) {
         this.brandName = brandName;
     }
+
+    public String getSalePrice() {
+        return salePrice;
+    }
+
+    public void setSalePrice(String salePrice) {
+        this.salePrice = salePrice;
+    }
 }
+