From 27745ee7cdd575bb65075cd638e112d8dc3e95b1 Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 7 Apr 2022 19:17:04 +0800 Subject: [PATCH] //update tenant --- .../controller/market/WxCouponController.java | 1 - .../com/iformall/controller/WxCouponController.java | 3 +-- .../com/iformall/domain/po/base/TenantEntity.java | 13 +++++++++++++ .../service/cuser/tt/TtCUserServiceAdapter.java | 2 +- .../service/cuser/wx/WxCUserServiceAdapter.java | 2 +- .../service/impl/WxCUserCarServiceImpl.java | 2 +- .../iformall/service/impl/WxCUserServiceImpl.java | 2 +- .../service/impl/WxCarCmdLogServiceImpl.java | 2 +- .../service/impl/WxCouponChannelServiceImpl.java | 2 +- .../service/impl/WxCouponOrderServiceImpl.java | 4 ++-- .../impl/WxMerchantTradeDailyServiceImpl.java | 2 +- .../service/impl/WxRentContractServiceImpl.java | 2 +- .../iformall/service/impl/WxShopServiceImpl.java | 4 +--- 13 files changed, 25 insertions(+), 16 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java index 046cd02d9..7b72d4106 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -470,7 +470,6 @@ public class WxCouponController extends BaseController { public ResultData findPressCountList(@ModelAttribute WxCoupon wxCoupon, Integer pageNum, Integer pageSize) { TenantEntity tenantEntity = getTenantInfo(); List tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); - Map result = new HashedMap(); wxCoupon.updateTenantInfo(tenantEntity); wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode()); PageInfo pages = wxCouponService.findPressData(wxCoupon,tenantEntitys,pageNum,pageSize); diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java index b28e7fbbf..ba9bd9e83 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java @@ -389,7 +389,6 @@ public class WxCouponController extends BaseController { TenantEntity tenantEntity = getTenantInfo(); List tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); - Map result = new HashedMap(); if (wxCoupon.getStartdate() == null) { wxCoupon.setStartdate(DateUtils.getFirstDayForCurrMonth()); } @@ -419,7 +418,7 @@ public class WxCouponController extends BaseController { public ResultData findPressCountList(@ModelAttribute WxCoupon wxCoupon, Integer pageNum, Integer pageSize) { TenantEntity tenantEntity = getTenantInfo(); List tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); - Map result = new HashedMap(); + wxCoupon.updateTenantInfo(tenantEntity); wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Bapi.getCode()); PageInfo pages = wxCouponService.findPressData(wxCoupon,tenantEntitys,pageNum,pageSize); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java index b4e3e2bc4..679141b69 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java @@ -81,4 +81,17 @@ public class TenantEntity extends BaseEntity { public void setFinalTenantId(String finalTenantId) { this.finalTenantId = finalTenantId; } + + public TenantEntity getTenantInfo() { + if (StringUtils.isBlank(getParentTenantId())) { + TenantEntity single = new TenantEntity(); + single.setTenantId(getTenantId()); + return single; + } else { + TenantEntity mul = new TenantEntity(); + mul.setTenantId(getTenantId()); + mul.setParentTenantId(getParentTenantId()); + return mul; + } + } } 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 098f2883a..423d6cb2a 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,7 +306,7 @@ public class TtCUserServiceAdapter extends BasicCUserService implements CUserSer @Override public long findCount(WxCUserBasicInfoDto dto) { - TenantEntity tenantEntity = dto; + TenantEntity tenantEntity = dto.getTenantInfo(); List tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); long count = 0l; for (TenantEntity te:tenantEntitys) { 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 b15e031a4..5bc2e8e46 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,7 +315,7 @@ public class WxCUserServiceAdapter extends BasicCUserService implements CUserSer @Override public long findCount(WxCUserBasicInfoDto dto) { - TenantEntity tenantEntity = dto; + TenantEntity tenantEntity = dto.getTenantInfo(); List tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); long count = 0l; for (TenantEntity te:tenantEntitys) { 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 aefa6ba38..fad4c3581 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserCarServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserCarServiceImpl.java @@ -92,7 +92,7 @@ public class WxCUserCarServiceImpl implements WxCUserCarService { @Override public Integer countUser(WxCUserBasicInfoDto dto) { - TenantEntity tenantEntity = dto; + TenantEntity tenantEntity = dto.getTenantInfo(); List tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); int count = 0; for (TenantEntity te:tenantEntitys) { 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 692341ac7..baeb222f3 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java @@ -244,7 +244,7 @@ public class WxCUserServiceImpl implements WxCUserService { @Override public long countByChannel(WxCUser user) { - TenantEntity tenantEntity = user; + TenantEntity tenantEntity = user.getTenantInfo(); List tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); long count = 0l; for (TenantEntity te:tenantEntitys) { 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 6c41fad28..a9d49f074 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCarCmdLogServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCarCmdLogServiceImpl.java @@ -81,7 +81,7 @@ public class WxCarCmdLogServiceImpl implements WxCarCmdLogService { @Override public Map getHourCountMap(WxCarCmdLog wxCarCmdLog) { - TenantEntity tenantEntity = wxCarCmdLog; + TenantEntity tenantEntity = wxCarCmdLog.getTenantInfo(); List tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); Map map = new HashMap<>(); for (TenantEntity te:tenantEntitys) { 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 3f8c7ea12..15e9452cf 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java @@ -348,7 +348,7 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { @Override public int countCoupon(WxCouponChannel wxCouponChannel) { - TenantEntity tenantEntity = wxCouponChannel; + TenantEntity tenantEntity = wxCouponChannel.getTenantInfo(); List tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); int count = 0; for (TenantEntity te:tenantEntitys) { 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 4d9d9401d..9bc5e855a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -2158,7 +2158,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { @Override public int queryPriceTotal(WxCouponOrder wxCouponOrder) { - TenantEntity tenantEntity = wxCouponOrder; + TenantEntity tenantEntity = wxCouponOrder.getTenantInfo(); List tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); int price = 0; for (TenantEntity te:tenantEntitys) { @@ -2749,7 +2749,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { } public int findCount(WxCouponOrder wxCouponOrder){ - TenantEntity tenantEntity = wxCouponOrder; + TenantEntity tenantEntity = wxCouponOrder.getTenantInfo(); List tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); int count = 0; for (TenantEntity te:tenantEntitys) { 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 f33aa77b4..e7d05f5d7 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java @@ -206,7 +206,7 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ @Override public Integer findSumMoney(WxMerchantTradeDaily merchantTradeDaily) { - TenantEntity tenantEntity = merchantTradeDaily; + TenantEntity tenantEntity = merchantTradeDaily.getTenantInfo(); List tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); int money = 0; for (TenantEntity te:tenantEntitys) { 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 c74ec3aa2..d3e653905 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -3249,7 +3249,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { @Override public long findCount(WxRentContract wxRentContract) { - TenantEntity tenantEntity = wxRentContract; + TenantEntity tenantEntity = wxRentContract.getTenantInfo(); List tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); long count = 0l; for (TenantEntity te:tenantEntitys) { 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 04565c077..1f4fd7742 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java @@ -169,15 +169,13 @@ public class WxShopServiceImpl implements WxShopService { @Override public long findCount(WxShop wxShop) { - TenantEntity tenantEntity = wxShop; - logger.info("---------tenantId="+tenantEntity.getTenantId()+"-----parentTenantId="+tenantEntity.getParentTenantId()); + TenantEntity tenantEntity = wxShop.getTenantInfo(); long count = 0l; List tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); for (TenantEntity te:tenantEntitys) { wxShop.updateTenantInfo(te); count += wxShopMapper.findCount(wxShop); } - logger.info("---------tenantId="+tenantEntity.getTenantId()+"-----parentTenantId="+tenantEntity.getParentTenantId()); wxShop.updateTenantInfo(tenantEntity); return count; }