From f8c76ba0de49ff0d87cbaa9d7425bdf5c1db18a4 Mon Sep 17 00:00:00 2001
From: PQZ <pangqingzhou@gmail.com>
Date: Mon, 30 Sep 2024 17:31:15 +0800
Subject: [PATCH] 1

---
 .../EventMarketing/newCertificate/index.vue   | 312 +++++++++++-------
 .../src/main/resources/application.properties |   4 +-
 2 files changed, 192 insertions(+), 124 deletions(-)

diff --git a/fuintAdmin/src/views/EventMarketing/newCertificate/index.vue b/fuintAdmin/src/views/EventMarketing/newCertificate/index.vue
index 4c5fdc23c..b169e0178 100644
--- a/fuintAdmin/src/views/EventMarketing/newCertificate/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/newCertificate/index.vue
@@ -332,93 +332,177 @@
 
         </div>
         <div class="d-s" style="justify-content: space-between">
-          <el-form-item label="适用时间段" style="width: 45%;">
-            <el-radio-group v-model="ruleForm.availableType">
-              <el-radio :label="'1'" style="margin-bottom: 15px">每周
-                <el-select v-model="ruleForm.availableWeek" multiple placeholder="请选择周日期">
-                  <el-option v-for="item in weekList" :key="item.value" :label="item.label" :value="item.value">
-                  </el-option>
-                </el-select>
-              </el-radio>
-              <el-radio :label="'2'" style="margin-bottom: 15px">每月
-                <el-select v-model="ruleForm.availableDay" multiple placeholder="请选择每月固定日期">
-                  <el-option v-for="item in monthList" :key="item.value" :label="item.label" :value="item.value">
-                  </el-option>
-                </el-select>
-              </el-radio>
-
+          <el-form-item label="时间段设置" prop="availableOrUn">
+            <el-radio-group v-model="ruleForm.availableOrUn">
+              <el-radio :label="'0'">适用时间段</el-radio>
+              <el-radio :label="'1'">不可用时间段</el-radio>
             </el-radio-group>
-
-            <div class="d-s">
-              <div class="malou">时间段</div>
-              <el-time-select
-                style="margin-right: 10px"
-                placeholder="起始时间"
-                v-model="ruleForm.availablePeriodStart"
-                :picker-options="{
-                  start: '00:00',
-                  step: '00:15',
-                  end: '24:00'
-                  }">
-              </el-time-select>
-              <el-time-select
-                placeholder="结束时间"
-                v-model="ruleForm.availablePeriodEnd"
-                :picker-options="{
-                     start: '00:00',
-                  step: '00:15',
-                  end: '24:00',
-                minTime: ruleForm.availablePeriodStart
-              }">
-              </el-time-select>
-            </div>
-
           </el-form-item>
-          <el-form-item label="不适用时间段" style="width: 50%;">
-            <el-radio-group v-model="ruleForm.unAvailableType">
-              <div>
-                <el-radio label="1" style="margin-bottom: 15px">每周
-                  <el-select v-model="ruleForm.unAvailableWeek" multiple placeholder="请选择周日期">
-                    <el-option v-for="item in weekList" :key="item.value" :label="item.label" :value="item.value">
+          <el-form-item v-if="ruleForm.availableOrUn == '0'" label="适用时间段" prop="suitTimeSlotType">
+            <div style="width: 100px;margin-top: 10px">
+              <el-radio-group v-model="ruleForm.availableType">
+                <div style="display: flex; width: 500px;margin-bottom: 15px;">
+                  <el-radio :label="'1'">每周</el-radio>
+                  <el-checkbox-group v-model="weekDay"  style="margin-left: 20px" :disabled="ruleForm.availableType!='1'">
+                    <el-checkbox v-for="(item,index) in weekList" :key="index" :label="item"></el-checkbox>
+                  </el-checkbox-group>
+                </div>
+
+                <el-radio :label="'2'">每月
+                  <el-select :disabled="ruleForm.availableType!='2'" v-model="monthDay" placeholder="请选择每月固定日期" multiple style="margin-left: 20px">
+                    <el-option
+                      v-for="item in 31"
+                      :key="item+''"
+                      :label="item+'日'"
+                      :value="item+''">
                     </el-option>
                   </el-select>
                 </el-radio>
-              </div>
-              <div>
-                <el-radio label="2" style="margin-bottom: 15px">每月
-                  <el-select v-model="ruleForm.unAvailableDay" multiple placeholder="请选择每月固定日期">
-                    <el-option v-for="item in monthList" :key="item.value" :label="item.label" :value="item.value">
+              </el-radio-group>
+            </div>
+            <div style="margin-top: 20px">
+              <el-form-item label="时间段"  label-width="70px">
+                <el-time-picker
+                  v-model="ruleForm.availablePeriodStart"
+                  format="HH:mm"
+                  value-format="HH:mm"
+                  placeholder="请选择开始时间点">
+                </el-time-picker>
+                至
+                <el-time-picker
+                  v-model="ruleForm.availablePeriodEnd"
+                  format="HH:mm"
+                  value-format="HH:mm"
+                  placeholder="请选择结束时间点">
+                </el-time-picker>
+              </el-form-item>
+            </div>
+          </el-form-item>
+          <el-form-item v-else label="不适用时间段" prop="noUseTimeType">
+            <div>
+              <el-radio-group v-model="ruleForm.unAvailableType">
+                <el-radio :label="'1'">每周
+                  <el-checkbox-group v-model="weekDay1"  style="margin-left: 20px" :disabled="ruleForm.unAvailableType!='1'">
+                    <el-checkbox v-for="(item,index) in weekList" :key="index" :label="item"></el-checkbox>
+                  </el-checkbox-group>
+                </el-radio>
+                <el-radio :label="'2'">每月
+                  <el-select :disabled="ruleForm.unAvailableType!='2'" v-model="monthDay1" placeholder="请选择每月固定日期" multiple style="margin-left: 20px">
+                    <el-option
+                      v-for="item in 31"
+                      :key="item+''"
+                      :label="item+'日'"
+                      :value="item+''">
                     </el-option>
                   </el-select>
                 </el-radio>
-              </div>
-            </el-radio-group>
-
-            <div class="d-s">
-              <div class="malou">时间段</div>
-              <el-time-select
-                style="margin-right: 10px"
-                placeholder="起始时间"
-                v-model="ruleForm.unAvailablePeriodStart"
-                :picker-options="{
-                  start: '00:00',
-                  step: '00:15',
-                  end: '24:00'
-                  }">
-              </el-time-select>
-              <el-time-select
-                placeholder="结束时间"
-                v-model="ruleForm.unAvailablePeriodEnd"
-                :picker-options="{
-                     start: '00:00',
-                  step: '00:15',
-                  end: '24:00',
-                minTime: ruleForm.availablePeriodStart
-              }">
-              </el-time-select>
+              </el-radio-group>
+            </div>
+            <div style="margin-top: 20px">
+              <el-form-item label="时间段" prop="noUseTimeFront" label-width="70px">
+                <el-time-picker
+                  v-model="ruleForm.unAvailablePeriodStart"
+                  format="HH:mm"
+                  value-format="HH:mm"
+                  placeholder="请选择开始时间点">
+                </el-time-picker>
+                至
+                <el-time-picker
+                  v-model="ruleForm.unAvailablePeriodEnd"
+                  format="HH:mm"
+                  value-format="HH:mm"
+                  placeholder="请选择结束时间点">
+                </el-time-picker>
+              </el-form-item>
             </div>
-
           </el-form-item>
+<!--          <el-form-item label="适用时间段" style="width: 45%;">-->
+<!--            <el-radio-group v-model="ruleForm.availableType">-->
+<!--              <el-radio :label="'1'" style="margin-bottom: 15px">每周-->
+<!--                <el-select v-model="ruleForm.availableWeek" multiple placeholder="请选择周日期">-->
+<!--                  <el-option v-for="item in weekList" :key="item.value" :label="item.label" :value="item.value">-->
+<!--                  </el-option>-->
+<!--                </el-select>-->
+<!--              </el-radio>-->
+<!--              <el-radio :label="'2'" style="margin-bottom: 15px">每月-->
+<!--                <el-select v-model="ruleForm.availableDay" multiple placeholder="请选择每月固定日期">-->
+<!--                  <el-option v-for="item in monthList" :key="item.value" :label="item.label" :value="item.value">-->
+<!--                  </el-option>-->
+<!--                </el-select>-->
+<!--              </el-radio>-->
+
+<!--            </el-radio-group>-->
+
+<!--            <div class="d-s">-->
+<!--              <div class="malou">时间段</div>-->
+<!--              <el-time-select-->
+<!--                style="margin-right: 10px"-->
+<!--                placeholder="起始时间"-->
+<!--                v-model="ruleForm.availablePeriodStart"-->
+<!--                :picker-options="{-->
+<!--                  start: '00:00',-->
+<!--                  step: '00:15',-->
+<!--                  end: '24:00'-->
+<!--                  }">-->
+<!--              </el-time-select>-->
+<!--              <el-time-select-->
+<!--                placeholder="结束时间"-->
+<!--                v-model="ruleForm.availablePeriodEnd"-->
+<!--                :picker-options="{-->
+<!--                     start: '00:00',-->
+<!--                  step: '00:15',-->
+<!--                  end: '24:00',-->
+<!--                minTime: ruleForm.availablePeriodStart-->
+<!--              }">-->
+<!--              </el-time-select>-->
+<!--            </div>-->
+
+<!--          </el-form-item>-->
+<!--          <el-form-item label="不适用时间段" style="width: 50%;">-->
+<!--            <el-radio-group v-model="ruleForm.unAvailableType">-->
+<!--              <div>-->
+<!--                <el-radio label="1" style="margin-bottom: 15px">每周-->
+<!--                  <el-select v-model="ruleForm.unAvailableWeek" multiple placeholder="请选择周日期">-->
+<!--                    <el-option v-for="item in weekList" :key="item.value" :label="item.label" :value="item.value">-->
+<!--                    </el-option>-->
+<!--                  </el-select>-->
+<!--                </el-radio>-->
+<!--              </div>-->
+<!--              <div>-->
+<!--                <el-radio label="2" style="margin-bottom: 15px">每月-->
+<!--                  <el-select v-model="ruleForm.unAvailableDay" multiple placeholder="请选择每月固定日期">-->
+<!--                    <el-option v-for="item in monthList" :key="item.value" :label="item.label" :value="item.value">-->
+<!--                    </el-option>-->
+<!--                  </el-select>-->
+<!--                </el-radio>-->
+<!--              </div>-->
+<!--            </el-radio-group>-->
+
+<!--            <div class="d-s">-->
+<!--              <div class="malou">时间段</div>-->
+<!--              <el-time-select-->
+<!--                style="margin-right: 10px"-->
+<!--                placeholder="起始时间"-->
+<!--                v-model="ruleForm.unAvailablePeriodStart"-->
+<!--                :picker-options="{-->
+<!--                  start: '00:00',-->
+<!--                  step: '00:15',-->
+<!--                  end: '24:00'-->
+<!--                  }">-->
+<!--              </el-time-select>-->
+<!--              <el-time-select-->
+<!--                placeholder="结束时间"-->
+<!--                v-model="ruleForm.unAvailablePeriodEnd"-->
+<!--                :picker-options="{-->
+<!--                     start: '00:00',-->
+<!--                  step: '00:15',-->
+<!--                  end: '24:00',-->
+<!--                minTime: ruleForm.availablePeriodStart-->
+<!--              }">-->
+<!--              </el-time-select>-->
+<!--            </div>-->
+
+<!--          </el-form-item>-->
         </div>
         <div class="d-s" style="justify-content: space-between">
           <el-form-item label="每人领券限制" required style="width: 45%;">
@@ -524,35 +608,7 @@ export default {
       threelist: [],
       goodsList: [],
       orderShow: false,
-      weekList: [
-        {
-          label: "周一",
-          value: "周一"
-        },
-        {
-          label: "周二",
-          value: "周二"
-        },
-        {
-          label: "周三",
-          value: "周三"
-        },
-        {
-          label: "周四",
-          value: "周四"
-        },
-        {
-          label: "周五",
-          value: "周五"
-        }, {
-          label: "周六",
-          value: "周六"
-        }, {
-          label: "周天",
-          value: "周天"
-        }
-
-      ],
+      weekList: ["周一", "周二", "周三", "周四", "周五", "周六", "周日"],
       monthList: [
         {
           label: "每月1号",
@@ -720,7 +776,12 @@ export default {
         }],
       oilNumberList: [],
       oilNameList: [],
+      weekDay: [],
+      monthDay: [],
+      weekDay1: [],
+      monthDay1: [],
       ruleForm: {
+        availableOrUn:'0',
         productIdList:[],
         productIds:'',
         productLimit:1,
@@ -844,17 +905,20 @@ export default {
       this.centerDialogVisible = !this.centerDialogVisible
       getCardCoupon(id).then(res => {
         this.ruleForm = res.data
+        if (this.ruleForm.availableOrUn == null || this.ruleForm.availableOrUn == ''){
+          this.ruleForm.availableOrUn = '0'
+        }
         if (res.data.unAvailableWeek) {
-          this.ruleForm.unAvailableWeek = res.data.unAvailableWeek.split(",")
+          this.weekDay1 = res.data.unAvailableWeek.split(",")
         }
         if (res.data.unAvailableDay) {
-          this.ruleForm.unAvailableDay = res.data.unAvailableDay.split(",")
+          this.monthDay1 = res.data.unAvailableDay.split(",")
         }
         if (res.data.availableWeek) {
-          this.ruleForm.availableWeek = res.data.availableWeek.split(",")
+          this.weekDay = res.data.availableWeek.split(",")
         }
         if (res.data.availableDay) {
-          this.ruleForm.availableDay = res.data.availableDay.split(",")
+          this.monthDay = res.data.availableDay.split(",")
         }
         if (res.data.membershipLevel) {
           this.ruleForm.membershipLevel = res.data.membershipLevel.split(",")
@@ -1072,18 +1136,18 @@ export default {
     },
     addBlock() {
 
-      if (this.ruleForm.unAvailableWeek) {
-        this.ruleForm.unAvailableWeek = this.ruleForm.unAvailableWeek.toString()
-      }
-      if (this.ruleForm.unAvailableDay) {
-        this.ruleForm.unAvailableDay = this.ruleForm.unAvailableDay.toString()
-      }
-      if (this.ruleForm.availableWeek) {
-        this.ruleForm.availableWeek = this.ruleForm.availableWeek.toString()
-      }
-      if (this.ruleForm.availableDay) {
-        this.ruleForm.availableDay = this.ruleForm.availableDay.toString()
-      }
+      // if (this.ruleForm.unAvailableWeek) {
+      //   this.ruleForm.unAvailableWeek = this.ruleForm.unAvailableWeek.toString()
+      // }
+      // if (this.ruleForm.unAvailableDay) {
+      //   this.ruleForm.unAvailableDay = this.ruleForm.unAvailableDay.toString()
+      // }
+      // if (this.ruleForm.availableWeek) {
+      //   this.ruleForm.availableWeek = this.ruleForm.availableWeek.toString()
+      // }
+      // if (this.ruleForm.availableDay) {
+      //   this.ruleForm.availableDay = this.ruleForm.availableDay.toString()
+      // }
       if (this.ruleForm.membershipLevel) {
         this.ruleForm.membershipLevel = this.ruleForm.membershipLevel.toString()
       }
@@ -1091,6 +1155,10 @@ export default {
         this.ruleForm.oilNumber = this.ruleForm.oilNumber.toString()
       }
       let productIds = this.ruleForm.productIdList + ''
+      this.ruleForm.availableWeek = this.weekDay + ''
+      this.ruleForm.availableDay = this.monthDay + ''
+      this.ruleForm.unAvailableWeek = this.weekDay1 + ''
+      this.ruleForm.unAvailableDay = this.monthDay1 + ''
       this.ruleForm.productIds = productIds
       if (!this.ruleForm.id) {
 
diff --git a/fuintBackend/fuint-application/src/main/resources/application.properties b/fuintBackend/fuint-application/src/main/resources/application.properties
index cced9dbc1..2e4d797e4 100644
--- a/fuintBackend/fuint-application/src/main/resources/application.properties
+++ b/fuintBackend/fuint-application/src/main/resources/application.properties
@@ -4,8 +4,8 @@ env.profile=dev
 #env.properties.path=D:/workspaces/oil-stations/fuintBackend/configure/
 #env.properties.path=F:/work/oilSystem/fuintBackend/configure/
 #env.properties.path=D:/oil/new-oil/oilSystem/fuintBackend/configure/
-env.properties.path=D:/code/bulidmap/oil-station/fuintBackend/configure
-#env.properties.path=D:/Code/yuzhan/oil-station/fuintBackend/configure
+#env.properties.path=D:/code/bulidmap/oil-station/fuintBackend/configure
+env.properties.path=D:/Code/yuzhan/oil-station/fuintBackend/configure
 #env.properties.path=/www/wwwroot/shenlanshuke/oilAdmin/
 
 # \u6570\u636E\u5E93\u914D\u7F6E