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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
齐天大圣 2024-03-05 11:22:57 +08:00
commit 3a535078bd
4 changed files with 56 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fuintAdmin/src/views/staffCommission/staffCommission.vue
View File

@ -286,7 +286,8 @@
<el-col :span="24"> <el-col :span="24">
<el-form-item label="提成金额" prop="royaltyRate"> <el-form-item label="提成金额" prop="royaltyRate">
<el-input v-model="form.royaltyRate" placeholder="请输入提成"> <el-input v-model="form.royaltyRate" placeholder="请输入提成">
<el-select v-model="select" maxlength="10" oninput="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" style="width: 70px" slot="append" placeholder="请选择"> <el-select v-model="select" maxlength="10"
oninput="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" style="width: 70px" slot="append" placeholder="请选择">
<el-option label="元" value="元"></el-option> <el-option label="元" value="元"></el-option>
<el-option label="%" value="%"></el-option> <el-option label="%" value="%"></el-option>
</el-select> </el-select>
@ -730,9 +731,9 @@ export default {
submitForm: function() { submitForm: function() {
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {
if (valid) { if (valid) {
if (/^\d+$/.test(this.form.royaltyRate)){ // if (/^\d+$/.test(this.form.royaltyRate)){
this.form.royaltyRate = this.form.royaltyRate + this.select this.form.royaltyRate = this.form.royaltyRate + this.select
} // }
this.form.staffRoleGroup = this.staffRoleGroup.toString() this.form.staffRoleGroup = this.staffRoleGroup.toString()
if (this.form.id) { if (this.form.id) {
updateCommission(this.form).then(response => { updateCommission(this.form).then(response => {

7
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java
View File

@ -1,5 +1,6 @@
package com.fuint.business.marketingActivity.activeExchange.service.impl; package com.fuint.business.marketingActivity.activeExchange.service.impl;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@ -512,7 +513,8 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService {
} }
//折扣+优惠券 //折扣+优惠券
for (ActiveDiscountPayVO activeDiscountPayVO : activeDiscountVOList) { for (ActiveDiscountPayVO activeDiscountPayVO : activeDiscountVOList) {
if (!activeDiscountPayVO.getParticipationCondition().equals("1")){ if (ObjectUtil.isNotEmpty(activeDiscountPayVO.getParticipationCondition())
&& !activeDiscountPayVO.getParticipationCondition().equals("1")){
for (CardFavorableRecordVO cardFavorableRecordVO : canUserCardFavorableList) { for (CardFavorableRecordVO cardFavorableRecordVO : canUserCardFavorableList) {
if(StringUtils.isNotEmpty(cardFavorableRecordVO.getExclusiveFunction()) && cardFavorableRecordVO.getExclusiveFunction().equals("2") if(StringUtils.isNotEmpty(cardFavorableRecordVO.getExclusiveFunction()) && cardFavorableRecordVO.getExclusiveFunction().equals("2")
&& StringUtils.isNotEmpty(cardFavorableRecordVO.getExclusiveFunction()) && !cardFavorableRecordVO.getExclusiveFunction().equals("0")){ && StringUtils.isNotEmpty(cardFavorableRecordVO.getExclusiveFunction()) && !cardFavorableRecordVO.getExclusiveFunction().equals("0")){
@ -553,7 +555,8 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService {
} }
//满减+优惠券 //满减+优惠券
for (ActiveDiscountPayVO activeDiscountPayVO : activeFuletVOList) { for (ActiveDiscountPayVO activeDiscountPayVO : activeFuletVOList) {
if (!activeDiscountPayVO.getParticipationCondition().equals("1")){ if (ObjectUtils.isNotEmpty(activeDiscountPayVO.getParticipationCondition())
&& !activeDiscountPayVO.getParticipationCondition().equals("1")){
for (CardFavorableRecordVO cardFavorableRecordVO : canUserCardFavorableList) { for (CardFavorableRecordVO cardFavorableRecordVO : canUserCardFavorableList) {
if(StringUtils.isNotEmpty(cardFavorableRecordVO.getExclusiveFunction()) && ObjectUtils.isNotEmpty(cardFavorableRecordVO) && cardFavorableRecordVO.getType().equals("2") && !cardFavorableRecordVO.getExclusiveFunction().equals("0")){ if(StringUtils.isNotEmpty(cardFavorableRecordVO.getExclusiveFunction()) && ObjectUtils.isNotEmpty(cardFavorableRecordVO) && cardFavorableRecordVO.getType().equals("2") && !cardFavorableRecordVO.getExclusiveFunction().equals("0")){
ActiveDiscountPayVO activeDiscountPayVO1 = new ActiveDiscountPayVO(); ActiveDiscountPayVO activeDiscountPayVO1 = new ActiveDiscountPayVO();

27
fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
View File

@ -90,7 +90,7 @@
</div> </div>
<div>-￥{{ fullReduction.toFixed(2) }}</div> <div>-￥{{ fullReduction.toFixed(2) }}</div>
</div> </div>
<div class="center-left-hj" v-show="isMember"> <div class="center-left-hj" v-show="isMember && gradeDiscount.length>0">
<div> <div>
<el-popover <el-popover
placement="bottom-start" placement="bottom-start"
@ -188,7 +188,7 @@
</div> </div>
<div class="th-box"> <div class="th-box">
<div @click="getStaffList">加油员</div> <div @click="getStaffList">加油员</div>
<div style="cursor: pointer;color: crimson" @click="getStaffList" >{{ staff.realName }}</div> <div style="cursor: pointer;color: crimson" @click="getStaffList" >{{ staff ? staff.realName : "--" }}</div>
</div> </div>
</div> </div>
</div> </div>
@ -345,13 +345,16 @@
:visible.sync="dialogVisible" :visible.sync="dialogVisible"
width="30%" width="30%"
:close-on-click-modal="false"> :close-on-click-modal="false">
<div class="wrap-wrap"> <div class="wrap-wrap" v-if="staffList.length>0">
<div class="of-box" v-for="(item,index) in staffList" :key="index" <div class="of-box" v-for="(item,index) in staffList" :key="index"
@click="chooseStaff(item)" @click="chooseStaff(item)"
:style="{'background-color': item.color}"> :style="{'background-color': item.color}">
<div class="of-title">{{ item.realName }}</div> <div class="of-title">{{ item.realName }}</div>
<div style="text-align: center;font-size: 17px">{{ item.mobile }}</div> <div style="text-align: center;font-size: 17px">{{ item.mobile }}</div>
</div> </div>
</div>
<div class="wrap-wrap" v-else>
<span>暂未配置加油员</span>
</div> </div>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">关 闭</el-button> <el-button @click="dialogVisible = false">关 闭</el-button>
@ -1626,7 +1629,7 @@
this.getOilName(); this.getOilName();
this.getGoods(); this.getGoods();
// this.getStaffList(); // this.getStaffList();
this.getStaff(); // this.getStaff();
this.getList(); this.getList();
this.getCouponList(); this.getCouponList();
// this.getUnitList(); // this.getUnitList();
@ -1760,7 +1763,8 @@
}, },
// 会员充值 // 会员充值
async userRecharge() { async userRecharge() {
if (this.isSure){ // if (this.isSure){
if (this.member){
this.$message.error("请先选择会员") this.$message.error("请先选择会员")
return; return;
} }
@ -2557,7 +2561,9 @@
this.map.consumeAmount = 0.0; this.map.consumeAmount = 0.0;
this.map.refuelMoney = JSON.stringify(this.refuelMoney) this.map.refuelMoney = JSON.stringify(this.refuelMoney)
this.map.couponId = this.useCouponIds this.map.couponId = this.useCouponIds
this.map.staffId = this.staff.id if (this.staff){
this.map.staffId = this.staff.id
}
this.map.cardFavorableId = this.cardFavorableId this.map.cardFavorableId = this.cardFavorableId
this.map.recordId = this.recordId this.map.recordId = this.recordId
this.map.userId = this.member.id this.map.userId = this.member.id
@ -2855,6 +2861,7 @@
resetMember(){ resetMember(){
this.member = {}; this.member = {};
this.isMember = false; this.isMember = false;
this.isSure = false;
this.map.payUser == ""; this.map.payUser == "";
this.balance = 0; this.balance = 0;
this.oilDiscount = 0; this.oilDiscount = 0;
@ -3569,7 +3576,7 @@
this.dialogVisiblej = true this.dialogVisiblej = true
this.getStaff() // this.getStaff()
}, },
// 重置油品订单 // 重置油品订单
resetting(){ resetting(){
@ -3826,6 +3833,7 @@
this.amount = 0 this.amount = 0
this.dialogVisibleamount = true; this.dialogVisibleamount = true;
let result = false let result = false
this.isExistOilOrder = false;
// 判断是否存在此油品的数据 // 判断是否存在此油品的数据
this.oilOrder.forEach(item => { this.oilOrder.forEach(item => {
if (item.id==data.id){ if (item.id==data.id){
@ -3887,7 +3895,9 @@
this.updateRefuelMoney(); this.updateRefuelMoney();
this.map.refuelMoney = JSON.stringify(this.refuelMoney) this.map.refuelMoney = JSON.stringify(this.refuelMoney)
this.map.couponId = this.useCouponIds this.map.couponId = this.useCouponIds
this.map.staffId = this.staff.id if (this.staff) {
this.map.staffId = this.staff.id
}
this.map.cardFavorableId = this.cardFavorableId this.map.cardFavorableId = this.cardFavorableId
this.map.recordId = this.recordId this.map.recordId = this.recordId
this.map.userId = this.member.id this.map.userId = this.member.id
@ -3984,6 +3994,7 @@
_this.oilTotal = 0; _this.oilTotal = 0;
_this.goodsTotal = 0; _this.goodsTotal = 0;
_this.isMember = false; _this.isMember = false;
_this.isSure = false;
_this.oilOrder = [] _this.oilOrder = []
_this.goodsOrder = [] _this.goodsOrder = []
_this.amount = 0 _this.amount = 0

51
gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue
View File

@ -9,29 +9,31 @@
<view class="my-icons"></view> <view class="my-icons"></view>
</view> </view>
<!-- 顶部区域 --> <!-- 顶部区域 -->
<!-- <view class="tap-box"> <view class="tap-box">
<view class="box-tap" :class="{ 'act' :actinput == index }" v-for="(item,index) in taplist" :key="index" <view class="box-tap" :class="{ 'act' :types == index }" v-for="(item,index) in taplist" :key="index"
@click="getindex(index)"> @click="getindex(index)">
<view class="title">{{item.title}}</view> <view class="title">{{item.title}}</view>
<view class="gang" :class="{ 'actgang' : actinput == index }"></view> <view class="gang" :class="{ 'actgang' : types == index }"></view>
</view> </view>
</view> --> </view>
<!-- 储值充值 --> <!-- 储值充值 -->
<view class="boxback" v-if="actinput == 0"> <view class="boxback" v-if="actinput == 0">
<view class="box_s" v-for="(item,index) in actList" :key="index"> <view class="box_s" v-for="(item,index) in actList" :key="index">
{{item.discountActiveDescribe || ''}} {{item.discountActiveDescribe || ''}}
</view> </view>
<view style="display: flex; align-items: center; justify-content: space-around;"> <!-- <view style="display: flex; align-items: center; justify-content: space-around;">
<view class="" @click="types = 0"> <u-button type="primary" text="自定义金额"></u-button></view> <view class="" @click="types = 0"> <u-button type="primary" text="自定义金额"></u-button></view>
<view class="" @click="types = 1"> <u-button type="primary" :plain="true" text="金额选项"></u-button> <view class="" @click="types = 1"> <u-button type="primary" :plain="true" text="金额选项"></u-button>
</view> </view>
</view> </view> -->
<view class="inputbox" v-if="types == 0"> <view class="inputbox"
style="border-bottom: 1px solid #e7f1ff; box-sizing: border-box; padding-bottom: 15px;"
v-if="types == 1">
<view class="cadname" style="width: 38%;">自定义金额</view> <view class="cadname" style="width: 38%;">自定义金额</view>
<input type="text" v-model="rechargeBalance" placeholder="请输入自定义金额" /> <input type="text" v-model="balance" placeholder="请输入自定义金额" />
</view> </view>
<view class="box-cz" v-if="types == 1"> <view class="box-cz" v-if="types == 0">
<view class="box-jg" :class="{ 'actbox' : actindex == index }" v-for="(item,index) in cardValueList" <view class="box-jg" :class="{ 'actbox' : actindex == index }" v-for="(item,index) in cardValueList"
:key="index" :key="index"
@click="xzindex(index,item.rechargeBalance,item.fringeBenefit,item.giftBalance,item.points,item.growthValue,item.count,item.id)"> @click="xzindex(index,item.rechargeBalance,item.fringeBenefit,item.giftBalance,item.points,item.growthValue,item.count,item.id)">
@ -207,6 +209,7 @@
text: '', text: '',
fringeBenefit: "", fringeBenefit: "",
giftBalance: "", giftBalance: "",
balance: '',
rechargeBalance: "", rechargeBalance: "",
incomeLitres: "", incomeLitres: "",
lockupPrice: "", lockupPrice: "",
@ -220,13 +223,10 @@
columns: [], columns: [],
actList: [], actList: [],
taplist: [{ taplist: [{
title: '储值充值' title: '金额选项'
}, },
{ {
title: '囤油充值' title: '自定义金额'
},
{
title: '礼品卡兑换'
}, },
], ],
@ -406,7 +406,7 @@
chainStoreId: this.chainStoreId, chainStoreId: this.chainStoreId,
cardFavorableId: this.cardFavorableId, cardFavorableId: this.cardFavorableId,
cardRecordId: this.cardRecordId, cardRecordId: this.cardRecordId,
rechargeBalance: this.rechargeBalance, balance: this.balance,
types: this.types types: this.types
}, },
@ -542,13 +542,14 @@
this.actindex = index this.actindex = index
}, },
getindex(index) { getindex(index) {
this.actinput = index // this.actinput = index
if (index == 0) { this.types = index
this.getValueCars(); // if (index == 0) {
} // this.getValueCars();
if (index == 1) { // }
this.getFuelCars(); // if (index == 1) {
} // this.getFuelCars();
// }
}, },
goback() { goback() {
uni.navigateBack() uni.navigateBack()
@ -692,7 +693,7 @@
} }
.box-tap { .box-tap {
width: 33%; width: 50%;
text-align: center; text-align: center;
} }
@ -841,5 +842,9 @@
margin: 10px auto; margin: 10px auto;
font-size: 14px; font-size: 14px;
color: #f40000; color: #f40000;
box-sizing: border-box;
padding: 5px;
border-radius: 6px;
background: #f4f5f6;
} }
</style> </style>