更新10.16

fuintAdmin/src/views/shopowner.vue

@@ -396,6 +396,7 @@ export default {
         this.disabled = false
       }
       this.getStoreAmount()
+      this.getDataAnalysis()
     },
     goList() {
       this.$router.push('/notificationList/index')
@@ -597,8 +598,15 @@ export default {
     },
     // 获取数据分析信息
     getDataAnalysis() {
-      getDataAnalysis().then(res => {
+      let data = {
+        startTime: this.value1[0],
+        endTime: this.value1[1]
+      }
+      getDataAnalysis(data).then(res => {
         // console.log('数据分析的数据', res)
+        this.dataAnalysisAllList = []
+        this.dataAnalysisOilNumberList = []
+        this.dataAnalysisIfOilList = []
         if (res.code == 200) {
           for (let i = 0; i < res.data.length; i++) {
             if (res.data[i].type == 1) {

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

@@ -316,7 +316,10 @@ public class AllOrderInfoController extends BaseController {
      * @return
      */
     @GetMapping("getDataAnalysis")
-    public ResponseObject getDataAnalysis(Map<String, String> map){
+    public ResponseObject getDataAnalysis(String startTime, String endTime){
+        Map<String, String> map = new HashMap<>();
+        map.put("startTime", startTime);
+        map.put("endTime", endTime);
         return getSuccessResult(allOrderInfoService.getDataAnalysis(map));
     }