From 1669c9150e657502355fcdea058c89184dd3ca39 Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Fri, 12 Jul 2024 14:30:33 +0800
Subject: [PATCH] bug

---
 fuintAdmin/src/main.js                            |  4 ++--
 fuintAdmin_zt/src/views/index.vue                 | 15 ++++++++++++---
 fuintAdmin_zt/src/views/login.vue                 |  4 ++--
 .../service/impl/AllOrderInfoServiceImpl.java     | 10 +++++-----
 4 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/fuintAdmin/src/main.js b/fuintAdmin/src/main.js
index 6dcef7313..2f342d9b8 100644
--- a/fuintAdmin/src/main.js
+++ b/fuintAdmin/src/main.js
@@ -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.ztUrl = 'http://192.168.31.178:82/' // 中台
 Vue.prototype.cashierUrl = 'https://cashier.youkerr.com/#/homeindex' // 收银台
-Vue.prototype.pcUrl = 'https://www.youkerr.com' // 收银台
-Vue.prototype.ztUrl = 'https://192.168.31.178:82/' // 中台
+Vue.prototype.pcUrl = 'https://www.youkerr.com/' // 收银台
+Vue.prototype.ztUrl = 'https://oil.youkerr.com/' // 中台
 const Collapse= false
 Vue.prototype.isCollapse = Collapse
 
diff --git a/fuintAdmin_zt/src/views/index.vue b/fuintAdmin_zt/src/views/index.vue
index dbb194b6f..9bb1565af 100644
--- a/fuintAdmin_zt/src/views/index.vue
+++ b/fuintAdmin_zt/src/views/index.vue
@@ -50,9 +50,11 @@
             <el-date-picker
               v-model="value1"
               type="datetimerange"
+              value-format="yyyy-MM-dd HH:mm:ss"
               range-separator="至"
               start-placeholder="开始日期"
-              end-placeholder="结束日期">
+              end-placeholder="结束日期"
+              @change="getStoreAmount">
             </el-date-picker>
           </div>
           <div style="margin-right: 40px">
@@ -136,9 +138,10 @@
          {{item}}
        </div>
         <el-date-picker
-          v-model="value1"
+          v-model="value2"
           type="datetimerange"
           range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
           start-placeholder="开始日期"
           end-placeholder="结束日期">
         </el-date-picker>
@@ -154,6 +157,7 @@
 import echarts from "echarts";
 import {storeAmountIndex, storeTotalIndex} from "@/api/indexBanner";
 import {selectChildByDeptId} from "@/api/system/Site/site";
+import {parseTime} from "@/utils/fuint";
 export default {
 
   data(){
@@ -183,7 +187,8 @@ export default {
         label: '北京烤鸭'
       }],
       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,
       queryParams:{},
       // 店铺数量
@@ -193,6 +198,10 @@ export default {
     }
   },
   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.selectChildByDeptIdApi()
     this.getStoreAmount()
diff --git a/fuintAdmin_zt/src/views/login.vue b/fuintAdmin_zt/src/views/login.vue
index a321c5ac6..1526d27c8 100644
--- a/fuintAdmin_zt/src/views/login.vue
+++ b/fuintAdmin_zt/src/views/login.vue
@@ -285,10 +285,10 @@ export default {
             if (Cookies.get("IS_BK_LOGIN")) {
               location.replace(this.bkUrl+"resource_oilstore");
             }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: "index" }).catch(()=>{});
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 2eb6fc9ae..d5acc3931 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
@@ -1004,13 +1004,13 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper,AllO
     @Override
     public Map<String, Object> getAmount(AllOrderInfoVo allOrderInfoVo) {
         Map<String, Object> map = new HashMap<>();
-        Integer tradeTotal = baseMapper.selectTotal(allOrderInfoVo);
-        Double tradeAmount = baseMapper.selectAllAmount(allOrderInfoVo);
+        Integer tradeTotal = ObjectUtil.isNotEmpty(baseMapper.selectTotal(allOrderInfoVo)) ? baseMapper.selectTotal(allOrderInfoVo) : 0;
+        Double tradeAmount = ObjectUtil.isNotEmpty(baseMapper.selectAllAmount(allOrderInfoVo)) ? baseMapper.selectAllAmount(allOrderInfoVo) : 0;
         allOrderInfoVo.setStatus("refund");
-        Integer refundTotal = baseMapper.selectTotal(allOrderInfoVo);
-        Double refundAmount = baseMapper.selectAllAmount(allOrderInfoVo);
+        Integer refundTotal = ObjectUtil.isNotEmpty(baseMapper.selectTotal(allOrderInfoVo)) ? baseMapper.selectTotal(allOrderInfoVo) : 0;
+        Double refundAmount = ObjectUtil.isNotEmpty(baseMapper.selectAllAmount(allOrderInfoVo)) ? baseMapper.selectAllAmount(allOrderInfoVo) : 0;
         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;
         Integer dayTradeTotal = 0;