From b9b49fcb6275028a746b7db7cf86037f0dae9bda Mon Sep 17 00:00:00 2001 From: cun-nan <19819293608@163.com> Date: Fri, 17 Nov 2023 16:33:36 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=94=B6=E9=93=B6=E5=8F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fuint/business/order/entity/OilOrder.java | 2 +- .../service/impl/OilOrderServiceImpl.java | 2 +- .../mapper/xml/OilGunMapper.xml | 5 +- .../mapper/xml/OilNumberMapper.xml | 2 +- fuintCashierWeb/src/api/cashier/oilGuns.js | 10 + fuintCashierWeb/src/api/cashier/oilnumber.js | 10 + .../views/cashier/NewComponents/homeindex.vue | 604 ++++++++++++------ 7 files changed, 434 insertions(+), 201 deletions(-) create mode 100644 fuintCashierWeb/src/api/cashier/oilnumber.js diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/OilOrder.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/OilOrder.java index 4f564d54a..fda551f4e 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/OilOrder.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/OilOrder.java @@ -64,7 +64,7 @@ public class OilOrder extends BaseEntity implements Serializable { /** * 油枪号 */ - private Integer oilGunNum; + private String oilGunNum; /** * 油品数量 */ diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java index e59662a12..7e1266b24 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java @@ -209,7 +209,7 @@ public class OilOrderServiceImpl extends ServiceImpl i order.setStaffId(staffId); order.setTerminal(terminal); order.setOils((String) jsonObjects.get(i).get("oilName")); - order.setOilGunNum(Integer.valueOf(jsonObjects.get(i).get("oilGunNum").toString())); + order.setOilGunNum(jsonObjects.get(i).get("gunName").toString()); order.setOilNum(oilNum); order.setDiscountAmount(oilDiscount); order.setPayUser(payUser); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/mapper/xml/OilGunMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/mapper/xml/OilGunMapper.xml index a356a0662..85e016e68 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/mapper/xml/OilGunMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/mapper/xml/OilGunMapper.xml @@ -29,11 +29,12 @@ - where number_id = #{numberId} + where number_id = #{id} insert into oil_number diff --git a/fuintCashierWeb/src/api/cashier/oilGuns.js b/fuintCashierWeb/src/api/cashier/oilGuns.js index 24c33bb84..29166fbe1 100644 --- a/fuintCashierWeb/src/api/cashier/oilGuns.js +++ b/fuintCashierWeb/src/api/cashier/oilGuns.js @@ -1,5 +1,14 @@ import request from "@/utils/request"; +// 查询油枪列表信息 +export function getOilGun(data) { + return request({ + url: '/business/petrolStationManagement/oilGun/queryByPage', + method: 'get', + params: data + }) +} + // 查询油罐列表 export function getGunApi(data) { return request({ @@ -8,6 +17,7 @@ export function getGunApi(data) { params: data }) } + // 新增有关信息 export function insertGunApi(data) { return request({ diff --git a/fuintCashierWeb/src/api/cashier/oilnumber.js b/fuintCashierWeb/src/api/cashier/oilnumber.js new file mode 100644 index 000000000..71c64096f --- /dev/null +++ b/fuintCashierWeb/src/api/cashier/oilnumber.js @@ -0,0 +1,10 @@ +import request from '@/utils/request' + +// 根据id查询油号油枪列表 +export function getOilNumberById(id) { + return request({ + url: '/business/petrolStationManagement/oilNumber/' +id , + method: 'get', + // data: data + }) +} diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue index 370edff93..c8ab4fda7 100644 --- a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue +++ b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue @@ -54,31 +54,162 @@
合计: ¥{{ oilAmount + goodsAmount }}
-
满减活动
-
-¥{{ oilDiscount + goodsDiscount }}
+
+ +
+ + +
+
{{city}}
+
+
-¥1.56
+
满100元每升优惠0.2元
+
+
+
+
+
+
+ + + 满减活动 +
+
+
+
-¥{{ fullReduction + goodsDiscount }}
-
充值优惠
-
-¥0
+
+ +
+ + +
+
{{item.type}}
+
+
-¥{{ oilDiscount }}
+
消费满{{ item.full }}元,立减{{ item.reduce }}元
+
消费满{{ item.full }}元,每升优惠{{ item.reduce }}元
+
+
+
+
+
+
+ + + 等级优惠 +
+
+
+
-¥{{ oilDiscount + goodsDiscount }}
- 囤油卡 -
- ({{ item.type }}卡 - {{ item.oilType }} - 余额:{{ item.refuelMoney }}L) -
+ +
+ + +
+
{{city}}
+
+
-¥1.56
+
满100元每升优惠0.2元
+
+
+
+
+
+
+ + + 囤油卡 +
+ ({{ item.type }}卡 + {{ item.oilType }} + 余额:{{ item.refuelMoney }}L) +
+
+
- {{ consumeRefuelMoney }}L
- 储值卡 - (账户余额:{{ balance }}元) + +
+ + +
+
{{city}}
+
+
-¥1.56
+
满100元每升优惠0.2元
+
+
+
+
+
+
+ + + 储值卡 + (账户余额:{{ balance }}元) +
+
-¥{{ consumeAmount }}
+
+
+ +
+ + +
+
{{city}}
+
+
-¥1.56
+
满100元每升优惠0.2元
+
+
+
+
+
+
+ + + 优惠券 +
+
+
+
-¥{{ couponAmount }}
+
扫码支付
@@ -86,7 +217,7 @@
找零
-
0
+
{{ seekZero }}
加油员
@@ -129,6 +260,18 @@
+
+ +
{{ item.oilNumber }}
+ +
{{item.gunName}}
+
+ + {{ item.tankName }} +
+
@@ -139,16 +282,6 @@ -
-
{{ getName(oilNameList,item.oilName) }}
- -
{{item.oilGunNum}}号枪
-
- -
-
@@ -359,18 +492,19 @@
合计金额:{{ oilAmount + goodsAmount }}元、优惠合计{{ oilDiscount + goodsDiscount }}元
-
- - - - - -
-
+
+
+ + + + + +
+
+
+
+ + +
+
+ 应找零 + ¥{{ seekZero }} +
+
取 消 @@ -430,7 +578,7 @@ {{member.remark ? member.remark : "--"}} - {{member.gradeId ? member.gradeId : "--"}} + {{member.gradeId ? getGradeName(gradeList,member.gradeId) : "--"}} - diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/HandoverOnly.vue b/fuintCashierWeb/src/views/cashier/NewComponents/HandoverOnly.vue index 8877cf01a..e36c78ddf 100644 --- a/fuintCashierWeb/src/views/cashier/NewComponents/HandoverOnly.vue +++ b/fuintCashierWeb/src/views/cashier/NewComponents/HandoverOnly.vue @@ -2,120 +2,124 @@ @@ -345,22 +349,27 @@ import {addHandoverApi, getHandoverApi} from "@/api/cashier/handover"; export default { - name: "Handover", - data() { - return { - handoverList : '', - } - }, + name: "HandoverOnly", + props: { + recordData:'' + }, + data() { + return { + handoverList : {}, + } + }, created() { - this.getHandover(); + console.log("12312231",this.recordData) + this.handoverList = this.recordData + // this.getHandover(); }, methods: { - getHandover() { - getHandoverApi().then(res=>{ - this.handoverList = res.data; - console.log("this.handoverList",this.handoverList) - }) - }, + // getHandover() { + // getHandoverApi().then(res=>{ + // this.handoverList = res.data; + // console.log("this.handoverList",this.handoverList) + // }) + // }, // 交班记录 recording() { diff --git a/fuintCashierWeb/src/views/cashier/index.vue b/fuintCashierWeb/src/views/cashier/index.vue index 222eccab5..246904e5a 100644 --- a/fuintCashierWeb/src/views/cashier/index.vue +++ b/fuintCashierWeb/src/views/cashier/index.vue @@ -203,7 +203,7 @@ -
+
From 273351cb351bceaa903c3792efb62475eabfe415 Mon Sep 17 00:00:00 2001 From: cun-nan <19819293608@163.com> Date: Fri, 17 Nov 2023 17:26:12 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=94=B6=E9=93=B6=E5=8F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fuintCashierWeb/src/api/cashier/preferential.js | 10 ++++++++++ .../src/views/cashier/NewComponents/homeindex.vue | 5 +++++ 2 files changed, 15 insertions(+) create mode 100644 fuintCashierWeb/src/api/cashier/preferential.js diff --git a/fuintCashierWeb/src/api/cashier/preferential.js b/fuintCashierWeb/src/api/cashier/preferential.js new file mode 100644 index 000000000..f782629f2 --- /dev/null +++ b/fuintCashierWeb/src/api/cashier/preferential.js @@ -0,0 +1,10 @@ +import request from '@/utils/request' + +// 扫码支付接口 +export function selectPreferential(data) { + return request({ + url: '/business/marketingActivity/activeExchange/selectConsumptionList', + method: 'get', + params: data + }) +} diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue index c8ab4fda7..79c0eaba2 100644 --- a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue +++ b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue @@ -1271,6 +1271,11 @@ this.getGrade(data.gradeId) this.changeRefuelMoney(); this.handleChange(); + + }, + // 调用优惠参数接口 + preferential(){ + }, // 查询该会员是否可使用优惠券 queryCoupon(list,id){ From 61fd49e3c47f9f67101bab46f39fbd4eabb5a39b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BD=90=E5=A4=A9=E5=A4=A7=E5=9C=A3?= <17615834396@163.com> Date: Mon, 20 Nov 2023 09:22:14 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=BB=A1=E5=87=8F=E4=BC=98=E6=83=A0?= =?UTF-8?q?=E5=88=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ActiveExchangeServiceImpl.java | 47 +++++++++++++++++-- 1 file changed, 43 insertions(+), 4 deletions(-) diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java index 4eecd4558..1a1699159 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java @@ -2,7 +2,10 @@ package com.fuint.business.marketingActivity.activeExchange.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.fuint.business.marketingActivity.activeDiscount.entity.ActiveDiscount; +import com.fuint.business.marketingActivity.activeDiscount.entity.ActiveDiscountChild; import com.fuint.business.marketingActivity.activeDiscount.service.ActiveDiscountChildService; import com.fuint.business.marketingActivity.activeDiscount.service.ActiveDiscountService; import com.fuint.business.marketingActivity.activeExchange.dto.ActiveExchangeRecordDTO; @@ -138,17 +141,53 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService { @Override public List selectConsumptionList(Integer pageNo, Integer pageSize, TransferDTO transferDTO) { + ArrayList maxoutVOArrayList = new ArrayList<>(); //构造满减券查询条件 LambdaQueryWrapper fullminusLambdaQueryWrapper = new LambdaQueryWrapper<>(); fullminusLambdaQueryWrapper.eq(ActiveFullminus::getStoreId,transferDTO.getStoreId()); fullminusLambdaQueryWrapper.eq(ActiveFullminus::getIsonline,0); fullminusLambdaQueryWrapper.eq(ActiveFullminus::getStatus,0); + fullminusLambdaQueryWrapper.orderByDesc(ActiveFullminus::getCreateTime); //会员等级判断 fullminusLambdaQueryWrapper.in(ActiveFullminus::getDieselUserLevel,userGradeService.selectUserGradeById(transferDTO.getGradeId()).getId()); + //符合油号判断 + fullminusLambdaQueryWrapper.in(ActiveFullminus::getAdaptOil,transferDTO.getOilName()); + List activeFullminusList = activeFullminusService.list(fullminusLambdaQueryWrapper); + for (ActiveFullminus activeFullminus : activeFullminusList) { + MaxoutVO maxoutVO = new MaxoutVO(); + BeanUtils.copyProperties(activeFullminus,maxoutVO); + LambdaQueryWrapper queryWrappers = new LambdaQueryWrapper<>(); + queryWrappers.eq(ActiveDiscountChild::getActiveDiscountId,activeFullminus.getId()); + //判断符合金额 + queryWrappers.le(ActiveDiscountChild::getAmount,transferDTO.getOilPrice() * transferDTO.getOilLiters()); + queryWrappers.orderByDesc(ActiveDiscountChild::getCreateTime); + maxoutVO.setActiveDiscountChildList(activeDiscountChildService.list(queryWrappers)); + maxoutVOArrayList.add(maxoutVO); + } - fullminusLambdaQueryWrapper.eq(ActiveFullminus::getDieselUserLevel,transferDTO.getGradeId()); - - //activeFullminusService.list() - return null; + //构造折扣券查询条件 + LambdaQueryWrapper discountLambdaQueryWrapper = new LambdaQueryWrapper<>(); + discountLambdaQueryWrapper.eq(ActiveDiscount::getStoreId,transferDTO.getStoreId()); + discountLambdaQueryWrapper.eq(ActiveDiscount::getIsonline,0); + discountLambdaQueryWrapper.eq(ActiveDiscount::getStatus,0); + discountLambdaQueryWrapper.orderByDesc(ActiveDiscount::getCreateTime); + //会员等级判断 + discountLambdaQueryWrapper.in(ActiveDiscount::getDieselUserLevel,userGradeService.selectUserGradeById(transferDTO.getGradeId()).getId()); + //符合油号判断 + discountLambdaQueryWrapper.in(ActiveDiscount::getAdaptOil,transferDTO.getOilName()); + List activeDiscountList = activeDiscountService.list(discountLambdaQueryWrapper); + //获取兑换物品信息 + for (ActiveDiscount activeDiscount : activeDiscountList) { + MaxoutVO maxoutVO = new MaxoutVO(); + BeanUtils.copyProperties(activeDiscount,maxoutVO); + LambdaQueryWrapper queryWrappers = new LambdaQueryWrapper<>(); + queryWrappers.eq(ActiveDiscountChild::getActiveDiscountId,activeDiscount.getId()); + //判断符合金额 + queryWrappers.le(ActiveDiscountChild::getAmount,transferDTO.getOilPrice() * transferDTO.getOilLiters()); + queryWrappers.orderByDesc(ActiveDiscountChild::getCreateTime); + maxoutVO.setActiveDiscountChildList(activeDiscountChildService.list(queryWrappers)); + maxoutVOArrayList.add(maxoutVO); + } + return maxoutVOArrayList; } }