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

admin

2020-04-13 dd5b15229cb15459fa7c31ccea77dac28cbfafbd

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/UserInviteMsgNotificationServiceImpl.java

@@ -5,14 +5,13 @@
import javax.annotation.Resource;



import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;



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

import com.yeshi.fanli.dto.push.PushContentDTO;

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

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

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

import com.yeshi.fanli.entity.config.push.PushMsgFactory;

import com.yeshi.fanli.exception.msg.MsgInviteDetailException;

import com.yeshi.fanli.exception.push.PushException;

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

import com.yeshi.fanli.service.inter.push.PushService;

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

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

@@ -23,70 +22,66 @@


   @Resource

   private MsgInviteDetailService msgInviteDetailService;

	
   @Resource

   private MsgExtraService msgExtraService;



   @Resource

   private PushService pushService;



   @Override

   public void inviteScan(Long uid, ThreeSale sale) {

      MsgInviteDetail detail = MsgInviteDetailFactory.createInviteScanSuccess(sale, uid, null);

   @Transactional(rollbackFor = Exception.class)

   private void saveMsgDetail(MsgInviteDetail detail) {

      try {

         msgInviteDetailService.addMsgInviteDetail(detail);

         // 消息内容

         msgExtraService.addMsgExtra(detail.getId(), detail.getExtraInfo(), MsgExtra.MSG_TYPE_INVITE);

      } catch (MsgInviteDetailException e) {

         e.printStackTrace();

      }

   }



   @Override

   public void inviteSuccess(Long uid, ThreeSale sale) {

      MsgInviteDetail detail = MsgInviteDetailFactory.createInviteSuccess(sale, uid, null);

      try {

         msgInviteDetailService.addMsgInviteDetail(detail);

      } catch (MsgInviteDetailException e) {

         e.printStackTrace();

      }



      PushContentDTO dto = PushMsgFactory.createInviteTeamSuccess(new Date(), sale.getWorker().getNickName());

      try {

         pushService.pushZNX(uid, dto.getTitle(), dto.getContent(), null, null);

      } catch (NumberFormatException e) {

         e.printStackTrace();

      } catch (PushException e) {

         e.printStackTrace();

      }

   }



   

   @Override

   public void inviteSuccess2_0_2(Long uid, ThreeSale sale) {

      MsgInviteDetail detail = MsgInviteDetailFactory.createInviteSuccess2_0_2(uid, sale);

      msgInviteDetailService.insertSelective(detail);

      PushContentDTO dto = PushMsgFactory.createInviteTeamSuccess(new Date(), sale.getWorker().getNickName());

      try {

         pushService.pushZNX(uid, dto.getTitle(), dto.getContent(), null, null);

      } catch (NumberFormatException e) {

         e.printStackTrace();

      } catch (PushException e) {

         e.printStackTrace();

      }

   @Transactional(rollbackFor = Exception.class)

   public void directInviteSuccess(Long uid, String nickName, String portrait, Date time) {

      saveMsgDetail(MsgInviteDetailFactory.directInviteSuccess(uid, nickName, portrait, time));

   }



   @Override

   @Transactional(rollbackFor = Exception.class)

   public void indirectInviteSuccess(Long uid, String inviteName, String nickName, String portrait, Date time) {

      saveMsgDetail(MsgInviteDetailFactory.indirectInviteSuccess(uid, inviteName, nickName, portrait, time));

   }

   

   @Override

   public void inviteFail(Long uid, ThreeSale sale) {

      MsgInviteDetail detail = MsgInviteDetailFactory.createInviteFail(sale, uid, null);

      try {

         msgInviteDetailService.addMsgInviteDetail(detail);

      } catch (MsgInviteDetailException e) {

         e.printStackTrace();

      }

   @Transactional(rollbackFor = Exception.class)

   public void fansUpgrade(Long uid, String relation, String rankName, String nickName, String item, Date time) {

      saveMsgDetail(MsgInviteDetailFactory.fansUpgrade(uid, relation, rankName, nickName, item, time));

   }



   

   @Override

   public void receiveGift(Long uid, String beizu, MsgInviteContentDTO content) {

      MsgInviteDetail detail = MsgInviteDetailFactory.receiveGift(uid, beizu, content);

      msgInviteDetailService.insertSelective(detail);

   @Transactional(rollbackFor = Exception.class)

   public void fansPreDivorced(Long uid, String rankName, String nickName, String item, Date time) {

      saveMsgDetail(MsgInviteDetailFactory.fansPreDivorced(uid, rankName, nickName, item, time));

   }



	
   @Override

   @Transactional(rollbackFor = Exception.class)

   public void fansPredivorcedIndirect(Long uid, String rankName, String nickName, String fansName,

         String item, Date time) {

      saveMsgDetail(MsgInviteDetailFactory.fansPredivorcedIndirect(uid, rankName, nickName, fansName, item, time));

   }

	
   @Override

   @Transactional(rollbackFor = Exception.class)

   public void fansDivorced(Long uid, String nickName, Date time) {

      saveMsgDetail(MsgInviteDetailFactory.fansDivorced(uid, nickName, time));

   }

	
	
   @Override

   @Transactional(rollbackFor = Exception.class)

   public void fansDivorcedIndirect(Long uid, String nickName, String fansName, Date time) {

      saveMsgDetail(MsgInviteDetailFactory.fansDivorcedIndirect(uid, nickName, fansName, time));

   }

	
}