update 订单列表页、站点订单列表页 创建时间 为 结算时间

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java

@@ -385,12 +385,12 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
         }
 
         OrderTotalDataVO vo = new OrderTotalDataVO();
-        String startTime = dto.getStartTime() == null ? DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.addDays(new Date(), -7)) : dto.getStartTime(); // 2023-08-16 00:00:00
-        String endTime = dto.getEndTime() == null ? DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, new Date()) : dto.getEndTime(); // 2023-08-16 23:59:59
-        vo.setDateDescription(startTime + " - " + endTime);
+        String startTime = dto.getStartSettleTime() == null ? DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.addDays(new Date(), -7)) : dto.getStartSettleTime(); // 2023-08-16 00:00:00
+        String endTime = dto.getEndSettleTime() == null ? DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, new Date()) : dto.getEndSettleTime(); // 2023-08-16 23:59:59
         // 格式化时间
         startTime = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.parseDate(startTime)); // 2023-08-16
         endTime = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.parseDate(endTime)); // 2023-08-16
+        vo.setDateDescription(startTime + " 至 " + endTime);
         List<SettleOrderReport> settleOrderReports = settleOrderReportService.queryOrderReport(stationIdList, startTime, endTime);
         // 总消费金额
         BigDecimal sumOrderAmount = BigDecimal.ZERO;

jsowell-ui/src/views/order/order/index.vue

@@ -69,22 +69,22 @@
           />
         </el-form-item>
 
-                <el-form-item label="创建时间">
-                    <el-date-picker
-                        v-model="createTimeRange"
-                        style="width: 240px"
-                        value-format="yyyy-MM-dd HH:mm:ss"
-                        :default-time="['00:00:00', '23:59:59']"
-                        type="daterange"
-                        range-separator="-"
-                        start-placeholder="开始日期"
-                        end-placeholder="结束日期"
-                        :clearable="true"
-                    ></el-date-picker>
-                </el-form-item>
+        <!--                <el-form-item label="创建时间">-->
+        <!--                    <el-date-picker-->
+        <!--                        v-model="createTimeRange"-->
+        <!--                        style="width: 240px"-->
+        <!--                        value-format="yyyy-MM-dd HH:mm:ss"-->
+        <!--                        :default-time="['00:00:00', '23:59:59']"-->
+        <!--                        type="daterange"-->
+        <!--                        range-separator="-"-->
+        <!--                        start-placeholder="开始日期"-->
+        <!--                        end-placeholder="结束日期"-->
+        <!--                        :clearable="true"-->
+        <!--                    ></el-date-picker>-->
+        <!--                </el-form-item>-->
         <el-form-item label="结算时间">
           <el-date-picker
-                        v-model="comeTimeRange"
+            v-model="settleTimeRange"
             style="width: 240px"
             value-format="yyyy-MM-dd HH:mm:ss"
             :default-time="['00:00:00', '23:59:59']"
@@ -172,7 +172,7 @@
           style="width: 100%; height: 100%"
         />
         <div style="padding: 14px">
-                    <el-skeleton-item variant="h3" style="width: 50%" />
+          <el-skeleton-item variant="h3" style="width: 50%"/>
           <div
             style="
                             display: flex;
@@ -186,7 +186,7 @@
               variant="text"
               style="margin-right: 16px"
             />
-                        <el-skeleton-item variant="text" style="width: 30%" />
+            <el-skeleton-item variant="text" style="width: 30%"/>
           </div>
         </div>
       </template>
@@ -252,7 +252,7 @@
                 >{{ item.chargeEndTime || "一" }}
                 </el-descriptions-item>
                 <el-descriptions-item label="启动方式"
-                                    >{{ startMode(item.startMode )}}
+                >{{ startMode(item.startMode) }}
                 </el-descriptions-item>
               </el-descriptions>
               <div
@@ -289,12 +289,12 @@ import {
   totalData,
 } from "@/api/order/order";
 import Template from "@/views/billing/template";
-import { listStation } from "@/api/pile/station";
-import { getDay } from "@/utils/common";
+import {listStation} from "@/api/pile/station";
+import {getDay} from "@/utils/common";
 
 export default {
   name: "Order",
-    components: { Template },
+  components: {Template},
 
   dicts: ["order_status", "start_mode", "pay_mode", "pay_status"],
   data() {
@@ -346,8 +346,8 @@ export default {
         merchantId: null,
         startTime: null,
         endTime: null,
-                startSettleTime:null,
-                endSettleTime:null,
+        startSettleTime: null,
+        endSettleTime: null,
       },
       // 表单参数
       form: {},
@@ -358,7 +358,7 @@ export default {
       // 订单创建时间范围
       createTimeRange: [],
       // 订单创建结束范围
-            comeTimeRange: [],
+      settleTimeRange: [],
     };
   },
   mounted() {
@@ -593,10 +593,11 @@ export default {
           this.getList();
           this.$modal.msgSuccess("删除成功");
         })
-                .catch(() => {});
+        .catch(() => {
+        });
     },
     /** 订单详情序号 */
-        rowOrderDetailIndex({ row, rowIndex }) {
+    rowOrderDetailIndex({row, rowIndex}) {
       row.index = rowIndex + 1;
     },
     /** 订单详情添加按钮操作 */
@@ -663,7 +664,7 @@ export default {
       //字符串拼接，开始时间，结束时间
       let beg = getDay(-7) + " 00:00:00"; //当月第一天
       let end = getDay(0) + " 23:59:59"; //当天
-            this.createTimeRange = [beg, end]; //将值设置给插件绑定的数据
+      this.settleTimeRange = [beg, end]; //将值设置给插件绑定的数据
       // return this.createTimeRange;
     },
   },
@@ -678,8 +679,8 @@ export default {
         this.queryParams.endTime = null;
       }
     },
-        comeTimeRange(newValue, oldValue) {
-            console.log("comeTimeRange发生变化", newValue, oldValue);
+    settleTimeRange(newValue, oldValue) {
+      console.log("settleTimeRange", newValue, oldValue);
       if (newValue != null && newValue.length > 0) {
         this.queryParams.startSettleTime = newValue[0];
         this.queryParams.endSettleTime = newValue[1];
@@ -706,6 +707,7 @@ export default {
   margin-bottom: 10px;
   // color:#337ab7
 }
+
 .cardview-box {
   width: 100%;
   margin-bottom: 12px;

jsowell-ui/src/views/pile/station/stationOrderList.vue

@@ -36,9 +36,9 @@
         />
       </el-form-item>
 
-      <el-form-item label="创建时间">
+      <el-form-item label="结算时间">
         <el-date-picker
-          v-model="createTimeRange"
+          v-model="settleTimeRange"
           style="width: 240px"
           value-format="yyyy-MM-dd HH:mm:ss"
           :default-time="['00:00:00', '23:59:59']"
@@ -157,7 +157,7 @@ export default {
   dicts: ['order_status', 'start_mode', 'pay_mode', 'pay_status'],
   data() {
     return {
-      dateDescription: '',
+      dateDescription: "",
       sumOrderAmount:'',
       sumUsedElectricity:'',
       // 遮罩
@@ -190,8 +190,8 @@ export default {
         mobileNumber: null,
         orderStatus: null,
         stationId: this.stationId,
-        startTime: null,
-        endTime: null,
+        startSettleTime: null,
+        endSettleTime: null,
       },
       // 表单参数
       form: {},
@@ -199,8 +199,8 @@ export default {
       rules: {},
       // 站点列表
       stationList: [],
-      // 订单创建时间范围
-      createTimeRange: [],
+      // 订单结算时间范围
+      settleTimeRange: [],
     };
   },
   created() {
@@ -222,7 +222,8 @@ export default {
       this.loading = true;
       listOrder(this.queryParams).then(response => {
         this.orderList = response.rows;
-        console.log('order里面的参数', this.orderList)
+        console.log('this.queryParams', this.queryParams)
+        console.log('response', response)
         this.total = response.total;
         this.loading = false;
       });
@@ -322,15 +323,15 @@ export default {
       //字符串拼接，开始时间，结束时间
       let beg = getDay(-7) + " 00:00:00";   //当月第一天
       let end = getDay(0) + " 23:59:59"; //当天
-      this.createTimeRange = [beg, end] //将值设置给插件绑定的数据
-      // console.log("defaultDate", this.createTimeRange);
+      this.settleTimeRange = [beg, end] //将值设置给插件绑定的数据
+      // console.log("defaultDate", this.settleTimeRange);
     },
   },
   watch: {
-    createTimeRange(newValue, oldValue) {
+    settleTimeRange(newValue, oldValue) {
       if (newValue != null && newValue.length > 0) {
-        this.queryParams.startTime = newValue[0];
-        this.queryParams.endTime = newValue[1];
+        this.queryParams.startSettleTime = newValue[0];
+        this.queryParams.endSettleTime = newValue[1];
       }
     },
   }