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

bug修改

Browse Source
This commit is contained in:
wangh 2024-01-08 10:07:07 +08:00
parent ca91fa5b5a
commit 0f37e8db23
11 changed files with 121 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fuintAdmin/src/views/integral/order/pointsMall.vue
View File

@ -111,8 +111,8 @@
<el-table-column label="配送类型" align="center" prop="shippingType">
<template slot-scope="scope">
<el-tag v-if="scope.row.shippingType=='门店自提'">{{scope.row.shippingType}}</el-tag>
<el-tag type="success" v-if="scope.row.shippingType=='物流配送'">{{scope.row.shippingType}}</el-tag>
<el-tag type="info" v-else>非实物兑换</el-tag>
<el-tag type="success" v-else-if="scope.row.shippingType=='物流配送'">{{scope.row.shippingType}}</el-tag>
<el-tag type="info" v-else >非实物兑换</el-tag>
</template>
</el-table-column>
<el-table-column label="实付信息" align="center" prop="categoryName" >

141
fuintAdmin/src/views/oilConfig/oilPrice/index.vue
View File

@ -166,14 +166,14 @@
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="油品单价" prop="oilPrice">
<el-input v-model="oilNumber.oilPrice" style="width: 217px">
<el-input v-model="oilNumber.oilPrice" pattern="^\d+(\.\d+)?$" style="width: 217px">
<template slot="append">元</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="国标价格" prop="gbPrice">
<el-input v-model="oilNumber.gbPrice" style="width: 217px">
<el-input v-model="oilNumber.gbPrice" pattern="^\d+(\.\d+)?$" style="width: 217px">
<template slot="append">元</template>
</el-input>
</el-form-item>
@ -252,14 +252,14 @@
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="油品单价" prop="oilPrice">
<el-input v-model="oilNumber.oilPrice" style="width: 217px">
<el-input v-model="oilNumber.oilPrice" pattern="^\d+(\.\d+)?$" style="width: 217px">
<template slot="append">元</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="国标价格" prop="gbPrice">
<el-input v-model="oilNumber.gbPrice" style="width: 217px">
<el-input v-model="oilNumber.gbPrice" pattern="^\d+(\.\d+)?$" style="width: 217px">
<template slot="append">元</template>
</el-input>
</el-form-item>
@ -316,17 +316,17 @@
</el-input>
</el-form-item>
<el-form-item label="预设油站价" prop="presetOilPrices">
<el-input v-model="oilPresetPrices.presetOilPrices" style="width: 217px">
<el-input v-model="oilPresetPrices.presetOilPrices" pattern="^\d+(\.\d+)?$" style="width: 217px">
<template slot="append">元</template>
</el-input>
</el-form-item>
<el-form-item label="当前国标价">
<el-input v-model="oilPresetPrices.currentPetrolPrices" style="width: 217px" readonly disabled>
<el-input v-model="oilPresetPrices.currentPetrolPrices" style="width: 217px" readonly disabled>
<template slot="append">元</template>
</el-input>
</el-form-item>
<el-form-item label="预设国标价" prop="presetGbPrice">
<el-input v-model="oilPresetPrices.presetGbPrice" style="width: 217px">
<el-input v-model="oilPresetPrices.presetGbPrice" pattern="^\d+(\.\d+)?$" style="width: 217px">
<template slot="append">元</template>
</el-input>
</el-form-item>
@ -371,11 +371,11 @@ import {
data() {
var valiNumberPass = (rule, value, callback) => {//包含小数的数字
let reg = /^[+-]?(0|([1-9]\d*))(\.\d+)?$/g;
let reg = /^[+-]?(0|([1-9]\d*))(\.\d{1,2})?$/;
if (value === '') {
callback(new Error('请输入内容'));
} else if (!reg.test(value)) {
callback(new Error('请输入数字'));
callback(new Error('请输入数字，最多保留两位小数'));
} else {
callback();
}
@ -391,8 +391,6 @@ import {
],
presetOilPrices: [
{ required: true, validator:valiNumberPass, trigger: "blur" }
// {required: true, message: '请输入', trigger: 'blur'},
// { type: 'number', message: '价格必须为数字值'}
],
presetGbPrice: [
{ required: true, validator:valiNumberPass, trigger: "blur" }
@ -413,7 +411,6 @@ import {
],
oilPrice: [
{ required: true, validator:valiNumberPass, trigger: "blur" }
],
gbPrice: [
{ required: true, validator:valiNumberPass, trigger: "blur" }
@ -503,8 +500,7 @@ import {
},
mounted() {
},
methods:{
methods: {
getStatusText(data) {
@ -516,7 +512,7 @@ import {
},
handleChange(value) {
console.log("this.oilNumber",this.oilNumber);
console.log("this.oilNumber", this.oilNumber);
console.log(value);
},
// 获取数据
@ -554,7 +550,7 @@ import {
}
},
res() {
this.oilNumber={
this.oilNumber = {
oilType: '汽油',
oilName: '',
oilPrice: '',
@ -566,10 +562,10 @@ import {
sort: '',
remark: '',
ifDelete: '',
allOil:'',
allOil: '',
oilTypeT: '',
oilNameT: '',
unit:'', // 计价单位
unit: '', // 计价单位
}
},
@ -597,39 +593,39 @@ import {
this.receivingUnitList = [];
var cla1 = {
label : "英文简称",
value : -1,
dis : true
label: "英文简称",
value: -1,
dis: true
}
this.receivingUnitList.push(cla1);
// 遍历 this.receivingUnitCN 对象的属性并添加到 receivingUnitList
for (const argumentsKey in this.receivingUnitCN) {
const value = this.receivingUnitCN[argumentsKey];
var cla = {
label : value.dictLabel,
value : value.dictValue,
dis : false
label: value.dictLabel,
value: value.dictValue,
dis: false
}
this.receivingUnitList.push(cla);
}
var cla2 = {
label : "中文简称",
value : -2,
dis : true
label: "中文简称",
value: -2,
dis: true
}
cla2 = {
label : "中文简称",
value : -3,
dis : true
cla2 = {
label: "中文简称",
value: -3,
dis: true
}
this.receivingUnitList.push(cla2);
for (const argumentsKey in this.receivingUnitEN) {
const value = this.receivingUnitEN[argumentsKey];
var cla = {
label : value.dictLabel,
value : value.dictValue,
dis : false
label: value.dictLabel,
value: value.dictValue,
dis: false
}
this.receivingUnitList.push(cla);
}
@ -657,32 +653,31 @@ import {
},
// 打开修改窗口
openOilNumberEdit(item) {
this.oilNumber = {};
let oil = item.allOil.split(' ');
console.log("oilNameT",item)
console.log("oilNameT", item)
// item.oilNameT = oil[1];
// item.oilName = oil[1];
this.oilNumber = item;
this.$set(this.oilNumber,'oilNameT',oil[1])
this.$set(this.oilNumber, 'oilNameT', oil[1])
this.oilTypeClick(item);
},
// 添加
insertOilNumberin(){
insertOilNumberin() {
this.$refs["oilNumberF"].validate(valid => {
if (valid) {
insertOilNumber(this.oilNumber).then( response => {
insertOilNumber(this.oilNumber).then(response => {
var list = response.data
if (list < 0) {
this.getList();
this.$modal.msgWarning("有重复油号");
}else if(list > 0){
} else if (list > 0) {
this.$modal.msgSuccess("新增油号成功");
this.dialogFormVisible = false,
this.getList();
@ -696,41 +691,41 @@ import {
},
// 修改
async updateOilNumberin(){
async updateOilNumberin() {
this.$refs["form"].validate(valid => {
if (valid) {
var this_ = this
updateOilNumber(this_.oilNumber).then( response => {
var list = response.data
if ( list < 0) {
this.getList();
this.$modal.msgWarning("油品重复");
} else {
this.getList();
this.dialogFormNumberEdit = false
this.$modal.msgSuccess("修改成功");
}
if (valid) {
var this_ = this
updateOilNumber(this_.oilNumber).then(response => {
var list = response.data
if (list < 0) {
this.getList();
this.$modal.msgWarning("油品重复");
} else {
this.getList();
this.dialogFormNumberEdit = false
this.$modal.msgSuccess("修改成功");
}
}).catch(res=>{
this.$modal.msgError("修改失败");
});
}
})
}).catch(res => {
this.$modal.msgError("修改失败");
});
}
})
},
// 查询数组字典类型
async getOilTypeList(data) {
var this_ = this
await dictSelect(data).then( response => {
await dictSelect(data).then(response => {
var list = response.data
if (data == "oil_type") {
this_.oilTypeList = list;
}else if (data == "pricingUnitCN"){ //获取几家单位
} else if (data == "pricingUnitCN") { //获取几家单位
this_.receivingUnitCN = list;
}else if (data == "pricingUnitEN"){ //获取几家单位
} else if (data == "pricingUnitEN") { //获取几家单位
this_.receivingUnitEN = list;
}else {
} else {
this_.oilNameList = list;
}
});
@ -742,7 +737,7 @@ import {
oilType: data
}
var this_ = this
getOilNameApi(OilNumber).then( response => {
getOilNameApi(OilNumber).then(response => {
var list = response.data
this_.oilNameList = list;
});
@ -750,17 +745,17 @@ import {
/**
* 油价预设
*/
*/
// 查询预设油号
getOilPresetListin() {
var this_=this
getOilPresetList().then( response => {
var this_ = this
getOilPresetList().then(response => {
this.oilPresetPricesList = response.data.records
this.oilPresetPricesList.forEach(oilNumber => {
this.AllOilList.forEach(oil => {
if (parseInt(oilNumber.oilType) == oil.id) {
oilNumber.oilNameT = oil.oilType+' '+oil.oilName;
oilNumber.oilNameT = oil.oilType + ' ' + oil.oilName;
}
});
});
@ -769,8 +764,8 @@ import {
},
// 油价预设查询列表
getOilNameList() {
var this_=this
getOilNameListApi().then( response => {
var this_ = this
getOilNameListApi().then(response => {
var list = response.data
this_.selectOilTypeByPrice = list
});
@ -784,7 +779,7 @@ import {
},
// 添加youjia1
insertOilPresePrices(){
insertOilPresePrices() {
this.$refs["priForm"].validate(valid => {
if (valid) {
this.dialogFormPricesAdd = false
@ -800,7 +795,7 @@ import {
// 更改状态
deleteRow(data1, data2) {
stopJobApi(data2).then( response => {
stopJobApi(data2).then(response => {
this.$modal.msgSuccess("停止成功");
this.getOilPresetListin();
@ -824,9 +819,9 @@ import {
this.oilNumber.oilName = this.oilNumber.oilNameT
},
getSecondName(){
getSecondName() {
this.$forceUpdate();
}
},
}
}
</script>

4
fuintBackend/configure/dev/application.properties
View File

@ -43,7 +43,7 @@ images.root=d:/rouyi/uploadPath
images.path=/static/uploadImages/
# \u4E0A\u4F20\u56FE\u7247\u670D\u52A1\u5668\u57DF\u540D
images.upload.url=http://localhost:8080
images.upload.url=http://localhost:8008
# \u4E0A\u4F20\u56FE\u7247\u5141\u8BB8\u7684\u5927\u5C0F\uFF08\u5355\u4F4D\uFF1AMB\uFF09
images.upload.maxSize=5
@ -51,7 +51,7 @@ images.upload.maxSize=5
################## \u5B9A\u65F6\u811A\u672C\u914D\u7F6E #########################
# \u5B9A\u65F6\u53D1\u9001\u6D88\u606F
message.job.switch = 1
message.job.time = 0 0/1 * * * ?
message.job.time = 0 0/1 * * * ?z
# \u5361\u5238\u5230\u671F\u5904\u7406
couponExpire.job.switch = 1

7
fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralOrdersServiceImpl.java
View File

@ -311,13 +311,12 @@ public class IntegralOrdersServiceImpl implements IntegralOrdersService {
cardFavorableRecord.setExchangeFrom("积分兑换");
cardFavorableRecordService.addCardFavorableRecord(cardFavorableRecord);
}else if(integralGift.getGiftType().equals("实物商品")) {
// 查询礼品信息
// 修改商品库存并增加记录
LJGoodsDto goods = new LJGoodsDto();
goods.setId(integralGift.getGoodsId());
// goods.setDocument();
goods.setDocument("积分兑换");
goods.setNumberOfChanges(-integralOrders.getExchangeQuantity());
goods.setGoodsNo(integralOrders.getOrderNumber());
ljGoodsService.editGoodsInventory(goods);
}

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/store/controller/ChainStoreInfoController.java
View File

@ -28,7 +28,7 @@ public class ChainStoreInfoController extends BaseController {
* 服务对象
*/
@Resource
private ChainStoreInfoService chainStoreInfoService;
private ChainStoreInfoService chainStoreInfoService;
/**
* 分页查询所有数据

1
fuintBackend/fuint-application/src/main/java/com/fuint/business/store/entity/MtStore.java
View File

@ -81,6 +81,7 @@ public class MtStore extends BaseEntity implements Serializable {
@ApiModelProperty("福利信息")
private String welfare;
private String ifDelete;
@ApiModelProperty("门头照")
private String doorstepPhoto;

1
fuintBackend/fuint-application/src/main/java/com/fuint/business/store/service/impl/ChainStoreInfoServiceImpl.java
View File

@ -56,6 +56,7 @@ public class ChainStoreInfoServiceImpl extends ServiceImpl<ChainStoreInfoMapper,
if (ObjectUtil.isNotEmpty(chainStoreInfo.getStatus())) {
queryWrapper.eq(MtStore :: getStatus,chainStoreInfo.getStatus());
}
queryWrapper.eq(MtStore::getIfDelete,0);
queryWrapper.eq(MtStore::getChainStoreId,it.getId()).orderByDesc(BaseEntity::getCreateTime);
List<MtStore> list = storeService.list(queryWrapper);
for (MtStore mtStore : list) {

29
fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue
View File

@ -37,7 +37,7 @@
border-radius: 5px;text-align: center">
<el-tooltip placement="top">
<div slot="content">
会员等级：{{ getGrade(member.gradeId) }}
会员等级：{{ member.gradeId?getGrade(member.gradeId):'未知' }}
</div>
<i class="el-icon-medal" style="font-size: 35px"></i>
</el-tooltip>
@ -526,18 +526,25 @@ import {
},
// 选择会员
chooseUser(mobile,id){
this.dialogVisiblevip = false
this.isMember = true;
// this.map.payUser = mobile;
// this.map.userId = id;
this.balance = this.member.cardBalance;
if (this.balance>=(this.oilAmount - this.oilDiscount)){
this.consumeAmount = this.oilAmount - this.oilDiscount;
this.oilActualPay = 0;
console.log("this.member",this.member)
if (this.member.id) {
this.dialogVisiblevip = false
this.isMember = true;
// this.map.payUser = mobile;
// this.map.userId = id;
this.balance = this.member.cardBalance;
if (this.balance>=(this.oilAmount - this.oilDiscount)){
this.consumeAmount = this.oilAmount - this.oilDiscount;
this.oilActualPay = 0;
}else {
this.consumeAmount = this.balance;
this.oilActualPay = this.oilAmount - this.oilDiscount - this.balance;
}
}else {
this.consumeAmount = this.balance;
this.oilActualPay = this.oilAmount - this.oilDiscount - this.balance;
this.$message.error('请先选择会员');
}
},
// 选择会员信息
handleChoose(data){

12
gasStation-uni/pages/index/index.vue
View File

@ -196,7 +196,7 @@
let storeId = "19";
let staffId = "";
if (str.includes("&")){
if (str.includes("&")) {
let arr = str.split("&");
arr.forEach(item => {
if (item.includes("storeId")) {
@ -205,17 +205,17 @@
staffId = item.split("=")[1]
}
})
}else{
} else {
storeId = str.split("=")[1]
}
uni.setStorageSync("storeId", storeId)
uni.setStorageSync("inviteStaffId", staffId)
this.storeId = uni.getStorageSync("storeId")
this.staffId = uni.getStorageSync("inviteStaffId")
uni.showLoading({
title:uni.getStorageSync("storeId") + "++" +uni.getStorageSync("inviteStaffId") + q
title: uni.getStorageSync("storeId") + "++" + uni.getStorageSync("inviteStaffId") + q
})
this.getUserAuthority();
this.getOilType();
@ -223,7 +223,7 @@
if (uni.getStorageSync("storeId")) {
this.storeId = uni.getStorageSync("storeId")
} else {
let storeId = "34";
let storeId = "12";
uni.setStorageSync("storeId", storeId)
}
@ -343,7 +343,7 @@
}
},
fail(err) {
}
})
},

2
gasStation-uni/pagesHome/goodsDetails/goodsDetails.vue
View File

@ -156,6 +156,8 @@
<style scoped lang="scss">
.content {
background: #f4f5f6;
width: 100%;
height: 100vh;
}
.container {

32
gasStation-uni/pagesHome/order/order.vue
View File

@ -17,7 +17,7 @@
<view class="dis">
<!-- <uni-icons type="location-filled" size="20"></uni-icons> -->
<view class="boximg">
<image src="../../static/logo.png" mode=""></image>
<image :src="logo?baseUrl+logo:'../../static/logo.png'" mode=""></image>
</view>
<view class="">
<view class="">{{storeName}}</view>
@ -110,7 +110,7 @@
<view style="color: #9d9d9d; font-size: 12px; ">积分账户{{myPoints}}</view>
</view>
<view @click="choose()" class="andeniu">
<text>选择</text>
<text>兑换</text>
</view>
</view>
@ -133,6 +133,7 @@
goodsInfo: '',
storeName: '',
storeAddress: '',
logo: '',
flag: false, // 禁用
title: '',
qhindex: 0,
@ -510,19 +511,19 @@
},
// 根据storeid 查找店铺信息
getStroeById() {
request({
url: 'business/storeInformation/store/storeInfoUni',
method: 'get',
params: {
storeId: uni.getStorageSync('storeId')
}
}).then((res) => {
if (res.code == 200) {
this.myPoints = res.data.points
}
})
},
// getStroeById() {
// request({
// url: 'business/storeInformation/store/storeInfoUni',
// method: 'get',
// params: {
// storeId: uni.getStorageSync('storeId')
// }
// }).then((res) => {
// if (res.code == 200) {
// this.myPoints = res.data.points
// }
// })
// },
// 根据storeId查询店铺信息
getInfoByStoreId() {
request({
@ -535,6 +536,7 @@
if (res.code == 200) {
this.storeName = res.data.name
this.storeAddress = res.data.address
this.logo = res.data.logo
}
})
},