diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/marketing/coupon/controller/MktCouponController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/marketing/coupon/controller/MktCouponController.java index 93b57226..b2bce267 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/marketing/coupon/controller/MktCouponController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/marketing/coupon/controller/MktCouponController.java @@ -1,12 +1,9 @@ package com.bonus.canteen.core.marketing.coupon.controller; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollUtil; -import com.bonus.canteen.core.marketing.dto.GroupCuponDto; +import com.bonus.canteen.core.marketing.coupon.dto.GroupCuponDto; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.canteen.core.marketing.coupon.param.MktCouponMobileUsableParam; import com.bonus.canteen.core.marketing.coupon.service.MktCouponService; -import com.bonus.canteen.core.marketing.coupon.vo.MktCouponMobileUsableVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; @@ -18,9 +15,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.Collection; -import java.util.List; - @RestController @RequestMapping({"/api/v2/mkt/coupon"}) @Api( diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/marketing/dto/GroupCuponDto.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/marketing/coupon/dto/GroupCuponDto.java similarity index 92% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/marketing/dto/GroupCuponDto.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/marketing/coupon/dto/GroupCuponDto.java index 20722e9b..45a0dd46 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/marketing/dto/GroupCuponDto.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/marketing/coupon/dto/GroupCuponDto.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.core.marketing.dto; +package com.bonus.canteen.core.marketing.coupon.dto; import com.bonus.canteen.core.common.page.PageDTO; import io.swagger.annotations.ApiModelProperty; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/marketing/coupon/service/MktCouponService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/marketing/coupon/service/MktCouponService.java index 62a60298..ffc8419b 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/marketing/coupon/service/MktCouponService.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/marketing/coupon/service/MktCouponService.java @@ -6,7 +6,7 @@ import com.bonus.canteen.core.marketing.coupon.model.MktCouponMacPayModel; import com.bonus.canteen.core.marketing.coupon.model.MktCouponPayModel; import com.bonus.canteen.core.marketing.coupon.param.MktCouponMobileUsableParam; import com.bonus.canteen.core.marketing.coupon.vo.MktCouponMobileUsableVO; -import com.bonus.canteen.core.marketing.dto.GroupCuponDto; +import com.bonus.canteen.core.marketing.coupon.dto.GroupCuponDto; import com.bonus.canteen.core.marketing.coupon.vo.MktGroupVo; import java.util.List; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/marketing/coupon/service/impl/MktCouponServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/marketing/coupon/service/impl/MktCouponServiceImpl.java index 423797a8..ebd34fcc 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/marketing/coupon/service/impl/MktCouponServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/marketing/coupon/service/impl/MktCouponServiceImpl.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.bonus.canteen.core.marketing.coupon.dto.GroupByCouponStateDto; import com.bonus.canteen.core.marketing.coupon.service.MktCouponTmplBackService; -import com.bonus.canteen.core.marketing.dto.GroupCuponDto; +import com.bonus.canteen.core.marketing.coupon.dto.GroupCuponDto; import com.bonus.canteen.core.marketing.coupon.vo.MktCouponMobileVO; import com.bonus.canteen.core.marketing.coupon.vo.MktCouponTmplBackVO; import com.bonus.canteen.core.marketing.coupon.vo.MktGroupVo;