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-07-12 14:30:33 +08:00
parent 70ba76875d
commit 1669c9150e
4 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fuintAdmin/src/main.js
View File

@ -60,8 +60,8 @@ Vue.prototype.imgurl = 'http://192.168.0.138:8008'
// Vue.prototype.pcUrl = 'http://192.168.31.178:83/#/homeindex' // 收银台 // Vue.prototype.pcUrl = 'http://192.168.31.178:83/#/homeindex' // 收银台
// Vue.prototype.ztUrl = 'http://192.168.31.178:82/' // 中台 // 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.pcUrl = 'https://www.youkerr.com/' // 收银台
Vue.prototype.ztUrl = 'https://192.168.31.178:82/' // 中台 Vue.prototype.ztUrl = 'https://oil.youkerr.com/' // 中台
const Collapse= false const Collapse= false
Vue.prototype.isCollapse = Collapse Vue.prototype.isCollapse = Collapse

15
fuintAdmin_zt/src/views/index.vue
View File

@ -50,9 +50,11 @@
<el-date-picker <el-date-picker
v-model="value1" v-model="value1"
type="datetimerange" type="datetimerange"
value-format="yyyy-MM-dd HH:mm:ss"
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期"> end-placeholder="结束日期"
@change="getStoreAmount">
</el-date-picker> </el-date-picker>
</div> </div>
<div style="margin-right: 40px"> <div style="margin-right: 40px">
@ -136,9 +138,10 @@
{{item}} {{item}}
</div> </div>
<el-date-picker <el-date-picker
v-model="value1" v-model="value2"
type="datetimerange" type="datetimerange"
range-separator="至" range-separator="至"
value-format="yyyy-MM-dd HH:mm:ss"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期"> end-placeholder="结束日期">
</el-date-picker> </el-date-picker>
@ -154,6 +157,7 @@
import echarts from "echarts"; import echarts from "echarts";
import {storeAmountIndex, storeTotalIndex} from "@/api/indexBanner"; import {storeAmountIndex, storeTotalIndex} from "@/api/indexBanner";
import {selectChildByDeptId} from "@/api/system/Site/site"; import {selectChildByDeptId} from "@/api/system/Site/site";
import {parseTime} from "@/utils/fuint";
export default { export default {
data(){ data(){
@ -183,7 +187,8 @@ export default {
label: '北京烤鸭' label: '北京烤鸭'
}], }],
value: '', value: '',
value1: [new Date(2000, 10, 10, 10, 10), new Date(2000, 10, 11, 10, 10)], value1: [],
value2: [],
imagePath: process.env.VUE_APP_SERVER_URL, imagePath: process.env.VUE_APP_SERVER_URL,
queryParams:{}, queryParams:{},
// 店铺数量 // 店铺数量
@ -193,6 +198,10 @@ export default {
} }
}, },
created() { created() {
let nowDate = new Date();
let oneWeekAgo = new Date(nowDate.getTime() - 6 * 24 * 60 * 60 * 1000)
this.value1 = [parseTime(oneWeekAgo),parseTime(nowDate)]
console.log("this.value1",this.value1)
this.getStoreTotal() this.getStoreTotal()
this.selectChildByDeptIdApi() this.selectChildByDeptIdApi()
this.getStoreAmount() this.getStoreAmount()

4
fuintAdmin_zt/src/views/login.vue
View File

@ -285,10 +285,10 @@ export default {
if (Cookies.get("IS_BK_LOGIN")) { if (Cookies.get("IS_BK_LOGIN")) {
location.replace(this.bkUrl+"resource_oilstore"); location.replace(this.bkUrl+"resource_oilstore");
}else { }else {
app.$router.push({ path: "/Service/index" }).catch(()=>{}); // app.$router.push({ path: "/Service/index" }).catch(()=>{});
} }
// app.$router.push({ path: this.redirect || "/" }).catch(()=>{}); app.$router.push({ path: this.redirect || "/" }).catch(()=>{});
// app.$router.push({ path: this.redirect || "/" }).catch(()=>{}); // app.$router.push({ path: this.redirect || "/" }).catch(()=>{});
// app.$router.push({ path: "index" }).catch(()=>{}); // app.$router.push({ path: "index" }).catch(()=>{});

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

@ -1004,13 +1004,13 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper,AllO
@Override @Override
public Map<String, Object> getAmount(AllOrderInfoVo allOrderInfoVo) { public Map<String, Object> getAmount(AllOrderInfoVo allOrderInfoVo) {
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
Integer tradeTotal = baseMapper.selectTotal(allOrderInfoVo); Integer tradeTotal = ObjectUtil.isNotEmpty(baseMapper.selectTotal(allOrderInfoVo)) ? baseMapper.selectTotal(allOrderInfoVo) : 0;
Double tradeAmount = baseMapper.selectAllAmount(allOrderInfoVo); Double tradeAmount = ObjectUtil.isNotEmpty(baseMapper.selectAllAmount(allOrderInfoVo)) ? baseMapper.selectAllAmount(allOrderInfoVo) : 0;
allOrderInfoVo.setStatus("refund"); allOrderInfoVo.setStatus("refund");
Integer refundTotal = baseMapper.selectTotal(allOrderInfoVo); Integer refundTotal = ObjectUtil.isNotEmpty(baseMapper.selectTotal(allOrderInfoVo)) ? baseMapper.selectTotal(allOrderInfoVo) : 0;
Double refundAmount = baseMapper.selectAllAmount(allOrderInfoVo); Double refundAmount = ObjectUtil.isNotEmpty(baseMapper.selectAllAmount(allOrderInfoVo)) ? baseMapper.selectAllAmount(allOrderInfoVo) : 0;
Double averagePrice = tradeAmount/tradeTotal; Double averagePrice = tradeAmount/tradeTotal;
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
Double dayTradeAmount = 0.0; Double dayTradeAmount = 0.0;
Integer dayTradeTotal = 0; Integer dayTradeTotal = 0;