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 e292e2240..1a0193db2 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 @@ -82,22 +82,4 @@ public class TenantEntity extends BaseEntity { public void setFinalTenantId(String finalTenantId) { this.finalTenantId = finalTenantId; } - - @TableField(exist = false) - @JsonProperty(access = JsonProperty.Access.READ_ONLY) - @io.swagger.annotations.ApiModelProperty(value = "", name = "tenantInfo") - private String tenantInfo; - - 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 423d6cb2a..c5d055729 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,9 @@ public class TtCUserServiceAdapter extends BasicCUserService implements CUserSer @Override public long findCount(WxCUserBasicInfoDto dto) { - TenantEntity tenantEntity = dto.getTenantInfo(); + TenantEntity tenantEntity = new TenantEntity(); + tenantEntity.setTenantId(dto.getTenantId()); + tenantEntity.setParentTenantId(dto.getParentTenantId()); 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 5bc2e8e46..194b9ec27 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,9 @@ public class WxCUserServiceAdapter extends BasicCUserService implements CUserSer @Override public long findCount(WxCUserBasicInfoDto dto) { - TenantEntity tenantEntity = dto.getTenantInfo(); + TenantEntity tenantEntity = new TenantEntity(); + tenantEntity.setTenantId(dto.getTenantId()); + tenantEntity.setParentTenantId(dto.getParentTenantId()); 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 fad4c3581..4a3e1b2a1 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,9 @@ public class WxCUserCarServiceImpl implements WxCUserCarService { @Override public Integer countUser(WxCUserBasicInfoDto dto) { - TenantEntity tenantEntity = dto.getTenantInfo(); + TenantEntity tenantEntity = new TenantEntity(); + tenantEntity.setTenantId(dto.getTenantId()); + tenantEntity.setParentTenantId(dto.getParentTenantId()); 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 baeb222f3..89353354b 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,9 @@ public class WxCUserServiceImpl implements WxCUserService { @Override public long countByChannel(WxCUser user) { - TenantEntity tenantEntity = user.getTenantInfo(); + TenantEntity tenantEntity = new TenantEntity(); + tenantEntity.setTenantId(user.getTenantId()); + tenantEntity.setParentTenantId(user.getParentTenantId()); 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 a9d49f074..88e6d4c33 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,9 @@ public class WxCarCmdLogServiceImpl implements WxCarCmdLogService { @Override public Map getHourCountMap(WxCarCmdLog wxCarCmdLog) { - TenantEntity tenantEntity = wxCarCmdLog.getTenantInfo(); + TenantEntity tenantEntity = new TenantEntity(); + tenantEntity.setTenantId(wxCarCmdLog.getTenantId()); + tenantEntity.setParentTenantId(wxCarCmdLog.getParentTenantId()); 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 15e9452cf..7268c094f 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,9 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { @Override public int countCoupon(WxCouponChannel wxCouponChannel) { - TenantEntity tenantEntity = wxCouponChannel.getTenantInfo(); + TenantEntity tenantEntity = new TenantEntity(); + tenantEntity.setTenantId(wxCouponChannel.getTenantId()); + tenantEntity.setParentTenantId(wxCouponChannel.getParentTenantId()); 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 9bc5e855a..5ab53cf65 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,9 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { @Override public int queryPriceTotal(WxCouponOrder wxCouponOrder) { - TenantEntity tenantEntity = wxCouponOrder.getTenantInfo(); + TenantEntity tenantEntity = new TenantEntity(); + tenantEntity.setTenantId(wxCouponOrder.getTenantId()); + tenantEntity.setParentTenantId(wxCouponOrder.getParentTenantId()); List tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); int price = 0; for (TenantEntity te:tenantEntitys) { @@ -2749,7 +2751,9 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { } public int findCount(WxCouponOrder wxCouponOrder){ - TenantEntity tenantEntity = wxCouponOrder.getTenantInfo(); + TenantEntity tenantEntity = new TenantEntity(); + tenantEntity.setTenantId(wxCouponOrder.getTenantId()); + tenantEntity.setParentTenantId(wxCouponOrder.getParentTenantId()); 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 e7d05f5d7..d82e4a3ce 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,9 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ @Override public Integer findSumMoney(WxMerchantTradeDaily merchantTradeDaily) { - TenantEntity tenantEntity = merchantTradeDaily.getTenantInfo(); + TenantEntity tenantEntity = new TenantEntity(); + tenantEntity.setTenantId(merchantTradeDaily.getTenantId()); + tenantEntity.setParentTenantId(merchantTradeDaily.getParentTenantId()); 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 d3e653905..aeab8d4a0 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,9 @@ public class WxRentContractServiceImpl implements WxRentContractService { @Override public long findCount(WxRentContract wxRentContract) { - TenantEntity tenantEntity = wxRentContract.getTenantInfo(); + TenantEntity tenantEntity = new TenantEntity(); + tenantEntity.setTenantId(wxRentContract.getTenantId()); + tenantEntity.setParentTenantId(wxRentContract.getParentTenantId()); 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 1f4fd7742..2f5026dc0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java @@ -169,7 +169,9 @@ public class WxShopServiceImpl implements WxShopService { @Override public long findCount(WxShop wxShop) { - TenantEntity tenantEntity = wxShop.getTenantInfo(); + TenantEntity tenantEntity = new TenantEntity(); + tenantEntity.setTenantId(wxShop.getTenantId()); + tenantEntity.setParentTenantId(wxShop.getParentTenantId()); long count = 0l; List tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); for (TenantEntity te:tenantEntitys) {