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..0b116c726 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,16 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService {
         List<ActiveDiscountPayVO> activeFuletVOLists = oilOrderMapper.selectActiveFules(storeId,paymentActiveDTO.getAmount(),paymentActiveDTO.getOilId(),paymentActiveDTO.getMtUserLevel());
         activeFuletVOList.addAll(activeFuletVOLists);
         //优惠券
-<<<<<<< HEAD
+//<<<<<<< HEAD
         //paymentActiveDTO.setUserId(userId);
         paymentActiveDTO.setUserId(117);
-=======
+//=======
         if (ObjectUtils.isNotEmpty(paymentActiveDTO.getUserId())){
             userId = paymentActiveDTO.getUserId();
         }
         paymentActiveDTO.setUserId(userId);
 
->>>>>>> origin/master
+//>>>>>>> origin/master
         List<CardFavorableRecordVO> canUserCardFavorableList = cardFavorableRecordMapper.getCanUserCardFavorableList(paymentActiveDTO);
         //如果是储值卡付款，直接过滤掉
         if(paymentActiveDTO.getType().equals("0")){
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 e4ad73b8f..55b236276 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
@@ -240,7 +240,7 @@ public class CardFavorableRecordServiceImpl extends ServiceImpl<CardFavorableRec
         boolean flag = false;
         AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
         Integer userId = null;
-        if (StringUtils.isNotEmpty(paymentActiveVO.getUserId().toString())){
+        if (paymentActiveVO.getUserId()!=null){
             userId = paymentActiveVO.getUserId();
         }else {
             userId = nowAccountInfo.getId();