9.10

fuintAdmin/src/api/allOrder.js

@@ -146,6 +146,7 @@ export function exportExcelDayApi(data) {
   });
 }
 
+// 油站首页核心数据
 export function getTotalAmount() {
   return request({
     url: 'business/allOrderInfo/getTotalAmount',
@@ -153,3 +154,12 @@ export function getTotalAmount() {
   });
 }
 
+// 油站首页数据展示
+export function getDataBoard(query) {
+  return request({
+    url: 'business/allOrderInfo/getDataBoard',
+    method: 'get',
+    params:query
+  });
+}
+

fuintAdmin/src/views/shopowner.vue

@@ -182,7 +182,7 @@ import {parseTime} from "@/utils/fuint";
 import {getBannerListApi} from "@/api/sys/banner";
 import {getNotificationlogList} from "@/api/sys/sysNotificationlog";
 import {employeeSalesApi} from "@/api/indexStatistics";
-import {getTotalAmount} from "@/api/allOrder";
+import {getDataBoard, getTotalAmount} from "@/api/allOrder";
 export default {
 
   props:["accountId"],
@@ -323,7 +323,7 @@ export default {
       })
     },
     getStoreAmount(){
-      storeAmountIndex(this.addDateRange(this.queryParams,this.value1)).then(res => {
+      getDataBoard(this.addDateRange(this.queryParams,this.value1)).then(res => {
         this.storeAmount = res.data
         this.initChart()
       })

fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/AllOrderInfoController.java

@@ -287,8 +287,21 @@ public class AllOrderInfoController extends BaseController {
         return getSuccessResult(allOrderInfoService.getHandoverByOrderNo(allOrderInfo));
     }
 
+    /**
+     * 油站首页 核心数据
+     * @return
+     */
     @GetMapping("getTotalAmount")
     public ResponseObject getTotalAmount(){
         return getSuccessResult(allOrderInfoService.getTotalAmount());
     }
+
+    /**
+     * 油站首页 数据展示
+     * @return
+     */
+    @GetMapping("getDataBoard")
+    public ResponseObject getDataBoard(@RequestParam Map<String, String> map){
+        return getSuccessResult(allOrderInfoService.getDataBoard(map));
+    }
 }