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

1

Browse Source
This commit is contained in:
zhaohengkun 2024-10-14 16:32:01 +08:00
parent 987ecc70df
commit 1aee452526
3 changed files with 54 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
fuintAdmin/src/views/EventMarketing/openCardGift/separate.vue
View File

@ -136,6 +136,9 @@
prop="paymentType"
label="支付方式"
>
<template slot-scope="scope">
{{ getPaymentTypeStr(scope.row.paymentType) }}
</template>
</el-table-column>
<el-table-column
align="center"
@ -322,7 +325,8 @@
v-if="dict.value!='APPLET_CODE'"
:key="dict.value"
:label="dict.value"
:value="dict.value">{{dict.label}}</el-checkbox>
:value="dict.value">{{ dict.label }}
</el-checkbox>
</el-checkbox-group>
</el-form-item>
<el-form-item label=" 会员标签">
@ -386,21 +390,21 @@
</el-col>
</div>
</el-form-item>
<!-- <el-form-item label="适用加油升数" required>-->
<!-- <el-col :span="11">-->
<!-- <el-form-item prop="literMin">-->
<!-- <el-input v-model="ruleForm1.literMin"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="2">-->
<!-- <div style="margin-left: 5px">到</div>-->
<!-- </el-col>-->
<!-- <el-col :span="11">-->
<!-- <el-form-item prop="literMax">-->
<!-- <el-input v-model="ruleForm1.literMax"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="适用加油升数" required>-->
<!-- <el-col :span="11">-->
<!-- <el-form-item prop="literMin">-->
<!-- <el-input v-model="ruleForm1.literMin"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="2">-->
<!-- <div style="margin-left: 5px">到</div>-->
<!-- </el-col>-->
<!-- <el-col :span="11">-->
<!-- <el-form-item prop="literMax">-->
<!-- <el-input v-model="ruleForm1.literMax"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-form-item>-->
<el-form-item label="最大优惠金额" prop="disMax">
<el-input v-model="ruleForm1.disMax"></el-input>
</el-form-item>
@ -600,7 +604,7 @@ export default {
ruleForm1: {
activeType: 1,
timeType: 0,
consumeType:'',
consumeType: '',
paymentType: []
}
}
@ -610,11 +614,27 @@ export default {
this.getRuleList()
},
methods: {
//支付方式 转义
getPaymentTypeStr(value) {
let valueList = value.split(",");
console.log(this.dict.type.payment_type)
let newValueList = valueList.map((item) => {
let matchedLabel = this.dict.type.payment_type.find((item1) => item1.value === item)?.label;
return matchedLabel || item; // 如果没有找到匹配的 label，则返回原来的 item
});
//数组 转字符串
return newValueList.join(",")
},
// 重置活动规则
resetRule() {
this.ruleForm1 = {
activeType: 1,
consumeType:'',
consumeType: '',
timeType: 0,
paymentType: []
}
@ -656,12 +676,12 @@ export default {
},
// 提交活动规则
submitRuleForm() {
if (this.ruleForm1.consumeType == 1){
if (!this.ruleForm1.literMin || !this.ruleForm1.literMax){
if (this.ruleForm1.consumeType == 1) {
if (!this.ruleForm1.literMin || !this.ruleForm1.literMax) {
this.$message.error("请填写消费条件信息")
}
}else {
if (!this.ruleForm1.moneyMin || !this.ruleForm1.moneyMax){
} else {
if (!this.ruleForm1.moneyMin || !this.ruleForm1.moneyMax) {
this.$message.error("请填写消费条件信息")
}
}
@ -701,7 +721,7 @@ export default {
},
// 查询分时优惠列表信息
getTimeShareList() {
getRequestList({pageNo: 1, pageSize: 10000,activeType:1}).then(res => {
getRequestList({pageNo: 1, pageSize: 10000, activeType: 1}).then(res => {
this.timeShareList = res.data.records
})
},

1
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activePrice/mapper/xml/ActivePriceRuleMapper.xml
View File

@ -73,6 +73,7 @@
AND ap.active_type = #{entity.activeType}
</if>
</where>
order by create_time desc
</select>
<select id="getLevel" resultType="com.fuint.repository.model.MtUserGrade">
select * from mt_user_grade

82
fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue
View File

@ -1123,79 +1123,17 @@ export default {
},
//表单重置
resetting1(){
let _this = this;
this.authCode = "";
if (_this.isPaySuccess == true){
// _this.isPay = false;
_this.oilAmount = 0;
_this.oilActualPay = 0;
_this.oilDiscount = 0;
_this.goodsAmount = 0;
_this.goodsActualPay = 0;
_this.goodsDiscount = 0;
_this.consumeAmount = 0;
_this.consumeRefuelMoney = 0;
_this.oilTotal = 0;
_this.goodsTotal = 0;
_this.oilCardAmount = 0;
_this.isMember = false;
_this.isSure = false;
_this.oilOrder = []
_this.goodsOrder = []
_this.amount = 0
_this.seekZero = 0;
_this.fullReduction = 0;
_this.fullReduceDiscount = []
_this.checkAll1 = false
_this.gradeDiscount = []
_this.checkAll2 = false
_this.checkAll3 = false
_this.checkAll4 = false
_this.checkAll5 = false
};
this.userNo = ""
this.map = {
allAmount:0,
// 用户支付条码信息
authCode:'',
// 油品订单
oilOrder:"",
// 商品订单
goodsOrder:"",
// 支付方式
payType:"WECHAT",
// 油品订单金额
oilAmount:0,
// 商品订单金额
goodsAmount:0,
// 油品实付金额
oilActualPay:0,
// 商品实付金额
goodsActualPay:0,
// 付款用户
payUser:"",
// 油品优惠金额
oilDiscount:0,
// 商品优惠金额
goodsDiscount:0,
// 优惠券id
couponId:"",
// 提成金额
commissionAmount:0,
// 使用积分数量
usePoint:0,
// 积分金额
pointAmount:0,
// 终端
terminal:"PC",
// 商品数量
goodsNum:0,
// 会员消费金额（储值卡需要减少的金额）
consumeAmount:0,
typeIdex:'',
};
this.payType = "WECHAT"
//请输入手机号输入框重置
this.userMobile=null
//油枪重置
this.oilGunClearing={}
//商品重置
this.goodsList=[]
this.userInfo=false
//支付方式 默认 支付宝
this.payType = "ALIPAY"
},
// 查询订单支付状态
queryPayStatus(){