diff --git a/fuintAdmin/src/main.js b/fuintAdmin/src/main.js index 2f342d9b8..6870aee72 100644 --- a/fuintAdmin/src/main.js +++ b/fuintAdmin/src/main.js @@ -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 diff --git a/fuintAdmin/src/views/convenienceStore/index.vue b/fuintAdmin/src/views/convenienceStore/index.vue index feaab03c7..522e25023 100644 --- a/fuintAdmin/src/views/convenienceStore/index.vue +++ b/fuintAdmin/src/views/convenienceStore/index.vue @@ -21,6 +21,7 @@ 搜索 + 重置 @@ -648,6 +649,15 @@ export default { this.queryParams.page = 1; this.getList(); }, + resetQuery() { + this.queryParams = { + page: 1, + pageSize: 10, + name:'', + status: '', + }; + this.getList(); + }, handleChange(){ }, //提交商品类别 diff --git a/fuintAdmin/src/views/duty/index.vue b/fuintAdmin/src/views/duty/index.vue index fb39b1e7b..d116e74a5 100644 --- a/fuintAdmin/src/views/duty/index.vue +++ b/fuintAdmin/src/views/duty/index.vue @@ -22,6 +22,8 @@ 查询 + 重置 + @@ -351,6 +353,17 @@ export default { this.loading = false; }) }, + // 重置按钮操作 + resetQuery() { + + this.queryParams1 = { + page:1, + pageSize:10, + // 当做机构id使用 + storeId:"", + } + this.getDutyList(); + }, } } diff --git a/fuintAdmin/src/views/financialStatement/reconciliation/tab/ref.vue b/fuintAdmin/src/views/financialStatement/reconciliation/tab/ref.vue index a99cd613b..fb92727de 100644 --- a/fuintAdmin/src/views/financialStatement/reconciliation/tab/ref.vue +++ b/fuintAdmin/src/views/financialStatement/reconciliation/tab/ref.vue @@ -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 = "" diff --git a/fuintAdmin/src/views/financialStatement/runningWater/tab/day.vue b/fuintAdmin/src/views/financialStatement/runningWater/tab/day.vue index 19c3ba85f..b46bac83e 100644 --- a/fuintAdmin/src/views/financialStatement/runningWater/tab/day.vue +++ b/fuintAdmin/src/views/financialStatement/runningWater/tab/day.vue @@ -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 = "" diff --git a/fuintAdmin/src/views/financialStatement/runningWater/tab/oilDepot.vue b/fuintAdmin/src/views/financialStatement/runningWater/tab/oilDepot.vue index e18c72c17..0a13cd57d 100644 --- a/fuintAdmin/src/views/financialStatement/runningWater/tab/oilDepot.vue +++ b/fuintAdmin/src/views/financialStatement/runningWater/tab/oilDepot.vue @@ -124,7 +124,12 @@ - + + + + diff --git a/fuintAdmin/src/views/oilConfig/oilSuppliers/list.vue b/fuintAdmin/src/views/oilConfig/oilSuppliers/list.vue index 40ab98f9b..0fada204b 100644 --- a/fuintAdmin/src/views/oilConfig/oilSuppliers/list.vue +++ b/fuintAdmin/src/views/oilConfig/oilSuppliers/list.vue @@ -34,7 +34,7 @@ 搜索 - + 重置 @@ -245,6 +245,16 @@ export default { this.queryParams.page = 1; this.getList(); }, + resetQuery() { + this.queryParams = { + supplierName: '', + contactPerson: '', + contactPhone: '', + page:null, + pageSize:null + }; + this.getList(); + }, }, } diff --git a/fuintAdmin/src/views/oilConfig/oilTank/list.vue b/fuintAdmin/src/views/oilConfig/oilTank/list.vue index f525fd4ef..03e38c667 100644 --- a/fuintAdmin/src/views/oilConfig/oilTank/list.vue +++ b/fuintAdmin/src/views/oilConfig/oilTank/list.vue @@ -15,7 +15,7 @@ 搜索 - + 重置 @@ -399,6 +399,14 @@ export default { this.queryParams.page = 1; this.getList(); }, + resetQuery() { + this.queryParams = { + tankName: '', + page:null, + pageSize:null + }; + this.getList(); + }, // 新增油罐 tankAdd() { // 表单重置 diff --git a/fuintAdmin/src/views/staff/list.vue b/fuintAdmin/src/views/staff/list.vue index 29251f096..9a4cfe944 100644 --- a/fuintAdmin/src/views/staff/list.vue +++ b/fuintAdmin/src/views/staff/list.vue @@ -38,7 +38,7 @@ 搜索 - + 重置 @@ -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) { diff --git a/fuintAdmin/src/views/staff/tag/list.vue b/fuintAdmin/src/views/staff/tag/list.vue index 1c14e33e6..f284932eb 100644 --- a/fuintAdmin/src/views/staff/tag/list.vue +++ b/fuintAdmin/src/views/staff/tag/list.vue @@ -23,7 +23,7 @@ 搜索 - + 重置 @@ -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(); }, // 多选框选中数据 diff --git a/fuintAdmin_zt/src/main.js b/fuintAdmin_zt/src/main.js index d210dd67b..ed8703670 100644 --- a/fuintAdmin_zt/src/main.js +++ b/fuintAdmin_zt/src/main.js @@ -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) diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/favorableRecords/entity/FavorableRecords.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/favorableRecords/entity/FavorableRecords.java index 834a37eb9..ce02cbec8 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/favorableRecords/entity/FavorableRecords.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/favorableRecords/entity/FavorableRecords.java @@ -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 { //创建者 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; } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/dto/AllOrderInfoDto.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/dto/AllOrderInfoDto.java index 7eb983054..e2b5c4e2f 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/dto/AllOrderInfoDto.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/dto/AllOrderInfoDto.java @@ -11,4 +11,5 @@ public class AllOrderInfoDto extends AllOrderInfo { private Long deptId; //节点类型:1代理商2连锁店3基本门店4三方机构 private List storeIds; private String flag; + private String isType; } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/AllOrderInfoMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/AllOrderInfoMapper.java index fd480fd7e..877d4423a 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/AllOrderInfoMapper.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/AllOrderInfoMapper.java @@ -41,6 +41,10 @@ public interface AllOrderInfoMapper extends BaseMapper { AllOrderInfoVo getRunningWaterByDayData(@Param("allOrderInfo") AllOrderInfoDto allOrderInfo); + AllOrderInfoVo getRunningWaterByDayDataLimit(@Param("allOrderInfo") AllOrderInfoDto allOrderInfo); + + + AllOrderInfoVo getRunningWaterByData(@Param("allOrderInfo") AllOrderInfoDto allOrderInfo); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml index 074ae33af..943ff716d 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml @@ -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') + + and aoi.store_id in + + #{item} + + 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') + + and aoi.store_id in + + #{item} + + + + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java index d5acc3931..f31f89d5e 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java @@ -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 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 runningWaterByDay = allOrderInfoMapper.getRunningWaterByDay(page,allOrderInfo); @@ -810,15 +825,47 @@ public class AllOrderInfoServiceImpl extends ServiceImpl 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 sysDepts = sysDeptMapper.selectChildrenDeptByIdStore(nowAccountInfo.getDeptId()); + allOrderInfo.setStoreIds(sysDepts.stream().map(SysDeptVo::getStoreId).collect(Collectors.toList())); + }else { + ArrayList longs = new ArrayList<>(); + longs.add(Long.parseLong(nowAccountInfo.getStoreId().toString())); + allOrderInfo.setStoreIds(longs); } - AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); - allOrderInfo.setDeptType("3"); - List 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); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/LJUserController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/LJUserController.java index d048583fe..879047c49 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/LJUserController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/LJUserController.java @@ -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)); } } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/entity/UserBalance.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/entity/UserBalance.java index ee4fc8e95..9b1bc548b 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/entity/UserBalance.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/entity/UserBalance.java @@ -71,6 +71,7 @@ public class UserBalance extends BaseEntity implements Serializable { * 固定等级 */ private String fixingLevel; + private String remark; diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/LJUserMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/LJUserMapper.xml index c575d2646..de6b86400 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/LJUserMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/LJUserMapper.xml @@ -10,7 +10,7 @@ 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 diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java index 861656759..9a5bcb041 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java @@ -562,6 +562,7 @@ public class LJUserServiceImpl extends ServiceImpl impleme if (!ObjectUtil.isEmpty(balance)){ balance.setGradeId(userVo.getGradeId()); balance.setFixingLevel(userVo.getFixingLevel()); + balance.setRemark(userVo.getRemark()); balanceService.updateUserBalance(balance); } return row; diff --git a/fuintCashierWeb/src/permission.js b/fuintCashierWeb/src/permission.js index e1c719ad5..6663c1f07 100644 --- a/fuintCashierWeb/src/permission.js +++ b/fuintCashierWeb/src/permission.js @@ -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()) { diff --git a/fuintCashierWeb/src/router/index.js b/fuintCashierWeb/src/router/index.js index 80150bb5d..3ffa291b4 100644 --- a/fuintCashierWeb/src/router/index.js +++ b/fuintCashierWeb/src/router/index.js @@ -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 })