|
@@ -3,14 +3,12 @@ package com.yonge.cooleshow.admin.controller.coupon;
|
|
|
|
|
|
import com.alibaba.fastjson.JSON;
|
|
import com.alibaba.fastjson.JSON;
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
-import com.yonge.cooleshow.admin.io.request.coupon.CouponInfoVO;
|
|
|
|
import com.yonge.cooleshow.admin.io.request.coupon.CouponIssueVo;
|
|
import com.yonge.cooleshow.admin.io.request.coupon.CouponIssueVo;
|
|
import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
|
|
import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
|
|
import com.yonge.cooleshow.auth.api.entity.SysUser;
|
|
import com.yonge.cooleshow.auth.api.entity.SysUser;
|
|
import com.yonge.cooleshow.biz.dal.entity.CouponIssue;
|
|
import com.yonge.cooleshow.biz.dal.entity.CouponIssue;
|
|
import com.yonge.cooleshow.biz.dal.enums.SendTypeEnum;
|
|
import com.yonge.cooleshow.biz.dal.enums.SendTypeEnum;
|
|
import com.yonge.cooleshow.biz.dal.enums.coupon.CouponUseStateEnum;
|
|
import com.yonge.cooleshow.biz.dal.enums.coupon.CouponUseStateEnum;
|
|
-import com.yonge.cooleshow.biz.dal.queryInfo.CouponInfoQuery;
|
|
|
|
import com.yonge.cooleshow.biz.dal.queryInfo.CouponIssueQueryInfo;
|
|
import com.yonge.cooleshow.biz.dal.queryInfo.CouponIssueQueryInfo;
|
|
import com.yonge.cooleshow.biz.dal.service.CouponIssueService;
|
|
import com.yonge.cooleshow.biz.dal.service.CouponIssueService;
|
|
import com.yonge.cooleshow.biz.dal.vo.CouponIssueUserVo;
|
|
import com.yonge.cooleshow.biz.dal.vo.CouponIssueUserVo;
|
|
@@ -26,7 +24,7 @@ import org.springframework.validation.annotation.Validated;
|
|
import org.springframework.web.bind.annotation.*;
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
import javax.validation.Valid;
|
|
import javax.validation.Valid;
|
|
-import java.time.Instant;
|
|
|
|
|
|
+import java.util.Date;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
|
|
import static com.yonge.cooleshow.common.entity.HttpResponseResult.failed;
|
|
import static com.yonge.cooleshow.common.entity.HttpResponseResult.failed;
|
|
@@ -99,7 +97,7 @@ public class CouponIssueController {
|
|
return failed("用户信息获取失败");
|
|
return failed("用户信息获取失败");
|
|
}
|
|
}
|
|
couponIssueService.issueCoupon(param.getCouponId(), param.getUserParam(), sysUser.getId(), param.getRemark(), true, true,
|
|
couponIssueService.issueCoupon(param.getCouponId(), param.getUserParam(), sysUser.getId(), param.getRemark(), true, true,
|
|
- SendTypeEnum.PLATFORM);
|
|
|
|
|
|
+ SendTypeEnum.PLATFORM, new Date());
|
|
|
|
|
|
return succeed();
|
|
return succeed();
|
|
}
|
|
}
|