修改弹窗

suishenbang-system/src/main/java/com/dgtly/system/mapper/AlertLogMapper.java

@@ -64,5 +64,5 @@ public interface AlertLogMapper
      */
     public int deleteAlertLogByIds(@Param("alertLogIds") String[] alertLogIds);
 
-    public AlertLog selectAlertLogByUserIdAndAlertId(@Param("userId") Long userId,@Param("alertId") Long alertId,@Param("isCacheType") String isCacheType);
+    AlertLog selectAlertLogByUserIdAndAlertId(@Param("userId") Long userId,@Param("alertId") Long alertId,@Param("isCacheType") String isCacheType,@Param("userType") String userType);
 }

suishenbang-system/src/main/java/com/dgtly/system/service/IAlertLogService.java

@@ -22,7 +22,7 @@ public interface IAlertLogService
 //  找
     public AlertLog selectAlertLogByUserId(Long userId);
 
-    public AlertLog selectAlertLogByUserIdAndAlertId(Long userId,Long alertId,String isCacheType);
+    public AlertLog selectAlertLogByUserIdAndAlertId(Long userId,Long alertId,String isCacheType,String userType);
 
     /**
      * 查询弹框日志列表

suishenbang-system/src/main/java/com/dgtly/system/service/impl/AlertLogServiceImpl.java

@@ -39,8 +39,8 @@ public class AlertLogServiceImpl implements IAlertLogService
     }
 
     @Override
-    public AlertLog selectAlertLogByUserIdAndAlertId(Long userId,Long alertId,String isCacheType) {
-        return alertLogMapper.selectAlertLogByUserIdAndAlertId(userId,alertId,isCacheType);
+    public AlertLog selectAlertLogByUserIdAndAlertId(Long userId,Long alertId,String isCacheType,String userType) {
+        return alertLogMapper.selectAlertLogByUserIdAndAlertId(userId,alertId,isCacheType,userType);
     }
 
     /**

suishenbang-system/src/main/resources/mapper/system/AlertLogMapper.xml

@@ -53,6 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="isCacheType !=null and  isCacheType == '0'.toString()">
             and DATE_FORMAT(create_time,'%Y%m%d') = DATE_FORMAT(NOW(),'%Y%m%d')
         </if>
+        <if test="userType != null ">and user_type = #{userType}</if>
         order by  create_time desc
         limit 1
     </select>

suishenbang-wxportal/suishenbang-wxportal-api/src/main/java/com/dgtly/wxportal/controller/WxAlertLogController.java

@@ -57,6 +57,8 @@ public class WxAlertLogController  extends ApiBaseController {
     public Object getAlertLog() throws ParseException {
         ParameterObject obj = getParameterObject();
         Long userId = Long.valueOf(obj.getString("userId"));
+        String userTp = obj.getString("userType");
+        log.info("当前系统进来为{}",userTp);
         Set<String> userTypeSet = new HashSet<>();
         List<String> userTypeList = new ArrayList<>();
         SysUserExt sysUserExt = sysUserExtService.selectSysUserExtById(userId);
@@ -106,7 +108,7 @@ public class WxAlertLogController  extends ApiBaseController {
                     log.info("开始匹配用户:{}",JSON.toJSON(sysUserExt));
                     if ((strings.contains("1")  || strings.contains("2")) && sysUserExt.getSalesLevel().equals("customer_level")){
                         //满足类型对应a
-                        AlertLog alertLog = alertLogService.selectAlertLogByUserIdAndAlertId(userId, alertConfiguration1.getAlertId(),"0");
+                        AlertLog alertLog = alertLogService.selectAlertLogByUserIdAndAlertId(userId, alertConfiguration1.getAlertId(),"0",userTp);
                         if (alertLog!=null){
                             if (alertLog.getAlertNum()<alertConfiguration1.getAlertNum()){
                                 updateAlertLog(alertConfiguration1,alertLog,sdf,"1");
@@ -120,7 +122,7 @@ public class WxAlertLogController  extends ApiBaseController {
                         }
                     }
                     if((strings.contains("0") || strings.contains("2")) && !sysUserExt.getSalesLevel().equals("customer_level")){
-                        AlertLog alertLog = alertLogService.selectAlertLogByUserIdAndAlertId(userId, alertConfiguration1.getAlertId(),"0");
+                        AlertLog alertLog = alertLogService.selectAlertLogByUserIdAndAlertId(userId, alertConfiguration1.getAlertId(),"0",userTp);
                         if (alertLog!=null){
                             if (alertLog.getAlertNum()<alertConfiguration1.getAlertNum()){
                                 updateAlertLog(alertConfiguration1,alertLog,sdf,"1");
@@ -138,7 +140,7 @@ public class WxAlertLogController  extends ApiBaseController {
                 if (sysUserShopExt != null){
                     log.info("开始匹配门店信息:{}",JSON.toJSON(sysUserShopExt));
                     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",userTp);
                         if (alertLog!=null){
                             if (alertLog.getAlertNum()<alertConfiguration1.getAlertNum()){
                                 updateAlertLog(alertConfiguration1,alertLog,sdf,"1");
@@ -152,7 +154,7 @@ public class WxAlertLogController  extends ApiBaseController {
                         }
                     }
                     if((strings.contains("4") || strings.contains("2")) && userTypeSet.contains("1")){
-                        AlertLog alertLog = alertLogService.selectAlertLogByUserIdAndAlertId(userId, alertConfiguration1.getAlertId(),"0");
+                        AlertLog alertLog = alertLogService.selectAlertLogByUserIdAndAlertId(userId, alertConfiguration1.getAlertId(),"0",userTp);
                         if (alertLog!=null){
                             if (alertLog.getAlertNum()<alertConfiguration1.getAlertNum()){
                                 updateAlertLog(alertConfiguration1,alertLog,sdf,"1");