From 75f2c2b3ad40325f8cd1945c60a781f631be86f3 Mon Sep 17 00:00:00 2001 From: zhaohengkun Date: Tue, 22 Oct 2024 11:16:59 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fuintAdmin/src/api/integral/gift.js | 95 +- fuintAdmin/src/views/integral/gift/add.vue | 894 ++--- fuintAdmin/src/views/integral/gift/gift.vue | 51 +- .../service/impl/IntegralGiftServiceImpl.java | 3 +- .../controller/CardCouponUserController.java | 14 + .../service/CardCouponUserService.java | 4 + .../impl/CardCouponUserServiceImpl.java | 5 + .../impl/CardExchangeRecordServiceImpl.java | 2 +- .../cardGiftActive/entity/CardGiftActive.java | 4 +- .../service/impl/CreditUnitServiceImpl.java | 6 +- .../views/cashier/NewComponents/Handover.vue | 840 ++-- .../views/cashier/NewComponents/Integral.vue | 3466 +++++++++-------- .../views/cashier/NewComponents/credit.vue | 3 +- 13 files changed, 2767 insertions(+), 2620 deletions(-) diff --git a/fuintAdmin/src/api/integral/gift.js b/fuintAdmin/src/api/integral/gift.js index 8f892fecc..8bc6a2924 100644 --- a/fuintAdmin/src/api/integral/gift.js +++ b/fuintAdmin/src/api/integral/gift.js @@ -2,54 +2,49 @@ import request from "@/utils/request"; // 查询油罐列表 export function getGiftApi(data) { - return request({ - url: 'business/integral/integralGift/queryByPage', - method: 'get', - params: data - }) - } - // 新增有关信息 - export function insertGiftApi(data) { - return request({ - url: 'business/integral/integralGift', - method: 'post', - data: data - }) - } - // 修改有关信息 - export function updateGiftApi(data) { - return request({ - url: 'business/integral/integralGift', - method: 'put', - data: data - }) - } - + return request({ + url: 'business/integral/integralGift/queryByPage', + method: 'get', + params: data + }) +} + +// 新增有关信息 +export function insertGiftApi(data) { + return request({ + url: 'business/integral/integralGift', + method: 'post', + data: data + }) +} + +// 修改有关信息 +export function updateGiftApi(data) { + return request({ + url: 'business/integral/integralGift', + method: 'put', + data: data + }) +} + + +// 修改库存 +export function updateGiftInventoryApi(data) { + return request({ + url: 'business/integral/integralGift/updateInventory', + method: 'get', + params: data + }) +} + + +//获取全部 剩余数量 >0 的优惠券 +export function getCardCoupon(data) { + return request({ + url: 'cardCoupon/queryByNum', + method: 'get', + params: data + }) +} + - // 修改库存 - export function updateGiftInventoryApi(data) { - return request({ - url: 'business/integral/integralGift/updateInventory', - method: 'get', - params: data - }) - } - - - //兑换券 - export function getCardFavorableApi(data) { - return request({ - url: 'business/marketingActivity/cardFavorable?pageNo=1&pageSize=10', - method: 'get', - params: data - }) - } - - //优惠券 - export function getCardExchangeApi(data) { - return request({ - url: 'business/marketingActivity/cardExchange?pageNo=1&pageSize=10', - method: 'get', - params: data - }) - } \ No newline at end of file diff --git a/fuintAdmin/src/views/integral/gift/add.vue b/fuintAdmin/src/views/integral/gift/add.vue index 238db70b1..62ff272f0 100644 --- a/fuintAdmin/src/views/integral/gift/add.vue +++ b/fuintAdmin/src/views/integral/gift/add.vue @@ -1,14 +1,14 @@ ` - // var fromHtml = bodyStyle+this.$refs.report.innerHTML - var fromHtml = '' + // var fromHtml = bodyStyle+this.$refs.report.innerHTML + var fromHtml = '' - fromHtml = bodyStyle+this.$refs.report.innerHTML + fromHtml = bodyStyle + this.$refs.report.innerHTML + // LODOP.PRINT_INITA(0, 0, 665, 600, '模板设计') + LODOP.ADD_PRINT_HTM(0, 0, '100%', '100%', fromHtml) + // LODOP.SET_PRINT_PAGESIZE(100,100,100,100) - // LODOP.PRINT_INITA(0, 0, 665, 600, '模板设计') - LODOP.ADD_PRINT_HTM(0, 0, "100%", "100%", fromHtml); - // LODOP.SET_PRINT_PAGESIZE(100,100,100,100) + LODOP.SET_PRINT_MODE('FULL_WIDTH_FOR_OVERFLOW', true) - LODOP.SET_PRINT_MODE("FULL_WIDTH_FOR_OVERFLOW",true); + // LODOP.ADD_PRINT_BARCODE(10,40,100,100,'QRCode','123456789'); + // let preview = LODOP.PREVIEW(); + // console.log("preview",preview); + LODOP.PRINT() - // LODOP.ADD_PRINT_BARCODE(10,40,100,100,'QRCode','123456789'); - // let preview = LODOP.PREVIEW(); - // console.log("preview",preview); - LODOP.PRINT(); + } + }, + watch: { + dialogVisiblej(newValue) { + if (!newValue && !this.visflg) { + console.log('newValue', newValue) + this.queryParams = { + categoryId: '', + giftName: '', + deliveryMethod: '门店自提', + page: 1, + pageSize: 10000 }, - }, - watch: { - dialogVisiblej(newValue) { - if (!newValue && !this.visflg) { - console.log("newValue",newValue) + this.seekZero = 0 + this.handClose() + this.reset() - this.queryParams= { - categoryId:'', - giftName:'', - deliveryMethod:'门店自提', - page: 1, - pageSize: 10000, - }, - this.seekZero = 0 - this.handClose() - this.reset() - - } else { - this.visflg = false - } - } - }, - computed: { - isTheBalanceIsSufficient(){ - if (this.member && this.member.points !== undefined) { - const allPoints = new BigNumber(this.allPoints); - const points = new BigNumber(this.member.points); - return points.minus(allPoints).toNumber() >= 0; - } - return false; + } else { + this.visflg = false } } + }, + computed: { + isTheBalanceIsSufficient() { + if (this.member && this.member.points !== undefined) { + const allPoints = new BigNumber(this.allPoints) + const points = new BigNumber(this.member.points) + return points.minus(allPoints).toNumber() >= 0 + } + return false } + } +} diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue b/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue index 5bd773706..f98cf6105 100644 --- a/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue +++ b/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue @@ -1040,6 +1040,7 @@ import {getLodop} from "@/api/LodopFuncs"; this.open1 = true }, handleUpdate(data){ + console.log("修改数据", data) creditUnitInfo(data.id).then(res => { this.form1 = res.data this.title = "修改挂账单位" @@ -1068,7 +1069,7 @@ import {getLodop} from "@/api/LodopFuncs"; this.total3 = res.data.total; }) - this.getUnitStatistic(val) + this.getUnitStatistic(undefined) }, getUnitStatistic(val){ if (val!=undefined){