From deb3db0b954d005c44df4d90e76297625f07a597 Mon Sep 17 00:00:00 2001 From: 13405411873 <1994398261@qq.com> Date: Tue, 8 Oct 2024 14:11:20 +0800 Subject: [PATCH] =?UTF-8?q?=E8=90=A5=E9=94=80=E6=B4=BB=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cardFule/controller/CardFuelDieselController.java | 4 +++- .../cardFule/service/impl/CardFuelDieselServiceImpl.java | 5 ++--- .../cardValue/controller/CardValueController.java | 5 +++++ .../service/impl/CardValueRecordServiceImpl.java | 4 ++-- .../cardValue/service/impl/CardValueServiceImpl.java | 5 ++--- .../business/userManager/controller/LJUserController.java | 2 ++ .../src/views/cashier/NewComponents/newHome.vue | 8 ++++---- 7 files changed, 20 insertions(+), 13 deletions(-) diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/controller/CardFuelDieselController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/controller/CardFuelDieselController.java index 934d8125a..b062a9a3d 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/controller/CardFuelDieselController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/controller/CardFuelDieselController.java @@ -69,7 +69,9 @@ public class CardFuelDieselController extends BaseController { } @GetMapping("fuelCardList") public ResponseObject fuelCardList(CardFuelDiesel cardFuelDiesel) { - + //获取当前登录用户 + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + cardFuelDiesel.setStoreId(nowAccountInfo.getStoreId()); return getSuccessResult(this.cardFuelDieselService.fuelCardList(cardFuelDiesel)); } /** diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelDieselServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelDieselServiceImpl.java index 0a4191f20..6e2601585 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelDieselServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelDieselServiceImpl.java @@ -106,11 +106,10 @@ public class CardFuelDieselServiceImpl extends ServiceImpl fuelCardList(CardFuelDiesel cardFuelDiesel) { - //获取当前登录用户 - AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + String nowTime = DateUtil.format(new Date(), "yyyy-MM-dd")+" 00:00:00"; LambdaQueryWrapper queryWrapper =new LambdaQueryWrapper<>(); - queryWrapper.eq(CardFuelDiesel::getStoreId,nowAccountInfo.getStoreId()).eq(CardFuelDiesel::getActiveStatus,"1").and(it->{ + queryWrapper.eq(CardFuelDiesel::getStoreId,cardFuelDiesel.getStoreId()).eq(CardFuelDiesel::getActiveStatus,"1").and(it->{ return it.eq(CardFuelDiesel::getActiveTime,"1").or(item->{ return item .eq(CardFuelDiesel::getActiveTime,"2") .le(CardFuelDiesel::getStartTime,nowTime).ge(CardFuelDiesel::getEndTime,nowTime); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/controller/CardValueController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/controller/CardValueController.java index 217104a56..4ff00b294 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/controller/CardValueController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/controller/CardValueController.java @@ -7,6 +7,8 @@ import com.fuint.business.marketingActivity.cardValue.entity.CardValue; import com.fuint.business.marketingActivity.cardValue.service.CardValueService; import com.fuint.business.setting.entity.SysLog; import com.fuint.business.setting.service.SysLogService; +import com.fuint.common.dto.AccountInfo; +import com.fuint.common.util.TokenUtil; import com.fuint.framework.web.BaseController; import com.fuint.framework.web.ResponseObject; import org.apache.ibatis.annotations.Param; @@ -77,6 +79,9 @@ public class CardValueController extends BaseController { */ @GetMapping("cardValueList") public ResponseObject cardValueList(@Param("cardValue") CardValue cardValue) { + //获取当前登录用户 + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + cardValue.setStoreId(nowAccountInfo.getStoreId()); return getSuccessResult(this.cardValueService.cardValueList(cardValue)); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java index 9dd71185c..71eb7471d 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java @@ -554,9 +554,9 @@ public class CardValueRecordServiceImpl extends ServiceImpl cardValueList(CardValue cardValue) { - //获取当前登录用户 - AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + String nowTime = DateUtil.format(new Date(), "yyyy-MM-dd")+" 00:00:00"; LambdaQueryWrapper queryWrapper =new LambdaQueryWrapper<>(); - queryWrapper.eq(CardValue::getStoreId,nowAccountInfo.getStoreId()).eq(CardValue::getActiveStatus,"1").and(it->{ + queryWrapper.eq(CardValue::getStoreId,cardValue.getStoreId()).eq(CardValue::getActiveStatus,"1").and(it->{ return it.eq(CardValue::getActiveTime,"1").or(item->{ return item .eq(CardValue::getActiveTime,"2") .le(CardValue::getStartTime,nowTime).ge(CardValue::getEndTime,nowTime); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/LJUserController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/LJUserController.java index 985adb8fa..fe405a669 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/LJUserController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/LJUserController.java @@ -191,6 +191,8 @@ public class LJUserController extends BaseController { return getSuccessResult(user); } + + /** * 根据手机号查询会员信息 * @param map diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue b/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue index da38dc571..5adff15bb 100644 --- a/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue +++ b/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue @@ -29,10 +29,10 @@ - - - - +
+
储值卡：￥{{chooseVipUser.cardBalance}}
+
囤油卡：￥1000.000
+