diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java index adf5c6164..01f9bd332 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java @@ -14,6 +14,7 @@ import com.iformall.enums.EnumRentContractAppStatus; import com.iformall.enums.EnumYesOrNo; import com.iformall.service.ExcelService; import com.iformall.service.WxBusinessService; +import com.iformall.utils.Constant; import com.iformall.utils.DateUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -45,7 +46,7 @@ public class WxBusinessController extends BaseController { @SystemControllerLog(description = "业态-全列表") public ResultData listAll() { logger.debug("[" + getIpAddr() + "] WxBusinessController::getList"); - final List busList = wxBusinessService.findListAll(getTenantInfo(),null,null); + final List busList = wxBusinessService.findListAll(true,getTenantInfo(),null,null); return new ResultData(busList); } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxBusinessController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxBusinessController.java index 93be7abf1..f9f309e4c 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxBusinessController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxBusinessController.java @@ -30,7 +30,7 @@ public class WxBusinessController extends BaseController { if(appPlat == null){ appPlat = EnumAppPlat.WX; } - return new ResultData(wxBusinessService.findListAll(getTenantInfo(),filter,appPlat.getCode())); + return new ResultData(wxBusinessService.findListAll(true,getTenantInfo(),filter,appPlat.getCode())); } } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBusinessMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBusinessMapper.java index 252a22553..49b2fb70f 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBusinessMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBusinessMapper.java @@ -11,8 +11,8 @@ public interface WxBusinessMapper extends CommonMapper { List findList(WxBusiness wxBusiness); List findListAll(WxBusiness wxBusiness); - List findListForMerchant(@Param("finalTenantId")String finalTenantId,@Param("isRoot")Integer isRoot,@Param("tenantId") String tenantId, @Param("parentTenantId") String parentTenantId); - List findListForCoupon(@Param("finalTenantId")String finalTenantId,@Param("isRoot")Integer isRoot,@Param("tenantId") String tenantId, @Param("parentTenantId") String parentTenantId, @Param("platCode") Integer platCode); + List findListForMerchant(@Param("finalTenantId")String finalTenantId,@Param("isRoot")Integer isRoot,@Param("isDel")Integer isDel,@Param("tenantId") String tenantId, @Param("parentTenantId") String parentTenantId); + List findListForCoupon(@Param("finalTenantId")String finalTenantId,@Param("isRoot")Integer isRoot,@Param("isDel")Integer isDel,@Param("tenantId") String tenantId, @Param("parentTenantId") String parentTenantId, @Param("platCode") Integer platCode); List> businessDataList(WxBusiness wxBusiness); diff --git a/mallinkService/src/main/java/com/iformall/service/WxBusinessService.java b/mallinkService/src/main/java/com/iformall/service/WxBusinessService.java index ac7672a94..d363d3ecb 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBusinessService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBusinessService.java @@ -44,7 +44,7 @@ public interface WxBusinessService { * * @return */ - List findListAll(TenantEntity tenantEntity, Integer filter,Integer platCode); + List findListAll(boolean isValid,TenantEntity tenantEntity, Integer filter,Integer platCode); /** * 根据Id获得实体 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java index c499a9bda..86dc86f00 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java @@ -9,6 +9,7 @@ import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.WxBusiness; import com.iformall.domain.po.WxPropertyContract; import com.iformall.domain.po.WxRentContract; +import com.iformall.domain.po.WxScoreRules; import com.iformall.enums.*; import com.iformall.mapper.WxBusinessMapper; import com.iformall.mapper.WxPropertyContractMapper; @@ -20,6 +21,8 @@ import org.apache.commons.collections.CollectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; import java.io.Serializable; @@ -42,6 +45,10 @@ public class WxBusinessServiceImpl implements WxBusinessService { private WxRentContractMapper wxRentContractMapper; @Autowired private WxPropertyContractMapper wxPropertyContractMapper; + + @Autowired + @Qualifier("scoreRuleRedisTemplate") + RedisTemplate scoreRulesRedisTemplate; @Override public void businessInit(TenantEntity tenantInfo) { @@ -68,18 +75,23 @@ public class WxBusinessServiceImpl implements WxBusinessService { } @Override - public List findListAll(TenantEntity tenantEntity, Integer filter,Integer paltCode) { + public List findListAll(boolean isValid,TenantEntity tenantEntity, Integer filter,Integer paltCode) { WxBusiness bq = new WxBusiness(); bq.setFinalTenantId(tenantEntity.getFinalTenantId()); bq.setIsRoot(EnumYesOrNo.YES.getCode()); + Integer isDel = null; + if (isValid) { + isDel = EnumYesOrNo.NO.getCode(); + } + bq.setIsDel(isDel); if (filter == null){ return wxBusinessMapper.findListAll(bq); }else if (filter.equals(EnumBusinessFilter.FILTER_BY_COUPON.getCode())) { if (paltCode == null) paltCode = EnumAppPlat.WX.getCode(); - return wxBusinessMapper.findListForCoupon(tenantEntity.getFinalTenantId(),EnumYesOrNo.YES.getCode(),tenantEntity.getTenantId(), tenantEntity.getParentTenantId(), paltCode); + return wxBusinessMapper.findListForCoupon(tenantEntity.getFinalTenantId(),EnumYesOrNo.YES.getCode(),isDel,tenantEntity.getTenantId(), tenantEntity.getParentTenantId(), paltCode); }else if (filter.equals(EnumBusinessFilter.FILTER_BY_MERCHANT.getCode())) { - return wxBusinessMapper.findListForMerchant(tenantEntity.getFinalTenantId(),EnumYesOrNo.YES.getCode(),tenantEntity.getTenantId(), tenantEntity.getParentTenantId()); + return wxBusinessMapper.findListForMerchant(tenantEntity.getFinalTenantId(),EnumYesOrNo.YES.getCode(),isDel,tenantEntity.getTenantId(), tenantEntity.getParentTenantId()); }else { return wxBusinessMapper.findListAll(bq); } @@ -312,6 +324,25 @@ public class WxBusinessServiceImpl implements WxBusinessService { record.setUpdateDate(new Date()); wxBusinessMapper.updateById(record); } + + //删除积分规则,成长值规则缓存 + String key = Constant.SCORE_RULES_KEY_PREV + record.getFinalTenantId(); + boolean hasKey = scoreRulesRedisTemplate.hasKey(key); + if (hasKey) { + scoreRulesRedisTemplate.delete(key); + } + + String key1 = Constant.CREDIT_RULES_KEY_PREV + record.getFinalTenantId(); + boolean hasKey1 = scoreRulesRedisTemplate.hasKey(key1); + if (hasKey1) { + scoreRulesRedisTemplate.delete(key1); + } + + String key2 = Constant.CREDIT_DOUBLE_RULES_KEY_PREV + record.getFinalTenantId(); + boolean hasKey2 = scoreRulesRedisTemplate.hasKey(key2); + if (hasKey2) { + scoreRulesRedisTemplate.delete(key2); + } } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java index cf93bee9a..e2676a7b2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -734,7 +734,7 @@ public class WxChartServiceImpl implements WxChartDataService { kwMerchantMeterDataDto.setLimitCount(null); List businessPower = kwMerchantMeterService.findDataVoList(kwMerchantMeterDataDto); - List businessList = wxBusinessService.findListAll(tenantEntity,null,null); + List businessList = wxBusinessService.findListAll(true,tenantEntity,null,null); businessList.stream().forEach(b->{ Optional businessData = businessPower.stream().filter(bd->bd.getBusinessId().equals(b.getId())).findAny(); if (businessData.isPresent()) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java index 88202a703..f71562115 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java @@ -132,7 +132,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { } } //根据业态来匹配 - List rootBusiness = wxBusinessService.findListAll(tenantEntity, null, null); + List rootBusiness = wxBusinessService.findListAll(true,tenantEntity, null, null); if (null != rootBusiness && rootBusiness.size() > 0 ) { for (int i = 0 ; i < rootBusiness.size(); i++){ WxBusiness bu = rootBusiness.get(i); diff --git a/mallinkService/src/main/resources/mapper/WxBusinessMapper.xml b/mallinkService/src/main/resources/mapper/WxBusinessMapper.xml index e3c1430a7..260fc1021 100644 --- a/mallinkService/src/main/resources/mapper/WxBusinessMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBusinessMapper.xml @@ -96,7 +96,7 @@ and `parent_id` is null - and `is_del` = #{isDel} + and `is_del` = #{isDel} order by create_date asc @@ -109,6 +109,9 @@ and b.`parent_id` is null + + and b.`is_del` = #{isDel} + and (select count(*) from wx_merchant m where b.id = m.business_id @@ -131,6 +134,9 @@ and b.`parent_id` is null + + and b.`is_del` = #{isDel} + and (select count(*) from wx_coupon_channel cc where b.id = cc.business diff --git a/mallinkTTAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java b/mallinkTTAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java index 4d19e2a5b..50ce6cae3 100644 --- a/mallinkTTAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java +++ b/mallinkTTAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java @@ -39,7 +39,7 @@ public class WxBusinessController extends BaseController { @SystemControllerLog(description = "业态-全列表") public ResultData listAll() { logger.debug("[" + getIpAddr() + "] WxBusinessController::getList"); - final List busList = wxBusinessService.findListAll(getTenantInfo(),null,null); + final List busList = wxBusinessService.findListAll(true,getTenantInfo(),null,null); return new ResultData(busList); } diff --git a/mallinkTTCApi/src/main/java/com/iformall/controller/WxBusinessController.java b/mallinkTTCApi/src/main/java/com/iformall/controller/WxBusinessController.java index bc5320e33..4c8aebc2a 100644 --- a/mallinkTTCApi/src/main/java/com/iformall/controller/WxBusinessController.java +++ b/mallinkTTCApi/src/main/java/com/iformall/controller/WxBusinessController.java @@ -25,7 +25,7 @@ public class WxBusinessController extends BaseController { @ApiOperation("业态全列表接口") @GetMapping("listAll") public ResultData listAll(Integer filter) { - return new ResultData(wxBusinessService.findListAll(getTenantInfo(),filter,null)); + return new ResultData(wxBusinessService.findListAll(true,getTenantInfo(),filter,null)); } }