Merge branch 'master' into div

yujian

2019-07-02 572a8ec9a3adac7488395ae86bf875f3175f8d46

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

@@ -27,7 +27,6 @@


   @Override

   public void addMsgOtherDetail(MsgOtherDetail detail) throws MsgOtherDetailException {



      if (detail.getType() == MsgTypeOtherTypeEnum.couponMianDan

            || detail.getType() == MsgTypeOtherTypeEnum.couponReward

            || detail.getType() == MsgTypeOtherTypeEnum.couponWelfareMianDan) {

@@ -38,6 +37,9 @@
            detail.setCreateTime(new Date());

         msgOtherDetailMapper.insertSelective(detail);

         userMsgReadStateService.addOtherMsgUnReadCount(detail.getUser().getId(), 1);

      } else if (detail.getType() == MsgTypeOtherTypeEnum.taoLiJin) {

         msgOtherDetailMapper.insertSelective(detail);

         userMsgReadStateService.addOtherMsgUnReadCount(detail.getUser().getId(), 1);

      }

   }