java/qijisheng.git

			@@ -12,6 +12,7 @@
			import org.springframework.stereotype.Service;

			import javax.annotation.Resource;
			import java.time.LocalDateTime;
			import java.time.format.DateTimeFormatter;
			import java.util.ArrayList;
			import java.util.Arrays;
			@@ -44,14 +45,14 @@
			@Override
			public List<PaymentUserCouponVo> getUserCoupon(Long userId, Integer type) {
			List<UserCoupon> list = this.list(new LambdaQueryWrapper<UserCoupon>().eq(UserCoupon::getAppUserId, userId).eq(UserCoupon::getDelFlag, 0)
			.last(" and now() between start_time and end_time"));
			.isNull(UserCoupon::getUseTime).gt(UserCoupon::getEndTime, LocalDateTime.now()).last(" and now() between start_time and end_time"));
			List<Integer> couponIds = list.stream().map(UserCoupon::getCouponId).collect(Collectors.toList());
			if(couponIds.size() == 0){
			return null;
			}
			List<CouponInfo> couponInfoList = couponInfoClient.getCouponInfoList(couponIds).getData();
			//构建返回数据
			DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
			DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
			List<PaymentUserCouponVo> infoVoList = new ArrayList<>();
			for (UserCoupon userCoupon : list) {
			CouponInfo couponInfo = couponInfoList.stream().filter(s -> s.getId().equals(userCoupon.getCouponId())).findFirst().get();