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:
齐天大圣 2024-04-28 17:09:01 +08:00
parent 59065d2c00
commit 3e51cf1e03
1 changed files with 3 additions and 3 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

@ -1086,7 +1086,7 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService {
@Override @Override
public void activeConsumption (PaymentActiveDTO paymentActiveDTO) throws Exception { public void activeConsumption (PaymentActiveDTO paymentActiveDTO) throws Exception {
//消费有礼 //消费有礼
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); // AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
ArrayList<ActiveConsumptionVO> activeConsumptionVOS1 = new ArrayList<>(); ArrayList<ActiveConsumptionVO> activeConsumptionVOS1 = new ArrayList<>();
List<ActiveConsumptionVO> activeConsumptionVOS = oilOrderMapper.selectActiveConsumption(paymentActiveDTO.getStoreId(), paymentActiveDTO.getOrderAmount()); List<ActiveConsumptionVO> activeConsumptionVOS = oilOrderMapper.selectActiveConsumption(paymentActiveDTO.getStoreId(), paymentActiveDTO.getOrderAmount());
if (CollectionUtils.isNotEmpty(activeConsumptionVOS)) { if (CollectionUtils.isNotEmpty(activeConsumptionVOS)) {
@ -1100,7 +1100,7 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService {
if (ObjectUtils.isNotEmpty(paymentActiveDTO.getUserId())){ if (ObjectUtils.isNotEmpty(paymentActiveDTO.getUserId())){
queryWrapper.eq(ActiveConsumptionRecord::getUserId,paymentActiveDTO.getUserId()); queryWrapper.eq(ActiveConsumptionRecord::getUserId,paymentActiveDTO.getUserId());
}else { }else {
queryWrapper.eq(ActiveConsumptionRecord::getUserId,nowAccountInfo.getId()); queryWrapper.eq(ActiveConsumptionRecord::getUserId,paymentActiveDTO.getUserId());
} }
List<ActiveConsumptionRecord> list = activeConsumptionRecordService.list(queryWrapper); List<ActiveConsumptionRecord> list = activeConsumptionRecordService.list(queryWrapper);
@ -1112,7 +1112,7 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService {
if (ObjectUtils.isNotEmpty(paymentActiveDTO.getUserId())){ if (ObjectUtils.isNotEmpty(paymentActiveDTO.getUserId())){
activeConsumptionRecord.setUserId(paymentActiveDTO.getUserId()); activeConsumptionRecord.setUserId(paymentActiveDTO.getUserId());
}else { }else {
activeConsumptionRecord.setUserId(nowAccountInfo.getId()); activeConsumptionRecord.setUserId(paymentActiveDTO.getUserId());
} }
activeConsumptionRecord.setStoreId(paymentActiveDTO.getStoreId()); activeConsumptionRecord.setStoreId(paymentActiveDTO.getStoreId());
activeConsumptionRecordService.save(activeConsumptionRecord); activeConsumptionRecordService.save(activeConsumptionRecord);