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:
cun-nan 2024-02-28 18:02:53 +08:00
parent 1fe8922e14
commit c79e5b3e9a
12 changed files with 137 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuintAdmin/src/views/convenienceStore/goodsFile.vue
View File

@ -91,7 +91,7 @@
</el-card>
<el-card style="margin-top: 20px">
<div>
<div v-if="activeName=='goods'">
<el-button
type="primary"
@click="batchGrounding('qy')"

50
fuintAdmin/src/views/member/index.vue
View File

@ -254,7 +254,7 @@
</el-card>
<!-- 添加会员信息，选择是否批量录入-->
<el-dialog :title="title" width="55%" :visible.sync="openUser" append-to-body>
<el-dialog :title="title" width="40%" :visible.sync="openUser" append-to-body>
<el-alert
type="info"
:closable="false">
@ -268,31 +268,31 @@
<el-button type="primary"
icon="el-icon-connection" @click="addMult" round>批量导入会员</el-button>
</div>
<div>
<el-table ref="tables" v-loading="loading" :data="userList">
<el-table-column prop="batchNumber" align="center" label="批次号" width="200"/>
<el-table-column prop="type" align="center" label="类型"/>
<el-table-column prop="memberNumber" align="center" label="会员数"/>
<el-table-column label="执行结果" align="center" >
<el-table-column prop="successNumber" align="center" label="成功人数"/>
<el-table-column prop="errorNumber" align="center" label="失败人数"/>
<el-table-column prop="repeatNumber" align="center" label="重复人数"/>
</el-table-column>
<el-table-column prop="createTime" align="center" label="处理时间" width="160">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<!-- <el-table-column prop="date" align="center" label="处理结果详情"/>-->
</el-table>
<!-- <div>-->
<!-- <el-table ref="tables" v-loading="loading" :data="userList">-->
<!-- <el-table-column prop="batchNumber" align="center" label="批次号" width="200"/>-->
<!-- <el-table-column prop="type" align="center" label="类型"/>-->
<!-- <el-table-column prop="memberNumber" align="center" label="会员数"/>-->
<!-- <el-table-column label="执行结果" align="center" >-->
<!-- <el-table-column prop="successNumber" align="center" label="成功人数"/>-->
<!-- <el-table-column prop="errorNumber" align="center" label="失败人数"/>-->
<!-- <el-table-column prop="repeatNumber" align="center" label="重复人数"/>-->
<!-- </el-table-column>-->
<!-- <el-table-column prop="createTime" align="center" label="处理时间" width="160">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ parseTime(scope.row.createTime) }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!--&lt;!&ndash; <el-table-column prop="date" align="center" label="处理结果详情"/>&ndash;&gt;-->
<!-- </el-table>-->
<pagination
:total="total1"
:page.sync="queryParams.page"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
</div>
<!-- <pagination-->
<!-- :total="total1"-->
<!-- :page.sync="queryParams.page"-->
<!-- :limit.sync="queryParams.pageSize"-->
<!-- @pagination="getList"-->
<!-- />-->
<!-- </div>-->
</el-dialog>
<!-- 添加或修改对话框 -->

9
fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java
View File

@ -12,6 +12,7 @@ import com.fuint.business.storeInformation.service.ILJStoreService;
import com.fuint.business.userManager.entity.*;
import com.fuint.business.userManager.mapper.LJUserMapper;
import com.fuint.business.userManager.mapper.MtInvitationMapper;
import com.fuint.business.userManager.mapper.UserBalanceMapper;
import com.fuint.business.userManager.service.*;
import com.fuint.business.userManager.vo.LJUserVo;
import com.fuint.common.dto.AccountInfo;
@ -34,6 +35,8 @@ public class LJUserServiceImpl extends ServiceImpl<LJUserMapper, LJUser> impleme
@Autowired
private UserBalanceService balanceService;
@Autowired
private UserBalanceMapper userBalanceMapper;
@Autowired
private ILJStoreService storeService;
/**
@ -134,12 +137,14 @@ public class LJUserServiceImpl extends ServiceImpl<LJUserMapper, LJUser> impleme
QueryWrapper queryWrapper = new QueryWrapper<>();
queryWrapper.apply(true, "TO_DAYS(NOW())-TO_DAYS(create_time) = 0");
Integer addNum = baseMapper.selectCount(queryWrapper);
// Integer addNum = baseMapper.selectCount(queryWrapper);
Integer addNum = userBalanceMapper.selectCount(queryWrapper);
QueryWrapper queryWrapper1 = new QueryWrapper<>();
queryWrapper1.apply(true, "TO_DAYS(NOW())-TO_DAYS(create_time) = 1");
Integer yesterdayAddNum = baseMapper.selectCount(queryWrapper1);
// Integer yesterdayAddNum = baseMapper.selectCount(queryWrapper1);
Integer yesterdayAddNum = userBalanceMapper.selectCount(queryWrapper1);
map.put("balance",balance);
map.put("point",point);

3
fuintCashierWeb/src/api/cashier/balancecardrecord.js
View File

@ -19,10 +19,11 @@ export function listCardOilRecord(query) {
}
// 查询优惠券信息列表
export function cardBalanceCount() {
export function cardBalanceCount(query) {
return request({
url: '/business/CardBalanceChange/getBalanceStoreCount',
method: 'get',
params: query
})
}

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

@ -317,7 +317,7 @@
<div v-if="isMember">{{ item.memberPrice }}</div>
<div>
<el-input-number v-model="item.num" size="small" controls-position="right"
@change="handleChange" :min="1" :max="10000"></el-input-number>
@change="handleChange" :min="1" :max="item.stock"></el-input-number>
</div>
<div @click="delGoods(index)"><i class="el-icon-circle-close" style="font-size: 22px"></i></div>
</div>
@ -3475,6 +3475,7 @@
if (goods[i].id == val.id) {
if (val.stock<goods[i].num + 1){
this.$modal.msgError("商品库存不足，请重新选择商品")
result = false;
break;
}
goods[i].num = goods[i].num + 1;
@ -3488,6 +3489,7 @@
break;
} else {
result = true;
console.log(265)
}
}
// this.goodsAmount = amount;
@ -3504,7 +3506,7 @@
if (_this.isMember) {
this.goodsDiscount += (val.retailPrice - val.memberPrice)
}
console.log(this.goodsAmount)
console.log(this.goodsAmount,847)
this.goodsAmount += +val.retailPrice
this.goodsActualPay = this.goodsAmount - this.goodsDiscount;
this.goodsOrder.push(val);
@ -4040,8 +4042,9 @@
_this.isQuery = false;
_this.amount = 0
_this.printLocally()
_this.loading = false;
_this.printLocally()
_this.resetting1();
if (response.data.oilOrderAmount>0){
// for (let i =0;i<_this.oilPreferentialData.length;i++){

5
fuintCashierWeb/src/views/cashier/vipComponents/balanceList.vue
View File

@ -651,6 +651,7 @@ import {oilNumbers} from "@/api/cashier/oilnumber";
if (val!=undefined){
this.queryParams.page = val
}
this.dateRange = []
if (this.beginTime && this.endTime) {
this.dateRange.push(this.beginTime.toLocaleDateString())
this.dateRange.push(this.endTime.toLocaleDateString())
@ -665,10 +666,12 @@ import {oilNumbers} from "@/api/cashier/oilnumber";
if (val!=undefined){
this.queryParams.page = val
}
this.dateRange = []
if (this.beginTime && this.endTime) {
this.dateRange.push(this.beginTime.toLocaleDateString())
this.dateRange.push(this.endTime.toLocaleDateString())
}
console.log(this.dateRange)
cardBalanceCount(this.addDateRange(this.queryParams, this.dateRange)).then(res => {
this.inCount = res.data.inCount
this.outCount = res.data.outCount
@ -681,6 +684,7 @@ import {oilNumbers} from "@/api/cashier/oilnumber";
if (val!=undefined){
this.queryParams.page = val
}
this.dateRange = []
if (this.beginTime && this.endTime) {
this.dateRange.push(this.beginTime.toLocaleDateString())
this.dateRange.push(this.endTime.toLocaleDateString())
@ -695,6 +699,7 @@ import {oilNumbers} from "@/api/cashier/oilnumber";
if (val!=undefined){
this.queryParams.page = val
}
this.dateRange = []
if (this.beginTime && this.endTime) {
this.dateRange.push(this.beginTime.toLocaleDateString())
this.dateRange.push(this.endTime.toLocaleDateString())

89
fuintCashierWeb/src/views/cashier/vipComponents/vipList.vue
View File

@ -223,12 +223,12 @@
<el-tag v-else type="danger">禁用</el-tag>
</template>
</el-table-column>
<el-table-column label="公众号" align="center" prop="official">
<template slot-scope="scope">
<span v-if="scope.row.official == 'ygz'">已关注</span>
<span v-else>未关注</span>
</template>
</el-table-column>
<!-- <el-table-column label="公众号" align="center" prop="official">-->
<!-- <template slot-scope="scope">-->
<!-- <span v-if="scope.row.official == 'ygz'">已关注</span>-->
<!-- <span v-else>未关注</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="操作" align="center" width="120" fixed='right'>
<template slot-scope="scope">
<el-button
@ -258,7 +258,7 @@
</el-card>
<!-- 添加会员信息，选择是否批量录入-->
<el-dialog :close-on-click-modal="false" :title="title" width="55%" :visible.sync="openUser" append-to-body>
<el-dialog :close-on-click-modal="false" :title="title" width="40%" :visible.sync="openUser" append-to-body>
<el-alert
type="info"
:closable="false">
@ -272,31 +272,31 @@
<el-button type="primary"
icon="el-icon-connection" @click="addMult" round>批量导入会员</el-button>
</div>
<div>
<el-table ref="tables" v-loading="loading" :data="userList">
<el-table-column prop="batchNumber" align="center" label="批次号" width="200"/>
<el-table-column prop="type" align="center" label="类型"/>
<el-table-column prop="memberNumber" align="center" label="会员数"/>
<el-table-column label="执行结果" align="center" >
<el-table-column prop="successNumber" align="center" label="成功人数"/>
<el-table-column prop="errorNumber" align="center" label="失败人数"/>
<el-table-column prop="repeatNumber" align="center" label="重复人数"/>
</el-table-column>
<el-table-column prop="createTime" align="center" label="处理时间" width="160">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<!-- <el-table-column prop="date" align="center" label="处理结果详情"/>-->
</el-table>
<!-- <div>-->
<!-- <el-table ref="tables" v-loading="loading" :data="userList">-->
<!-- <el-table-column prop="batchNumber" align="center" label="批次号" width="200"/>-->
<!-- <el-table-column prop="type" align="center" label="类型"/>-->
<!-- <el-table-column prop="memberNumber" align="center" label="会员数"/>-->
<!-- <el-table-column label="执行结果" align="center" >-->
<!-- <el-table-column prop="successNumber" align="center" label="成功人数"/>-->
<!-- <el-table-column prop="errorNumber" align="center" label="失败人数"/>-->
<!-- <el-table-column prop="repeatNumber" align="center" label="重复人数"/>-->
<!-- </el-table-column>-->
<!-- <el-table-column prop="createTime" align="center" label="处理时间" width="160">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ parseTime(scope.row.createTime) }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- &lt;!&ndash; <el-table-column prop="date" align="center" label="处理结果详情"/>&ndash;&gt;-->
<!-- </el-table>-->
<pagination
:total="total1"
:page.sync="queryParams.page"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
</div>
<!-- <pagination-->
<!-- :total="total1"-->
<!-- :page.sync="queryParams.page"-->
<!-- :limit.sync="queryParams.pageSize"-->
<!-- @pagination="getList"-->
<!-- />-->
<!-- </div>-->
</el-dialog>
<!-- 添加或修改对话框 -->
@ -347,7 +347,7 @@
<el-row>
<el-col :span="24">
<el-form-item label="会员初始积分" prop="points">
<el-input v-model="form.points" placeholder="0" maxlength="30"/>
<el-input :disabled="title == '编辑会员'" v-model="form.points" placeholder="0" maxlength="30"/>
</el-form-item>
</el-col>
</el-row>
@ -361,7 +361,7 @@
<el-row>
<el-col :span="24">
<el-form-item label="储值通用余额" prop="cardBalance">
<el-input v-model="form.cardBalance" placeholder="0" maxlength="30"/>
<el-input :disabled="title == '编辑会员'" v-model="form.cardBalance" placeholder="0" maxlength="30"/>
</el-form-item>
</el-col>
</el-row>
@ -372,19 +372,19 @@
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- <el-row>-->
<!-- <el-col :span="24">-->
<!-- <el-form-item label="是否关注公众号">-->
<!-- <el-radio-group v-model="form.official">-->
<!-- <el-radio label="ygz" value="ygz">已关注</el-radio>-->
<!-- <el-radio label="wgz" value="wgz">未关注</el-radio>-->
<!-- </el-radio-group>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<el-row>
<el-col :span="24">
<el-form-item label="是否关注公众号">
<el-radio-group v-model="form.official">
<el-radio label="ygz" value="ygz">已关注</el-radio>
<el-radio label="wgz" value="wgz">未关注</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="会员状态">
<el-form-item label="会员状态" prop="status">
<el-radio-group v-model="form.status">
<el-radio label="qy" value="qy">启用</el-radio>
<el-radio label="jy" value="jy">禁用</el-radio>
@ -562,6 +562,7 @@
mobile: [
{ required: true, message: "请输入手机号", trigger: "blur" },
],
status: [{ required: true, message: "请选择会员状态", trigger: "blur" }],
},
}
},

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

@ -205,6 +205,7 @@
let storeId = "19";
let staffId = "";
console.log(111);
if (str.includes("&")) {
let arr = str.split("&");
arr.forEach(item => {
@ -234,9 +235,9 @@
uni.setStorageSync("storeId", storeId)
}
await this.getUserAuthority();
// await this.getOilType();
}
await this.getUserAuthority();
// await this.getOilType();
await this.getTheJudgmentIsTheSame();
}else{
await this.getUserAuthority();
@ -246,7 +247,7 @@
},
onShow() {
this.isJoined()
this.getIndexBanner()
// this.getIndexBanner()
},
components: {
tabbar
@ -277,14 +278,16 @@
method: 'get',
}).then(res => {
_this.list1 = res.data
for (let i = 0; i < res.data.length; i++) {
if (res.data[i].bannerUrl.includes("http")) {
_this.list1[i].bannerUrl = res.data[i].bannerUrl
} else {
_this.list1[i].bannerUrl = _this.baseUrl + res.data[i].bannerUrl
if (res.data.length>0){
for (let i = 0; i < res.data.length; i++) {
if (res.data[i].bannerUrl.includes("http")) {
_this.list1[i].bannerUrl = res.data[i].bannerUrl
} else {
_this.list1[i].bannerUrl = _this.baseUrl + res.data[i].bannerUrl
}
}
console.log(_this.list1);
}
console.log(_this.list1);
})
}
},
@ -388,6 +391,7 @@
},
// 判断token是否与当前连锁店id相同
async getTheJudgmentIsTheSame() {
console.log(this.AppToken,547);
// 判断是否登录
if (!this.AppToken) {
return;
@ -417,8 +421,8 @@
data: {
code: res.code
}
}).then(res => {
if (!res.data) {
}).then(resp => {
if (!resp.data) {
uni.removeStorageSync("App-Token");
}
})
@ -443,7 +447,8 @@
storeId: uni.getStorageSync("storeId"),
},
}).then((resp) => {
if (!res.data) {
console.log(resp,85412);
if (!resp.data) {
uni.removeStorageSync("App-Token");
}
})
@ -490,10 +495,6 @@
},
// 获取当前位置
getAddress(storeId) {
// uni.showToast({
// title:"店铺id"+storeId,
// icon:"none"
// })
let _this = this;
uni.getLocation({
// 谷歌使用wgs84 其他使用gcj02
@ -517,17 +518,19 @@
},
}).then((response) => {
console.log(response,"2154");
// uni.showToast({
// title:"121984:"+storeId
// })
if (response.data.store){
_this.distance = (Math.ceil(response.data.distance))
.toFixed(1)
_this.store = response.data.store
console.log(response,"storeId");
uni.setStorageSync("storeId", response.data.store.id)
uni.setStorageSync("chainStoreId", response.data.store.chainStoreId)
// console.log(uni.getStorageSync("chainStoreId"));
let welfare = response.data.store.welfare
if (welfare) {
if (welfare.includes(",")) {
console.log(uni.getStorageSync("chainStoreId"));
if (response.data.store.welfare) {
if (response.data.store.welfare.includes(",")) {
_this.welfare = response.data.store.welfare
.split(",")
} else {
@ -554,7 +557,7 @@
})
}
})
}).catch(err => {})
// uni.showToast({
// title: "获取位置信息成功",

4
gasStation-uni/pages/my/my.vue
View File

@ -216,6 +216,7 @@
},
// 查询当前登录用户信息
getUser() {
console.log(this.AppToken,2343);
if (!this.AppToken) {
return;
}
@ -223,7 +224,8 @@
url: 'business/userManager/user/getUser',
method: 'get',
}).then(res => {
if (res.data != null && res.data != "" && res.data != undefined) {
console.log(res,1541);
if (res.data) {
this.user = res.data
uni.setStorageSync('userId', res.data.id)
this.user.mobile = res.data.mobile.slice(0, 3) + "****" + res.data.mobile.slice(res.data

21
gasStation-uni/pages/refuel/refuel.vue
View File

@ -301,14 +301,14 @@
_this.storeId = res.data.id;
uni.setStorageSync("storeId", _this.store.id)
uni.setStorageSync("chainStoreId", _this.store.chainStoreId)
let welfare = res.data.welfare
if (welfare) {
if (welfare.includes(",")) {
_this.welfare = res.data.welfare.split(",")
} else {
_this.welfare.push(res.data.welfare)
}
}
// let welfare = res.data.welfare
// if (welfare) {
// if (welfare.includes(",")) {
// _this.welfare = res.data.welfare.split(",")
// } else {
// _this.welfare.push(res.data.welfare)
// }
// }
}).catch(err => {
// uni.showLoading({
// title: JSON.stringify(err) + 222
@ -337,9 +337,8 @@
_this.storeId = response.data.store.id;
_this.getOilNumber(_this.storeId);
// _this.getStaffList(_this.storeId)
let welfare = response.data.store.welfare;
if (welfare != undefined && welfare != null && welfare != "") {
if (welfare.includes(",")) {
if (response.data.store.welfare) {
if (response.data.store.welfare.includes(",")) {
_this.welfare = response.data.store.welfare.split(",");
} else {
_this.welfare.push(response.data.store.welfare);

9
gasStation-uni/pagesLogin/login/login.vue
View File

@ -91,7 +91,11 @@
encryptedData: encryptedData,
},
}).then((resp) => {
// console.log(resp)
if (uni.getStorageSync("y_type") ==
'yaoqingyouli') {
this.activeRecommendRecords()
}
if (resp.code == 200) {
uni.setStorageSync('App-Token', resp.data.token);
@ -102,8 +106,7 @@
url: '/pages/index/index'
})
}
console.log("swq", uni.getStorageSync(
'App-Token'));
console.log("swq", uni.getStorageSync('App-Token'));
})
},
fail: err => {

2
gasStation-uni/pagesRefuel/orderDetail/index.vue
View File

@ -476,6 +476,8 @@
if (this.refuelMoney[i].refuelMoney >= this.oilOrder.oilNum){
this.oilCardRedece = this.oilOrder.oilNum
this.refuelMoneyAfter[i].refuelMoney = this.refuelMoney[i].refuelMoney - this.oilOrder.oilNum
this.payAmount = 0
this.checkOilCard = true
}else{
this.oilCardRedece = this.refuelMoney[i].refuelMoney
this.refuelMoneyAfter[i].refuelMoney = 0