Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

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

@@ -35,10 +35,10 @@


   @Resource

   private MsgMoneyDetailService msgMoneyDetailService;

	


   @Resource

   private MsgOtherDetailService msgOtherDetailService;

	


   @Resource

   private UserSystemMsgService userSystemMsgService;



@@ -103,7 +103,7 @@
      update.setUpdateTime(new Date());

      userMsgUnReadNumMapper.updateByPrimaryKeySelective(update);

   }

	


   @Override

   public void addOtherMsgUnReadCount(Long uid, int count) {

      UserMsgUnReadNum num = getUserMsgUnReadNum(uid);

@@ -194,6 +194,7 @@
      update.setTypeSystem(0);

      update.setTypeOrder(0);

      update.setUpdateTime(new Date());

      update.setGuanXuanReadTime(new Date());

      userMsgUnReadNumMapper.updateByPrimaryKeySelective(update);

      readAccountMsg(uid);

      readOrderMsg(uid);

@@ -214,6 +215,10 @@
      userMsgUnReadNumMapper.updateByPrimaryKeySelective(update);

   }





   @Override

   public void updateSelective(UserMsgUnReadNum num) {

      if (num != null)

         userMsgUnReadNumMapper.updateByPrimaryKeySelective(num);

   }



}