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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/msg/UserAccountMsgNotificationServiceImpl.java

@@ -3,10 +3,8 @@
import javax.annotation.Resource;



import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;



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

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

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

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

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

@@ -18,84 +16,79 @@


   @Resource

   private MsgAccountDetailService msgAccountDetailService;

	


   @Resource

   private MsgExtraService msgExtraService;



   @Override

   @Transactional(rollbackFor = Exception.class)

   public void bindingSuccess(Long uid, int type) {

      saveDetail(MsgAccountDetailFactory.createBindSuccess(uid, type, MsgAccountDetailFactory.WAY_BIND));

   }



   @Override

   @Transactional(rollbackFor = Exception.class)

   public void unBindingSuccess(Long uid, int type) {

      saveDetail(MsgAccountDetailFactory.createBindSuccess(uid, type, MsgAccountDetailFactory.WAY_UNBIND));

   }



   @Override

   @Transactional(rollbackFor = Exception.class)

   public void changeBindingSuccess(Long uid, int type) {

      saveDetail(MsgAccountDetailFactory.createBindSuccess(uid, type, MsgAccountDetailFactory.WAY_CHANGE));

   }





   @Override

   @Transactional(rollbackFor = Exception.class)

   public void taoBaoAuthFail(Long uid, String taoBaoNickName, String reason) {

      saveDetail(MsgAccountDetailFactory.createBindFail(uid, MsgAccountDetailFactory.TYPE_TB, 
      saveDetail(MsgAccountDetailFactory.createBindFail(uid, MsgAccountDetailFactory.TYPE_TB,

            MsgAccountDetailFactory.WAY_CHANGE, reason));

   }

	


   @Override

   @Transactional(rollbackFor = Exception.class)

   public void createChangeInviteCode(Long uid, String oldCode, String newCode) {

      saveDetail(MsgAccountDetailFactory.createChangeInviteCode(uid, oldCode, newCode));

   }

	
	


   @Override

   @Transactional(rollbackFor = Exception.class)

   public void vipPreUpgrade(Long uid, String originalName, String upName, int days, long targetNum1, Long targetNum2,Integer type) {

      saveDetail( MsgAccountDetailFactory.vipPreUpgrade(uid, originalName, upName, days, targetNum1,

            targetNum2, type, null));

   public void vipPreUpgrade(Long uid, String originalName, String upName, int days, long targetNum1, Long targetNum2,

         boolean teamPass) {

      saveDetail(MsgAccountDetailFactory.vipPreUpgrade(uid, originalName, upName, days, targetNum1, targetNum2,

            teamPass));

   }

	


   @Override

   @Transactional(rollbackFor = Exception.class)

   public void vipUpgradeSuccess(Long uid, int days) {

      saveDetail(MsgAccountDetailFactory.vipUpgradeSuccess(uid, days));

   }



   @Override

   @Transactional(rollbackFor = Exception.class)

   public void vipUpgradeFail(Long uid, String reason) {

      saveDetail(MsgAccountDetailFactory.vipUpgradeFail(uid, reason));

   }

	


   @Override

   @Transactional(rollbackFor = Exception.class)

   public void teacherInvite(Long uid, String nickname,String kefuName, String kefuWX) {

       saveDetail(MsgAccountDetailFactory.teacherInvite(uid, nickname, kefuName, kefuWX));

   public void teacherInvite(Long uid, String nickname, String kefuName, String kefuWX) {

      saveDetail(MsgAccountDetailFactory.teacherInvite(uid, nickname, kefuName, kefuWX));

   }

	


   @Override

   @Transactional(rollbackFor = Exception.class)

   public void teacherSuccess(Long uid, int days, String kefuName, String kefuWX) {

      saveDetail(MsgAccountDetailFactory.teacherSuccess(uid, days, kefuName, kefuWX));

   }

	
	
   @Transactional(rollbackFor = Exception.class)



   private void saveDetail(MsgAccountDetail detail) {

      try {

         msgAccountDetailService.addMsgAccountDetail(detail);

         // 消息内容

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

      } catch (MsgAccountDetailException e) {

         e.printStackTrace();

      }

   }

	


   @Override

   public void artificialVipUpgradePass(Long uid, String originalName, String upName, int days) {

      saveDetail(MsgAccountDetailFactory.artificialVipUpgradeSuccess(uid, originalName, upName, days));

   }



   @Override

   public void artificialVipUpgradeReject(Long uid, String originalName, String upName, String reson) {

      saveDetail(MsgAccountDetailFactory.artificialVipUpgradeFail(uid, originalName, upName, reson));

   }



}