Browse Source

//update tenant

release_toaliyun_real
xhxu 4 years ago
parent
commit
27745ee7cd
13 changed files with 25 additions and 16 deletions
  1. +0
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java
  2. +1
    -2
      mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java
  3. +13
    -0
      mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java
  4. +1
    -1
      mallinkService/src/main/java/com/iformall/service/cuser/tt/TtCUserServiceAdapter.java
  5. +1
    -1
      mallinkService/src/main/java/com/iformall/service/cuser/wx/WxCUserServiceAdapter.java
  6. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxCUserCarServiceImpl.java
  7. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java
  8. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxCarCmdLogServiceImpl.java
  9. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java
  10. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java
  11. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java
  12. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
  13. +1
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java

+ 0
- 1
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java View File

@@ -470,7 +470,6 @@ public class WxCouponController extends BaseController {
public ResultData findPressCountList(@ModelAttribute WxCoupon wxCoupon, Integer pageNum, Integer pageSize) {
TenantEntity tenantEntity = getTenantInfo();
List<TenantEntity> tenantEntitys = wxMallService.getTenantEntitys(tenantEntity);
Map<String,Object> result = new HashedMap();
wxCoupon.updateTenantInfo(tenantEntity);
wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode());
PageInfo<WxCouponStatisVo> pages = wxCouponService.findPressData(wxCoupon,tenantEntitys,pageNum,pageSize);


+ 1
- 2
mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java View File

@@ -389,7 +389,6 @@ public class WxCouponController extends BaseController {
TenantEntity tenantEntity = getTenantInfo();
List<TenantEntity> tenantEntitys = wxMallService.getTenantEntitys(tenantEntity);

Map<String, Object> 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<TenantEntity> tenantEntitys = wxMallService.getTenantEntitys(tenantEntity);
Map<String,Object> result = new HashedMap();
wxCoupon.updateTenantInfo(tenantEntity);
wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Bapi.getCode());
PageInfo<WxCouponStatisVo> pages = wxCouponService.findPressData(wxCoupon,tenantEntitys,pageNum,pageSize);


+ 13
- 0
mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java View File

@@ -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;
}
}
}

+ 1
- 1
mallinkService/src/main/java/com/iformall/service/cuser/tt/TtCUserServiceAdapter.java View File

@@ -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<TenantEntity> tenantEntitys = wxMallService.getTenantEntitys(tenantEntity);
long count = 0l;
for (TenantEntity te:tenantEntitys) {


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/cuser/wx/WxCUserServiceAdapter.java View File

@@ -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<TenantEntity> tenantEntitys = wxMallService.getTenantEntitys(tenantEntity);
long count = 0l;
for (TenantEntity te:tenantEntitys) {


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxCUserCarServiceImpl.java View File

@@ -92,7 +92,7 @@ public class WxCUserCarServiceImpl implements WxCUserCarService {

@Override
public Integer countUser(WxCUserBasicInfoDto dto) {
TenantEntity tenantEntity = dto;
TenantEntity tenantEntity = dto.getTenantInfo();
List<TenantEntity> tenantEntitys = wxMallService.getTenantEntitys(tenantEntity);
int count = 0;
for (TenantEntity te:tenantEntitys) {


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java View File

@@ -244,7 +244,7 @@ public class WxCUserServiceImpl implements WxCUserService {

@Override
public long countByChannel(WxCUser user) {
TenantEntity tenantEntity = user;
TenantEntity tenantEntity = user.getTenantInfo();
List<TenantEntity> tenantEntitys = wxMallService.getTenantEntitys(tenantEntity);
long count = 0l;
for (TenantEntity te:tenantEntitys) {


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxCarCmdLogServiceImpl.java View File

@@ -81,7 +81,7 @@ public class WxCarCmdLogServiceImpl implements WxCarCmdLogService {

@Override
public Map<String, Long> getHourCountMap(WxCarCmdLog wxCarCmdLog) {
TenantEntity tenantEntity = wxCarCmdLog;
TenantEntity tenantEntity = wxCarCmdLog.getTenantInfo();
List<TenantEntity> tenantEntitys = wxMallService.getTenantEntitys(tenantEntity);
Map<String, Long> map = new HashMap<>();
for (TenantEntity te:tenantEntitys) {


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java View File

@@ -348,7 +348,7 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService {

@Override
public int countCoupon(WxCouponChannel wxCouponChannel) {
TenantEntity tenantEntity = wxCouponChannel;
TenantEntity tenantEntity = wxCouponChannel.getTenantInfo();
List<TenantEntity> tenantEntitys = wxMallService.getTenantEntitys(tenantEntity);
int count = 0;
for (TenantEntity te:tenantEntitys) {


+ 2
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java View File

@@ -2158,7 +2158,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {

@Override
public int queryPriceTotal(WxCouponOrder wxCouponOrder) {
TenantEntity tenantEntity = wxCouponOrder;
TenantEntity tenantEntity = wxCouponOrder.getTenantInfo();
List<TenantEntity> 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<TenantEntity> tenantEntitys = wxMallService.getTenantEntitys(tenantEntity);
int count = 0;
for (TenantEntity te:tenantEntitys) {


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java View File

@@ -206,7 +206,7 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ

@Override
public Integer findSumMoney(WxMerchantTradeDaily merchantTradeDaily) {
TenantEntity tenantEntity = merchantTradeDaily;
TenantEntity tenantEntity = merchantTradeDaily.getTenantInfo();
List<TenantEntity> tenantEntitys = wxMallService.getTenantEntitys(tenantEntity);
int money = 0;
for (TenantEntity te:tenantEntitys) {


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java View File

@@ -3249,7 +3249,7 @@ public class WxRentContractServiceImpl implements WxRentContractService {

@Override
public long findCount(WxRentContract wxRentContract) {
TenantEntity tenantEntity = wxRentContract;
TenantEntity tenantEntity = wxRentContract.getTenantInfo();
List<TenantEntity> tenantEntitys = wxMallService.getTenantEntitys(tenantEntity);
long count = 0l;
for (TenantEntity te:tenantEntitys) {


+ 1
- 3
mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java View File

@@ -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<TenantEntity> 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;
}


Loading…
Cancel
Save