diff --git a/bweb/src/main/java/com/bweb/controller/BsDiscountStockController.java b/bweb/src/main/java/com/bweb/controller/BsDiscountStockController.java index f9d4b13..541cf2f 100644 --- a/bweb/src/main/java/com/bweb/controller/BsDiscountStockController.java +++ b/bweb/src/main/java/com/bweb/controller/BsDiscountStockController.java @@ -91,8 +91,6 @@ public class BsDiscountStockController { } } - - @RequestMapping(value="/queryStockBatchCodeList",method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "查询库存批次优惠券code") diff --git a/service/src/main/java/com/hfkj/dao/BsDiscountUserMapperExt.java b/service/src/main/java/com/hfkj/dao/BsDiscountUserMapperExt.java index 1a3a09a..4962b7a 100644 --- a/service/src/main/java/com/hfkj/dao/BsDiscountUserMapperExt.java +++ b/service/src/main/java/com/hfkj/dao/BsDiscountUserMapperExt.java @@ -40,6 +40,11 @@ public interface BsDiscountUserMapperExt { ""}) List queryUserDiscountList(@Param("param") Map param); - @Update("") + @Update("") void expiration(); } diff --git a/service/src/main/java/com/hfkj/sysenum/discount/DiscountStockCodeStatusEnum.java b/service/src/main/java/com/hfkj/sysenum/discount/DiscountStockCodeStatusEnum.java index 8048044..48f79f0 100644 --- a/service/src/main/java/com/hfkj/sysenum/discount/DiscountStockCodeStatusEnum.java +++ b/service/src/main/java/com/hfkj/sysenum/discount/DiscountStockCodeStatusEnum.java @@ -7,10 +7,26 @@ import java.util.Objects; * @author hurui */ public enum DiscountStockCodeStatusEnum { - status0(0 , "删除"), + /** + * 不可用 + */ + status0(0 , "不可用"), + /** + * 未领取 + */ status1(1 , "未领取"), + /** + * 未使用 + */ status2(2 , "未使用"), + /** + * 已使用 + */ status3(3 , "已使用"), + /** + * 已过期 + */ + status4(4 , "已过期"), ; private Integer code;