diff --git a/jzo2o-api/src/main/java/com/jzo2o/api/market/CouponApi.java b/jzo2o-api/src/main/java/com/jzo2o/api/market/CouponApi.java index 2d373bc..b55b2eb 100644 --- a/jzo2o-api/src/main/java/com/jzo2o/api/market/CouponApi.java +++ b/jzo2o-api/src/main/java/com/jzo2o/api/market/CouponApi.java @@ -1,5 +1,6 @@ package com.jzo2o.api.market; +import com.jzo2o.api.market.dto.request.CouponUseBackReqDTO; import com.jzo2o.api.market.dto.request.CouponUseReqDTO; import com.jzo2o.api.market.dto.response.AvailableCouponsResDTO; import com.jzo2o.api.market.dto.response.CouponUseResDTO; @@ -29,4 +30,10 @@ public interface CouponApi { */ @PostMapping("/use") CouponUseResDTO useCoupon(@RequestBody CouponUseReqDTO couponUseReqDTO); + + /** + * 用户取消订单退回使用优惠卷 + */ + @PostMapping("/useBack") + void useBack(@RequestBody CouponUseBackReqDTO couponUseBackReqDTO); } \ No newline at end of file diff --git a/jzo2o-api/src/main/java/com/jzo2o/api/market/dto/request/CouponUseBackReqDTO.java b/jzo2o-api/src/main/java/com/jzo2o/api/market/dto/request/CouponUseBackReqDTO.java index f836a1e..6fccdcc 100644 --- a/jzo2o-api/src/main/java/com/jzo2o/api/market/dto/request/CouponUseBackReqDTO.java +++ b/jzo2o-api/src/main/java/com/jzo2o/api/market/dto/request/CouponUseBackReqDTO.java @@ -4,8 +4,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -@ApiModel("优惠券使用退回请求模型") @Data +@ApiModel("优惠券使用退回请求模型") public class CouponUseBackReqDTO { @ApiModelProperty("优惠券id") private Long id; @@ -13,4 +13,4 @@ public class CouponUseBackReqDTO { private Long ordersId; @ApiModelProperty("用户id") private Long userId; -} +} \ No newline at end of file diff --git a/jzo2o-market/src/main/java/com/jzo2o/market/controller/inner/CouponController.java b/jzo2o-market/src/main/java/com/jzo2o/market/controller/inner/CouponController.java index f52aa0c..429246b 100644 --- a/jzo2o-market/src/main/java/com/jzo2o/market/controller/inner/CouponController.java +++ b/jzo2o-market/src/main/java/com/jzo2o/market/controller/inner/CouponController.java @@ -1,10 +1,12 @@ package com.jzo2o.market.controller.inner; import com.jzo2o.api.market.CouponApi; +import com.jzo2o.api.market.dto.request.CouponUseBackReqDTO; import com.jzo2o.api.market.dto.request.CouponUseReqDTO; import com.jzo2o.api.market.dto.response.AvailableCouponsResDTO; import com.jzo2o.api.market.dto.response.CouponUseResDTO; import com.jzo2o.market.service.ICouponService; +import com.jzo2o.market.service.ICouponUseBackService; import com.jzo2o.market.service.ICouponWriteOffService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; @@ -27,6 +29,8 @@ public class CouponController implements CouponApi { private ICouponService couponService; @Resource private ICouponWriteOffService couponWriteOffService; + @Resource + private ICouponUseBackService couponUseBackService; /** * 根据订单金额获取当前用户可用优惠卷 @@ -45,4 +49,11 @@ public class CouponController implements CouponApi { public CouponUseResDTO useCoupon(@RequestBody CouponUseReqDTO couponUseReqDTO) { return couponWriteOffService.use(couponUseReqDTO); } + + @Override + @PostMapping("/useBack") + @ApiOperation("优惠券退回接口") + public void useBack(@RequestBody CouponUseBackReqDTO couponUseBackReqDTO) { + couponUseBackService.useBack(couponUseBackReqDTO); + } } \ No newline at end of file diff --git a/jzo2o-market/src/main/java/com/jzo2o/market/model/domain/CouponUseBack.java b/jzo2o-market/src/main/java/com/jzo2o/market/model/domain/CouponUseBack.java index 8a613da..7443d13 100644 --- a/jzo2o-market/src/main/java/com/jzo2o/market/model/domain/CouponUseBack.java +++ b/jzo2o-market/src/main/java/com/jzo2o/market/model/domain/CouponUseBack.java @@ -1,22 +1,24 @@ package com.jzo2o.market.model.domain; import com.baomidou.mybatisplus.annotation.IdType; -import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; +import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.io.Serializable; +import java.time.LocalDateTime; + /** *
* 优惠券使用回退记录 *
- * * @author itcast * @since 2023-09-18 */ @Data +@Builder @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) public class CouponUseBack implements Serializable { @@ -26,7 +28,7 @@ public class CouponUseBack implements Serializable { /** * 回退记录id */ - @TableId(value = "id", type = IdType.NONE) + @TableId(value = "id", type = IdType.ASSIGN_ID) private Long id; /** @@ -48,6 +50,4 @@ public class CouponUseBack implements Serializable { * 核销时间 */ private LocalDateTime writeOffTime; - - -} +} \ No newline at end of file diff --git a/jzo2o-market/src/main/java/com/jzo2o/market/service/ICouponUseBackService.java b/jzo2o-market/src/main/java/com/jzo2o/market/service/ICouponUseBackService.java index 70f713f..097aa52 100644 --- a/jzo2o-market/src/main/java/com/jzo2o/market/service/ICouponUseBackService.java +++ b/jzo2o-market/src/main/java/com/jzo2o/market/service/ICouponUseBackService.java @@ -1,18 +1,19 @@ package com.jzo2o.market.service; -import com.jzo2o.market.model.domain.CouponUseBack; import com.baomidou.mybatisplus.extension.service.IService; - -import java.time.LocalDateTime; +import com.jzo2o.api.market.dto.request.CouponUseBackReqDTO; +import com.jzo2o.market.model.domain.CouponUseBack; /** ** 优惠券使用回退记录 服务类 *
- * * @author itcast * @since 2023-09-18 */ public interface ICouponUseBackService extends IService* 优惠券使用回退记录 服务实现类 *
- * * @author itcast * @since 2023-09-18 */ @Service public class CouponUseBackServiceImpl extends ServiceImpl