From 0417b46d55448018f87d94247b62dbd71ea65ad1 Mon Sep 17 00:00:00 2001 From: 13405411873 <1994398261@qq.com> Date: Sun, 22 Sep 2024 18:34:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cardCoupon/entity/CardCoupon.java | 2 +- .../impl/CardCouponUserServiceImpl.java | 2 +- .../mapper/xml/CardValueChildMapper.xml | 2 +- .../views/cashier/NewComponents/homeindex.vue | 9 - .../views/cashier/NewComponents/newHome.vue | 234 ++++++++++-------- .../newHomeComponents/memberRecharge.vue | 98 ++++---- 6 files changed, 181 insertions(+), 166 deletions(-) diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/entity/CardCoupon.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/entity/CardCoupon.java index bc92392b6..2ed474f5b 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/entity/CardCoupon.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/entity/CardCoupon.java @@ -133,7 +133,7 @@ public class CardCoupon extends Model { private Date updateTime; //当次获取数量 @TableField(exist = false) - private Integer giftCardToatl; + private Integer giftCardTotal; } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/service/impl/CardCouponUserServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/service/impl/CardCouponUserServiceImpl.java index eb6bf9a9e..566d31cc1 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/service/impl/CardCouponUserServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/service/impl/CardCouponUserServiceImpl.java @@ -35,7 +35,7 @@ public class CardCouponUserServiceImpl extends ServiceImpl SELECT - cc.*,cvc.gift_card_total as giftCardToatl + cc.*,cvc.gift_card_total as giftCardTotal FROM card_value_child cvc INNER JOIN card_coupon cc on cvc.vouchers_id = cc.id diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue index 59fb94780..e22b138a7 100644 --- a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue +++ b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue @@ -2172,11 +2172,7 @@ }, // 确认充值 async confirm(flag) { - - - this.flag = flag - if (flag === 1) { if (this.cardValueForm.paymentType === '') { this.$message.error('请选择支付方式'); @@ -2198,18 +2194,13 @@ this.$message.error('请选择支付方式'); return } - this.realyPayBills = this.cardFuelDieselForm.rechargeBalance } - // 发送扫码机请求（易联云网络下发） await this.getSendPrintIndex(this.realyPayBills); - this.openConfirm = true; this.isPay = true - this.getCode(this.realyPayBills,1) - }, printLocally() { if (!connectFlag){ diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue b/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue index b51786e38..c6d47388e 100644 --- a/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue +++ b/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue @@ -120,9 +120,9 @@
-
{{ item.name }} + >{{ item.dictLabel }}
@@ -406,7 +406,7 @@ 取 消 - 确认充值 + 确认充值 确 定 + + + +
+ +
付款金额
+
+ ￥{{ payForm.realyPayBills }} +
+ +
+
+ + + + + + + +
+
+
+ +
+
+
+
+
+ + +
+
+ 应找零 + ￥{{ payForm.seekZero }} +
+
+ +
+ 取消收款 + 确定收款 +
+
+ +
+
+ + + +
+
+ + + +
+
+ + + +
+
+ + + @@ -438,10 +525,21 @@ import {QRCodeByStoreId} from "@/api/staff/qrcode"; import {userListByPhone} from "@/api/cashier/user"; import { VueClipboard } from 'vue-clipboard2'; +import {getDicts} from "@/api/dict/data"; export default { data() { return { + payForm:{ + realyPayBills:0.00, + paymentType:null, + authCode:null, + seekZero:0.00 + }, + + openConfirm:false, + isPay:false, + loading:false, // 门店二维码 collectionImg: '', baseUrl: process.env.VUE_APP_BASE_API, @@ -498,39 +596,7 @@ export default { num: '0' }, ], - cardList: [ - { - name: '储值卡', - num: '0' - }, - { - name: '支付宝', - num: '0' - }, - { - name: '微信', - num: '0' - }, - { - name: '银联二维码', - num: '0' - }, - { - name: '现金', - num: '0' - }, - { - name: '小程序码', - num: '0' - }, - { - name: '挂账', - num: '0' - }, - { - name: '囤油卡', - num: '0' - } + payList: [ ], //油枪数据 初始化容器 tabList: { @@ -599,10 +665,9 @@ export default { this.getOilList() this.getGoodsList() this.getQRCodeInfoByStoreId(0); + this.getPayList() }, - mounted() { - }, computed: { getGoodsItem() { if (this.oilGunClearing.amount && this.oilGunClearing.amount !== undefined) { @@ -636,6 +701,37 @@ export default { }, methods: { + // 获取支付方式 + getPayList(){ + getDicts("payment_type").then( response => { + this.payList = response.data; + }) + }, + // 确认充值 + async rechargeConfirm() { + let selectCard = this.$refs.rechargeRef.selectCard + if (!selectCard.paymentType) { + this.$message.error('请选择支付方式'); + return + } + if (!selectCard.paymentType) { + this.$message.error('请选择输入充值本金'); + return + } + if (!selectCard.paymentType) { + this.$message.error('请选择输入充值本金'); + return + } + this.payForm.realyPayBills = selectCard.rechargeBalance + this.payForm.paymentType = selectCard.paymentType + + // // 发送扫码机请求（易联云网络下发） + // await this.getSendPrintIndex(this.realyPayBills); + this.openConfirm = true; + this.isPay = true + this.getCode(this.realyPayBills,1) + }, + /** * @description 油枪金额和商品金额发生变化，请求后端查询可用优惠活动和优惠券 * 传入后台的参数，会员的用户id、加油油号、加油订单金额（不包括商品金额）、加油订单总金额（包括商品金额）、加油总升数 @@ -766,7 +862,6 @@ export default { item.img = './imgs/0oil.png' item.classStyle = 'card0' }) - } if (key == '98#') { this.tabList[key].forEach(item => { @@ -885,15 +980,6 @@ export default { }) }, - changeBox() { - this.boxShow = !this.boxShow - }, - changeBox1() { - this.boxShow1 = !this.boxShow1 - }, - changeBox2() { - this.boxShow2 = !this.boxShow2 - }, setTabindex(key, index) { //列表选中样式 this.tabIndex = index @@ -924,58 +1010,6 @@ export default { this.oilGun = item }, - loadAll() { - return [ - { 'value': '三全鲜食（北新泾店）', 'address': '长宁区新渔路144号' }, - { 'value': 'Hot honey 首尔炸鸡（仙霞路）', 'address': '上海市长宁区淞虹路661号' }, - { 'value': '新旺角茶餐厅', 'address': '上海市普陀区真北路988号创邑金沙谷6号楼113' }, - { 'value': '泷千家(天山西路店)', 'address': '天山西路438号' }, - { 'value': '胖仙女纸杯蛋糕（上海凌空店）', 'address': '上海市长宁区金钟路968号1幢18号楼一层商铺18-101' }, - { 'value': '贡茶', 'address': '上海市长宁区金钟路633号' }, - { 'value': '豪大大香鸡排超级奶爸', 'address': '上海市嘉定区曹安公路曹安路1685号' }, - { 'value': '茶芝兰（奶茶，手抓饼）', 'address': '上海市普陀区同普路1435号' }, - { 'value': '十二泷町', 'address': '上海市北翟路1444弄81号B幢-107' }, - { 'value': '星移浓缩咖啡', 'address': '上海市嘉定区新郁路817号' }, - { 'value': '阿姨奶茶/豪大大', 'address': '嘉定区曹安路1611号' }, - { 'value': '新麦甜四季甜品炸鸡', 'address': '嘉定区曹安公路2383弄55号' }, - { 'value': 'Monica摩托主题咖啡店', 'address': '嘉定区江桥镇曹安公路2409号1F，2383弄62号1F' }, - { 'value': '浮生若茶（凌空soho店）', 'address': '上海长宁区金钟路968号9号楼地下一层' }, - { 'value': 'NONO JUICE 鲜榨果汁', 'address': '上海市长宁区天山西路119号' }, - { 'value': 'CoCo都可(北新泾店）', 'address': '上海市长宁区仙霞西路' }, - { 'value': '快乐柠檬（神州智慧店）', 'address': '上海市长宁区天山西路567号1层R117号店铺' }, - { 'value': 'Merci Paul cafe', 'address': '上海市普陀区光复西路丹巴路28弄6号楼819' }, - { 'value': '猫山王（西郊百联店）', 'address': '上海市长宁区仙霞西路88号第一层G05-F01-1-306' }, - { 'value': '枪会山', 'address': '上海市普陀区棕榈路' }, - { 'value': '纵食', 'address': '元丰天山花园(东门) 双流路267号' }, - { 'value': '钱记', 'address': '上海市长宁区天山西路' }, - { 'value': '壹杯加', 'address': '上海市长宁区通协路' }, - { 'value': '唦哇嘀咖', 'address': '上海市长宁区新泾镇金钟路999号2幢（B幢）第01层第1-02A单元' }, - { 'value': '爱茜茜里(西郊百联)', 'address': '长宁区仙霞西路88号1305室' }, - { 'value': '爱茜茜里(近铁广场)', 'address': '上海市普陀区真北路818号近铁城市广场北区地下二楼N-B2-O2-C商铺' }, - { 'value': '鲜果榨汁（金沙江路和美广店）', 'address': '普陀区金沙江路2239号金沙和美广场B1-10-6' }, - { 'value': '开心丽果（缤谷店）', 'address': '上海市长宁区威宁路天山路341号' }, - { 'value': '超级鸡车（丰庄路店）', 'address': '上海市嘉定区丰庄路240号' }, - { 'value': '妙生活果园（北新泾店）', 'address': '长宁区新渔路144号' }, - { 'value': '香宜度麻辣香锅', 'address': '长宁区淞虹路148号' }, - { 'value': '凡仔汉堡（老真北路店）', 'address': '上海市普陀区老真北路160号' }, - { 'value': '港式小铺', 'address': '上海市长宁区金钟路968号15楼15-105室' }, - { 'value': '蜀香源麻辣香锅（剑河路店）', 'address': '剑河路443-1' }, - { 'value': '北京饺子馆', 'address': '长宁区北新泾街道天山西路490-1号' }, - { 'value': '饭典*新简餐（凌空SOHO店）', 'address': '上海市长宁区金钟路968号9号楼地下一层9-83室' }, - { 'value': '焦耳·川式快餐（金钟路店）', 'address': '上海市金钟路633号地下一层甲部' }, - { 'value': '动力鸡车', 'address': '长宁区仙霞西路299弄3号101B' }, - { 'value': '浏阳蒸菜', 'address': '天山西路430号' }, - { 'value': '四海游龙（天山西路店）', 'address': '上海市长宁区天山西路' }, - { 'value': '樱花食堂（凌空店）', 'address': '上海市长宁区金钟路968号15楼15-105室' }, - { 'value': '壹分米客家传统调制米粉(天山店)', 'address': '天山西路428号' }, - { 'value': '福荣祥烧腊（平溪路店）', 'address': '上海市长宁区协和路福泉路255弄57-73号' }, - { 'value': '速记黄焖鸡米饭', 'address': '上海市长宁区北新泾街道金钟路180号1层01号摊位' }, - { 'value': '红辣椒麻辣烫', 'address': '上海市长宁区天山西路492号' }, - { 'value': '(小杨生煎)西郊百联餐厅', 'address': '长宁区仙霞西路88号百联2楼' }, - { 'value': '阳阳麻辣烫', 'address': '天山西路389号' }, - { 'value': '南拳妈妈龙虾盖浇饭', 'address': '普陀区金沙江路1699号鑫乐惠美食广场A13' } - ] - }, //必须是异步方法 querySearchAsync(queryString, cb) { const restaurants = this.restaurants diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/newHomeComponents/memberRecharge.vue b/fuintCashierWeb/src/views/cashier/NewComponents/newHomeComponents/memberRecharge.vue index 0b109606d..e8a23c61c 100644 --- a/fuintCashierWeb/src/views/cashier/NewComponents/newHomeComponents/memberRecharge.vue +++ b/fuintCashierWeb/src/views/cashier/NewComponents/newHomeComponents/memberRecharge.vue @@ -1,15 +1,15 @@ -