Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

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

@@ -1,13 +1,16 @@
package com.yeshi.fanli.service.impl.msg;



import java.math.BigDecimal;

import java.text.SimpleDateFormat;

import java.util.Date;



import javax.annotation.Resource;



import org.springframework.stereotype.Service;



import com.google.gson.Gson;

import com.yeshi.fanli.dto.msg.MsgOtherCouponContentDTO;

import com.yeshi.fanli.dto.msg.MsgOtherTaoLiJinContentDTO;

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

import com.yeshi.fanli.entity.bus.msg.MsgOtherDetail.MsgTypeOtherTypeEnum;

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

@@ -282,18 +285,21 @@
      }

   }



//   @Override

//   public void taoLiJinGet(UserSystemCoupon coupon, int percent) {

//      if (coupon == null || coupon.getUid() == null)

//         return;

//      MsgOtherCouponContentDTO dto = MsgOtherCouponContentDTOFactory.createRewardCouponGet(getLeftDay(coupon),

//            coupon.getSource(), coupon.getStartTime(), coupon.getEndTime());

//      try {

//         msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(),

//               coupon.getId(), dto, MsgTypeOtherTypeEnum.couponReward, "返利已到账后再奖励返利的" + percent + "%"));

//      } catch (MsgOtherDetailException e) {

//         e.printStackTrace();

//      }

//   }

	
   @Override

   public void taoLiJinMsg(Long uid, String beiZhu, MsgOtherTaoLiJinContentDTO content) {

      try {

         MsgOtherDetail detail = new MsgOtherDetail();

         detail.setBeiZhu(beiZhu);

         detail.setCreateTime(new Date());

         detail.setRead(false);

         detail.setUser(new UserInfo(uid));

         detail.setContent(new Gson().toJson(content));

         detail.setType(MsgTypeOtherTypeEnum.taoLiJin);

         msgOtherDetailService.addMsgOtherDetail(detail);

      } catch (MsgOtherDetailException e) {

         e.printStackTrace();

      }

   }



}