渠道分析、点位营销优化（v2.0）

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/ChannelAnalyseServiceImpl.java

@@ -118,7 +118,7 @@ public class ChannelAnalyseServiceImpl implements ChannelAnalyseService {
         queryWrapper.select("wd_id");
         assembleQueryWrapper(queryWrapper,channelMapAceeptVo);
         queryWrapper.and(queryWrapper2 ->{
-            queryWrapper2.eq("deleted",0);
+            queryWrapper2.eq("show_delete",0);
         });
         List<WdInfo> queryWd = wdInfoDao.selectList(queryWrapper);
 
@@ -230,7 +230,7 @@ public class ChannelAnalyseServiceImpl implements ChannelAnalyseService {
         queryWrapper.select("wd_id");
         assembleQueryWrapper(queryWrapper,channelMapAceeptVo);
         queryWrapper.and(queryWrapper2 ->{
-            queryWrapper2.eq("deleted",0);
+            queryWrapper2.eq("show_delete",0);
         });
 
         //门店
@@ -307,7 +307,7 @@ public class ChannelAnalyseServiceImpl implements ChannelAnalyseService {
             queryWrapper1.eq("wd_type_code","1");
         });
         queryWrapper.and(queryWrapper2 ->{
-            queryWrapper2.eq("deleted",0);
+            queryWrapper2.eq("show_delete",0);
         });
 
         List<StoreWd> storeWds = storeWdDao.businessStatusAnalyse(queryWrapper);
@@ -379,7 +379,7 @@ public class ChannelAnalyseServiceImpl implements ChannelAnalyseService {
             queryWrapper1.eq("wd_type_code","1");
         });
         queryWrapper.and(queryWrapper2 ->{
-            queryWrapper2.eq("deleted",0);
+            queryWrapper2.eq("show_delete",0);
         });
 
         List<StoreWd> storeWds = storeWdDao.perCapitaConsumpAnalyse(queryWrapper);
@@ -428,7 +428,7 @@ public class ChannelAnalyseServiceImpl implements ChannelAnalyseService {
             queryWrapper1.eq("wd_type_code","1");
         });
         queryWrapper.and(queryWrapper2 ->{
-            queryWrapper2.eq("deleted",0);
+            queryWrapper2.eq("show_delete",0);
         });
 
         List<StoreWd> storeWds = storeWdDao.operateTimeAnalyse(queryWrapper);