Merge branch 'dev' into update_dept

2026-05-08 12:00:11 +08:00 · 2023-10-31 15:17:59 +08:00
parent 52f1825b5c 800053b5fc
commit cb4e3dc5d6
11 changed files with 400 additions and 207 deletions
--- a/jsowell-admin/src/main/java/com/jsowell/thirdparty/lianlian/LianLianController.java
+++ b/jsowell-admin/src/main/java/com/jsowell/thirdparty/lianlian/LianLianController.java
@@ -343,7 +343,7 @@ public class LianLianController extends BaseController {
            String dataStr = new String(plainText, StandardCharsets.UTF_8);
            // 转换成相应对象
            QueryStartChargeDTO queryStartChargeDTO = JSONObject.parseObject(dataStr, QueryStartChargeDTO.class);
-            queryStartChargeDTO.setOperatorID(dto.getOperatorID());
+            queryStartChargeDTO.setOperatorId(dto.getOperatorID());
            Map<String, String> map = lianLianService.query_start_charge(queryStartChargeDTO);

            return CommonResult.success(0, "请求启动充电成功！", map.get("Data"), map.get("Sig"));
@@ -467,7 +467,7 @@ public class LianLianController extends BaseController {
            String dataStr = new String(plainText, StandardCharsets.UTF_8);
            // 转换成相应对象
            QueryStartChargeDTO queryStartChargeDTO = JSONObject.parseObject(dataStr, QueryStartChargeDTO.class);
-            queryStartChargeDTO.setOperatorID(dto.getOperatorID());
+            queryStartChargeDTO.setOperatorId(dto.getOperatorID());
            Map<String, String> map = lianLianService.query_stop_charge(queryStartChargeDTO);

            return CommonResult.success(0, "请求停止充电成功！", map.get("Data"), map.get("Sig"));
--- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryEquipmentDTO.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryEquipmentDTO.java
@@ -17,14 +17,14 @@ public class QueryEquipmentDTO {
     * 27 字符
     */
    @JsonProperty(value = "EquipAuthSeq")
-    private String EquipAuthSeq;
+    private String equipAuthSeq;

    /**
     * 充电设备接口编码
     */
    @JsonProperty(value = "ConnectorID")
-    private String ConnectorID;
+    private String connectorID;

    @JsonProperty(value = "OperatorID")
-    private String OperatorID;
+    private String operatorID;
 }
--- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryStartChargeDTO.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryStartChargeDTO.java
@@ -15,32 +15,32 @@ public class QueryStartChargeDTO {
     * 充电订单号
     */
    @JsonProperty(value = "StartChargeSeq")
-    private String StartChargeSeq;
+    private String startChargeSeq;

    /**
     * 充电设备接口编码
     */
    @JsonProperty(value = "ConnectorID")
-    private String ConnectorID;
+    private String connectorID;

    /**
     * 二维码
     */
    @JsonProperty(value = "QRCode")
-    private String QRCode;
+    private String qrCode;

    /**
     * 用户手机号
     */
    @JsonProperty(value = "PhoneNum")
-    private String PhoneNum;
+    private String phoneNum;

    /**
     * 车牌号
     */
    @JsonProperty(value = "PlateNum")
-    private String PlateNum;
+    private String plateNum;

    @JsonProperty(value = "OperatorID")
-    private String OperatorID;
+    private String operatorId;
 }
--- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/MerchantClearingBillVO.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/MerchantClearingBillVO.java
@@ -46,4 +46,7 @@ public class MerchantClearingBillVO {

    // 提现单号
    private String withdrawCode;
+
+    // 提现申请时间
+    private String applicationTime;
 }
--- a/jsowell-pile/src/main/resources/mapper/pile/ClearingBillInfoMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/ClearingBillInfoMapper.xml
@@ -774,9 +774,11 @@
        t1.actual_clearing_amount as actualClearingAmount,
        t1.fee_amount as feeAmount,
        t1.withdrawable_amount as  withdrawAbleAmount,
-        t1.withdraw_code as withdrawCode
+        t1.withdraw_code as withdrawCode,
+        t3.application_time as applicationTime
    from clearing_bill_info t1
      join pile_merchant_info t2 on t1.merchant_id = t2.id and t1.del_flag = '0'
+    left join clearing_withdraw_info t3 on t3.withdraw_code = t1.withdraw_code and t3.del_flag = '0'
    where t1.merchant_id = #{merchantId,jdbcType=VARCHAR}
    and t1.trade_date between #{startTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
    order by
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java
@@ -605,7 +605,7 @@ public class LianLianServiceImpl implements LianLianService {
            // 平台已存在订单
            return null;
        }
-        ThirdPartyPlatformConfig configInfo = thirdPartyPlatformConfigService.getInfoByOperatorId(dto.getOperatorID());
+        ThirdPartyPlatformConfig configInfo = thirdPartyPlatformConfigService.getInfoByOperatorId(dto.getOperatorId());
        if (configInfo == null) {
            return null;
        }
@@ -737,7 +737,7 @@ public class LianLianServiceImpl implements LianLianService {
        if (orderInfo == null) {
            return null;
        }
-        ThirdPartyPlatformConfig configInfo = thirdPartyPlatformConfigService.getInfoByOperatorId(dto.getOperatorID());
+        ThirdPartyPlatformConfig configInfo = thirdPartyPlatformConfigService.getInfoByOperatorId(dto.getOperatorId());
        if (configInfo == null) {
            return null;
        }
@@ -752,6 +752,8 @@ public class LianLianServiceImpl implements LianLianService {
            vo.setStartChargeSeq(orderCode);
            vo.setStartChargeSeqStat(3); // 3-停止中
        }
+        vo.setSuccStat(0);
+        vo.setFailReason(0);
        // 加密
        Map<String, String> resultMap = Maps.newLinkedHashMap();
        // 加密数据
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/yongchengboche/dto/YCBCGetTokenDTO.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/yongchengboche/dto/YCBCGetTokenDTO.java
@@ -0,0 +1,12 @@
+package com.jsowell.thirdparty.yongchengboche.dto;
+
+import com.jsowell.thirdparty.zhongdianlian.dto.ZDLGetTokenDTO;
+
+/**
+ * TODO
+ *
+ * @author Lemon
+ * @Date 2023/10/30 15:49:51
+ */
+public class YCBCGetTokenDTO extends ZDLGetTokenDTO {
+}
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/yongchengboche/dto/YCCommonParamsDTO.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/yongchengboche/dto/YCCommonParamsDTO.java
@@ -0,0 +1,18 @@
+package com.jsowell.thirdparty.yongchengboche.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.jsowell.thirdparty.lianlian.dto.CommonParamsDTO;
+import lombok.Data;
+
+/**
+ * 甬城泊车通用请求参数DTO
+ *
+ * @author Lemon
+ * @Date 2023/10/30 15:53:35
+ */
+@Data
+public class YCCommonParamsDTO extends CommonParamsDTO {
+
+    @JsonProperty(value = "AccessName")
+    private String accessName;
+}
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/yongchengboche/service/YCBCService.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/yongchengboche/service/YCBCService.java
@@ -0,0 +1,105 @@
+package com.jsowell.thirdparty.yongchengboche.service;
+
+import com.jsowell.pile.dto.QueryEquipChargeStatusDTO;
+import com.jsowell.pile.dto.QueryEquipmentDTO;
+import com.jsowell.pile.dto.QueryStartChargeDTO;
+import com.jsowell.pile.dto.QueryStationInfoDTO;
+import com.jsowell.thirdparty.yongchengboche.dto.YCBCGetTokenDTO;
+
+import java.io.UnsupportedEncodingException;
+import java.util.Map;
+
+/**
+ * 甬城泊车 Service
+ *
+ * @author Lemon
+ * @Date 2023/10/30 15:44:09
+ */
+public interface YCBCService {
+    /**
+     * 获取令牌
+     * @param dto
+     * @return
+     */
+    public String YCBCGetToken(YCBCGetTokenDTO dto);
+
+    /**
+     * 查询站点信息
+     * @param dto
+     * @return
+     */
+    public Map<String, String> queryStationsInfo(QueryStationInfoDTO dto);
+
+    /**
+     * 设备接口状态查询
+     * 此接口用于批量查询设备实时状态
+     *
+     * @param dto
+     * @return
+     */
+    Map<String, String> queryStationStatus(QueryStationInfoDTO dto);
+
+
+    /**
+     * 设备状态变化推送
+     * @param pileConnectorCode
+     * @param status
+     * @return
+     */
+    String notificationStationStatus(String pileConnectorCode, String status);
+
+
+    /**
+     * 请求设备认证
+     * @param dto
+     * @return
+     */
+    Map<String, String> queryEquipAuth(QueryEquipmentDTO dto);
+
+    /**
+     * 请求开始充电
+     * @param dto
+     * @return
+     */
+    Map<String, String> queryStartCharge(QueryStartChargeDTO dto);
+
+    /**
+     * 推送启动充电结果
+     * @return
+     */
+    String pushStartChargeResult(String orderCode);
+
+    /**
+     * 查询充电状态
+     * @param dto
+     */
+    Map<String, String> queryEquipChargeStatus(QueryEquipChargeStatusDTO dto);
+
+    /**
+     * 推送充电状态
+     * @param orderCode
+     * @return
+     */
+    String pushChargeStatus(String orderCode) throws UnsupportedEncodingException;
+
+    /**
+     * 请求停止充电
+     * @param dto
+     * @return
+     */
+    Map<String, String> queryStopCharge(QueryStartChargeDTO dto);
+
+    /**
+     * 推送停止充电结果(仅在 0x19的帧类型中调用)
+     * @param orderCode
+     * @return
+     */
+    String pushStopChargeResult(String orderCode);
+
+    /**
+     * 推送充电订单信息
+     * @param orderCode
+     * @return
+     */
+    String pushChargeOrderInfo(String orderCode);
+}
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/yongchengboche/service/impl/YCBCServiceImpl.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/yongchengboche/service/impl/YCBCServiceImpl.java
@@ -0,0 +1,154 @@
+package com.jsowell.thirdparty.yongchengboche.service.impl;
+
+import com.jsowell.pile.dto.QueryEquipChargeStatusDTO;
+import com.jsowell.pile.dto.QueryEquipmentDTO;
+import com.jsowell.pile.dto.QueryStartChargeDTO;
+import com.jsowell.pile.dto.QueryStationInfoDTO;
+import com.jsowell.thirdparty.lianlian.service.LianLianService;
+import com.jsowell.thirdparty.yongchengboche.dto.YCBCGetTokenDTO;
+import com.jsowell.thirdparty.yongchengboche.service.YCBCService;
+import com.jsowell.thirdparty.zhongdianlian.service.ZDLService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.io.UnsupportedEncodingException;
+import java.util.Map;
+
+/**
+ * 甬城泊车 Service
+ *
+ * @author Lemon
+ * @Date 2023/10/30 15:44:58
+ */
+@Service
+public class YCBCServiceImpl implements YCBCService {
+
+    @Autowired
+    private ZDLService zdlService;
+
+    @Autowired
+    private LianLianService lianLianService;
+
+
+    /**
+     * 获取令牌
+     * @param dto
+     * @return
+     */
+    @Override
+    public String YCBCGetToken(YCBCGetTokenDTO dto) {
+        return zdlService.ZDLGetToken(dto);
+    }
+
+    /**
+     * 获取充电站信息
+     * @param dto
+     * @return
+     */
+    @Override
+    public Map<String, String> queryStationsInfo(QueryStationInfoDTO dto) {
+        return zdlService.queryStationsInfo(dto);
+    }
+
+
+    /**
+     * 设备接口状态查询
+     * @param dto
+     * @return
+     */
+    @Override
+    public Map<String, String> queryStationStatus(QueryStationInfoDTO dto) {
+        return zdlService.queryStationStatus(dto);
+    }
+
+    /**
+     * 设备状态变化推送
+     * @param pileConnectorCode
+     * @param status
+     * @return
+     */
+    @Override
+    public String notificationStationStatus(String pileConnectorCode, String status) {
+        return zdlService.notificationStationStatus(pileConnectorCode, status);
+    }
+
+    /**
+     * 请求设备认证
+     * @param dto
+     * @return
+     */
+    @Override
+    public Map<String, String> queryEquipAuth(QueryEquipmentDTO dto) {
+        return lianLianService.query_equip_auth(dto);
+    }
+
+    /**
+     * 请求开始充电
+     * @param dto
+     * @return
+     */
+    @Override
+    public Map<String, String> queryStartCharge(QueryStartChargeDTO dto) {
+        return lianLianService.query_start_charge(dto);
+    }
+
+    /**
+     * 推送启动充电结果
+     * @return
+     */
+    @Override
+    public String pushStartChargeResult(String orderCode) {
+        return lianLianService.pushStartChargeResult(orderCode);
+    }
+
+    /**
+     * 查询充电状态
+     * @param dto
+     */
+    @Override
+    public Map<String, String> queryEquipChargeStatus(QueryEquipChargeStatusDTO dto) {
+        return lianLianService.query_equip_charge_status(dto);
+    }
+
+    /**
+     * 推送充电状态
+     * @param orderCode
+     * @return
+     */
+    @Override
+    public String pushChargeStatus(String orderCode) throws UnsupportedEncodingException {
+        return lianLianService.pushChargeStatus(orderCode);
+    }
+
+    /**
+     * 请求停止充电
+     * @param dto
+     * @return
+     */
+    @Override
+    public Map<String, String> queryStopCharge(QueryStartChargeDTO dto) {
+        return lianLianService.query_stop_charge(dto);
+    }
+
+    /**
+     * 推送停止充电结果(仅在 0x19的帧类型中调用)
+     * @param orderCode
+     * @return
+     */
+    @Override
+    public String pushStopChargeResult(String orderCode) {
+        return lianLianService.pushStopChargeResult(orderCode);
+    }
+
+    /**
+     * 推送充电订单信息
+     * @param orderCode
+     * @return
+     */
+    @Override
+    public String pushChargeOrderInfo(String orderCode) {
+        return lianLianService.pushChargeOrderInfo(orderCode);
+    }
+
+
+}
--- a/jsowell-ui/src/views/financial/financeDetail.vue
+++ b/jsowell-ui/src/views/financial/financeDetail.vue
@@ -1,6 +1,6 @@
 <template>
  <div class="app-container">
-    <div class="header">
+    <div class="header-cont ">
      <div class="header-txt">运营汇总</div>
      <el-button type="primary" @click="goAccount">开户信息</el-button>
    </div>
@@ -12,13 +12,9 @@
      </template>
      <template v-else>
        <template v-if="showAccountList">
-          <div
-            class="foot1"
-            v-for="(item, index) in settleAccountList"
-            :key="index"
-          >
+          <div class="foot1" v-for="(item, index) in settleAccountList" :key="index">
            <el-descriptions :column="1">
-              <el-descriptions-item label="运营商">
+              <el-descriptions-item label="运营商" class="remarks">
                <span class="color">
                  {{ merchant }}
                </span>
@@ -109,8 +105,8 @@
          <el-descriptions-item label="白名单支付(次)">
            <span class="color">{{
              merchantOrderReport.whitelistPaymentsNum === null
-                ? "一"
-                : merchantOrderReport.whitelistPaymentsNum
+              ? "一"
+              : merchantOrderReport.whitelistPaymentsNum
            }}</span>
          </el-descriptions-item>
        </el-descriptions>
@@ -122,163 +118,67 @@
        <div class="margin-right foot4">
          <div class="color60">可提现(元)</div>
          <div class="margin-20 color">{{ adapayMember.avlBalance }}</div>
-          <el-button
-            type="primary"
-            v-if="adapayMember.avlBalance > withdrawalFee"
-            @click="dialogVisible = true"
-            >提现申请</el-button
-          >
+          <el-button type="primary" v-if="adapayMember.avlBalance > withdrawalFee"
+            @click="dialogVisible = true">提现申请</el-button>
          <div v-else>
-            注:
-            <span class="text"
-              >该余额大于{{ withdrawalFee }}元时，才可发起取现</span
-            >
+            <span class="text">该余额大于{{ withdrawalFee }}元时，才可发起取现</span>
          </div>
        </div>
-        <div class="margin-right foot4" style="width: 20%">
+        <div class="margin-right foot4">
+          <div class="color60" @click="already">已提现(元)</div>
+          <div class="margin-20 color">{{ adapayMember.withdrawn }}</div>
+          <div>
+            <span class="text">已成功提现到绑定银行卡的金额汇总</span>
+          </div>
+        </div>
+        <div class="margin-right foot4">
+          <el-button type="primary">提现中</el-button>
+        </div>
+        <!-- <div class="margin-right foot4" style="width: 20%">
          <div class="color60">冻结金额(元)</div>
          <div class="margin-20 color">{{ adapayMember.frzBalance }}</div>
          <div>
-            注:
-            <span class="text"
-              >当配置了自动结算功能，在每日发起结算时会将可用余额转为冻结金额。该部分金额不允许取现。</span
-            >
+            <span class="text">当配置了自动结算功能，在每日发起结算时会将可用余额转为冻结金额。该部分金额不允许取现。</span>
          </div>
-        </div>
-        <!-- <div class="foot4"> -->
-
-        <!-- <div class="margin-right">
-            <div class="color60">昨日日终余额(元)</div>
-            <div class="margin-20 color">{{ adapayMember.lastAvlBalance }}</div>
-          </div> -->
-        <!-- <div class="margin-right">
-            <div>提现申请中</div>
-            <div class="margin-10">
-              {{ adapayMember.withdrawalApplication }}(元)
-            </div>
-            <el-button type="primary" @click="recordDialog = true"
-            >提现记录</el-button
-          >
-          </div>
-          <div class="margin-right">
-            <div>已提现</div>
-            <div class="margin-10">{{ adapayMember.withdrawn }}(元)</div>
-            <div style="font-size: 13px">已成功提现到绑定银行卡的金额汇总</div>
-          </div> -->
-        <!-- </div> -->
+        </div> -->
      </template>
    </div>
    <hr />
    <div class="center">
      <div class="header-txt">运营分析</div>
-      <el-form
-        :model="queryParams"
-        ref="queryForm"
-        size="small"
-        inline
-        label-width="68px"
-      >
+      <el-form :model="queryParams" ref="queryForm" size="small" inline label-width="68px">
        <el-form-item label="日期" prop="tradeDate">
-          <el-date-picker
-            v-model="createTimeRange"
-            style="width: 240px"
-            value-format="yyyy-MM-dd"
-            :default-time="['00:00:00', '23:59:59']"
-            type="daterange"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-            :clearable="false"
-          ></el-date-picker>
+          <el-date-picker v-model="createTimeRange" style="width: 240px" value-format="yyyy-MM-dd"
+            :default-time="['00:00:00', '23:59:59']" type="daterange" range-separator="至" start-placeholder="开始日期"
+            end-placeholder="结束日期" :clearable="false"></el-date-picker>
        </el-form-item>
        <el-form-item>
-          <el-button
-            type="primary"
-            icon="el-icon-search"
-            size="mini"
-            @click="handleQuery"
-            >搜索</el-button
-          >
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
        </el-form-item>
      </el-form>
    </div>
    <hr />
    <el-table :data="reportList">
      <el-table-column label="日期" align="center" prop="tradeDate" />
-      <!-- <el-table-column label="站点名称" align="center" prop="stationName">
-        <template slot-scope="scope">
-          <router-link
-            :to="
-              '/station/detail/index/' +
-              scope.row.stationId +
-              '/' +
-              scope.row.stationName
-            "
-            class="link-type"
-          >
-            <span>{{ scope.row.stationName }}</span>
-          </router-link>
-        </template>
-      </el-table-column> -->

      <el-table-column label="账单状态" align="center" prop="billStatus">
        <template slot-scope="scope">
-          <dict-tag
-            :options="dict.type.bill_status"
-            :value="scope.row.billStatus"
-          />
+          <dict-tag :options="dict.type.bill_status" :value="scope.row.billStatus" />
        </template>
      </el-table-column>
-      <el-table-column
-        label="应收金额（元）"
-        align="center"
-        prop="receivableAmount"
-      />
-      <el-table-column
-        label="可提现金额（元）"
-        align="center"
-        prop="withdrawAbleAmount"
-      />
-      <el-table-column
-        label="交易手续费（元）"
-        align="center"
-        prop="feeAmount"
-      />
-      <!-- <el-table-column label="清分时间" align="center" prop="clearingTime" /> -->
-      <!-- <el-table-column
-        label="应清分金额"
-        align="center"
-        prop="shouldClearingAmount"
-      />
-      <el-table-column
-        label="实际清分金额"
-        align="center"
-        prop="actualClearingAmount"
-      />
-      <el-table-column
-        label="清分账单编号"
-        align="center"
-        prop="clearingBillCode"
-      /> -->
-      <el-table-column label="提现订单号" align="center" prop=" withdrawCode" />
-      <el-table-column
-        label="提现申请时间"
-        align="center"
-        prop="withdrawalTime"
-      />
+      <el-table-column label="应收金额（元）" align="center" prop="receivableAmount" />
+      <el-table-column label="可提现金额（元）" align="center" prop="withdrawAbleAmount" />
+      <el-table-column label="交易手续费（元）" align="center" prop="feeAmount" />
+      <el-table-column label="提现订单号" align="center" prop="withdrawCode" />
+      <el-table-column label="提现申请时间" align="center" prop="applicationTime"/>
      <el-table-column label="操作" align="center">
        <template slot-scope="scope">
          <span class="link-type" @click="goTradeDate(scope)">订单流水</span>
        </template>
      </el-table-column>
    </el-table>
-    <pagination
-      v-show="reportTotal > 0"
-      :total="reportTotal"
-      :page.sync="reportQueryParams.pageNum"
-      :limit.sync="reportQueryParams.pageSize"
-      @pagination="getList"
-    />
+    <pagination v-show="reportTotal > 0" :total="reportTotal" :page.sync="reportQueryParams.pageNum"
+      :limit.sync="reportQueryParams.pageSize" @pagination="getList" />
    <!-- 提现申请弹窗 -->
    <el-dialog title="提现申请" :visible.sync="dialogVisible" width="33%">
      温馨提示
@@ -298,7 +198,6 @@
      <p>
        实际到账（元）：
        <span class="number color">
-          <!-- <span>11</span> -->
          {{ adapayMember.avlBalance - withdrawalFee }}
        </span>
      </p>
@@ -310,57 +209,31 @@
    <!-- 提现记录 -->
    <el-dialog title="提现记录" :visible.sync="recordDialog">
      <el-table :data="tableData" style="width: 100%">
-        <el-table-column label="日期" />
-        <el-table-column label="账单状态" />
-        <el-table-column label="应收金额(元)" />
-        <el-table-column label="充值手续费(元)" />
-        <el-table-column label="可提现金额(元)" />
-        <el-table-column label="提现订单号(元)" />
-        <el-table-column label="提现申请时间(元)" />
-        <el-table-column label="操作">
-          <template slot-scope="scope">
-            <router-link
-              :to="{
-                path: '/financial/merchant/merchantVirtual',
-                query: {
-                  merchantId: scope.row.id,
-                  merchantName: scope.row.merchantName,
-                },
-              }"
-              class="link-type"
-            >
-              <span>订单流水</span>
-            </router-link>
-          </template>
-        </el-table-column>
+        <el-table-column label="日期" align="center" />
+        <el-table-column label="状态" align="center" />
+        <el-table-column label="金额" align="center"></el-table-column>
      </el-table>
+      <pagination v-show="orderTotal > 0" :total="orderTotal" :page.sync="getOrderParams.pageNum"
+        :limit.sync="getOrderParams.pageSize" @pagination="getOrderList" />
    </el-dialog>
-    <el-dialog
-      title="订单流水"
-      :visible.sync="dialogTableVisible"
-      :before-close="orderClose"
-    >
+    <!-- 订单流水 -->
+    <el-dialog title="订单流水" :visible.sync="dialogTableVisible" :before-close="orderClose">
      <el-table :data="orderList" v-loading="orderLoading">
-        <el-table-column property="orderCode" label="订单编号" />
-        <el-table-column property="settleAmount" label="结算金额(元)" />
-        <el-table-column property="clearingStatus" label="清分状态">
+        <el-table-column property="orderCode" label="订单编号" align="center" />
+        <el-table-column property="settleAmount" label="结算金额(元)" align="center" />
+        <el-table-column property="clearingStatus" label="清分状态" align="center">
          <template slot-scope="scope">
            <span>{{
              scope.row.clearingStatus === "0" ? "未清分" : "已清分"
            }}</span>
          </template>
        </el-table-column>
-        <el-table-column property="clearingBillCode" label="清分账单编号" />
-        <el-table-column property="withdrawStatus" label="提现状态" />
-        <el-table-column property="withdrawCode" label="提现编号" />
+        <el-table-column property="clearingBillCode" label="清分账单编号" align="center" />
+        <el-table-column property="withdrawStatus" label="提现状态" align="center" />
+        <el-table-column property="withdrawCode" label="提现编号" align="center" />
      </el-table>
-      <pagination
-        v-show="orderTotal > 0"
-        :total="orderTotal"
-        :page.sync="getOrderParams.pageNum"
-        :limit.sync="getOrderParams.pageSize"
-        @pagination="getOrderList"
-      />
+      <pagination v-show="orderTotal > 0" :total="orderTotal" :page.sync="getOrderParams.pageNum"
+        :limit.sync="getOrderParams.pageSize" @pagination="getOrderList" />
    </el-dialog>
  </div>
 </template>
@@ -428,10 +301,8 @@ export default {
      if (code == null) {
        return "";
      }
-      // if (code === undefined) return;
      const bankList = text.bankList;
      let arr = bankList.find((item) => item.bankCode === code);
-      // console.log("银行编码对应的银行名称 arr", arr);
      if (arr.bankName != null) {
        this.bankName = arr.bankName;
      }
@@ -484,7 +355,6 @@ export default {
        this.orderList = res.rows;
        this.orderTotal = res.total;
        this.orderLoading = false;
-        // console.log("this.orderTotal", this.orderTotal);
      });
    },
    // 弹层关闭之前执行的事情
@@ -508,7 +378,6 @@ export default {
    getList() {
      console.log("queryParams", this.queryParams);
      getMerchantOrderReport(this.reportQueryParams).then((response) => {
-        // console.log("查询报表", reportList, merchantOrderReport);
        console.log("getMerchantOrderReport", response);
        if (response.data) {
          this.merchantOrderReport = response.data.merchantOrderReport;
@@ -540,7 +409,7 @@ export default {
          });
          this.dialogVisible = false;
        })
-        .catch((_) => {});
+        .catch((_) => { });
    },
    // 点击提交按钮
    submit() {
@@ -581,6 +450,9 @@ export default {
      this.reportQueryParams.endTime = end;
      this.getList();
    },
+    already() {
+      this.recordDialog = true
+    }
  },
  created() {
    this.defaultDate();
@@ -594,58 +466,83 @@ export default {
 .color60 {
  color: #606266;
 }
+
 .center {
  display: flex;
  align-content: center;
  margin-top: 30px;
 }
+
 .margin-20 {
  margin: 20px 0;
  font-size: 20px;
 }
+
 .font-13 {
  font-size: 13px;
 }
+
 .header {
+  display: flex;
+  align-items: center;
+}
+
+.header-cont {
  display: flex;
  justify-content: space-between;
  align-items: center;
 }
+
 .header-txt {
  font-size: 24px;
 }
+
 .text {
  font-size: 12px;
  color: red;
 }
+
 .foot1 {
-  width: 25%;
+  width: 20%;
  margin-top: 10px;
-  // .el-descriptions__body .el-descriptions__table {
-  //   width: 0 !important;
-  // }
+
+  ::v-deep .el-descriptions-item__label {
+    width: 80px;
+    margin-right: 0;
+  }
 }
+
 .foot2 {
  margin-left: 10px;
  margin-right: 10px;
-  width: 200px;
+  width: 450px;
+
+  ::v-deep .el-descriptions-item__label {
+    width: 105px;
+    margin-right: 0;
+  }
 }
+
 .foot3 {
-  width: 200px;
+  width: 400px;
  margin-right: 10px;
+
+  ::v-deep .el-descriptions-item__label {
+    width: 108px;
+    margin-right: 0;
+  }
 }
+
 .foot4 {
  display: inline-block;
-  // flex: 1;
-  // display: flex;
-  // justify-content: space-between;
-  // margin-left: 50px;
 }
+
 .margin-right {
-  width: 180px;
-  margin-right: 10px;
+  width: 500px;
+  // margin-right: 50px;
  text-align: center;
 }
+
 .color {
  color: #000;
  font-weight: bolder;