From 2550b407c6910450e9d7553711c3ae0345aee9a4 Mon Sep 17 00:00:00 2001
From: hurui <177768073@qq.com>
Date: Wed, 4 Sep 2024 10:23:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/BsDiscountStockController.java  |  2 --
 .../com/hfkj/dao/BsDiscountUserMapperExt.java  |  7 ++++++-
 .../discount/DiscountStockCodeStatusEnum.java  | 18 +++++++++++++++++-
 3 files changed, 23 insertions(+), 4 deletions(-)

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 {
             "</script>"})
     List<DiscountUserModel> queryUserDiscountList(@Param("param") Map<String,Object> param);
 
-    @Update("<script>update bs_discount_user SET `status` = 3 where `status` = 1   <![CDATA[ and expiration_date <= NOW() ]]></script>")
+    @Update("<script>" +
+            " update bs_discount_user a" +
+            " LEFT JOIN bs_discount_stock_code b on b.id = a.discount_stock_code " +
+            " SET a.`status` = 3,b.`status` = 4" +
+            " where  a.`status` = 1 <![CDATA[ and a.expiration_date <= NOW() ]]>" +
+            " </script>")
     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;