Merge remote-tracking branch 'origin/div' into 2.1.2

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserMsgReadStateServiceImpl.java

@@ -10,12 +10,13 @@
import com.yeshi.fanli.dao.mybatis.msg.UserMsgUnReadNumMapper;

import com.yeshi.fanli.entity.bus.msg.UserMsgUnReadNum;

import com.yeshi.fanli.entity.bus.user.UserInfo;

import com.yeshi.fanli.service.inter.msg.MsgAccountDetailService;

import com.yeshi.fanli.service.inter.msg.MsgInviteDetailService;

import com.yeshi.fanli.service.inter.msg.MsgMoneyDetailService;

import com.yeshi.fanli.service.inter.msg.MsgOrderDetailService;

import com.yeshi.fanli.service.inter.money.msg.MsgMoneyDetailService;

import com.yeshi.fanli.service.inter.msg.MsgOtherDetailService;

import com.yeshi.fanli.service.inter.msg.UserMsgReadStateService;

import com.yeshi.fanli.service.inter.msg.UserSystemMsgService;

import com.yeshi.fanli.service.inter.order.msg.MsgOrderDetailService;

import com.yeshi.fanli.service.inter.user.invite.MsgInviteDetailService;

import com.yeshi.fanli.service.inter.user.msg.MsgAccountDetailService;



@Service

public class UserMsgReadStateServiceImpl implements UserMsgReadStateService {

@@ -34,6 +35,9 @@


   @Resource

   private MsgMoneyDetailService msgMoneyDetailService;



   @Resource

   private MsgOtherDetailService msgOtherDetailService;



   @Resource

   private UserSystemMsgService userSystemMsgService;

@@ -101,6 +105,16 @@
   }



   @Override

   public void addOtherMsgUnReadCount(Long uid, int count) {

      UserMsgUnReadNum num = getUserMsgUnReadNum(uid);

      UserMsgUnReadNum update = new UserMsgUnReadNum();

      update.setId(num.getId());

      update.setTypeOther(num.getTypeOther() + count);

      update.setUpdateTime(new Date());

      userMsgUnReadNumMapper.updateByPrimaryKeySelective(update);

   }



   @Override

   public UserMsgUnReadNum getReadStateByUid(Long uid) {

      return getUserMsgUnReadNum(uid);

   }

@@ -158,7 +172,6 @@
   @Override

   public void readUserSystemMsg(Long uid) {

      userSystemMsgService.readMsgByUid(uid);



      UserMsgUnReadNum num = getUserMsgUnReadNum(uid);

      UserMsgUnReadNum update = new UserMsgUnReadNum();

      update.setId(num.getId());

@@ -179,13 +192,33 @@
      update.setTypeOrder(0);

      update.setTypeScore(0);

      update.setTypeSystem(0);

      update.setTypeOrder(0);

      update.setUpdateTime(new Date());

      update.setGuanXuanReadTime(new Date());

      userMsgUnReadNumMapper.updateByPrimaryKeySelective(update);

      readAccountMsg(uid);

      readOrderMsg(uid);

      readMoneyMsg(uid);

      readInviteMsg(uid);

      readUserSystemMsg(uid);

      readOtherMsg(uid);

   }



   @Override

   public void readOtherMsg(Long uid) {

      msgOtherDetailService.readMsgByUid(uid);

      UserMsgUnReadNum num = getUserMsgUnReadNum(uid);

      UserMsgUnReadNum update = new UserMsgUnReadNum();

      update.setId(num.getId());

      update.setTypeOther(0);

      update.setUpdateTime(new Date());

      userMsgUnReadNumMapper.updateByPrimaryKeySelective(update);

   }



   @Override

   public void updateSelective(UserMsgUnReadNum num) {

      if (num != null)

         userMsgUnReadNumMapper.updateByPrimaryKeySelective(num);

   }



}