线上线下分开导出

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/export/ContentMaterialClerkUsedDataHandler.java

@@ -20,6 +20,7 @@ import org.springframework.stereotype.Component;
 import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Objects;
 
 @Component
 public class ContentMaterialClerkUsedDataHandler extends DownloadHandlerAbstract<MaterialClerkUsedDataVO> {
@@ -38,11 +39,14 @@ public class ContentMaterialClerkUsedDataHandler extends DownloadHandlerAbstract
         Page<MaterialClerkUsedDataVO> clerkUsedData = materialDataAdaptor.queryMaterialClerkUsedData(materialStatisticsBaseQO,materialStatisticsBaseQO.getStoreIdList());
         List<MaterialClerkUsedDataVO> result = clerkUsedData.getResult();
         if (CollectionUtils.isEmpty(result)) {
+            return Collections.emptyList();
+        }
+        Integer mallType = materialStatisticsBaseQO.getMallType();
+        if (Objects.equals(mallType, 0)) {
             result.forEach(x -> {
-                x.setConvsUserNum(x.getConvsUserNum() + x.getOfflineConvsUserNum());
-                x.setConvsAmt(x.getConvsAmt().add(x.getOfflineConvsAmt()));
+                x.setConvsUserNum(x.getOfflineConvsUserNum());
+                x.setConvsAmt(x.getOfflineConvsAmt());
             });
-            return Collections.emptyList();
         }
         return result;
     }

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/export/ContentMaterialStoreUsedDataHandler.java

@@ -21,6 +21,7 @@ import org.springframework.stereotype.Component;
 import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Objects;
 
 @Component
 public class ContentMaterialStoreUsedDataHandler extends DownloadHandlerAbstract<MaterialStoreUsedDataVO> {
@@ -39,11 +40,14 @@ public class ContentMaterialStoreUsedDataHandler extends DownloadHandlerAbstract
         Page<MaterialStoreUsedDataVO> storeUsedData = materialDataAdaptor.queryMaterialStoreUsedData(materialStatisticsBaseQO, materialStatisticsBaseQO.getStoreIdList());
         List<MaterialStoreUsedDataVO> result = storeUsedData.getResult();
         if (CollectionUtils.isEmpty(result)) {
+            return Collections.emptyList();
+        }
+        Integer mallType = materialStatisticsBaseQO.getMallType();
+        if (Objects.equals(mallType, 0)) {
             result.forEach(x -> {
-                x.setConvUserNum(x.getConvUserNum() + x.getOfflineConvUserNum());
-                x.setConvSalesNmt(x.getConvSalesNmt().add(x.getOfflineConvSalesNmt()));
+                x.setConvUserNum(x.getOfflineConvUserNum());
+                x.setConvSalesNmt(x.getOfflineConvSalesNmt());
             });
-            return Collections.emptyList();
         }
         return result;
     }

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

@@ -61,6 +61,11 @@ public class MaterialStatisticsBaseQO extends BasePageInfo {
 
     private Integer storeStatusFilter;
 
+    /**
+     * 0线下 1线上
+     */
+    private Integer mallType;
+
 
     public String getEnterpriseId() {
         return enterpriseId;
@@ -154,4 +159,12 @@ public class MaterialStatisticsBaseQO extends BasePageInfo {
                 return null;
         }
     }
+
+    public Integer getMallType() {
+        return mallType;
+    }
+
+    public void setMallType(Integer mallType) {
+        this.mallType = mallType;
+    }
 }