diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/IntegralSettingsService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/IntegralSettingsService.java index 235a546c6..6073fdaf3 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/IntegralSettingsService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/IntegralSettingsService.java @@ -2,6 +2,7 @@ package com.fuint.business.integral.service; import com.baomidou.mybatisplus.core.metadata.IPage; 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.IntegralSettings; import com.fuint.business.integral.vo.IntegralSettingsVo; @@ -71,7 +72,7 @@ public interface IntegralSettingsService { Integer todayIsSignIn(Integer storeId); - IntegralSettings signInFunction(IntegralSettings integralSettings); + IntegralDetail signInFunction(IntegralSettings integralSettings); /** * 加油赠送积分 diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralSettingsServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralSettingsServiceImpl.java index 12d4b6161..680afd1b1 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralSettingsServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralSettingsServiceImpl.java @@ -248,7 +248,7 @@ public class IntegralSettingsServiceImpl implements IntegralSettingsService { */ @Override @Transactional - public IntegralSettings signInFunction(IntegralSettings integralSettings) { + public IntegralDetail signInFunction(IntegralSettings integralSettings) { AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); Integer integer = todayIsSignIn(integralSettings.getStoreId()); @@ -286,7 +286,7 @@ public class IntegralSettingsServiceImpl implements IntegralSettingsService { List signInGifts = integralDetailMapper.signInGiftsYesterday("签到赠送", ljUserVos.getId(), ljUserVos.getChainStoreId()); if (ObjectUtil.isEmpty(signInGifts)) { - extracted(integralSetting, ljUserVos, jsonArray, 0); + return extracted(integralSetting, ljUserVos, jsonArray, 0); } else { String changeReason = signInGifts.get(0).getChangeReason(); @@ -310,7 +310,7 @@ public class IntegralSettingsServiceImpl implements IntegralSettingsService { // if (dayInt > 8 && 8< jsonArray.size()) { // extracted(ljUserVos, jsonArray, dayInt); // } 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.setStoreId(ljUserVos.getStoreId()); @@ -542,5 +542,6 @@ public class IntegralSettingsServiceImpl implements IntegralSettingsService { userBalance.setId(ljUserVos.getBalanceId()); userBalance.setPoints(addPoints.intValue()); userBalanceService.updateUserBalance(userBalance); + return integralDetail; } } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/dto/AllOrderInfoDto.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/dto/AllOrderInfoDto.java index cad78845b..89ab9965a 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/dto/AllOrderInfoDto.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/dto/AllOrderInfoDto.java @@ -12,5 +12,5 @@ public class AllOrderInfoDto extends AllOrderInfo { private List storeIds; private String flag; private String isType; - private Long staffId; +// private Long staffId; } diff --git a/gasStation-uni/pagesMy/signIn/index.vue b/gasStation-uni/pagesMy/signIn/index.vue index c095f5cbb..4d53f2566 100644 --- a/gasStation-uni/pagesMy/signIn/index.vue +++ b/gasStation-uni/pagesMy/signIn/index.vue @@ -108,6 +108,7 @@ }).then((res) => { if (res.code == 200) { console.log(res, 108); + integral = res.data.point this.show = true // this.getList() }