diff --git a/src/main/java/com/sqx/modules/coupon/controller/CouponController.java b/src/main/java/com/sqx/modules/coupon/controller/CouponController.java index d7d1761..039b7b3 100644 --- a/src/main/java/com/sqx/modules/coupon/controller/CouponController.java +++ b/src/main/java/com/sqx/modules/coupon/controller/CouponController.java @@ -47,10 +47,10 @@ public class CouponController extends AbstractController { @ApiOperation("管理端赠送用户优惠券") @GetMapping(value = "/giveCoupon") - public Result giveCoupon(Long couponId, String userIds, Long shopId){ + public Result giveCoupon(Long couponId, String userIds, Long shopId,@RequestParam(value = "amount",required = false) Integer amount){ String[] userId = userIds.split(","); List userIdList = Arrays.asList(userId); - return couponService.giveCoupon(couponId, userIdList, shopId); + return couponService.giveCoupon(couponId, userIdList, shopId,amount); } -} \ No newline at end of file +} diff --git a/src/main/java/com/sqx/modules/coupon/service/CouponService.java b/src/main/java/com/sqx/modules/coupon/service/CouponService.java index 4f7e8ed..e841601 100644 --- a/src/main/java/com/sqx/modules/coupon/service/CouponService.java +++ b/src/main/java/com/sqx/modules/coupon/service/CouponService.java @@ -18,6 +18,6 @@ public interface CouponService extends IService { Result selectCouponList(Integer page, Integer limit); - Result giveCoupon(Long couponId, List userIdList, Long shopId); + Result giveCoupon(Long couponId, List userIdList, Long shopId, Integer amount); } diff --git a/src/main/java/com/sqx/modules/coupon/service/impl/CouponServiceImpl.java b/src/main/java/com/sqx/modules/coupon/service/impl/CouponServiceImpl.java index 5ef4175..c9efb74 100644 --- a/src/main/java/com/sqx/modules/coupon/service/impl/CouponServiceImpl.java +++ b/src/main/java/com/sqx/modules/coupon/service/impl/CouponServiceImpl.java @@ -60,7 +60,7 @@ public class CouponServiceImpl extends ServiceImpl implements @Transactional @Override - public Result giveCoupon(Long couponId, List userIdList, Long shopId) { + public Result giveCoupon(Long couponId, List userIdList, Long shopId, Integer amount) { Coupon coupon = couponDao.selectById(couponId); //计算优惠券过期时间 Integer endDate = coupon.getEndDate(); @@ -70,8 +70,11 @@ public class CouponServiceImpl extends ServiceImpl implements Date date = calendar.getTime(); String createTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String expirationTime = new SimpleDateFormat("yyyy-MM-dd").format(date); - couponUserDao.giveCoupon(userIdList, coupon.getCouponName(), coupon.getCouponPicture(), createTime, expirationTime, coupon.getMinMoney(), - coupon.getMoney(), 0,coupon.getEndDate().toString()); + if(amount == null) amount = 3; + for (Integer i = 0; i < amount; i++) { + couponUserDao.giveCoupon(userIdList, coupon.getCouponName(), coupon.getCouponPicture(), createTime, expirationTime, coupon.getMinMoney(), + coupon.getMoney(), 0, coupon.getEndDate().toString()); + } return Result.success(); }