diff --git a/mallinkService/src/main/java/com/iformall/service/cuser/tt/TtCUserServiceAdapter.java b/mallinkService/src/main/java/com/iformall/service/cuser/tt/TtCUserServiceAdapter.java index 3115c0f00..098f2883a 100644 --- a/mallinkService/src/main/java/com/iformall/service/cuser/tt/TtCUserServiceAdapter.java +++ b/mallinkService/src/main/java/com/iformall/service/cuser/tt/TtCUserServiceAdapter.java @@ -306,12 +306,14 @@ public class TtCUserServiceAdapter extends BasicCUserService implements CUserSer @Override public long findCount(WxCUserBasicInfoDto dto) { - List tenantEntitys = wxMallService.getTenantEntitys(dto); + TenantEntity tenantEntity = dto; + List tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); long count = 0l; - for (TenantEntity tenantEntity:tenantEntitys) { - dto.updateTenantInfo(tenantEntity); + for (TenantEntity te:tenantEntitys) { + dto.updateTenantInfo(te); count += ttCUserMapper.findCount(dto); } + dto.updateTenantInfo(tenantEntity); return count; } diff --git a/mallinkService/src/main/java/com/iformall/service/cuser/wx/WxCUserServiceAdapter.java b/mallinkService/src/main/java/com/iformall/service/cuser/wx/WxCUserServiceAdapter.java index 144e4b1b6..b15e031a4 100644 --- a/mallinkService/src/main/java/com/iformall/service/cuser/wx/WxCUserServiceAdapter.java +++ b/mallinkService/src/main/java/com/iformall/service/cuser/wx/WxCUserServiceAdapter.java @@ -315,12 +315,14 @@ public class WxCUserServiceAdapter extends BasicCUserService implements CUserSer @Override public long findCount(WxCUserBasicInfoDto dto) { - List tenantEntitys = wxMallService.getTenantEntitys(dto); + TenantEntity tenantEntity = dto; + List tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); long count = 0l; - for (TenantEntity tenantEntity:tenantEntitys) { - dto.updateTenantInfo(tenantEntity); + for (TenantEntity te:tenantEntitys) { + dto.updateTenantInfo(te); count += wxCUserMapper.findCount(dto); } + dto.updateTenantInfo(tenantEntity); return count; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserCarServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserCarServiceImpl.java index 31ff11347..aefa6ba38 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserCarServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserCarServiceImpl.java @@ -92,12 +92,14 @@ public class WxCUserCarServiceImpl implements WxCUserCarService { @Override public Integer countUser(WxCUserBasicInfoDto dto) { - List tenantEntitys = wxMallService.getTenantEntitys(dto); + TenantEntity tenantEntity = dto; + List tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); int count = 0; - for (TenantEntity tenantEntity:tenantEntitys) { - dto.updateTenantInfo(tenantEntity); + for (TenantEntity te:tenantEntitys) { + dto.updateTenantInfo(te); count += wxCUserCarMapper.countUser(dto); } + dto.updateTenantInfo(tenantEntity); return count; } @@ -162,16 +164,18 @@ public class WxCUserCarServiceImpl implements WxCUserCarService { String tenantId = params.get("tenantId").toString(); String parentTenantId = params.get("parentTenantId") == null?null:params.get("parentTenantId").toString(); - TenantEntity te = new TenantEntity(); - te.setTenantId(tenantId); - te.setParentTenantId(parentTenantId); - List tenantEntitys = wxMallService.getTenantEntitys(te); + TenantEntity tenantEntity = new TenantEntity(); + tenantEntity.setTenantId(tenantId); + tenantEntity.setParentTenantId(parentTenantId); + List tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); long count = 0l; - for (TenantEntity tenantEntity:tenantEntitys) { - params.put("tenantId", tenantEntity.getTenantId()); - params.put("parentTenantId", tenantEntity.getParentTenantId()); + for (TenantEntity te:tenantEntitys) { + params.put("tenantId", te.getTenantId()); + params.put("parentTenantId", te.getParentTenantId()); count += wxCUserCarMapper.queryCarCount(params); } + params.put("tenantId", tenantEntity.getTenantId()); + params.put("parentTenantId", tenantEntity.getParentTenantId()); return count; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java index 6d040ac3e..692341ac7 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java @@ -244,12 +244,14 @@ public class WxCUserServiceImpl implements WxCUserService { @Override public long countByChannel(WxCUser user) { - List tenantEntitys = wxMallService.getTenantEntitys(user); + TenantEntity tenantEntity = user; + List tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); long count = 0l; for (TenantEntity te:tenantEntitys) { user.updateTenantInfo(te); count += wxCUserMapper.countByChannel(user); } + user.updateTenantInfo(tenantEntity); return count; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCarCmdLogServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCarCmdLogServiceImpl.java index e8b5995d5..5565a90fe 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCarCmdLogServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCarCmdLogServiceImpl.java @@ -81,11 +81,11 @@ public class WxCarCmdLogServiceImpl implements WxCarCmdLogService { @Override public Map getHourCountMap(WxCarCmdLog wxCarCmdLog) { - - List tenantEntitys = wxMallService.getTenantEntitys(wxCarCmdLog); + TenantEntity tenantEntity = wxCarCmdLog; + List tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); Map map = new HashMap<>(); - for (TenantEntity tenantEntity:tenantEntitys) { - wxCarCmdLog.updateTenantInfo(tenantEntity); + for (TenantEntity te:tenantEntitys) { + wxCarCmdLog.updateTenantInfo(te); List> list = wxCarCmdLogMapper.queryTodayCar(wxCarCmdLog); Map collect = list.stream().collect(Collectors.toMap(m -> { return (String)m.get("create_time"); @@ -94,6 +94,7 @@ public class WxCarCmdLogServiceImpl implements WxCarCmdLogService { })); collect.forEach((key,value) -> map.merge(key,value,Long::sum)); } + wxCarCmdLog.updateTenantInfo(tenantEntity); return map; } @@ -101,16 +102,18 @@ public class WxCarCmdLogServiceImpl implements WxCarCmdLogService { public long queryHistoryCount(HashMap params) { String tenantId = params.get("tenantId").toString(); String parentTenantId = params.get("parentTenantId") == null?null:params.get("parentTenantId").toString(); - TenantEntity te = new TenantEntity(); - te.setTenantId(tenantId); - te.setParentTenantId(parentTenantId); - List tenantEntitys = wxMallService.getTenantEntitys(te); + TenantEntity tenantEntity = new TenantEntity(); + tenantEntity.setTenantId(tenantId); + tenantEntity.setParentTenantId(parentTenantId); + List tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); long count = 0l; - for (TenantEntity tenantEntity:tenantEntitys) { - params.put("tenantId", tenantEntity.getTenantId()); - params.put("parentTenantId", tenantEntity.getParentTenantId()); + for (TenantEntity te:tenantEntitys) { + params.put("tenantId", te.getTenantId()); + params.put("parentTenantId", te.getParentTenantId()); count += wxCarCmdLogMapper.queryHistoryCount(params); } + params.put("tenantId", tenantEntity.getTenantId()); + params.put("parentTenantId", tenantEntity.getParentTenantId()); return count; } @@ -118,17 +121,19 @@ public class WxCarCmdLogServiceImpl implements WxCarCmdLogService { public BigDecimal queryCarPay(HashMap params) { String tenantId = params.get("tenantId").toString(); String parentTenantId = params.get("parentTenantId") == null?null:params.get("parentTenantId").toString(); - TenantEntity te = new TenantEntity(); - te.setTenantId(tenantId); - te.setParentTenantId(parentTenantId); - List tenantEntitys = wxMallService.getTenantEntitys(te); + TenantEntity tenantEntity = new TenantEntity(); + tenantEntity.setTenantId(tenantId); + tenantEntity.setParentTenantId(parentTenantId); + List tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); BigDecimal carPay = new BigDecimal(0); - for (TenantEntity tenantEntity:tenantEntitys) { - params.put("tenantId", tenantEntity.getTenantId()); - params.put("parentTenantId", tenantEntity.getParentTenantId()); + for (TenantEntity te:tenantEntitys) { + params.put("tenantId", te.getTenantId()); + params.put("parentTenantId", te.getParentTenantId()); BigDecimal bigDecimal = wxCarCmdLogMapper.queryCarPay(params); carPay.add(bigDecimal); } + params.put("tenantId", tenantEntity.getTenantId()); + params.put("parentTenantId", tenantEntity.getParentTenantId()); return carPay; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java index f6c41fee4..3a9638be8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java @@ -302,12 +302,14 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { @Override public int countCoupon(WxCouponChannel wxCouponChannel) { - List tenantEntitys = wxMallService.getTenantEntitys(wxCouponChannel); + TenantEntity tenantEntity = wxCouponChannel; + List tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); int count = 0; - for (TenantEntity tenantEntity:tenantEntitys) { - wxCouponChannel.updateTenantInfo(tenantEntity); + for (TenantEntity te:tenantEntitys) { + wxCouponChannel.updateTenantInfo(te); count += wxCouponChannelMapper.countCoupon(wxCouponChannel); } + wxCouponChannel.updateTenantInfo(tenantEntity); return count; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index c87175318..8177d644c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -2159,12 +2159,14 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { @Override public int queryPriceTotal(WxCouponOrder wxCouponOrder) { - int price = 0; - List tenantEntitys = wxMallService.getTenantEntitys(wxCouponOrder); - for (TenantEntity tenantEntity:tenantEntitys) { - wxCouponOrder.updateTenantInfo(tenantEntity); + TenantEntity tenantEntity = wxCouponOrder; + List tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); + int price = 0; + for (TenantEntity te:tenantEntitys) { + wxCouponOrder.updateTenantInfo(te); price += wxCouponOrderMapper.queryPriceTotal(wxCouponOrder); } + wxCouponOrder.updateTenantInfo(tenantEntity); return price; } @@ -2748,12 +2750,14 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { } public int findCount(WxCouponOrder wxCouponOrder){ - List tenantEntitys = wxMallService.getTenantEntitys(wxCouponOrder); + TenantEntity tenantEntity = wxCouponOrder; + List tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); int count = 0; - for (TenantEntity tenantEntity:tenantEntitys) { - wxCouponOrder.updateTenantInfo(tenantEntity); + for (TenantEntity te:tenantEntitys) { + wxCouponOrder.updateTenantInfo(te); count += wxCouponOrderMapper.findCount(wxCouponOrder); } + wxCouponOrder.updateTenantInfo(tenantEntity); return count; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java index 29a34dfe2..f33aa77b4 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java @@ -206,13 +206,15 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ @Override public Integer findSumMoney(WxMerchantTradeDaily merchantTradeDaily) { - List tenantEntitys = wxMallService.getTenantEntitys(merchantTradeDaily); + TenantEntity tenantEntity = merchantTradeDaily; + List tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); int money = 0; - for (TenantEntity tenantEntity:tenantEntitys) { - merchantTradeDaily.updateTenantInfo(tenantEntity); + for (TenantEntity te:tenantEntitys) { + merchantTradeDaily.updateTenantInfo(te); String sumMoney = wxMerchantTradeDailyMapper.findSumMoney(merchantTradeDaily); money += Integer.parseInt(sumMoney); } + merchantTradeDaily.updateTenantInfo(tenantEntity); return money; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 30e6781fd..c74ec3aa2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -3249,12 +3249,14 @@ public class WxRentContractServiceImpl implements WxRentContractService { @Override public long findCount(WxRentContract wxRentContract) { - List tenantEntitys = wxMallService.getTenantEntitys(wxRentContract); + TenantEntity tenantEntity = wxRentContract; + List tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); long count = 0l; - for (TenantEntity tenantEntity:tenantEntitys) { - wxRentContract.updateTenantInfo(tenantEntity); + for (TenantEntity te:tenantEntitys) { + wxRentContract.updateTenantInfo(te); count += wxRentContractMapper.findCount(wxRentContract); } + wxRentContract.updateTenantInfo(tenantEntity); return count; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java index e25c8dcfc..a23742999 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java @@ -169,12 +169,14 @@ public class WxShopServiceImpl implements WxShopService { @Override public long findCount(WxShop wxShop) { + TenantEntity tenantEntity = wxShop; long count = 0l; - List tenantEntitys = wxMallService.getTenantEntitys(wxShop); - for (TenantEntity tenantEntity:tenantEntitys) { - wxShop.updateTenantInfo(tenantEntity); + List tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); + for (TenantEntity te:tenantEntitys) { + wxShop.updateTenantInfo(te); count += wxShopMapper.findCount(wxShop); } + wxShop.updateTenantInfo(tenantEntity); return count; }