Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-08-22 11c098089f8c4714188e91032e5a19e8fe94bf96

 fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinOriginServiceImpl.java

@@ -399,8 +399,6 @@
      });

   }

   

	
	


   @Override

   public void overdueHongBao(Long uid) {

@@ -579,4 +577,61 @@
      // 红包明细

      userTaoLiJinDetailService.createAddDetail(origin);

   }

	
	
   @Override

   @Transactional

   public UserTaoLiJinOrigin  receiveFriendsGive(Long uid, BigDecimal money) throws UserTaoLiJinOriginException{

      if (uid == null || money == null) {

         throw new UserTaoLiJinOriginException(1, "参数不能为空");

      }

		
      // 添加红包余额

      userMoneyExtraService.addTaoLiJin(uid, money, false);

      // 添加新增记录

      UserTaoLiJinOrigin origin = saveOrigin(uid, 1, money, TaoLiJinOriginEnum.friendsGive);

      // 红包明细

      userTaoLiJinDetailService.createAddDetail(origin);

      // 消息

      executor.execute(new Runnable() {

         @Override

         public void run() {

            try {

               MsgOtherTaoLiJinContentDTO content = new MsgOtherTaoLiJinContentDTO();

               content.setState("红包增加");

               content.setSource("好友赠送");

               content.setMoney(money);

               userOtherMsgNotificationService.taoLiJinMsg(uid, "", content);

            } catch (Exception e) {

               LogHelper.errorDetailInfo(e);

            }

         }

      });

      return origin;

   }

	
	
	
   @Override

   @Transactional

   public void  giveSendBack(Long uid, BigDecimal money) throws UserTaoLiJinOriginException{

      if (uid == null || money == null) {

         throw new UserTaoLiJinOriginException(1, "参数不能为空");

      }

		
      // 添加红包余额

      userMoneyExtraService.addTaoLiJin(uid, money, false);

      // 添加新增记录

      UserTaoLiJinOrigin origin = saveOrigin(uid, 1, money, TaoLiJinOriginEnum.giveSendBack);

      // 红包明细

      userTaoLiJinDetailService.createAddDetail(origin);

      UserTaoLiJinDetail detail = new UserTaoLiJinDetail();

      detail.setUid(uid);

      detail.setMoney(money);

      detail.setType(TaoLiJinDetailTypeEnum.giveBack);

      detail.setTitle(TaoLiJinDetailTypeEnum.giveBack.getDesc());

      detail.setCreateTime(new Date());

      userTaoLiJinDetailService.insertSelective(detail);

   }

	
}