From d31e230e8c61ddf6e1a5683f4815cb6395af2aac 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: Wed, 27 Mar 2024 11:24:51 +0800
Subject: [PATCH] bug

---
 .../service/impl/ActiveExchangeServiceImpl.java  |  2 +-
 .../service/impl/TagCodeRecordServiceImpl.java   | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java
index a607fa7d7..d5bd5f0ce 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java
@@ -785,7 +785,7 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService {
             //4. 3和优惠券比较
             if (ObjectUtils.isNotEmpty(activeDiscountPayVO3)) {
                 finalAmount = activeDiscountPayVO3.getDiscounts();
-                if (ObjectUtils.isNotEmpty(cardFavorableRecordVO) && finalAmount < cardFavorableRecordVO.getDiscountAmount()) {
+                if (ObjectUtils.isNotEmpty(cardFavorableRecordVO) && ObjectUtils.isNotEmpty(cardFavorableRecordVO.getDiscountAmount()) && finalAmount < cardFavorableRecordVO.getDiscountAmount()) {
                     PaymentActiveVO paymentActiveVO1 = new PaymentActiveVO();
                     //单用优惠券优惠力度最大
                     paymentActiveVO1.setCardFavorableId(cardFavorableRecordVO.getId());
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/tag/service/impl/TagCodeRecordServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/tag/service/impl/TagCodeRecordServiceImpl.java
index e16041a96..17766730f 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/tag/service/impl/TagCodeRecordServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/tag/service/impl/TagCodeRecordServiceImpl.java
@@ -17,6 +17,7 @@ import com.fuint.business.tag.mapper.TagCodeRecordMapper;
 import com.fuint.business.tag.entity.TagCodeRecord;
 import com.fuint.business.tag.service.OilTagService;
 import com.fuint.business.tag.service.TagCodeRecordService;
+import com.fuint.business.tag.service.TagCodeService;
 import com.fuint.business.tag.vo.TagCodeRecordVO;
 import com.fuint.common.dto.AccountInfo;
 import com.fuint.common.service.StaffService;
@@ -51,6 +52,9 @@ public class TagCodeRecordServiceImpl extends ServiceImpl<TagCodeRecordMapper, T
     @Resource
     private ILJStaffService mtStaffService;
 
+    @Resource
+    private TagCodeService tagCodeService;
+
     @Override
     @Transactional
     public boolean add(TagCodeRecordDTO tagCodeRecordDTO) {
@@ -59,6 +63,18 @@ public class TagCodeRecordServiceImpl extends ServiceImpl<TagCodeRecordMapper, T
         TagCodeRecord tagCodeRecord = new TagCodeRecord();
         if (ObjectUtils.isNotEmpty(tagCodeRecordDTO) && CollectionUtils.isNotEmpty(tagCodeRecordDTO.getOilTagList())){
             for (Integer integer : tagCodeRecordDTO.getOilTagList()) {
+
+                //码牌配置
+                OilTag byId = oilTagService.getById(integer);
+                //二维码id
+                Integer tagCodeId = byId.getTagCodeId();
+                //二维码
+                TagCode byId1 = tagCodeService.getById(tagCodeId);
+                String collection = byId1.getCollection();
+                collection += "&storeId=" + tagCodeRecordDTO.getStoreId();
+                byId1.setCollection(collection);
+                tagCodeService.updateById(byId1);
+
                 OilTag oilTag = new OilTag();
                 //码牌绑定店铺
                 tagCodeRecord.setOilTagId(integer);