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

no message

Browse Source
This commit is contained in:
DESKTOP-369JRHT\12997 2024-07-15 16:52:04 +08:00
parent 831c73d498
commit eeebaaaa51
22 changed files with 201 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fuintAdmin/src/main.js
View File

@ -56,10 +56,10 @@ Vue.prototype.download = download
Vue.prototype.handleTree = handleTree
Vue.prototype.imgurl = 'http://192.168.0.138:8008'
// Vue.prototype.pcUrl = 'http://192.168.0.178:83/'
// Vue.prototype.cashierUrl = 'http://192.168.31.178:83/#/homeindex' // 收银台
// Vue.prototype.cashierUrl = 'http://192.168.31.178:84/homeindex' // 收银台
// Vue.prototype.pcUrl = 'http://192.168.31.178:83/#/homeindex' // 收银台
// Vue.prototype.ztUrl = 'http://192.168.31.178:82/' // 中台
Vue.prototype.cashierUrl = 'https://cashier.youkerr.com/#/homeindex' // 收银台
Vue.prototype.cashierUrl = 'https://cashier.youkerr.com/homeindex' // 收银台
Vue.prototype.pcUrl = 'https://www.youkerr.com/' // 收银台
Vue.prototype.ztUrl = 'https://oil.youkerr.com/' // 中台
const Collapse= false

10
fuintAdmin/src/views/convenienceStore/index.vue
View File

@ -21,6 +21,7 @@
<!-- </el-form-item>-->
<el-form-item style="float: right">
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<el-button @click="resetQuery" icon="el-icon-refresh" >重置</el-button>
</el-form-item>
</el-form>
</el-card>
@ -648,6 +649,15 @@ export default {
this.queryParams.page = 1;
this.getList();
},
resetQuery() {
this.queryParams = {
page: 1,
pageSize: 10,
name:'',
status: '',
};
this.getList();
},
handleChange(){
},
//提交商品类别

13
fuintAdmin/src/views/duty/index.vue
View File

@ -22,6 +22,8 @@
</el-form-item>
<el-form-item style="float: right">
<el-button type="primary" icon="el-icon-search" @click="handleQuery1">查询</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
@ -351,6 +353,17 @@ export default {
this.loading = false;
})
},
// 重置按钮操作
resetQuery() {
this.queryParams1 = {
page:1,
pageSize:10,
// 当做机构id使用
storeId:"",
}
this.getDutyList();
},
}
}
</script>

8
fuintAdmin/src/views/financialStatement/reconciliation/tab/ref.vue
View File

@ -312,7 +312,7 @@ import {getmyDataApi, getRunningWaterByTissueApi, getTissueByDataApi, getTrading
// 获取订单统计信息
async getOrderStatistics() {
await this.getDeptList()
// await this.getDeptList()
let dateRange = []
if (this.beginTime && this.endTime) {
@ -321,7 +321,7 @@ import {getmyDataApi, getRunningWaterByTissueApi, getTissueByDataApi, getTrading
}
getTissueByDataApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
this.orderStatistics = res.data
this.getOrderStatistics()
// this.getOrderStatistics()
})
@ -341,7 +341,7 @@ import {getmyDataApi, getRunningWaterByTissueApi, getTissueByDataApi, getTrading
this.orderList = response.data.records;
this.total = response.data.total;
this.isSysDate = false
this.getOrderStatistics()
})
},
async getDeptList() {
@ -364,6 +364,8 @@ import {getmyDataApi, getRunningWaterByTissueApi, getTissueByDataApi, getTrading
this.queryParams = {
page: 1,
pageSize: 10,
status:"refund",
}
this.beginTime = ""
this.endTime = ""

13
fuintAdmin/src/views/financialStatement/runningWater/tab/day.vue
View File

@ -173,6 +173,7 @@ import {
pageSize: 10,
beginTime:"",
endTime:"",
isType:"3",
},
orderStatistics:{
amount:'0',
@ -194,7 +195,7 @@ import {
this.beginTime = start
this.endTime = new Date()
this.isSysDate = true
await this.getDeptList();
// await this.getDeptList();
this.getList();
@ -238,18 +239,20 @@ import {
},
// 获取列表信息
getList(val){
async getList(val){
await this.getDeptList()
let dateRange = []
if (this.beginTime && this.endTime) {
dateRange.push(this.beginTime.toLocaleDateString())
dateRange.push(this.endTime.toLocaleDateString())
}
getDayListApi(this.addDateRange(this.queryParams, dateRange)).then( response => {
await getDayListApi(this.addDateRange(this.queryParams, dateRange)).then( response => {
this.orderList = response.data.records;
this.total = response.data.total;
this.isSysDate = false
this.getOrderStatistics()
})
this.getOrderStatistics()
},
// 搜索按钮操作
@ -263,6 +266,8 @@ import {
this.queryParams = {
page: 1,
pageSize: 10,
isType:"3",
}
this.beginTime = ""
this.endTime = ""

7
fuintAdmin/src/views/financialStatement/runningWater/tab/oilDepot.vue
View File

@ -124,7 +124,12 @@
<el-table-column prop="addr" align="center" label="门店省市"> </el-table-column>
<el-table-column prop="amount" align="center" label="交易金额"> </el-table-column>
<el-table-column prop="strokeCount" align="center" label="交易笔数"> </el-table-column>
<el-table-column prop="unitPrice" align="center" label="笔单价"> </el-table-column>
<el-table-column prop="unitPrice" align="center" label="笔单价">
<template slot-scope="scope">
{{ scope.row.unitPrice?(Number(scope.row.unitPrice).toFixed(2)) : '' }}
</template>
</el-table-column>
<el-table-column prop="dailyAmount" align="center" label="日均交易金额"> </el-table-column>
<el-table-column prop="strokesPerDay" align="center" label="日均交易笔数"> </el-table-column>
<!-- <el-table-column prop="parentStoreId" align="center" label="机构编号"> </el-table-column>-->

12
fuintAdmin/src/views/oilConfig/oilSuppliers/list.vue
View File

@ -34,7 +34,7 @@
<el-form-item style="float: right">
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<!-- <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>-->
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
</el-card>
@ -245,6 +245,16 @@ export default {
this.queryParams.page = 1;
this.getList();
},
resetQuery() {
this.queryParams = {
supplierName: '',
contactPerson: '',
contactPhone: '',
page:null,
pageSize:null
};
this.getList();
},
},
}

10
fuintAdmin/src/views/oilConfig/oilTank/list.vue
View File

@ -15,7 +15,7 @@
<el-form-item style="float: right">
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<!-- <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>-->
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
</el-card>
@ -399,6 +399,14 @@ export default {
this.queryParams.page = 1;
this.getList();
},
resetQuery() {
this.queryParams = {
tankName: '',
page:null,
pageSize:null
};
this.getList();
},
// 新增油罐
tankAdd() {
// 表单重置

18
fuintAdmin/src/views/staff/list.vue
View File

@ -38,7 +38,7 @@
</el-form-item>
<el-form-item style="float: right">
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<!-- <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>-->
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
@ -730,10 +730,18 @@ export default {
},
// 重置按钮操作
resetQuery() {
this.dateRange = [];
this.resetForm("queryForm");
this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order)
this.handleQuery();
// this.dateRange = [];
// this.resetForm("queryForm");
// this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order)
// this.handleQuery();
this.queryParams = {
page: 1,
pageSize: 10,
realName: '',
mobile: '',
status: ''
}
this.getList();
},
// 状态修改
handleStatusChange(row) {

18
fuintAdmin/src/views/staff/tag/list.vue
View File

@ -23,7 +23,7 @@
</el-form-item>
<el-form-item style="float: right">
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<!-- <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>-->
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
@ -290,10 +290,18 @@ export default {
},
// 重置按钮操作
resetQuery() {
this.dateRange = [];
this.resetForm("queryForm");
this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order)
this.handleQuery();
// this.dateRange = [];
// this.resetForm("queryForm");
// this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order)
// this.handleQuery();
this.queryParams = {
page: 1,
pageSize: 10,
realName: '',
tagCodeSn: '',
snCode: ''
}
this.getList();
},
// 多选框选中数据

2
fuintAdmin_zt/src/main.js
View File

@ -58,7 +58,7 @@ Vue.prototype.handleTree = handleTree
Vue.prototype.bkUrl = 'https://www.youkerr.com/' //跳转油站
Vue.prototype.pcUrl = 'https://www.youkerr.com' // 收银台
Vue.prototype.pcUrl = 'https://www.youkerr.com/' // 收银台
// 全局组件挂载
Vue.component('DictTag', DictTag)
Vue.component('Pagination', Pagination)

5
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/favorableRecords/entity/FavorableRecords.java
View File

@ -5,6 +5,7 @@ import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.io.Serializable;
@ -37,10 +38,14 @@ public class FavorableRecords extends Model<FavorableRecords> {
//创建者
private String createBy;
//创建时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
//更新者
private String updateBy;
//更新时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
}

1
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/dto/AllOrderInfoDto.java
View File

@ -11,4 +11,5 @@ public class AllOrderInfoDto extends AllOrderInfo {
private Long deptId; //节点类型:1代理商2连锁店3基本门店4三方机构
private List<Long> storeIds;
private String flag;
private String isType;
}

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/AllOrderInfoMapper.java
View File

@ -41,6 +41,10 @@ public interface AllOrderInfoMapper extends BaseMapper<AllOrderInfo> {
AllOrderInfoVo getRunningWaterByDayData(@Param("allOrderInfo") AllOrderInfoDto allOrderInfo);
AllOrderInfoVo getRunningWaterByDayDataLimit(@Param("allOrderInfo") AllOrderInfoDto allOrderInfo);
AllOrderInfoVo getRunningWaterByData(@Param("allOrderInfo") AllOrderInfoDto allOrderInfo);

28
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml
View File

@ -251,6 +251,12 @@
) AS unitPrice
from all_order_info aoi
WHERE date_format(aoi.pay_time,'%y%m%d') BETWEEN date_format(#{allOrderInfo.params.beginTime},'%y%m%d') AND date_format(#{allOrderInfo.params.endTime},'%y%m%d')
<if test="allOrderInfo.storeIds != null">
and aoi.store_id in
<foreach collection="allOrderInfo.storeIds" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
</if>
GROUP BY date_format(aoi.pay_time,'%y%m%d')
HAVING
amount > 0
@ -271,7 +277,14 @@
) AS unitPrice
from all_order_info aoi
WHERE date_format(aoi.pay_time,'%y%m%d') BETWEEN date_format(#{allOrderInfo.params.beginTime},'%y%m%d') AND date_format(#{allOrderInfo.params.endTime},'%y%m%d')
<if test="allOrderInfo.storeIds != null">
and aoi.store_id in
<foreach collection="allOrderInfo.storeIds" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
</if>
</select>
<select id="getRunningWaterByData" resultType="com.fuint.business.order.vo.AllOrderInfoVo">
select
COUNT(DISTINCT aoi.store_id) storeCount,
@ -437,6 +450,21 @@
</if>
</where>
</select>
<select id="getRunningWaterByDayDataLimit" resultType="com.fuint.business.order.vo.AllOrderInfoVo">
SELECT
*
from all_order_info
<where>
<if test="allOrderInfo.storeIds != null">
and store_id in
<foreach collection="allOrderInfo.storeIds" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
</if>
</where>
order by create_time ASC limit 1
</select>
<!-- WHERE-->
<!-- DATE(pay_time) = CURDATE();-->
<!-- <if test="startTime != null ">&lt;!&ndash; 开始时间检索 &ndash;&gt;-->

71
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java
View File

@ -60,6 +60,7 @@ import java.math.BigDecimal;
import java.math.RoundingMode;
import java.text.DecimalFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.time.temporal.ChronoUnit;
@ -784,11 +785,6 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper,AllO
}
public IPage<AllOrderInfoVo> runningWaterByDay(Page page, AllOrderInfoDto allOrderInfo) {
//计算天数
if (ObjectUtil.isEmpty(allOrderInfo.getParams().get("beginTime")) || ObjectUtil.isEmpty(allOrderInfo.getParams().get("endTime"))) {
throw new RuntimeException("请选择时间范围");
}
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
if (ObjectUtil.isEmpty(allOrderInfo.getDeptId())) {
@ -801,6 +797,25 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper,AllO
allOrderInfo.setStoreIds(longs);
}
//计算天数
if (ObjectUtil.isEmpty(allOrderInfo.getParams().get("beginTime")) || ObjectUtil.isEmpty(allOrderInfo.getParams().get("endTime"))) {
// throw new RuntimeException("请选择时间范围");
AllOrderInfoVo runningWaterByDay = allOrderInfoMapper.getRunningWaterByDayDataLimit(allOrderInfo);
allOrderInfo.getParams().put("beginTime",runningWaterByDay.getCreateTime());
// 获取当前时间
LocalDateTime now = LocalDateTime.now();
// 定义所需的格式
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy/MM/dd");
// 格式化当前时间
String formattedNow = now.format(formatter);
allOrderInfo.getParams().put("endTime",formattedNow);
}
// 数据查询
IPage<AllOrderInfoVo> runningWaterByDay = allOrderInfoMapper.getRunningWaterByDay(page,allOrderInfo);
@ -810,15 +825,47 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper,AllO
}
public AllOrderInfoVo getRunningWaterByDayData(AllOrderInfoDto allOrderInfo) {
//计算天数
if (!ObjectUtil.isNotEmpty(allOrderInfo.getParams().get("beginTime")) && ObjectUtil.isNotEmpty(allOrderInfo.getParams().get("endTime"))) {
throw new RuntimeException("");
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
// allOrderInfo.setDeptType("3");
// allOrderInfo.setStoreId(nowAccountInfo.getStoreId());
// List<SysDeptVo> sysDepts = new ArrayList<>();
// if ("3".equals(allOrderInfo.getIsType())) {
// SysDeptVo sysDept = sysDeptMapper.getStoreByDept(nowAccountInfo.getDeptId());
// sysDepts.add(sysDept);
// }else {
// sysDepts = sysDeptMapper.selectChildrenDeptByIdStore(nowAccountInfo.getDeptId());
// }
if (ObjectUtil.isEmpty(allOrderInfo.getDeptId())) {
allOrderInfo.setDeptType("3");
List<SysDeptVo> sysDepts = sysDeptMapper.selectChildrenDeptByIdStore(nowAccountInfo.getDeptId());
allOrderInfo.setStoreIds(sysDepts.stream().map(SysDeptVo::getStoreId).collect(Collectors.toList()));
}else {
ArrayList<Long> longs = new ArrayList<>();
longs.add(Long.parseLong(nowAccountInfo.getStoreId().toString()));
allOrderInfo.setStoreIds(longs);
}
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
allOrderInfo.setDeptType("3");
List<SysDeptVo> sysDepts = sysDeptMapper.selectChildrenDeptByIdStore(nowAccountInfo.getDeptId());
allOrderInfo.setStoreIds(sysDepts.stream().map(SysDeptVo::getStoreId).collect(Collectors.toList()));
// allOrderInfo.setStoreIds(sysDepts.stream().map(SysDeptVo::getStoreId).collect(Collectors.toList()));
//计算天数
if (ObjectUtil.isEmpty(allOrderInfo.getParams().get("beginTime")) || ObjectUtil.isEmpty(allOrderInfo.getParams().get("endTime"))) {
// throw new RuntimeException("");
AllOrderInfoVo runningWaterByDay = allOrderInfoMapper.getRunningWaterByDayDataLimit(allOrderInfo);
allOrderInfo.getParams().put("beginTime",runningWaterByDay.getCreateTime());
// 获取当前时间
LocalDateTime now = LocalDateTime.now();
// 定义所需的格式
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy/MM/dd");
// 格式化当前时间
String formattedNow = now.format(formatter);
allOrderInfo.getParams().put("endTime",formattedNow);
}
// 数据查询
AllOrderInfoVo runningWaterByDay = allOrderInfoMapper.getRunningWaterByDayData(allOrderInfo);

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/LJUserController.java
View File

@ -266,7 +266,7 @@ public class LJUserController extends BaseController {
* @return
*/
@PutMapping("/edit")
public ResponseObject editUser(@Validated @RequestBody LJUser user){
public ResponseObject editUser(@Validated @RequestBody LJUser user){
return getSuccessResult(userService.editUser(user));
}
}

1
fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/entity/UserBalance.java
View File

@ -71,6 +71,7 @@ public class UserBalance extends BaseEntity implements Serializable {
* 固定等级
*/
private String fixingLevel;
private String remark;

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/LJUserMapper.xml
View File

@ -10,7 +10,7 @@
</sql>
<sql id="selectUserAndBalance">
select mu.*,mub.id balanceId,mub.grade_id,mub.card_balance,mub.points,mub.consume_num,mub.growth_value,mub.refuel_money,
mub.second_card,mub.fixing_level,mub.create_time balCreateTime
mub.second_card,mub.fixing_level,mub.create_time balCreateTime,mub.remark remark
FROM mt_user mu
LEFT JOIN mt_user_balance mub ON mu.id = mub.mt_user_id
</sql>

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

@ -562,6 +562,7 @@ public class LJUserServiceImpl extends ServiceImpl<LJUserMapper, LJUser> impleme
if (!ObjectUtil.isEmpty(balance)){
balance.setGradeId(userVo.getGradeId());
balance.setFixingLevel(userVo.getFixingLevel());
balance.setRemark(userVo.getRemark());
balanceService.updateUserBalance(balance);
}
return row;

10
fuintCashierWeb/src/permission.js
View File

@ -3,7 +3,7 @@ import store from './store'
import { Message } from 'element-ui'
import NProgress from 'nprogress'
import 'nprogress/nprogress.css'
import { getToken } from '@/utils/auth'
import { getToken,setToken } from '@/utils/auth'
import { isRelogin } from '@/utils/request'
NProgress.configure({ showSpinner: false })
@ -12,15 +12,19 @@ const whiteList = ['/login', '/auth-redirect']
router.beforeEach((to, from, next) => {
NProgress.start()
if (true) {
const urlParams = new URLSearchParams(window.location.search);
console.log("urlParams111",urlParams)
console.log("urlParams111",window.location.search)
const data = urlParams.get('token');
console.log(data); // 输出: "value"
console.log("token",data); // 输出: "value"
if(data) {
console.log(data); // 输出: "value"
setToken(data);
}
}
if (getToken()) {

2
fuintCashierWeb/src/router/index.js
View File

@ -144,7 +144,7 @@ Router.prototype.push = function push(location) {
}
export default new Router({
// mode: 'history', // 去掉url中的#
mode: 'history', // 去掉url中的#
scrollBehavior: () => ({ y: 0 }),
routes: constantRoutes
})