java/qijisheng.git

			@@ -3,6 +3,7 @@

			import com.alibaba.fastjson2.JSON;
			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
			import com.baomidou.mybatisplus.core.metadata.IPage;
			import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
			import com.ruoyi.account.api.feignClient.AppUserClient;
			@@ -25,6 +26,7 @@
			import org.springframework.web.bind.annotation.*;

			import javax.annotation.Resource;
			import java.time.LocalDate;
			import java.util.Arrays;
			import java.util.Collection;
			import java.util.List;
			@@ -74,11 +76,11 @@
			@ApiOperation(value = "优惠劵管理-详情", tags = {"管理后台-活动管理"})
			public R<CouponInfo> detail(@RequestParam("id") Integer id) {
			CouponInfo byId = couponInfoService.getById(id);
			byId.setGoodsNameList(JSON.parseArray(byId.getGoodsNameJson(), String.class));
			String forGoodIds = byId.getForGoodIds();
			if (StringUtils.isNotEmpty(forGoodIds)){
			if (!"-1".equals(forGoodIds) && StringUtils.isNotEmpty(forGoodIds)){
			List<Goods> goods = goodsService.listByIds(Arrays.asList(forGoodIds.split(",")));
			byId.setGoods(goods);
			byId.setGoodsNameList(goods.stream().map(Goods::getName).collect(Collectors.toList()));
			}
			String personIds = byId.getPersonIds();
			if (StringUtils.isNotEmpty(personIds)){
			@@ -104,6 +106,11 @@
			public R<Void> edit(@RequestBody CouponInfo couponInfo) {
			List<String> goodsNameList = couponInfo.getGoodsNameList();
			couponInfo.setGoodsNameJson(JSON.toJSONString(goodsNameList));
			if(couponInfo.getPeriodType() == 2){
			Integer periodDays = couponInfo.getPeriodDays();
			couponInfo.setPeriodStartTime(LocalDate.now());
			couponInfo.setPeriodEndTime(LocalDate.now().plusDays(periodDays));
			}
			couponInfoService.updateById(couponInfo);
			return R.ok();
			}
			@@ -127,6 +134,12 @@
			couponInfo.setShelfStatus(0);
			List<String> goodsNameList = couponInfo.getGoodsNameList();
			couponInfo.setGoodsNameJson(JSON.toJSONString(goodsNameList));
			couponInfo.setShelfStatus(1);
			if(couponInfo.getPeriodType() == 2){
			Integer periodDays = couponInfo.getPeriodDays();
			couponInfo.setPeriodStartTime(LocalDate.now());
			couponInfo.setPeriodEndTime(LocalDate.now().plusDays(periodDays));
			}
			couponInfoService.save(couponInfo);
			return R.ok();
			}
			@@ -187,8 +200,15 @@

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







			}