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

更新10.9

Browse Source
This commit is contained in:
许允枞 2024-10-09 18:12:21 +08:00
parent 7cce0cb66f
commit 1fe42d51f6
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/IntegralSettingsService.java
View File

@ -2,6 +2,7 @@ package com.fuint.business.integral.service;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.integral.entity.IntegralDetail;
import com.fuint.business.integral.entity.IntegralGift; import com.fuint.business.integral.entity.IntegralGift;
import com.fuint.business.integral.entity.IntegralSettings; import com.fuint.business.integral.entity.IntegralSettings;
import com.fuint.business.integral.vo.IntegralSettingsVo; import com.fuint.business.integral.vo.IntegralSettingsVo;
@ -71,7 +72,7 @@ public interface IntegralSettingsService {
Integer todayIsSignIn(Integer storeId); Integer todayIsSignIn(Integer storeId);
IntegralSettings signInFunction(IntegralSettings integralSettings); IntegralDetail signInFunction(IntegralSettings integralSettings);
/** /**
* 加油赠送积分 * 加油赠送积分

9
fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralSettingsServiceImpl.java
View File

@ -248,7 +248,7 @@ public class IntegralSettingsServiceImpl implements IntegralSettingsService {
*/ */
@Override @Override
@Transactional @Transactional
public IntegralSettings signInFunction(IntegralSettings integralSettings) { public IntegralDetail signInFunction(IntegralSettings integralSettings) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
Integer integer = todayIsSignIn(integralSettings.getStoreId()); Integer integer = todayIsSignIn(integralSettings.getStoreId());
@ -286,7 +286,7 @@ public class IntegralSettingsServiceImpl implements IntegralSettingsService {
List<IntegralDetail> signInGifts = integralDetailMapper.signInGiftsYesterday("签到赠送", ljUserVos.getId(), ljUserVos.getChainStoreId()); List<IntegralDetail> signInGifts = integralDetailMapper.signInGiftsYesterday("签到赠送", ljUserVos.getId(), ljUserVos.getChainStoreId());
if (ObjectUtil.isEmpty(signInGifts)) { if (ObjectUtil.isEmpty(signInGifts)) {
extracted(integralSetting, ljUserVos, jsonArray, 0); return extracted(integralSetting, ljUserVos, jsonArray, 0);
} else { } else {
String changeReason = signInGifts.get(0).getChangeReason(); String changeReason = signInGifts.get(0).getChangeReason();
@ -310,7 +310,7 @@ public class IntegralSettingsServiceImpl implements IntegralSettingsService {
// if (dayInt > 8 && 8< jsonArray.size()) { // if (dayInt > 8 && 8< jsonArray.size()) {
// extracted(ljUserVos, jsonArray, dayInt); // extracted(ljUserVos, jsonArray, dayInt);
// } else if (dayInt >= 1 && dayInt <= jsonArray.size()) { // } else if (dayInt >= 1 && dayInt <= jsonArray.size()) {
extracted(integralSetting, ljUserVos, jsonArray, dayInt - 1); return extracted(integralSetting, ljUserVos, jsonArray, dayInt - 1);
// } // }
} }
} }
@ -474,7 +474,7 @@ public class IntegralSettingsServiceImpl implements IntegralSettingsService {
} }
} }
private void extracted(IntegralSettings integralSetting, LJUserVo ljUserVos, JSONArray jsonArray, int dayInt) { private IntegralDetail extracted(IntegralSettings integralSetting, LJUserVo ljUserVos, JSONArray jsonArray, int dayInt) {
IntegralDetail integralDetail = new IntegralDetail(); IntegralDetail integralDetail = new IntegralDetail();
integralDetail.setStoreId(ljUserVos.getStoreId()); integralDetail.setStoreId(ljUserVos.getStoreId());
@ -542,5 +542,6 @@ public class IntegralSettingsServiceImpl implements IntegralSettingsService {
userBalance.setId(ljUserVos.getBalanceId()); userBalance.setId(ljUserVos.getBalanceId());
userBalance.setPoints(addPoints.intValue()); userBalance.setPoints(addPoints.intValue());
userBalanceService.updateUserBalance(userBalance); userBalanceService.updateUserBalance(userBalance);
return integralDetail;
} }
} }

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/dto/AllOrderInfoDto.java
View File

@ -12,5 +12,5 @@ public class AllOrderInfoDto extends AllOrderInfo {
private List<Long> storeIds; private List<Long> storeIds;
private String flag; private String flag;
private String isType; private String isType;
private Long staffId; // private Long staffId;
} }

1
gasStation-uni/pagesMy/signIn/index.vue
View File

@ -108,6 +108,7 @@
}).then((res) => { }).then((res) => {
if (res.code == 200) { if (res.code == 200) {
console.log(res, 108); console.log(res, 108);
integral = res.data.point
this.show = true this.show = true
// this.getList() // this.getList()
} }