From afb7203e88dc6bf94e0124ea207e364fa67c1b4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BD=90=E5=A4=A9=E5=A4=A7=E5=9C=A3?= <17615834396@163.com>
Date: Tue, 9 Jan 2024 16:12:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/CardExchangeRecordServiceImpl.java       | 2 +-
 .../controller/CardFavorableRecordController.java         | 2 +-
 .../cardFavorable/service/CardFavorableRecordService.java | 2 +-
 .../service/impl/CardFavorableRecordServiceImpl.java      | 8 +++++++-
 gasStation-uni/pagesMy/writeOff/writeOff.vue              | 5 ++++-
 5 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardExchange/service/impl/CardExchangeRecordServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardExchange/service/impl/CardExchangeRecordServiceImpl.java
index 4b6e3d48b..899c934f0 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardExchange/service/impl/CardExchangeRecordServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardExchange/service/impl/CardExchangeRecordServiceImpl.java
@@ -109,7 +109,7 @@ public class CardExchangeRecordServiceImpl extends ServiceImpl<CardExchangeRecor
      */
     @Override
     public IPage<CardExchangeRecordVO> selectCancelRecords(Page page, CardExchangeRecordDTO cardExchangeRecordDTO) {
-        cardExchangeRecordDTO.setStoreId(TokenUtil.getNowAccountInfo().getStoreId());
+        /*cardExchangeRecordDTO.setStoreId(TokenUtil.getNowAccountInfo().getStoreId());*/
         cardExchangeRecordDTO.setMtUserId(TokenUtil.getNowAccountInfo().getId());
         return cardExchangeRecordMapper.selectCancelRecords(page,cardExchangeRecordDTO);
     }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/controller/CardFavorableRecordController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/controller/CardFavorableRecordController.java
index 4cddc3d6c..88c4011b0 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/controller/CardFavorableRecordController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/controller/CardFavorableRecordController.java
@@ -91,7 +91,7 @@ public class CardFavorableRecordController extends BaseController {
      * @return 新增结果
      */
     @PostMapping("drawDown")
-    public ResponseObject drawDown(@RequestBody IdListDTO idList) {
+    public ResponseObject drawDown(@RequestBody IdListDTO idList) throws Exception {
         return getSuccessResult(this.cardFavorableRecordService.drawDown(idList));
     }
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/CardFavorableRecordService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/CardFavorableRecordService.java
index 12092cb70..b68771cd5 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/CardFavorableRecordService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/CardFavorableRecordService.java
@@ -41,7 +41,7 @@ public interface CardFavorableRecordService extends IService<CardFavorableRecord
      * @param idList
      * @return
      */
-    boolean drawDown(IdListDTO idList);
+    boolean drawDown(IdListDTO idList) throws Exception;
 
     /**
      * 小程序端判断是否领取优惠券
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/impl/CardFavorableRecordServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/impl/CardFavorableRecordServiceImpl.java
index cadad2b04..1eddf1e86 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/impl/CardFavorableRecordServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/impl/CardFavorableRecordServiceImpl.java
@@ -100,7 +100,7 @@ public class CardFavorableRecordServiceImpl extends ServiceImpl<CardFavorableRec
      * @return
      */
     @Override
-    public boolean drawDown(IdListDTO idList) {
+    public boolean drawDown(IdListDTO idList) throws Exception {
         boolean save = false;
         AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
         Integer userId = nowAccountInfo.getId();
@@ -109,6 +109,11 @@ public class CardFavorableRecordServiceImpl extends ServiceImpl<CardFavorableRec
         //优惠券
         for (Integer id : idList.getIdList()) {
             CardFavorable cardFavorable = cardFavorableService.getById(id);
+            //优惠券的数量
+            Integer count = cardFavorable.getCount();
+            if (count < 1){
+                throw  new Exception("优惠券已领完");
+            }
             if (ObjectUtils.isNotEmpty(cardFavorable) && ObjectUtils.isNotEmpty(cardFavorable.getTimeType())){
                 if (cardFavorable.getTimeType().equals("0")){
                     cardFavorableRecord.setStartTime(new Date());
@@ -133,6 +138,7 @@ public class CardFavorableRecordServiceImpl extends ServiceImpl<CardFavorableRec
                 cardFavorableRecord.setExchangeFrom("店铺发券");
                 cardFavorableRecord.setStatus("0");
                 save = save(cardFavorableRecord);
+                cardFavorable.setCount(count-1);
             }
         }
         return save;
diff --git a/gasStation-uni/pagesMy/writeOff/writeOff.vue b/gasStation-uni/pagesMy/writeOff/writeOff.vue
index 4407f4164..98b5ca197 100644
--- a/gasStation-uni/pagesMy/writeOff/writeOff.vue
+++ b/gasStation-uni/pagesMy/writeOff/writeOff.vue
@@ -58,8 +58,10 @@
 	export default {
 		data() {
 			return {
+				storeId: '',
 				cardsList: [],
 				query: {
+					storeId: '',
 					cardType: '兑换券',
 					pageNo: 1,
 					pageSize: 10
@@ -86,6 +88,7 @@
 
 		},
 		onShow() {
+			this.query.storeId = uni.getStorageSync("storeId");
 			this.getGiftRecords()
 		},
 		methods: {
@@ -250,4 +253,4 @@
 		font-size: 14px;
 		border-radius: 15px;
 	}
-</style>
+</style>
\ No newline at end of file