feat: 运费模板重复

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

@@ -4,12 +4,14 @@ import com.gic.api.base.commons.Page;
 import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.haoban.manage.web.qo.content.ContentMaterialBaseQO;
 import com.gic.haoban.manage.web.qo.content.statistics.MaterialAnalyzeDataQO;
+import com.gic.haoban.manage.web.qo.content.statistics.MaterialPersonalUsedQO;
 import com.gic.haoban.manage.web.qo.content.statistics.MaterialStatisticsBaseQO;
 import com.gic.haoban.manage.web.vo.content.statistics.MaterialClerkUsedDataVO;
 import com.gic.haoban.manage.web.vo.content.statistics.MaterialDataOverviewVO;
 import com.gic.haoban.manage.web.vo.content.statistics.MaterialIndexDataVO;
 import com.gic.haoban.manage.web.vo.content.statistics.MaterialRealDataVO;
 import com.gic.haoban.manage.web.vo.content.statistics.MaterialStoreUsedDataVO;
+import com.gic.haoban.manage.web.vo.content.statistics.report.MaterialPersonalUsedDataVO;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -63,6 +65,7 @@ public class MaterialDataStaticsController {
      */
     @RequestMapping(path = "/content/material/clerk/data")
     public RestResponse<Page<MaterialClerkUsedDataVO>> queryMaterialClerkUsedData(@RequestBody MaterialAnalyzeDataQO materialStatisticsBaseQO) {
+        //
         return RestResponse.successResult();
     }
 
@@ -75,4 +78,54 @@ public class MaterialDataStaticsController {
     public RestResponse<Page<MaterialStoreUsedDataVO>> queryMaterialStoreUsedData(@RequestBody MaterialAnalyzeDataQO materialStatisticsBaseQO) {
         return RestResponse.successResult();
     }
+
+
+    // 导购 周报/月报数据
+
+    /**
+     * 周/月报--导购/店长-素材使用个人数据
+     *
+     * @return
+     */
+    @RequestMapping(path = "/content/material/personal/used/data")
+    public RestResponse<MaterialPersonalUsedDataVO> queryMaterialUsedReport(@RequestBody MaterialPersonalUsedQO materialPersonalUsedQO) {
+        return RestResponse.successResult();
+    }
+
+
+    /**
+     * 周/月报--查询导购素材使用数据列表
+     *
+     * @return
+     */
+    @RequestMapping(path = "/content/material/personal/used/data/list")
+    public RestResponse<Page<MaterialPersonalUsedDataVO>> queryMaterialUsedReportList(@RequestBody MaterialPersonalUsedQO materialPersonalUsedQO) {
+        return RestResponse.successResult();
+    }
+
+    /**
+     * 周/月报--查询门店纬度素材使用数据
+     * @param materialPersonalUsedQO
+     * @return
+     */
+    @RequestMapping(path = "/content/material/store/used/data")
+    public RestResponse<MaterialStoreUsedDataVO> queryMaterialStoreUseReport(@RequestBody MaterialPersonalUsedQO materialPersonalUsedQO) {
+        return RestResponse.successResult();
+    }
+
+    /**
+     * 周/月报--查询门店纬度素材使用数据列表
+     * @param materialPersonalUsedQO
+     * @return
+     */
+    @RequestMapping(path = "/content/material/store/used/data/list")
+    public RestResponse<Page<MaterialStoreUsedDataVO>> queryMaterialStoreUseReportList(@RequestBody MaterialPersonalUsedQO materialPersonalUsedQO) {
+        return RestResponse.successResult();
+    }
+
+    @RequestMapping(path = "/content/mater/area")
+    public RestResponse<?> query() {
+
+    }
+
 }

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

@@ -28,32 +28,26 @@ public class MaterialAnalyzeDataQO extends MaterialStatisticsBaseQO {
      */
     private Integer order;
 
-    @Override
     public Integer getFixedDateDiff() {
         return fixedDateDiff;
     }
 
-    @Override
     public void setFixedDateDiff(Integer fixedDateDiff) {
         this.fixedDateDiff = fixedDateDiff;
     }
 
-    @Override
     public Integer getOrderByField() {
         return orderByField;
     }
 
-    @Override
     public void setOrderByField(Integer orderByField) {
         this.orderByField = orderByField;
     }
 
-    @Override
     public Integer getOrder() {
         return order;
     }
 
-    @Override
     public void setOrder(Integer order) {
         this.order = order;
     }

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/qo/content/statistics/MaterialClerkUsedQO.java → haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/qo/content/statistics/MaterialPersonalUsedQO.java

 package com.gic.haoban.manage.web.qo.content.statistics;
 
-import com.gic.haoban.base.api.common.BasePageInfo;
-
 /**
  * @Author MUSI
  * @Date 2023/3/23 12:48 PM
  * @Description
  * @Version
- * 素材使用纬度参数
+ * 素材
  **/
-public class MaterialClerkUsedQO extends BasePageInfo {
-
-    private String enterpriseId;
+public class MaterialPersonalUsedQO extends MaterialStatisticsBaseQO {
 
+    private static final long serialVersionUID = -4105397589798480404L;
 
 }

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

@@ -50,28 +50,4 @@ public class MaterialStatisticsBaseQO extends BasePageInfo {
     public void setStoreId(String storeId) {
         this.storeId = storeId;
     }
-
-    public Integer getFixedDateDiff() {
-        return fixedDateDiff;
-    }
-
-    public void setFixedDateDiff(Integer fixedDateDiff) {
-        this.fixedDateDiff = fixedDateDiff;
-    }
-
-    public Integer getOrderByField() {
-        return orderByField;
-    }
-
-    public void setOrderByField(Integer orderByField) {
-        this.orderByField = orderByField;
-    }
-
-    public Integer getOrder() {
-        return order;
-    }
-
-    public void setOrder(Integer order) {
-        this.order = order;
-    }
 }

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

@@ -8,7 +8,7 @@ import java.math.BigDecimal;
  * @Date 2023/3/23 11:43 AM
  * @Description
  * @Version
- * 导购纬度使用数据
+ * 门店纬度使用数据
  **/
 public class MaterialStoreUsedDataVO implements Serializable {
 

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/content/statistics/report/MaterialPersonalUsedDataVO.java

+package com.gic.haoban.manage.web.vo.content.statistics.report;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @Author MUSI
+ * @Date 2023/3/23 4:25 PM
+ * @Description
+ * @Version
+ **/
+public class MaterialPersonalUsedDataVO implements Serializable {
+
+    /**
+     * 开始时间
+     */
+    private Date startTime;
+
+    /**
+     * 结束时间
+     */
+    private Date endTime;
+
+    /**
+     * 导购id
+     */
+    private String clerkId;
+
+    /**
+     * 导购名称
+     */
+    private String clerkName;
+
+    /**
+     * 导购头像
+     */
+    private String imageUrl;
+
+    /**
+     * 使用素材数量
+     */
+    private Integer useMatlNum;
+
+    /**
+     * 使用素材排行
+     */
+    private Integer useMatlNumRank;
+
+    /**
+     * 使用素材数量环比
+     */
+    private BigDecimal useMatlNumRatio;
+
+    /**
+     * 点击客户数
+     */
+    private Integer userClickNum;
+
+    /**
+     * 点击客户环比
+     */
+    private BigDecimal userClickNumRatio;
+
+    /**
+     * 转换客户数
+     */
+    private Integer convUserNum;
+
+    /**
+     * 转化客户数环比
+     */
+    private BigDecimal convUserNumRatio;
+
+    /**
+     * 转换金额
+     */
+    private BigDecimal convSalesAmt;
+
+    /**
+     * 转化金额排名
+     */
+    private Integer convSalesAmtRank;
+
+    /**
+     * 转化金额环比
+     */
+    private BigDecimal convSalesAmtRatio;
+
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getClerkId() {
+        return clerkId;
+    }
+
+    public void setClerkId(String clerkId) {
+        this.clerkId = clerkId;
+    }
+
+    public String getClerkName() {
+        return clerkName;
+    }
+
+    public void setClerkName(String clerkName) {
+        this.clerkName = clerkName;
+    }
+
+    public String getImageUrl() {
+        return imageUrl;
+    }
+
+    public void setImageUrl(String imageUrl) {
+        this.imageUrl = imageUrl;
+    }
+
+    public Integer getUseMatlNum() {
+        return useMatlNum;
+    }
+
+    public void setUseMatlNum(Integer useMatlNum) {
+        this.useMatlNum = useMatlNum;
+    }
+
+    public Integer getUseMatlNumRank() {
+        return useMatlNumRank;
+    }
+
+    public void setUseMatlNumRank(Integer useMatlNumRank) {
+        this.useMatlNumRank = useMatlNumRank;
+    }
+
+    public BigDecimal getUseMatlNumRatio() {
+        return useMatlNumRatio;
+    }
+
+    public void setUseMatlNumRatio(BigDecimal useMatlNumRatio) {
+        this.useMatlNumRatio = useMatlNumRatio;
+    }
+
+    public Integer getUserClickNum() {
+        return userClickNum;
+    }
+
+    public void setUserClickNum(Integer userClickNum) {
+        this.userClickNum = userClickNum;
+    }
+
+    public BigDecimal getUserClickNumRatio() {
+        return userClickNumRatio;
+    }
+
+    public void setUserClickNumRatio(BigDecimal userClickNumRatio) {
+        this.userClickNumRatio = userClickNumRatio;
+    }
+
+    public Integer getConvUserNum() {
+        return convUserNum;
+    }
+
+    public void setConvUserNum(Integer convUserNum) {
+        this.convUserNum = convUserNum;
+    }
+
+    public BigDecimal getConvUserNumRatio() {
+        return convUserNumRatio;
+    }
+
+    public void setConvUserNumRatio(BigDecimal convUserNumRatio) {
+        this.convUserNumRatio = convUserNumRatio;
+    }
+
+    public BigDecimal getConvSalesAmt() {
+        return convSalesAmt;
+    }
+
+    public void setConvSalesAmt(BigDecimal convSalesAmt) {
+        this.convSalesAmt = convSalesAmt;
+    }
+
+    public Integer getConvSalesAmtRank() {
+        return convSalesAmtRank;
+    }
+
+    public void setConvSalesAmtRank(Integer convSalesAmtRank) {
+        this.convSalesAmtRank = convSalesAmtRank;
+    }
+
+    public BigDecimal getConvSalesAmtRatio() {
+        return convSalesAmtRatio;
+    }
+
+    public void setConvSalesAmtRatio(BigDecimal convSalesAmtRatio) {
+        this.convSalesAmtRatio = convSalesAmtRatio;
+    }
+}