Merge branch 'feature-content6' into 'master'

Feature content6

See merge request !1659

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

@@ -114,7 +114,7 @@ public class MaterialDataAdaptor {
             return null;
         }
         int useMatlNum = jsonObject.getIntValue("useMatlNum");
-        BigDecimal convSalesAmt = Optional.ofNullable(jsonObject.getBigDecimal("convSalesAmt")).orElse(BigDecimal.ZERO);
+        BigDecimal convSalesAmt = Optional.ofNullable(jsonObject.getBigDecimal("omniConvSalesAmt")).orElse(BigDecimal.ZERO);
         String amountUnit = "";
         if (convSalesAmt.compareTo(new BigDecimal(10000)) >= 0) {
             convSalesAmt = convSalesAmt.divide(BigDecimal.valueOf(10000), 2, RoundingMode.HALF_UP);
@@ -164,6 +164,7 @@ public class MaterialDataAdaptor {
         }
         BigDecimal dayAvgUseMatlNum = jsonObject.getBigDecimal("dayAvgUseMatlNum");
         BigDecimal convSalesAmt = Optional.ofNullable(jsonObject.getBigDecimal("convSalesAmt")).orElse(BigDecimal.ZERO);
+        convSalesAmt = convSalesAmt.add(Optional.ofNullable(jsonObject.getBigDecimal("offlineConvSalesAmt")).orElse(BigDecimal.ZERO));
         String amountUnit = "";
         if (convSalesAmt.compareTo(new BigDecimal(10000)) >= 0) {
             convSalesAmt = convSalesAmt.divide(BigDecimal.valueOf(10000), 2, RoundingMode.HALF_UP);

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

@@ -31,6 +31,7 @@ import com.gic.haoban.manage.web.vo.content.statistics.bo.MaterialTodayDataBO;
 import com.gic.haoban.manage.web.vo.content.statistics.report.MaterialPersonalUsedDataVO;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -106,9 +107,13 @@ public class MaterialDataStaticsController {
                 .newMaterialNum(totalMaterialNum)
                 .useMaterialClerkNum(temp.getUseMatlClerkNum())
                 .unUseMaterialClerkNum(temp.getUnusedMatlClerkNum())
-                .conversionAmount(Optional.ofNullable(temp.getConvSalesAmt()).orElse(BigDecimal.ZERO))
+                .conversionAmount(temp.getOmniConvSalesAmt())
                 .storeManagerNum(totalManagerStoreNum)
                 .clickUserNum(temp.getClickUserNum())
+                .offlineConvUserNum(temp.getOfflineConvUserNum())
+                .offlineConvSalesAmt(temp.getOfflineConvSalesAmt())
+                .omniConvSalesAmt(temp.getOmniConvSalesAmt())
+                .omniConvUserNum(temp.getOmniConvUserNum())
                 .build();
         return RestResponse.successResult(indexDataVO);
     }
@@ -130,6 +135,7 @@ public class MaterialDataStaticsController {
         }
         MaterialTodayDataBO materialTodayDataBO = materialDataAdaptor.queryMaterialTodayData(materialStatisticsBaseQO.getEnterpriseId(), storeIds);
         MaterialRealDataVO temp = new MaterialRealDataVO();
+        BeanUtils.copyProperties(materialTodayDataBO, temp);
         temp.setUseMatlClerkNum(materialTodayDataBO.getUseMatlClerkNum());
         temp.setUnusedMatlClerkNum(materialTodayDataBO.getUnusedMatlClerkNum());
         temp.setClickUserNum(materialTodayDataBO.getClickUserNum());

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

@@ -194,10 +194,6 @@ public class MaterialDataAdaptor {
     /**
      * 门店纬度数据统计
      *
-     * @param enterpriseId
-     * @param storeIds
-     * @param fixedDateDiff
-     * @param orderStr
      * @return
      */
     public Page<MaterialStoreUsedDataVO> queryMaterialStoreUsedData(MaterialStoreAnalyzeDataQO dataQO, List<String> storeIds) {

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

@@ -35,6 +35,10 @@ public class MaterialAnalyzeDataQO extends MaterialStatisticsBaseQO {
         map.put("useMatlDayNum", 11);
         map.put("useMatlNum", 12);
         map.put("singleMatlAvgCnt", 13);
+        map.put("convsUserNum", 14);
+        map.put("convsAmt", 15);
+        map.put("offlineConvsUserNum", 16);
+        map.put("offlineConvsAmt", 17);
         return map;
     }
 

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

@@ -55,6 +55,11 @@ public class MaterialReportQO extends MaterialStatisticsBaseQO {
         map.put("convSalesAmt", 12);
         map.put("convSalesAmtRank", 13);
         map.put("convSalesAmtRatio", 14);
+        map.put("offlineConvUserNum", 15);
+        map.put("offlineConvUserNumRatio", 16);
+        map.put("offlineConvSalesAmt", 17);
+        map.put("offlineConvSalesAmtRank", 18);
+        map.put("offlineConvSalesAmtRatio", 19);
         return map;
     }
 

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

@@ -37,6 +37,8 @@ public class MaterialStoreAnalyzeDataQO extends MaterialStatisticsBaseQO {
         map.put("clickUserNum", 7);
         map.put("convUserNum", 8);
         map.put("convSalesNmt", 9);
+        map.put("offlineConvUserNum", 10);
+        map.put("offlineConvSalesNmt", 11);
         return map;
     }
 

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

@@ -56,6 +56,12 @@ public class MaterialStoreReportQO extends MaterialStatisticsBaseQO {
         map.put("convSalesAmt", 12);
         map.put("convSalesAmtRank", 13);
         map.put("convSalesAmtRatio", 14);
+        map.put("offlineConvUserNum", 15);
+        map.put("offlineConvUserNumRatio", 16);
+        map.put("offlineConvSalesAmt", 17);
+        map.put("offlineConvSalesAmtRank", 18);
+        map.put("offlineConvSalesAmtRatio", 19);
+
         return map;
     }
 

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

@@ -101,4 +101,40 @@ public class MaterialAreaUsedDataVO implements Serializable {
      * 品牌名称
      */
     private String brandName;
+
+    /**
+     * 线下转化客户数
+     */
+    private Integer offlineConvUserNum;
+
+    /**
+     * 线下转化客户数环比
+     */
+    private BigDecimal offlineConvUserNumRatio;
+
+    /**
+     * 线下客户转化金额
+     */
+    private BigDecimal offlineConvSalesAmt;
+
+    /**
+     * 线下客户转化金额环比
+     */
+    private BigDecimal offlineConvSalesAmtRatio;
+
+    /**
+     * 总转化金额
+     */
+    private BigDecimal omniConvSalesAmt;
+
+    /**
+     * 总转化金额排行
+     */
+    private Integer omniConvSalesAmtRank;
+
+    /**
+     * 总转化金额环比
+     */
+    private Integer omniConvSalesAmtRatio;
+
 }

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

@@ -63,6 +63,27 @@ public class MaterialClerkUsedDataVO implements Serializable {
      */
     private BigDecimal singleMatlAvgCnt;
 
+
+    /**
+     * 线上转化客户数
+     */
+    private Integer convsUserNum;
+
+    /**
+     * 线上转化金额
+     */
+    private BigDecimal convsAmt;
+
+    /**
+     * 线下转化客户数
+     */
+    private Integer offlineConvsUserNum;
+
+    /**
+     * 线下转化金额
+     */
+    private BigDecimal offlineConvsAmt;
+
     public String getStoreId() {
         return storeId;
     }
@@ -142,4 +163,36 @@ public class MaterialClerkUsedDataVO implements Serializable {
     public void setSingleMatlAvgCnt(BigDecimal singleMatlAvgCnt) {
         this.singleMatlAvgCnt = singleMatlAvgCnt;
     }
+
+    public Integer getConvsUserNum() {
+        return convsUserNum;
+    }
+
+    public void setConvsUserNum(Integer convsUserNum) {
+        this.convsUserNum = convsUserNum;
+    }
+
+    public BigDecimal getConvsAmt() {
+        return convsAmt;
+    }
+
+    public void setConvsAmt(BigDecimal convsAmt) {
+        this.convsAmt = convsAmt;
+    }
+
+    public Integer getOfflineConvsUserNum() {
+        return offlineConvsUserNum;
+    }
+
+    public void setOfflineConvsUserNum(Integer offlineConvsUserNum) {
+        this.offlineConvsUserNum = offlineConvsUserNum;
+    }
+
+    public BigDecimal getOfflineConvsAmt() {
+        return offlineConvsAmt;
+    }
+
+    public void setOfflineConvsAmt(BigDecimal offlineConvsAmt) {
+        this.offlineConvsAmt = offlineConvsAmt;
+    }
 }

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

@@ -30,45 +30,24 @@ public class MaterialDataOverviewVO implements Serializable {
     private Integer clickUserNum;
 
     /**
-     * 转化客户数
+     * 线上转化客户数
      */
     private Integer convUserNum;
 
     /**
-     * 客户转化金额
+     * 线上客户转化金额
      */
     private BigDecimal convSalesNmt;
 
 
-    public BigDecimal getDayAvgUseRate() {
-        return dayAvgUseRate;
-    }
-
-    public void setDayAvgUseRate(BigDecimal dayAvgUseRate) {
-        this.dayAvgUseRate = dayAvgUseRate;
-    }
-
-    public Integer getClickUserNum() {
-        return clickUserNum;
-    }
-
-    public void setClickUserNum(Integer clickUserNum) {
-        this.clickUserNum = clickUserNum;
-    }
-
-    public Integer getConvUserNum() {
-        return convUserNum;
-    }
-
-    public void setConvUserNum(Integer convUserNum) {
-        this.convUserNum = convUserNum;
-    }
+    /**
+     * 线下转化客户数
+     */
+    private Integer offlineConvUserNum;
 
-    public BigDecimal getConvSalesNmt() {
-        return convSalesNmt;
-    }
+    /**
+     * 线下转化金额
+     */
+    private BigDecimal offlineConvSalesNmt;
 
-    public void setConvSalesNmt(BigDecimal convSalesNmt) {
-        this.convSalesNmt = convSalesNmt;
-    }
 }

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

@@ -34,7 +34,7 @@ public class MaterialIndexDataVO implements Serializable {
     private Integer unUseMaterialClerkNum;
 
     /**
-     * 转换金额
+     * 转化金额
      */
     private BigDecimal conversionAmount;
 
@@ -49,7 +49,29 @@ public class MaterialIndexDataVO implements Serializable {
     private Integer storeManagerNum;
 
     /**
-     * 转化用户数
+     * 点击客户数
      */
     private Integer clickUserNum;
+
+
+    /**
+     * 线下转化客户数
+     */
+    private Integer offlineConvUserNum;
+
+    /**
+     * 线下转化金额
+     */
+    private BigDecimal offlineConvSalesAmt;
+
+
+    /**
+     * 总转化金额
+     */
+    private BigDecimal omniConvSalesAmt;
+
+    /**
+     * 总转化人数
+     */
+    private Integer omniConvUserNum;
 }

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

@@ -35,6 +35,29 @@ public class MaterialRealDataVO implements Serializable {
      */
     private BigDecimal convSalesAmt;
 
+
+
+    /**
+     * 线下转化客户数
+     */
+    private Integer offlineConvUserNum;
+
+    /**
+     * 线下转化金额
+     */
+    private BigDecimal offlineConvSalesAmt;
+
+
+    /**
+     * 总转化金额
+     */
+    private BigDecimal omniConvSalesAmt;
+
+    /**
+     * 总转化人数
+     */
+    private Integer omniConvUserNum;
+
     public Integer getUseMatlClerkNum() {
         return useMatlClerkNum;
     }
@@ -74,4 +97,36 @@ public class MaterialRealDataVO implements Serializable {
     public void setConvSalesAmt(BigDecimal convSalesAmt) {
         this.convSalesAmt = convSalesAmt;
     }
+
+    public Integer getOfflineConvUserNum() {
+        return offlineConvUserNum;
+    }
+
+    public void setOfflineConvUserNum(Integer offlineConvUserNum) {
+        this.offlineConvUserNum = offlineConvUserNum;
+    }
+
+    public BigDecimal getOfflineConvSalesAmt() {
+        return offlineConvSalesAmt;
+    }
+
+    public void setOfflineConvSalesAmt(BigDecimal offlineConvSalesAmt) {
+        this.offlineConvSalesAmt = offlineConvSalesAmt;
+    }
+
+    public BigDecimal getOmniConvSalesAmt() {
+        return omniConvSalesAmt;
+    }
+
+    public void setOmniConvSalesAmt(BigDecimal omniConvSalesAmt) {
+        this.omniConvSalesAmt = omniConvSalesAmt;
+    }
+
+    public Integer getOmniConvUserNum() {
+        return omniConvUserNum;
+    }
+
+    public void setOmniConvUserNum(Integer omniConvUserNum) {
+        this.omniConvUserNum = omniConvUserNum;
+    }
 }

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

@@ -116,4 +116,47 @@ public class MaterialStoreUsedDataVO implements Serializable {
      * 导购头像
      */
     private String imageUrl;
+
+
+
+    /**
+     * 线下转化客户数
+     */
+    private Integer offlineConvUserNum;
+
+    /**
+     * 线下转化客户数环比
+     */
+    private BigDecimal offlineConvUserNumRatio;
+
+    /**
+     * 线下转化金额
+     */
+    private BigDecimal offlineConvSalesNmt;
+
+    /**
+     * 线下转换金额排名
+     */
+    private Integer offlineConvSalesAmtRank;
+
+    /**
+     * 线下转化金额环比
+     */
+    private BigDecimal offlineConvSalesAmtRatio;
+
+    /**
+     * 总转化金额
+     */
+    private BigDecimal omniConvSalesNmt;
+
+    /**
+     * 总转化金额排行
+     */
+    private Integer omniConvSalesAmtRank;
+
+    /**
+     * 总转化金额环比
+     */
+    private Integer omniConvSalesAmtRatio;
+
 }

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

@@ -4,6 +4,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Optional;
 
 /**
  * @Author MUSI
@@ -38,6 +39,40 @@ public class MaterialTodayDataBO implements Serializable {
      */
     private BigDecimal convSalesAmt;
 
+    /**
+     * 线下转化客户数
+     */
+    private Integer offlineConvUserNum;
+
+    /**
+     * 线下转化金额
+     */
+    private BigDecimal offlineConvSalesAmt;
+
+
+    /**
+     * 总转化金额
+     */
+    private BigDecimal omniConvSalesAmt;
+
+    /**
+     * 总转化人数
+     */
+    private Integer omniConvUserNum;
+
+    public BigDecimal getOmniConvSalesAmt() {
+        if (this.omniConvSalesAmt != null) {
+            return this.omniConvSalesAmt;
+        }
+        return Optional.ofNullable(this.convSalesAmt).orElse(BigDecimal.ZERO).add(Optional.ofNullable(this.offlineConvSalesAmt).orElse(BigDecimal.ZERO));
+    }
+
+    public Integer getOmniConvUserNum() {
+        if (this.omniConvUserNum != null) {
+            return omniConvUserNum;
+        }
+        return Optional.ofNullable(this.convUserNum).orElse(0) + Optional.ofNullable(this.offlineConvUserNum).orElse(0);
+    }
 
     public static MaterialTodayDataBO empty(){
         return new MaterialTodayDataBO();

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

@@ -69,34 +69,74 @@ public class MaterialPersonalUsedDataVO implements Serializable {
     private BigDecimal userClickNumRatio;
 
     /**
-     * 转换客户数
+     * 线上转换客户数
      */
     private Integer convUserNum;
 
     /**
-     * 转化客户数环比
+     * 线上转化客户数环比
      */
     private BigDecimal convUserNumRatio;
 
     /**
-     * 转换金额
+     * 线上转换金额
      */
     private BigDecimal convSalesAmt;
 
     /**
-     * 转化金额排名
+     * 线上转化金额排名
      */
     private Integer convSalesAmtRank;
 
     /**
-     * 转化金额环比
+     * 线上转化金额环比
      */
     private BigDecimal convSalesAmtRatio;
 
+    /**
+     * 线下转化客户数
+     */
+    private Integer offlineConvUserNum;
+
+    /**
+     * 线下转化客户数环比
+     */
+    private BigDecimal offlineConvUserNumRatio;
+
+    /**
+     * 线下转化金额
+     */
+    private BigDecimal offlineConvSalesAmt;
+
+    /**
+     * 线下转化金额排名
+     */
+    private Integer offlineConvSalesAmtRank;
+
+    /**
+     * 线下转化金额环比
+     */
+    private BigDecimal offlineConvSalesAmtRatio;
+
+    /**
+     * 总转化金额
+     */
+    private BigDecimal omniConvSalesAmt;
+
+    /**
+     * 总转化金额排行
+     */
+    private Integer omniConvSalesAmtRank;
+
+    /**
+     * 总转化金额环比
+     */
+    private Integer omniConvSalesAmtRatio;
+
+
     public Date getStartTime() {
         return startTime;
     }
-
     public void setStartTime(Date startTime) {
         this.startTime = startTime;
     }
@@ -220,4 +260,68 @@ public class MaterialPersonalUsedDataVO implements Serializable {
     public void setClerkCode(String clerkCode) {
         this.clerkCode = clerkCode;
     }
+
+    public BigDecimal getOfflineConvUserNumRatio() {
+        return offlineConvUserNumRatio;
+    }
+
+    public void setOfflineConvUserNumRatio(BigDecimal offlineConvUserNumRatio) {
+        this.offlineConvUserNumRatio = offlineConvUserNumRatio;
+    }
+
+    public Integer getOfflineConvUserNum() {
+        return offlineConvUserNum;
+    }
+
+    public void setOfflineConvUserNum(Integer offlineConvUserNum) {
+        this.offlineConvUserNum = offlineConvUserNum;
+    }
+
+    public BigDecimal getOfflineConvSalesAmt() {
+        return offlineConvSalesAmt;
+    }
+
+    public void setOfflineConvSalesAmt(BigDecimal offlineConvSalesAmt) {
+        this.offlineConvSalesAmt = offlineConvSalesAmt;
+    }
+
+    public Integer getOfflineConvSalesAmtRank() {
+        return offlineConvSalesAmtRank;
+    }
+
+    public void setOfflineConvSalesAmtRank(Integer offlineConvSalesAmtRank) {
+        this.offlineConvSalesAmtRank = offlineConvSalesAmtRank;
+    }
+
+    public BigDecimal getOfflineConvSalesAmtRatio() {
+        return offlineConvSalesAmtRatio;
+    }
+
+    public void setOfflineConvSalesAmtRatio(BigDecimal offlineConvSalesAmtRatio) {
+        this.offlineConvSalesAmtRatio = offlineConvSalesAmtRatio;
+    }
+
+    public BigDecimal getOmniConvSalesAmt() {
+        return omniConvSalesAmt;
+    }
+
+    public void setOmniConvSalesAmt(BigDecimal omniConvSalesAmt) {
+        this.omniConvSalesAmt = omniConvSalesAmt;
+    }
+
+    public Integer getOmniConvSalesAmtRank() {
+        return omniConvSalesAmtRank;
+    }
+
+    public void setOmniConvSalesAmtRank(Integer omniConvSalesAmtRank) {
+        this.omniConvSalesAmtRank = omniConvSalesAmtRank;
+    }
+
+    public Integer getOmniConvSalesAmtRatio() {
+        return omniConvSalesAmtRatio;
+    }
+
+    public void setOmniConvSalesAmtRatio(Integer omniConvSalesAmtRatio) {
+        this.omniConvSalesAmtRatio = omniConvSalesAmtRatio;
+    }
 }