diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/BizMessageMapper.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/BizMessageMapper.java index b2bbe04..46c2e4c 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/BizMessageMapper.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/BizMessageMapper.java @@ -23,7 +23,7 @@ public interface BizMessageMapper extends BaseMapper { List findMessageByLikeCode(String code); - Integer deleteMessageByServicecdoe(List magIds); + Integer deleteMessageById(@Param("magId")String magId); - Integer deleteAuthorizeByServicecdoe(@Param("magId")String magId,@Param("userIds")List userIds); + Integer deleteAuthorizeById(@Param("magId")String magId,@Param("userId")String userId); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml index ed87114..cfcee88 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml @@ -85,21 +85,15 @@ select * from biz_message where servicecode like CONCAT('%"questId":"',#{code},'"%') - - delete from biz_message where id in - - #{id} - + + delete from biz_message where id = #{magId} - + delete from biz_message_authorize where message_id = #{magId} - - and user_id in - - #{id} - + + and user_id = #{userId} \ No newline at end of file diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageProducerServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageProducerServiceImpl.java index dc754eb..0d1943a 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageProducerServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageProducerServiceImpl.java @@ -172,15 +172,14 @@ public class BizMessageProducerServiceImpl implements BizMessageProducerService Map map = new HashMap<>(); if(magIds!=null&&magIds.size()>0) { - List userIds = null; - if(userId!=null){ - userIds = new ArrayList<>(); - userIds.add(userId); - } - - List finalUserIds = userIds; magIds.forEach(magid->{ - messageMapper.deleteAuthorizeByServicecdoe(magid, finalUserIds); + messageMapper.deleteAuthorizeById(magid, userId); + BizMessageAuthorize vo = new BizMessageAuthorize(); + vo.setMessageId(magid); + List messageAList = messageMapper.findAuthorizeList(vo); + if(messageAList==null||messageAList.size()==0){ + messageMapper.deleteMessageById(magid); + } }); } return true;