dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug

Browse Source
This commit is contained in:
cun-nan 2024-01-22 09:22:50 +08:00
parent b2c17babe9
commit 1d09b0b4c2
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java
View File

@ -456,16 +456,16 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService {
List<ActiveDiscountPayVO> activeFuletVOLists = oilOrderMapper.selectActiveFules(storeId,paymentActiveDTO.getAmount(),paymentActiveDTO.getOilId(),paymentActiveDTO.getMtUserLevel()); List<ActiveDiscountPayVO> activeFuletVOLists = oilOrderMapper.selectActiveFules(storeId,paymentActiveDTO.getAmount(),paymentActiveDTO.getOilId(),paymentActiveDTO.getMtUserLevel());
activeFuletVOList.addAll(activeFuletVOLists); activeFuletVOList.addAll(activeFuletVOLists);
//优惠券 //优惠券
<<<<<<< HEAD //<<<<<<< HEAD
//paymentActiveDTO.setUserId(userId); //paymentActiveDTO.setUserId(userId);
paymentActiveDTO.setUserId(117); paymentActiveDTO.setUserId(117);
======= //=======
if (ObjectUtils.isNotEmpty(paymentActiveDTO.getUserId())){ if (ObjectUtils.isNotEmpty(paymentActiveDTO.getUserId())){
userId = paymentActiveDTO.getUserId(); userId = paymentActiveDTO.getUserId();
} }
paymentActiveDTO.setUserId(userId); paymentActiveDTO.setUserId(userId);
>>>>>>> origin/master //>>>>>>> origin/master
List<CardFavorableRecordVO> canUserCardFavorableList = cardFavorableRecordMapper.getCanUserCardFavorableList(paymentActiveDTO); List<CardFavorableRecordVO> canUserCardFavorableList = cardFavorableRecordMapper.getCanUserCardFavorableList(paymentActiveDTO);
//如果是储值卡付款，直接过滤掉 //如果是储值卡付款，直接过滤掉
if(paymentActiveDTO.getType().equals("0")){ if(paymentActiveDTO.getType().equals("0")){

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/impl/CardFavorableRecordServiceImpl.java
View File

@ -240,7 +240,7 @@ public class CardFavorableRecordServiceImpl extends ServiceImpl<CardFavorableRec
boolean flag = false; boolean flag = false;
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
Integer userId = null; Integer userId = null;
if (StringUtils.isNotEmpty(paymentActiveVO.getUserId().toString())){ if (paymentActiveVO.getUserId()!=null){
userId = paymentActiveVO.getUserId(); userId = paymentActiveVO.getUserId();
}else { }else {
userId = nowAccountInfo.getId(); userId = nowAccountInfo.getId();