|
@@ -103,6 +103,7 @@ public class WxAlertLogController extends ApiBaseController {
|
|
|
String[] split = alertConfiguration1.getUserType().split(",");
|
|
String[] split = alertConfiguration1.getUserType().split(",");
|
|
|
List<String> strings = Arrays.asList(split);
|
|
List<String> strings = Arrays.asList(split);
|
|
|
if (sysUserExt != null){
|
|
if (sysUserExt != null){
|
|
|
|
|
+ log.info("开始匹配用户:{}",JSON.toJSON(sysUserExt));
|
|
|
if ((strings.contains("1") || strings.contains("2")) && sysUserExt.getSalesLevel().equals("customer_level")){
|
|
if ((strings.contains("1") || strings.contains("2")) && sysUserExt.getSalesLevel().equals("customer_level")){
|
|
|
//满足类型对应a
|
|
//满足类型对应a
|
|
|
AlertLog alertLog = alertLogService.selectAlertLogByUserIdAndAlertId(userId, alertConfiguration1.getAlertId(),"0");
|
|
AlertLog alertLog = alertLogService.selectAlertLogByUserIdAndAlertId(userId, alertConfiguration1.getAlertId(),"0");
|
|
@@ -135,6 +136,7 @@ public class WxAlertLogController extends ApiBaseController {
|
|
|
}
|
|
}
|
|
|
//判断该用户是否为金牌店或仿石漆
|
|
//判断该用户是否为金牌店或仿石漆
|
|
|
if (sysUserShopExt != null){
|
|
if (sysUserShopExt != null){
|
|
|
|
|
+ log.info("开始匹配门店信息:{}",JSON.toJSON(sysUserShopExt));
|
|
|
if((strings.contains("3") || strings.contains("2")) && userTypeSet.contains("0")){
|
|
if((strings.contains("3") || strings.contains("2")) && userTypeSet.contains("0")){
|
|
|
AlertLog alertLog = alertLogService.selectAlertLogByUserIdAndAlertId(userId, alertConfiguration1.getAlertId(),"0");
|
|
AlertLog alertLog = alertLogService.selectAlertLogByUserIdAndAlertId(userId, alertConfiguration1.getAlertId(),"0");
|
|
|
if (alertLog!=null){
|
|
if (alertLog!=null){
|