观云台小程序

gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/BaseSalesController.java

@@ -147,9 +147,9 @@ public class BaseSalesController {
                     page.getResult().stream().forEach(baseSalesDTO -> {
                         baseSalesDTO.setLevel(level - 1);
                         for(ShopDTO shopDTO : result){
-                            if(baseSalesDTO.getId().equals(shopDTO.getId())){
+                            if(baseSalesDTO.getId().equals(shopDTO.getId()+"")){
                                 baseSalesDTO.setName(shopDTO.getName());
-                                baseSalesDTO.setChannel(StoreChannelEnum.OFFLINE.getChannel());
+                                baseSalesDTO.setChannel(channel);
                             }
                         }
                     });
@@ -163,7 +163,7 @@ public class BaseSalesController {
                         for(WmStoreDTO dto : result1){
                             if(baseSalesDTO.getId().equals(dto.getWmMallStoreId()+"")){
                                 baseSalesDTO.setName(dto.getWmMainAccount());
-                                baseSalesDTO.setChannel(StoreChannelEnum.OFFLINE.getChannel());
+                                baseSalesDTO.setChannel(channel);
                             }
                         }
                     });

gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/ConsumeStructureController.java

@@ -107,7 +107,7 @@ public class ConsumeStructureController {
         if(response1.isSuccess() && response1.getResult() != null && CollectionUtils.isNotEmpty(response1.getResult().getResult())){
             AgeConsumeAreaDTO total = response1.getResult().getResult().get(0);
             if(total != null){
-                total.setAreaId(0);
+                total.setAreaId("0");
                 total.setAreaName("合计/均值");
                 vo.setTotal(total);
             }
@@ -119,7 +119,7 @@ public class ConsumeStructureController {
                 AgeConsumeAreaDTO wgs = response2.getResult().getResult().get(0);
                 if(wgs != null){
                     wgs.setAreaName("无归属");
-                    wgs.setAreaId(-1);
+                    wgs.setAreaId("-1");
                     vo.setWgs(wgs);
                 }
             }
@@ -160,9 +160,9 @@ public class ConsumeStructureController {
                     page.getResult().stream().forEach(baseSalesDTO -> {
                         baseSalesDTO.setLevel(level - 1);
                         for(ShopDTO shopDTO : result){
-                            if(baseSalesDTO.getId().equals(shopDTO.getId())){
+                            if(baseSalesDTO.getAreaId().equals(shopDTO.getId()+"")){
                                 baseSalesDTO.setAreaName(shopDTO.getName());
-                                baseSalesDTO.setChannel(StoreChannelEnum.OFFLINE.getChannel());
+                                baseSalesDTO.setChannel(channel);
                             }
                         }
                     });
@@ -174,9 +174,9 @@ public class ConsumeStructureController {
                     page.getResult().stream().forEach(baseSalesDTO -> {
                         baseSalesDTO.setLevel(level - 1);
                         for(WmStoreDTO dto : result1){
-                            if(baseSalesDTO.getId().equals(dto.getWmMallStoreId()+"")){
+                            if(baseSalesDTO.getAreaId().equals(dto.getWmMallStoreId()+"")){
                                 baseSalesDTO.setAreaName(dto.getWmMainAccount());
-                                baseSalesDTO.setChannel(StoreChannelEnum.OFFLINE.getChannel());
+                                baseSalesDTO.setChannel(channel);
                             }
                         }
                     });