定时优惠券

deploy.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+# 源目录 (本地)
+local_dir="./dist"
+
+# 目标目录 (远程)
+remote_user="root"
+remote_host="111.230.193.88"
+remote_dir="/var/www/frontend/admin"
+
+# 使用 scp 递归复制 dist 目录下的所有内容
+scp -r "$local_dir"/* "$remote_user@$remote_host:$remote_dir"
+
+if [ $? -ne 0 ]; then
+  echo "文件传输失败。"
+  exit 1
+fi
+
+echo "文件传输成功。"
+exit 0

src/views/store/couponSchedule/index.vue

@@ -10,10 +10,20 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="订单ID" prop="orderId">
+<!--      <el-form-item label="订单ID" prop="orderId">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.orderId"-->
+<!--          placeholder="请输入订单ID"-->
+<!--          clearable-->
+<!--          size="small"-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+
+      <el-form-item label="订单号" prop="orderCode">
         <el-input
-          v-model="queryParams.orderId"
-          placeholder="请输入订单ID"
+          v-model="queryParams.orderCode"
+          placeholder="请输入订单号"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -64,14 +74,6 @@
           placeholder="选择下单时间">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="执行时间" prop="executeTime">
-        <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.executeTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择执行时间">
-        </el-date-picker>
-      </el-form-item>
       <el-form-item label="优惠券ID" prop="couponId">
         <el-input
           v-model="queryParams.couponId"
@@ -81,15 +83,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="优惠券批次ID" prop="couponBatchId">
-        <el-input
-          v-model="queryParams.couponBatchId"
-          placeholder="请输入优惠券批次ID"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="预计发送时间" prop="sendTime">
         <el-date-picker clearable size="small" style="width: 200px"
           v-model="queryParams.sendTime"
@@ -124,23 +117,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="最大重试次数" prop="maxRetries">
-        <el-input
-          v-model="queryParams.maxRetries"
-          placeholder="请输入最大重试次数"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="下次重试时间" prop="nextRetryTime">
-        <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.nextRetryTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择下次重试时间">
-        </el-date-picker>
-      </el-form-item>
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -148,15 +124,15 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:schedule:add']"
-        >新增</el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="primary"-->
+<!--          icon="el-icon-plus"-->
+<!--          size="mini"-->
+<!--          @click="handleAdd"-->
+<!--          v-hasPermi="['system:schedule:add']"-->
+<!--        >新增</el-button>-->
+<!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="success"
@@ -193,24 +169,22 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="主键ID" align="center" prop="id" />
       <el-table-column label="用户ID" align="center" prop="userId" />
-      <el-table-column label="订单ID" align="center" prop="orderId" />
+      <el-table-column label="订单号" align="center" prop="orderCode" />
       <el-table-column label="套餐ID" align="center" prop="setmealId" />
       <el-table-column label="总月数" align="center" prop="month" />
       <el-table-column label="当前次数" align="center" prop="count" />
 <!--      0待处理, 1正在处理, 2成功, -1失败, 3用户拒签或者退货-->
-      <el-table-column label="状态" align="center" prop="status" />
-      <el-table-column label="下单时间" align="center" prop="orderTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.orderTime, '{y}-{m}-{d}') }}</span>
+      <el-table-column label="状态" align="center" prop="status" >
+        <template slot-scope="scope" v-if="statusOptions">
+          <span>{{statusText(scope.row.status)}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="执行时间" align="center" prop="executeTime" width="180">
+      <el-table-column label="下单时间" align="center" prop="orderTime" width="180">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.executeTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.orderTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="优惠券ID" align="center" prop="couponId" />
-      <el-table-column label="优惠券批次ID" align="center" prop="couponBatchId" />
       <el-table-column label="预计发送时间" align="center" prop="sendTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.sendTime, '{y}-{m}-{d}') }}</span>
@@ -223,12 +197,6 @@
       </el-table-column>
       <el-table-column label="错误信息" align="center" prop="errorMessage" />
       <el-table-column label="重试次数" align="center" prop="retryCount" />
-      <el-table-column label="最大重试次数" align="center" prop="maxRetries" />
-      <el-table-column label="下次重试时间" align="center" prop="nextRetryTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.nextRetryTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
 <!--      <el-table-column label="订单来源" align="center" prop="sourceType" />-->
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -263,13 +231,13 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="用户ID" prop="userId">
-          <el-input v-model="form.userId" placeholder="请输入用户ID" />
-        </el-form-item>
-        <el-form-item label="订单ID" prop="orderId">
-          <el-input v-model="form.orderId" placeholder="请输入订单ID" />
+          <el-input v-model="form.userId" placeholder="请输入用户ID" disabled/>
         </el-form-item>
+<!--        <el-form-item label="订单ID" prop="orderId">-->
+<!--          <el-input v-model="form.orderId" placeholder="请输入订单ID" />-->
+<!--        </el-form-item>-->
         <el-form-item label="套餐ID" prop="setmealId">
-          <el-input v-model="form.setmealId" placeholder="请输入套餐ID" />
+          <el-input v-model="form.setmealId" placeholder="请输入套餐ID" disabled/>
         </el-form-item>
         <el-form-item label="总月数" prop="month">
           <el-input v-model="form.month" placeholder="请输入总月数" />
@@ -286,28 +254,16 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="下单时间" prop="orderTime">
-          <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.orderTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择下单时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="执行时间" prop="executeTime">
-          <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.executeTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择执行时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="优惠券ID" prop="couponId">
-          <el-input v-model="form.couponId" placeholder="请输入优惠券ID" />
-        </el-form-item>
-        <el-form-item label="优惠券批次ID" prop="couponBatchId">
-          <el-input v-model="form.couponBatchId" placeholder="请输入优惠券批次ID" />
-        </el-form-item>
+<!--        <el-form-item label="下单时间" prop="orderTime">-->
+<!--          <el-date-picker clearable size="small" style="width: 200px"-->
+<!--            v-model="form.orderTime"-->
+<!--            type="date"-->
+<!--            value-format="yyyy-MM-dd"-->
+<!--            placeholder="选择下单时间">-->
+<!--          </el-date-picker>-->
+<!--        </el-form-item>-->
+
+
         <el-form-item label="预计发送时间" prop="sendTime">
           <el-date-picker clearable size="small" style="width: 200px"
             v-model="form.sendTime"
@@ -316,31 +272,17 @@
             placeholder="选择预计发送时间">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="实际发送时间" prop="actualSendTime">
-          <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.actualSendTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择实际发送时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="错误信息" prop="errorMessage">
-          <el-input v-model="form.errorMessage" placeholder="请输入错误信息" />
-        </el-form-item>
+<!--        <el-form-item label="实际发送时间" prop="actualSendTime">-->
+<!--          <el-date-picker clearable size="small" style="width: 200px"-->
+<!--            v-model="form.actualSendTime"-->
+<!--            type="date"-->
+<!--            value-format="yyyy-MM-dd"-->
+<!--            placeholder="选择实际发送时间">-->
+<!--          </el-date-picker>-->
+<!--        </el-form-item>-->
         <el-form-item label="重试次数" prop="retryCount">
           <el-input v-model="form.retryCount" placeholder="请输入重试次数" />
         </el-form-item>
-        <el-form-item label="最大重试次数" prop="maxRetries">
-          <el-input v-model="form.maxRetries" placeholder="请输入最大重试次数" />
-        </el-form-item>
-        <el-form-item label="下次重试时间" prop="nextRetryTime">
-          <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.nextRetryTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择下次重试时间">
-          </el-date-picker>
-        </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入备注" />
         </el-form-item>
@@ -386,6 +328,7 @@ export default {
         pageSize: 10,
         userId: null,
         orderId: null,
+        orderCode: null,
         setmealId: null,
         month: null,
         count: null,
@@ -423,6 +366,14 @@ export default {
     })
   },
   computed: {
+    statusText() {
+      return (status) => {
+        console.log(this.statusOptions)
+
+        const item = this.statusOptions.find(option => option.dictValue == status);
+        return item ? item.dictLabel : ''; // 或者一个默认值
+      };
+    },
     scheduleCouponStatus: {
       get(){
         return this.form.status?.toString()
@@ -453,6 +404,7 @@ export default {
         id: null,
         userId: null,
         orderId: null,
+        orderCode: null,
         setmealId: null,
         month: null,
         count: null,