From f16d31ca40763051b661ca149e9e302d7a275ab1 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: Mon, 22 Jan 2024 14:26:01 +0800
Subject: [PATCH] bug

---
 fuintAdmin/src/views/member/userInfoOrder/couponList.vue       | 2 +-
 .../activeExchange/service/impl/ActiveExchangeServiceImpl.java | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/fuintAdmin/src/views/member/userInfoOrder/couponList.vue b/fuintAdmin/src/views/member/userInfoOrder/couponList.vue
index 105344b54..ddfb94406 100644
--- a/fuintAdmin/src/views/member/userInfoOrder/couponList.vue
+++ b/fuintAdmin/src/views/member/userInfoOrder/couponList.vue
@@ -112,7 +112,7 @@ export default {
     getList(){
       this.loading = true
 
-      this.queryParams.userId = this.userId
+      this.queryParams.mtUserId = this.userId
       getCardFavorableList(this.queryParams).then(res=>{
         if (res.code == 200) {
           this.list = res.data.records
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 6bb722bfb..7deea9176 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
@@ -456,16 +456,13 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService {
         List<ActiveDiscountPayVO> activeFuletVOLists = oilOrderMapper.selectActiveFules(storeId,paymentActiveDTO.getAmount(),paymentActiveDTO.getOilId(),paymentActiveDTO.getMtUserLevel());
         activeFuletVOList.addAll(activeFuletVOLists);
         //优惠券
-<<<<<<< HEAD
         //paymentActiveDTO.setUserId(userId);
         paymentActiveDTO.setUserId(117);
-=======
         if (ObjectUtils.isNotEmpty(paymentActiveDTO.getUserId())){
             userId = paymentActiveDTO.getUserId();
         }
         paymentActiveDTO.setUserId(userId);
 
->>>>>>> origin/master
         List<CardFavorableRecordVO> canUserCardFavorableList = cardFavorableRecordMapper.getCanUserCardFavorableList(paymentActiveDTO);
         //如果是储值卡付款，直接过滤掉
         if(paymentActiveDTO.getType().equals("0")){