免单更改

admin

2019-08-22 c044b6dd024b6884a4f39bc56e4873c95b13fe02

 fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java

@@ -406,13 +406,11 @@
         object.put("memoName", memoName);



         String nickName = "";

         Long  workerId= null;

         String portrait = "";

         Long lastLoginTime = null;



         UserInfo worker = threeSale.getWorker();

         if (worker != null) {

            workerId = worker.getId();

            portrait = worker.getPortrait();

            lastLoginTime = worker.getLastLoginTime();

            nickName = worker.getNickName();

@@ -505,7 +503,7 @@


   @Override

   @Transactional

   public void bindRelationshipByInviteCode(UserInfo invitee, UserInfo inviter, String platform, String version) throws ThreeSaleException {

   public void bindRelationshipByInviteCode(UserInfo invitee, UserInfo inviter) throws ThreeSaleException {



      if (invitee == null || inviter == null) 

         throw new ThreeSaleException(1, "用户信息为空");

@@ -515,6 +513,8 @@


      if (threeSale != null) {

         // 有效关系--生效

         threeSale.setBoss(inviter);

         threeSale.setWorker(invitee);

         threeSale.setState(true);

         threeSale.setExpire(ThreeSale.EXPIRE_NORMAL);

         threeSale.setSucceedTime(java.lang.System.currentTimeMillis());

@@ -590,7 +590,7 @@


   @Override

   @Transactional

   public void bindRelationshipByWX(UserInfo invitee, Long inviterId, ThreeSale threeSaleOld, String platform, String version) throws ThreeSaleException {

   public void bindRelationshipByWX(UserInfo invitee, Long inviterId, ThreeSale threeSaleOld) throws ThreeSaleException {



      if (invitee == null || (inviterId == null && threeSaleOld == null))

         throw new ThreeSaleException(1, "用户信息为空");

@@ -633,6 +633,7 @@
      

      UserInfo boss = userInfoService.selectByPKey(threeSale.getBoss().getId());

      threeSale.setBoss(boss);

      threeSale.setWorker(invitee);

      

      // 添加到队列

      ThreeSaleCMQManager.getInstance().addThreeSaleMsg(threeSale);