Merge remote-tracking branch 'origin/master'

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/manager/issue/UserEquityLinkManagerImpl.java

@@ -63,9 +63,9 @@ public class UserEquityLinkManagerImpl extends AbstractIawManager implements Use
         if (equityLink == null) {
             throw new ManagerException("未获取到权益！");
         }
-        if (LocalDateTime.now().isAfter(equityLink.getValidEndTime())) {
-            throw new ManagerException("权益已过期！");
-        }
+//        if (equityLink.getValidEndTime() != null && LocalDateTime.now().isAfter(equityLink.getValidEndTime())) {
+//            throw new ManagerException("权益已过期！");
+//        }
         //获取兑换码
         IssueSingleEquity singleEquity = singleEquityRepo.findBySingleEquityId(equityLink.getEquityId());
         if (singleEquity == null) {
@@ -133,7 +133,7 @@ public class UserEquityLinkManagerImpl extends AbstractIawManager implements Use
         if (singleEquity == null) {
             throw new ManagerException("未获取到权益！");
         }
-        equityLink.setEquityId(singleEquity.getId());
+        equityLink.setEquityId(singleEquity.getSingleEquityId());
         equityLink.setEquityName(singleEquity.getEquityName());
         equityLink.setProductIntro(singleEquity.getProductIntro());
         equityLink.setFee(singleEquity.getDiscountPrice());