dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

一键发券

Browse Source
This commit is contained in:
齐天大圣 2024-02-01 15:53:54 +08:00
parent d5a7ddd1d2
commit 7e11f77a6e
10 changed files with 97 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fuintAdmin/src/components/Fuint/Doc/index.vue
View File

@ -1,5 +1,5 @@
<template>
<div title="收银台" class="nav-icon">
<div title="数据大屏" class="nav-icon">
<!-- <svg-icon icon-class="question" @click="goto" />-->
<i class="el-icon-s-platform" @click="goto" style="font-size: 24px"></i>
</div>
@ -20,7 +20,7 @@ export default {
methods: {
goto() {
console.log( getToken())
window.open('http://127.0.0.1:5500/index.html?id='+ getToken())
window.open('http://127.0.0.1:8081/index.html?id='+ getToken())
}
}
}

2
fuintAdmin/src/views/EventMarketing/CardHolder/index.vue
View File

@ -23,7 +23,7 @@
<div class="k-box" @click="goDetail(3)">
<div class="img-box" id="img3"> <img src="https://club.liantuobank.com/assets/images/market/11.png" > </div>
<div class="size-box">
<div class="box-title">存油卡</div>
<div class="box-title">囤油卡</div>
<div class="js"> 使用便捷 交易安全 易于管理 节约费用 各地加油 积分增值服务 插卡加油 自动结算 </div>
</div>
</div>

2
fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue
View File

@ -16,7 +16,7 @@
</el-alert>
</div>
<div style="margin: 10px 0px">
<el-button type="primary" icon="el-icon-plus" @click="addblock()">新增储值活动</el-button>
<el-button type="primary" icon="el-icon-plus" @click="addblock()">新增储值卡</el-button>
</div>
<el-table
:data="tableData"

18
fuintAdmin/src/views/EventMarketing/cardFavorable/index.vue
View File

@ -21,7 +21,7 @@
<el-form-item label="" prop="region">
<el-select v-model="queryParams.type" clearable placeholder="卡券类型">
<el-option label="油品券" value="0"></el-option>
<el-option label="商品券" value="1"></el-option>
<!-- <el-option label="商品券" value="1"></el-option>-->
<el-option label="通用券" value="2"></el-option>
</el-select>
</el-form-item>
@ -50,7 +50,7 @@
<el-table-column label="卡券类型 " align="center" prop="type" >
<template slot-scope="scope">
<el-tag v-if="scope.row.type == 0">油品券</el-tag>
<el-tag type="success" v-if="scope.row.type == 1">商品券</el-tag>
<!-- <el-tag type="success" v-if="scope.row.type == 1">商品券</el-tag>-->
<el-tag type="warning" v-if="scope.row.type == 2">通用券</el-tag>
</template>
</el-table-column>
@ -93,13 +93,13 @@
</el-table-column>-->
<el-table-column label="发放数量" align="center" prop="count" />
<el-table-column label="满足金额" align="center" prop="satisfiedAmount" />
<el-table-column label="二维码链接" align="center" prop="qrCodeLink" >
<!-- <el-table-column label="二维码链接" align="center" prop="qrCodeLink" >
<template slot-scope="scope">
<div style="cursor: pointer" @click="qrcodelook(scope.row.qrCodeLink)">
<i class="el-icon-picture" ></i>
</div>
</template>
</el-table-column>
</el-table-column>-->
<el-table-column label="优惠券状态" align="center" prop="status" >
<template slot-scope="scope">
<div v-if="scope.row.status == 0"> <el-tag>启用</el-tag> </div>
@ -116,11 +116,11 @@
@click="handleUpdate(scope.row)"
>修改</el-button>
<el-button
<!-- <el-button
size="mini"
type="text"
@click="tableciick(scope.row)"
>统计</el-button>
>统计</el-button>-->
<el-button
size="mini"
type="text"
@ -152,7 +152,7 @@
<el-form-item label="卡券类型" prop="type">
<el-radio-group v-model="form.type">
<el-radio label="0">油品券</el-radio>
<el-radio label="1">商品券</el-radio>
<!-- <el-radio label="1">商品券</el-radio>-->
<el-radio label="2">通用券</el-radio>
</el-radio-group>
</el-form-item>
@ -271,7 +271,7 @@
<el-button type="primary" @click="centerDialogVisible = false">确 定</el-button>
</span>
</el-dialog>
<el-drawer
<!-- <el-drawer
title="统计!"
:visible.sync="table"
direction="rtl"
@ -332,7 +332,7 @@
@pagination="gettongji"
/>
</div>
</el-drawer>
</el-drawer>-->
</div>
</template>

29
fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue
View File

@ -31,7 +31,7 @@
</div>
</el-card>
<el-card style="margin-bottom: 20px">
<el-button type="primary" icon="el-icon-plus" style="margin-bottom: 10px " @click="addoilBlock()">新增锁价活动</el-button>
<el-button type="primary" icon="el-icon-plus" style="margin-bottom: 10px " @click="addoilBlock()">新增囤油卡</el-button>
<el-alert
title="当前配置为锁价活动、锁价活动为充值后所得升数进行锁定,卡类型下每个油品最多可创建6个锁价充值活动"
type="info"
@ -41,14 +41,13 @@
:data="tableData"
style="width: 100%">
<el-table-column
prop="id"
label="活动编号"
width="110">
type="index"
>
</el-table-column>
<el-table-column
prop="type"
label="油卡类型"
width="140">
>
<template slot-scope="scope">
<el-tag>{{scope.row.type}}</el-tag>
</template>
@ -56,12 +55,12 @@
<el-table-column
prop="oilType"
label="油品"
width="110">
>
</el-table-column>
<el-table-column
prop="rechargeBalance"
label="充值金额"
width="110">
>
<template slot-scope="scope">
<el-tag>{{scope.row.rechargeBalance}}</el-tag>
</template>
@ -69,7 +68,7 @@
<el-table-column
prop="lockupPrice"
label="锁价单价"
width="110">
>
<template slot-scope="scope">
<el-tag>{{scope.row.lockupPrice}}</el-tag>
</template>
@ -77,7 +76,7 @@
<el-table-column
prop="incomeLitres"
label="升数"
width="110">
>
<template slot-scope="scope">
<el-tag>{{scope.row.incomeLitres}}</el-tag>
</template>
@ -85,7 +84,7 @@
<el-table-column
prop="points"
label="赠送积分"
width="110">
>
<template slot-scope="scope">
<el-tag>{{scope.row.points}}</el-tag>
</template>
@ -93,7 +92,7 @@
<el-table-column
prop="activeTime"
label="活动时间"
width="180">
>
<template slot-scope="scope">
<span v-if="scope.row.activeTime == 1">不限时间</span>
<span v-if="scope.row.activeTime == 2">自定义时间</span>
@ -102,7 +101,7 @@
<el-table-column
prop="activityProgress"
label="活动进度"
width="110">
>
<template slot-scope="scope">
<el-tag type="info"v-if="scope.row.activityProgress == 2">已结束</el-tag>
<el-tag type="success" v-if="scope.row.activityProgress == 1">进行中</el-tag>
@ -112,7 +111,7 @@
<el-table-column
prop="activeStatus"
label="状态"
width="100">
>
<template slot-scope="scope">
<el-switch
@ -128,12 +127,12 @@
</el-table-column>
<el-table-column
prop="createTime"
width="240"
align="center"
label="更新时间">
</el-table-column>
<el-table-column
label="编辑"
width="180">
>
<template slot-scope="scope">
<el-button
size="mini"

24
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/xml/CardValueRecordMapper.xml
View File

@ -71,7 +71,7 @@
combined_result.payStatus
FROM
(SELECT '储值卡' AS recordName,payment_type paymentType,mt_user_id mtUserId,
recharge_balance rechargeBalance, gift_balance obtain, fringe_benefit oilName,royalty_type type,
recharge_balance rechargeBalance, bid_balance obtain, fringe_benefit oilName,royalty_type type,
create_time createTime, chain_store_id chainStoreId, store_id storeId,pay_status payStatus FROM card_value_record
UNION
SELECT '升数卡' AS recordName,payment_type paymentType,mt_user_id mtUserId, recharge_balance rechargeBalance,
@ -79,19 +79,19 @@
store_id storeId,pay_status payStatus FROM card_fuel_record
UNION
SELECT '储值卡' AS recordName,
change_type paymentType,
user_id mtUserId,
balance rechargeBalance,
after_the_change obtain,
order_no oilName,
from_type type,
create_time createTime,
chain_store_id chainStoreId,
store_id storeId,
id payStatus
cbc.change_type paymentType,
cbc.user_id mtUserId,
cbc.balance rechargeBalance,
oo.order_amount obtain,
cbc.order_no oilName,
cbc.from_type type,
cbc.create_time createTime,
cbc.chain_store_id chainStoreId,
cbc.store_id storeId,
cbc.id payStatus
from card_balance_change cbc
left join oil_order oo on cbc.order_no = oo.order_no
where change_type = 0 ) AS combined_result
<where>
<if test="cardValueRecord.mtUserId != null">
and combined_result.mtUserId = #{cardValueRecord.mtUserId}

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java
View File

@ -679,7 +679,7 @@ public class CardValueRecordServiceImpl extends ServiceImpl<CardValueRecordMappe
IPage<CardValueRecordDTO> cardValueRecordDTOIPage = this.cardValueRecordMapper.selectAllRecord(page, cardValueRecord);
List<CardValueRecordDTO> records = cardValueRecordDTOIPage.getRecords();
for (CardValueRecordDTO record : records) {
if (record.getPaymentType().equals("0")){
if (ObjectUtils.isNotEmpty(record.getPaymentType()) && record.getPaymentType().equals("0")){
record.setPayStatus("paid");
record.setPaymentType("xf");
}

4
gasStation-uni/pagesMy/Recharge/Recharge.vue
View File

@ -79,7 +79,7 @@
text: "储值卡"
},
{
text: "升数卡"
text: "囤油卡"
},
]
@ -120,7 +120,7 @@
} else if (index == 1) {
this.query.recordName = '储值卡'
} else if (index == 2) {
this.query.recordName = '升数卡'
this.query.recordName = '囤油卡'
}
this.getAllOrderList()
},

23
gasStation-uni/pagesMy/moneyBalance/moneyBalance.vue
View File

@ -36,23 +36,32 @@
<view class="moneyname" v-else>未支付</view>
</view>
<view class="y-bt">
<view class="sizehui">支付方式</view>
<!-- <view class="sizehui">支付方式</view> -->
<view class="sizehui">余额变化类型</view>
<!-- <view class="sizehei">￥{{item.paymentType}}</view> -->
<view class="sizehei" v-if="item.paymentType == 'CASH'">现金</view>
<!-- <view class="sizehei" v-if="item.paymentType == 'CASH'">现金</view>
<view class="sizehei" v-else-if="item.paymentType == 'WECHAT'">微信</view>
<view class="sizehei" v-else-if="item.paymentType == 'ALIPAY'">支付宝</view>
<view class="sizehei" v-else-if="item.paymentType == 'UNIONPAY'">银联二维码</view>
<view class="sizehei" v-else>小程序码</view> -->
<view class="sizehei" v-if="item.paymentType == 'CASH'">充值</view>
<view class="sizehei" v-else-if="item.paymentType == 'WECHAT'">充值</view>
<view class="sizehei" v-else-if="item.paymentType == 'ALIPAY'">充值</view>
<view class="sizehei" v-else-if="item.paymentType == 'UNIONPAY'">充值</view>
<view class="sizehei" v-else-if="item.paymentType == 'xf'">消费</view>
<view class="sizehei" v-else>小程序码</view>
<view class="sizehei" v-else>充值</view>
</view>
<view class="y-bt">
<view class="sizehui">订单金额</view>
<view class="sizehei" v-if="item.paymentType =='xf' ">￥{{'-'+item.rechargeBalance}}</view>
</view>
<view class="y-bt">
<view class="sizehui">优惠合计</view>
<view class="sizehong">￥{{item.obtain || 0}}</view>
</view>
<view class="y-bt">
<view class="sizehui">实付金额</view>
<view class="sizehei" v-if="item.paymentType =='xf' ">￥{{item.rechargeBalance}}</view>
<view class="sizehei" v-else>￥{{item.rechargeBalance}}</view>
</view>
<view class="y-bt">
<view class="sizehui">订单时间</view>
<view class="sizehei">{{item.createTime}}</view>

8
gasStation-uni/pagesMy/oilBalance/oilBalance.vue
View File

@ -10,7 +10,7 @@
<view class="top-box" v-for="(item,index) in refuelMoney" :key="index">
<!-- <view class="kuangbox">使用规则 </view> -->
<view class="box-title">囤油升数</view>
<view class="box-nmb">{{item.type}} : {{item.oilType}}</view>
<view class="box-nmb">{{item.type}} : {{item.oilName}}</view>
<view class="box-nmb">剩余升数: {{item.refuelMoney}}升</view>
<!-- <view class="dis-bt">
<view class="">累计获得0.00</view>
@ -77,6 +77,7 @@
query: {
mtUserId: '',
storeId: '',
chainStoreId: '',
recordName: '升数卡',
pageNo: 1,
pageSize: 10
@ -95,6 +96,8 @@
},
onShow() {
this.storeId = uni.getStorageSync("storeId");
this.query.storeId = uni.getStorageSync("storeId")
this.query.chainStoreId = uni.getStorageSync('chainStoreId')
this.list = []
this.getAllOrderList();
this.getUserBalance()
@ -149,8 +152,9 @@
},
getUserBalance() {
request({
url: '/business/userManager/user/getUserBalance',
url: '/business/userManager/user/getUserBalanceApplet',
method: 'get',
params: this.query
}).then(res => {
console.log(res)
if (res.code == 200) {