修改接口地址等

admin-web/src/views/admin/invoice/index.vue

@@ -292,7 +292,7 @@ const loadData = (refresh: boolean = false) => {
     state.pageQuery.pageNum = 1;
   }
   state.tableData.loading = true;
-  $body(`/finance/list`, {...state.formQuery, ...state.pageQuery}).then((res: any) => {
+  $body(`/finance/listInvoice`, {...state.formQuery, ...state.pageQuery}).then((res: any) => {
     let {list, total} = res;
     state.tableData.data = list;
     state.pageQuery.total = total;

admin-web/src/views/admin/refund/index.vue

@@ -179,9 +179,10 @@ const state = reactive({
     data: [] as Array<any>,
     loading: false,
     columns: [
-      {label: '商户退款单号', prop: 'outRefundNo', width: 150, resizable: true,fixed:'left'},
-      {label: '商户订单号', prop: 'outTradeNo', width: 150, resizable: true,fixed:'left'},
-      {label: '手机号', prop: 'mobilePhone', width: 150, resizable: true,fixed:'left'},
+      {label: '退款记录ID', prop: 'refundLogId', width: 130, resizable: true,fixed:'left'},
+      {label: '商户退款单号', prop: 'outRefundNo', width: 130, resizable: true,fixed:'left'},
+      {label: '商户订单号', prop: 'outTradeNo', width: 130, resizable: true,fixed:'left'},
+      {label: '手机号', prop: 'mobilePhone', width: 120, resizable: true,fixed:'left'},
       // {label: '退款渠道', prop: 'channel', width: 150,resizable: true},
       {label: '申请时间', prop: 'createTime', sortable: 'custom', resizable: true, width: 180},
       {label: '退款状态', prop: 'status', resizable: true, width: 120},

admin/src/main/java/com/kym/admin/controller/FinanceController.java

@@ -62,9 +62,19 @@ public class FinanceController {
      * @param params
      * @return 发票列表
      */
-    @PostMapping("/list")
+    @PostMapping("/listInvoice")
     R<?> list(@RequestBody InvoiceQueryParam params) {
         return R.success(invoiceService.listInvoice(params));
     }
 
+    /**
+     * 取消申请发票，发票抬头填写页关闭事件调用
+     * @return
+     */
+    @GetMapping("/cancelApplyInvoice")
+    R<?> cancelApplyInvoice(){
+        invoiceService.cancelApplyInvoice();
+        return R.success();
+    }
+
 }

miniapp/src/main/java/com/kym/miniapp/controller/InvoiceController.java

@@ -50,17 +50,6 @@ public class InvoiceController {
         return R.success(invoiceService.applyInvoice(params));
     }
 
-    /**
-     * 取消申请发票，发票抬头填写页关闭事件调用
-     * @return
-     */
-    @GetMapping("/cancelApplyInvoice")
-    R<?> cancelApplyInvoice(){
-        invoiceService.cancelApplyInvoice();
-        return R.success();
-    }
-
-
     /**
      * 发票列表
      *

service/src/main/java/com/kym/service/admin/impl/StationServiceImpl.java

@@ -176,7 +176,7 @@ public class StationServiceImpl extends ServiceImpl<StationMapper, Station> impl
         // 手动切换数据源
         DynamicDataSourceContextHolder.push("db-admin");
         KymCache.INSTANCE.putStationId2Name(newStations.stream().collect(Collectors.toMap(Station::getStationId, Station::getStationName)));
-        KymCache.INSTANCE.putConnectorId2ParkingNo(newEquipmentInfos.stream().collect(Collectors.toMap(equipmentInfo -> equipmentInfo.getEquipmentId().concat("1"), EquipmentInfo::getParkingNo)));
+//        KymCache.INSTANCE.putConnectorId2ParkingNo(newEquipmentInfos.stream().collect(Collectors.toMap(equipmentInfo -> equipmentInfo.getEquipmentId().concat("1"), EquipmentInfo::getParkingNo?)));
         DynamicDataSourceContextHolder.poll();
 
         // 新数据写入数据库