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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
cun-nan 2024-01-22 14:28:50 +08:00
commit e49689ceec
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuintAdmin/src/views/member/userInfoOrder/couponList.vue
View File

@ -111,7 +111,7 @@ export default {
getList(){ getList(){
this.loading = true this.loading = true
this.queryParams.userId = this.userId this.queryParams.mtUserId = this.userId
getCardFavorableList(this.queryParams).then(res=>{ getCardFavorableList(this.queryParams).then(res=>{
if (res.code == 200) { if (res.code == 200) {
this.list = res.data.records this.list = res.data.records

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

@ -456,16 +456,13 @@ 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 //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
List<CardFavorableRecordVO> canUserCardFavorableList = cardFavorableRecordMapper.getCanUserCardFavorableList(paymentActiveDTO); List<CardFavorableRecordVO> canUserCardFavorableList = cardFavorableRecordMapper.getCanUserCardFavorableList(paymentActiveDTO);
//如果是储值卡付款，直接过滤掉 //如果是储值卡付款，直接过滤掉
if(paymentActiveDTO.getType().equals("0")){ if(paymentActiveDTO.getType().equals("0")){