java/qijisheng.git

			@@ -8,6 +8,7 @@
			import com.ruoyi.account.api.feignClient.AppUserClient;
			import com.ruoyi.account.api.feignClient.UserCouponClient;
			import com.ruoyi.account.api.model.AppUser;
			import com.ruoyi.account.api.model.UserCoupon;
			import com.ruoyi.common.core.domain.R;
			import com.ruoyi.common.core.utils.StringUtils;
			import com.ruoyi.common.security.service.TokenService;
			@@ -16,6 +17,7 @@
			import com.ruoyi.other.service.CouponInfoService;
			import com.ruoyi.other.service.GoodsService;
			import io.swagger.annotations.ApiOperation;
			import io.swagger.annotations.ApiParam;
			import org.springframework.web.bind.annotation.PostMapping;
			import org.springframework.web.bind.annotation.RequestMapping;
			import org.springframework.web.bind.annotation.RequestParam;
			@@ -24,10 +26,12 @@

			import javax.annotation.Resource;
			import java.util.Arrays;
			import java.util.Collection;
			import java.util.List;

			import java.time.LocalDateTime;
			import java.util.ArrayList;
			import java.util.stream.Collectors;

			/**
			* <p>
			@@ -75,6 +79,12 @@
			if (StringUtils.isNotEmpty(forGoodIds)){
			List<Goods> goods = goodsService.listByIds(Arrays.asList(forGoodIds.split(",")));
			byId.setGoods(goods);
			}
			String personIds = byId.getPersonIds();
			if (StringUtils.isNotEmpty(personIds)){
			List<Long> ids = Arrays.stream(personIds.split(",")).map(Long::valueOf).collect(Collectors.toList());
			List<AppUser> appUserList = appUserClient.listByIds(ids);
			byId.setAppUserList(appUserList);
			}

			return R.ok(byId);
			@@ -170,5 +180,15 @@
			return R.ok(couponInfos);
			}


			/**
			* 获取领取记录
			*/

			@GetMapping("/getReceiveRecord")
			public R<IPage<UserCoupon>> getReceiveRecord(@ApiParam("页码") @RequestParam Integer pageNum, @ApiParam("大小") Integer pageSize,UserCoupon userCoupon) {
			return null;
			}

			}