配置

.env.production

@@ -24,9 +24,9 @@ VUE_APP_XXL_JOB_ADMIN = '/xxl-job-admin'
 
 # 趣玩
 # 趣玩生产
-# VUE_APP_COS_BASE_URL = 'https://filedsjkdlas.oqpac.cn/'
+VUE_APP_COS_BASE_URL = 'https://filesdjkal.mgzhq.cn/'
 # 趣玩测试
-VUE_APP_COS_BASE_URL = 'https://quyoutest-1330083379.cos.ap-guangzhou.myqcloud.com/'
+# VUE_APP_COS_BASE_URL = 'https://quyoutest-1330083379.cos.ap-guangzhou.myqcloud.com/'
 VUE_APP_SYSTEM_HOME = '趣玩'
 VUE_APP_TITLE = 趣玩后台管理系统
 

src/api/cai/orderLogs.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询订单日志列表
+export function listOrderLogs(query) {
+  return request({
+    url: '/cai/orderLogs/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询订单日志详细
+export function getOrderLogs(id) {
+  return request({
+    url: '/cai/orderLogs/' + id,
+    method: 'get'
+  })
+}
+
+// 新增订单日志
+export function addOrderLogs(data) {
+  return request({
+    url: '/cai/orderLogs',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改订单日志
+export function updateOrderLogs(data) {
+  return request({
+    url: '/cai/orderLogs',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除订单日志
+export function delOrderLogs(id) {
+  return request({
+    url: '/cai/orderLogs/' + id,
+    method: 'delete'
+  })
+}

src/api/cai/rechargeOrder.js

@@ -58,3 +58,12 @@ export function listOrderLogsByOrderNo(queryParams) {
     params: queryParams
   })
 }
+
+
+export function checkRechargeOrder(orderNo,payType) {
+  return request({
+    url: '/cai/rechargeOrder/checkPay',
+    method: 'get',
+    params: {orderNo,payType}
+  })
+}

src/views/cai/orderLogs/index.vue

@@ -0,0 +1,123 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="订单号" prop="orderNo">
+        <el-input
+          v-model="queryParams.orderNo"
+          placeholder="请输入订单号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="标识" prop="flagName">
+        <el-input
+            v-model="queryParams.flagName"
+            placeholder="请输入操作名称"
+            clearable
+            @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="操作名称" prop="stepName">
+        <el-input
+          v-model="queryParams.stepName"
+          placeholder="请输入操作名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-table v-loading="loading" :data="orderLogsList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="订单号" align="center" prop="orderNo" />
+      <el-table-column label="标识" align="center" prop="flagName" />
+      <el-table-column label="操作时间" align="center" prop="createTime" />
+      <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip />
+      <el-table-column label="操作名称" align="center" prop="stepName" />
+      <el-table-column label="入参" align="center" prop="inParams" show-overflow-tooltip />
+      <el-table-column label="出参" align="center" prop="outParams" show-overflow-tooltip />
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </div>
+</template>
+
+<script>
+import {listOrderLogs} from "@/api/cai/orderLogs";
+
+export default {
+  name: "OrderLogs",
+  data() {
+    return {
+      // 按钮loading
+      buttonLoading: false,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 订单日志表格数据
+      orderLogsList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        orderNo: undefined,
+        flagName: undefined,
+        stepName: undefined,
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询订单日志列表 */
+    getList() {
+      this.loading = true;
+      listOrderLogs(this.queryParams).then(response => {
+        this.orderLogsList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+  }
+};
+</script>

src/views/cai/payTrdConfig/index.vue

@@ -56,11 +56,14 @@
         </template>
       </el-table-column>
       <el-table-column label="支付类型" align="center" prop="type" />
+      <el-table-column label="最小金额" align="center" prop="minAmount" />
+      <el-table-column label="最大金额" align="center" prop="maxAmount" />
+      <el-table-column label="排序" align="center" prop="sortBy" />
       <el-table-column label="支付名称" align="center" prop="name" />
       <el-table-column label="商户ID" align="center" prop="mchId" />
       <el-table-column label="支付宝产品ID" align="center" prop="aliProductId" />
-      <el-table-column label="请求域名" align="center" prop="gatewayUrl" />
-      <el-table-column label="回调域名" align="center" prop="notifyUrl" />
+      <el-table-column label="请求域名" align="center" prop="gatewayUrl" show-overflow-tooltip />
+      <el-table-column label="回调域名" align="center" prop="notifyUrl" show-overflow-tooltip  />
       <el-table-column label="秘钥" align="center" prop="sign" show-overflow-tooltip />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">

src/views/cai/payTrdConfig/pay-trd-config-add-or-update-dialog.vue

@@ -12,6 +12,15 @@
           <el-option key="V7" label="V7" value="V7" />
         </el-select>
       </el-form-item>
+      <el-form-item label="最小金额" prop="minAmount">
+        <el-input v-model="form.minAmount" placeholder="请输入最小金额" />
+      </el-form-item>
+      <el-form-item label="最大金额" prop="maxAmount">
+        <el-input v-model="form.maxAmount" placeholder="请输入最大金额" />
+      </el-form-item>
+      <el-form-item label="排序" prop="sortBy">
+        <el-input v-model="form.sortBy" placeholder="请输入排序" />
+      </el-form-item>
       <el-form-item label="支付名称" prop="name">
         <el-input v-model="form.name" placeholder="请输入支付名称" />
       </el-form-item>
@@ -53,6 +62,9 @@ export default {
         type: undefined,
         name: undefined,
         mchId: undefined,
+        minAmount: 0,
+        maxAmount: 0,
+        sortBy: 0,
         aliProductId: undefined,
         gatewayUrl: undefined,
         notifyUrl: undefined,
@@ -60,6 +72,15 @@ export default {
       },
       // 表单校验
       rules: {
+        minAmount: [
+          { required: true, message: "不能为空", trigger: "blur" }
+        ],
+        maxAmount: [
+          { required: true, message: "不能为空", trigger: "blur" }
+        ],
+        sortBy: [
+          { required: true, message: "不能为空", trigger: "blur" }
+        ],
         type: [
           { required: true, message: "支付类型不能为空", trigger: "change" }
         ],

src/views/cai/rechargeOrder/index.vue

@@ -88,12 +88,11 @@
         </template>
       </el-table-column>
       <el-table-column label="链路号" align="center" prop="traceId" show-overflow-tooltip/>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="210">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="270">
         <template v-slot="scope">
           <el-button
               size="mini"
               type="text"
-              icon="el-icon-info"
               v-if="scope.row.traceId && scope.row.admin===false"
               @click="handleConsumerLog(scope.row)"
           >分销记录
@@ -101,7 +100,13 @@
           <el-button
               size="mini"
               type="text"
-              icon="el-icon-info"
+              v-if="scope.row.admin===false"
+              @click="handleCheck(scope.row)"
+          >支付校验
+          </el-button>
+          <el-button
+              size="mini"
+              type="text"
               @click="handleOrderLogs(scope.row)"
           >操作记录</el-button>
           <el-button
@@ -128,7 +133,7 @@
 </template>
 
 <script>
-import {listRechargeOrder} from "@/api/cai/rechargeOrder";
+import {checkRechargeOrder, listRechargeOrder} from "@/api/cai/rechargeOrder";
 import {
   booleanList,
   genderList,
@@ -216,6 +221,23 @@ export default {
         this.$refs.consumeLogInfo.traceIdInit(row.traceId)
       })
     },
+    handleCheck(row) {
+      this.$modal.confirm('是否确定校验订单号【"' + row.orderNo + '"】的数据项？').then(() => {
+        this.loading = true;
+        return checkRechargeOrder(row.orderNo);
+      }).then((resp) => {
+        this.loading = false;
+        if(resp.data.title){
+          this.$modal.alertWarning(resp.data.title);
+        }else{
+          this.getList();
+          this.$modal.msgSuccess("成功");
+        }
+      }).catch(() => {
+      }).finally(() => {
+        this.loading = false;
+      });
+    },
     handleOrderLogs(row){
       this.orderLogsVisible = true
       this.$nextTick(() => {