admin
2019-03-05 61c67aaf53de97ba4c1ad2570df06d302c0607c7
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java
@@ -1042,7 +1042,9 @@
   
   @Transactional
   @Override
   public void activatedWelfareFreeCoupon(Long uid) {
   public void activatedWelfareFreeCoupon(Long uid, String fromNickName) {
      LogHelper.test("券激活:"+uid);
      if (uid == null) {
         return;
      }
@@ -1065,9 +1067,11 @@
      
      for (UserSystemCoupon userSystemCoupon: list) {
         // 激活
         userSystemCoupon.setStateActivated(1);
         userSystemCoupon.setUpdateTime(new Date());
         userSystemCouponMapper.updateByPrimaryKeySelective(userSystemCoupon);
         UserSystemCoupon update=new UserSystemCoupon();
         update.setId(userSystemCoupon.getId());
         update.setStateActivated(1);
         update.setUpdateTime(new Date());
         userSystemCouponMapper.updateByPrimaryKeySelective(update);
         
         Integer state = userSystemCoupon.getState();
         if (UserSystemCoupon.STATE_OVERDUE == state) {
@@ -1076,7 +1080,11 @@
         
         // 消息推送
         try {
            userOtherMsgNotificationService.welfareCouponActive(userSystemCoupon, new UserInfo(uid));
            UserInfo userInfo = new UserInfo();
            userInfo.setId(uid);
            userInfo.setNickName(fromNickName);
            userOtherMsgNotificationService.welfareCouponActive(userSystemCoupon, userInfo);
         } catch(Exception e) {
            try {
               LogHelper.errorDetailInfo(e);
@@ -1450,7 +1458,5 @@
      userInfoExtraService.saveUserInfoExtra(userInfoExtra);
   
   }
}