Просмотр исходного кода

Merge branch 'release_real_202010' of https://git.malls.iformall.com/server/formallProject into release_real_202010

release_toaliyun_real
xiaohanzi 5 лет назад
Родитель
Сommit
c99566fa9f
3 измененных файлов: 15 добавлений и 13 удалений
  1. +3
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxAppinfoServiceImpl.java
  2. +11
    -9
      mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java

+ 3
- 3
mallinkService/src/main/java/com/iformall/service/impl/WxAppinfoServiceImpl.java Просмотреть файл

@@ -153,9 +153,9 @@ public class WxAppinfoServiceImpl implements WxAppinfoService {
+ "-" + EnumAppType.C.getCode(); + "-" + EnumAppType.C.getCode();
record = RedisCacheUtils.getCacheObject(wxAppinfoRedisTemplate, key, WxAppinfo.class); record = RedisCacheUtils.getCacheObject(wxAppinfoRedisTemplate, key, WxAppinfo.class);
if (null == record) { if (null == record) {
record = this.getCAppInfo(new TenantEntity() {{
setTenantId(tenantId);
}}, payWayWechat);
TenantEntity tenantEntity = new TenantEntity();
tenantEntity.setTenantId(tenantId);
record = this.getCAppInfo(tenantEntity, payWayWechat);
if(record != null){ if(record != null){
RedisCacheUtils.cache(wxAppinfoRedisTemplate, key, record, 3600*24*7); RedisCacheUtils.cache(wxAppinfoRedisTemplate, key, record, 3600*24*7);
} }


+ 11
- 9
mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java Просмотреть файл

@@ -141,11 +141,11 @@ public class WxLevelConfigServiceImpl implements WxLevelConfigService {


@Override @Override
public List<WxLevelConfig> getByTenantInfo(TenantEntity tenantEntity) { public List<WxLevelConfig> getByTenantInfo(TenantEntity tenantEntity) {
String key = Constant.levelConfigPrev + tenantEntity.getTenantId();
String key = Constant.levelConfigPrev + tenantEntity.getFinalTenantId();
List<WxLevelConfig> clist = RedisCacheUtils.getCacheListObject(wxLevelConfigListRedisTemplate, key, WxLevelConfig.class); List<WxLevelConfig> clist = RedisCacheUtils.getCacheListObject(wxLevelConfigListRedisTemplate, key, WxLevelConfig.class);
if (null == clist || clist.size() <= 0) { if (null == clist || clist.size() <= 0) {
WxLevelConfig wxLevelConfig = new WxLevelConfig(); WxLevelConfig wxLevelConfig = new WxLevelConfig();
wxLevelConfig.setTenantId(tenantEntity.getTenantId());
wxLevelConfig.setTenantId(tenantEntity.getFinalTenantId());
wxLevelConfig.setSortColumns(BaseEntity.SortField.Points_ASC); wxLevelConfig.setSortColumns(BaseEntity.SortField.Points_ASC);
clist = wxLevelConfigMapper.findList(wxLevelConfig); clist = wxLevelConfigMapper.findList(wxLevelConfig);
RedisCacheUtils.cache(wxLevelConfigListRedisTemplate, key, clist, 3600*24*7); RedisCacheUtils.cache(wxLevelConfigListRedisTemplate, key, clist, 3600*24*7);
@@ -175,7 +175,7 @@ public class WxLevelConfigServiceImpl implements WxLevelConfigService {
@Override @Override
public void batchSave(TenantEntity tenantEntity, List<WxLevelConfig> records) { public void batchSave(TenantEntity tenantEntity, List<WxLevelConfig> records) {
final IdWorker idWorker = IdWorker.get(); final IdWorker idWorker = IdWorker.get();
wxLevelConfigMapper.deleteAll(tenantEntity.getTenantId());
wxLevelConfigMapper.deleteAll(tenantEntity.getFinalTenantId());
List<WxLevelConfig> levelConfigs = new ArrayList<>(); List<WxLevelConfig> levelConfigs = new ArrayList<>();
for(WxLevelConfig levelConfig: records) { for(WxLevelConfig levelConfig: records) {
if(levelConfig.getId() == null) { if(levelConfig.getId() == null) {
@@ -185,7 +185,8 @@ public class WxLevelConfigServiceImpl implements WxLevelConfigService {
} else { } else {
levelConfig.setUpdateDate(new Date()); levelConfig.setUpdateDate(new Date());
} }
levelConfig.updateTenantInfo(tenantEntity);
// levelConfig.updateTenantInfo(tenantEntity);
levelConfig.setTenantId(tenantEntity.getFinalTenantId());
levelConfigs.add(levelConfig); levelConfigs.add(levelConfig);
} }
wxLevelConfigMapper.insertBatch(levelConfigs); wxLevelConfigMapper.insertBatch(levelConfigs);
@@ -197,7 +198,8 @@ public class WxLevelConfigServiceImpl implements WxLevelConfigService {
List<WxLevelConfig> levelConfigs = new ArrayList<WxLevelConfig>(); List<WxLevelConfig> levelConfigs = new ArrayList<WxLevelConfig>();
for(WxLevelConfig levelConfig: records) { for(WxLevelConfig levelConfig: records) {
if(levelConfig.getId() != null && levelConfig.getCount() != null) { if(levelConfig.getId() != null && levelConfig.getCount() != null) {
levelConfig.updateTenantInfo(tenantEntity);
// levelConfig.updateTenantInfo(tenantEntity);
levelConfig.setTenantId(tenantEntity.getFinalTenantId());
levelConfig.setUpdateDate(new Date()); levelConfig.setUpdateDate(new Date());
JSONObject jo = new JSONObject(); JSONObject jo = new JSONObject();
jo.put(CAPABILITY_SEND_CAR_COUPON,levelConfig.getCount()); jo.put(CAPABILITY_SEND_CAR_COUPON,levelConfig.getCount());
@@ -206,7 +208,7 @@ public class WxLevelConfigServiceImpl implements WxLevelConfigService {
} }
} }
wxLevelConfigMapper.batchUpdate(levelConfigs); wxLevelConfigMapper.batchUpdate(levelConfigs);
this.deleteRedis(tenantEntity.getTenantId());
this.deleteRedis(tenantEntity.getFinalTenantId());
} }


@Override @Override
@@ -223,14 +225,14 @@ public class WxLevelConfigServiceImpl implements WxLevelConfigService {


@Override @Override
public void deleteAll(TenantEntity tenantEntity) { public void deleteAll(TenantEntity tenantEntity) {
this.deleteRedis(tenantEntity.getTenantId());
wxLevelConfigMapper.deleteAll(tenantEntity.getTenantId());
this.deleteRedis(tenantEntity.getFinalTenantId());
wxLevelConfigMapper.deleteAll(tenantEntity.getFinalTenantId());
} }


@Override @Override
public String getLevel(TenantEntity tenantEntity, int score) { public String getLevel(TenantEntity tenantEntity, int score) {
return wxLevelConfigMapper.getLevel(tenantEntity.getTenantId(),score);
return wxLevelConfigMapper.getLevel(tenantEntity.getFinalTenantId(),score);
} }


@Override @Override


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java Просмотреть файл

@@ -138,7 +138,7 @@ public class WxShopServiceImpl implements WxShopService {
} else { } else {
wxRentContract.setShopNumber(wxShop.getShopNumber()); wxRentContract.setShopNumber(wxShop.getShopNumber());
List<WxRentContract> list = wxRentContractMapper.selectList(new QueryWrapper(wxRentContract));
List<WxRentContract> list = wxRentContractMapper.findList(wxRentContract);
// count = list.stream().filter(r -> !r.getStatus().equals(EnumRentContractStatus.SIGNED_RENT_UNPAID.getCode()) && // count = list.stream().filter(r -> !r.getStatus().equals(EnumRentContractStatus.SIGNED_RENT_UNPAID.getCode()) &&
// !r.getStatus().equals(EnumRentContractStatus.RENT_PAID.getCode()) && // !r.getStatus().equals(EnumRentContractStatus.RENT_PAID.getCode()) &&
// !r.getStatus().equals(EnumRentContractStatus.CONTRACT_END_SOON.getCode())).count(); // !r.getStatus().equals(EnumRentContractStatus.CONTRACT_END_SOON.getCode())).count();


Загрузка…
Отмена
Сохранить