From a7fb4a6d080fa5f031becb3d96efddb69fb426e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BD=90=E5=A4=A9=E5=A4=A7=E5=9C=A3?= <17615834396@163.com>
Date: Wed, 8 May 2024 11:14:16 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EventMarketing/storeOilBlock/index.vue    | 57 +++++++++----------
 .../cardFule/entity/CardFuelDiesel.java       |  4 ++
 .../service/impl/OilOrderServiceImpl.java     |  1 +
 3 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue b/fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue
index 32701b1d6..e40c1641f 100644
--- a/fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue
@@ -66,8 +66,8 @@
           >
           </el-table-column>
           <el-table-column
-            prop="lockupPrice"
-            label="囤油锁定价(元)/L"
+            prop="lockPrice"
+            label="锁价活动价(元)/L"
           >
           </el-table-column>
           <el-table-column
@@ -95,7 +95,7 @@
               <div v-if="scope.row.activeTime==='1'" style="display: flex;align-items: center"><div>不限时间</div></div>
             </template>
           </el-table-column>
-          <el-table-column
+<!--          <el-table-column
             prop="type"
             label="到期时间"
             width="350"
@@ -105,20 +105,20 @@
                 <div>{{scope.row.expireTime}}</div>
               </div>
             </template>
-          </el-table-column>
+          </el-table-column>-->
 <!--          <el-table-column-->
 <!--            prop="oilType"-->
 <!--            label="油品"-->
 <!--            >-->
 <!--          </el-table-column>-->
-          <el-table-column
+<!--          <el-table-column
             prop="rechargeBalance"
             label="充值金额（元）"
             >
             <template slot-scope="scope">
               <el-tag>{{scope.row.rechargeBalance}}</el-tag>
             </template>
-          </el-table-column>
+          </el-table-column>-->
 <!--          <el-table-column-->
 <!--            prop="lockupPrice"-->
 <!--            label="锁价单价"-->
@@ -127,14 +127,14 @@
 <!--              <el-tag>{{scope.row.lockupPrice}}</el-tag>-->
 <!--            </template>-->
 <!--          </el-table-column>-->
-          <el-table-column
+<!--          <el-table-column
             prop="incomeLitres"
             label="所得升数（L）"
             >
             <template slot-scope="scope">
               <el-tag>{{scope.row.incomeLitres}}</el-tag>
             </template>
-          </el-table-column>
+          </el-table-column>-->
 
 <!--          <el-table-column-->
 <!--            prop="points"-->
@@ -201,7 +201,7 @@
         width="36%"
         center>
 
-        <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="80px" class="demo-ruleForm">
+        <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="110px" class="demo-ruleForm">
             <div style="display: flex; align-items: center ">
               <el-form-item label="油品类型" prop="oilType">
                 <el-select v-model="ruleForm.oilType" placeholder="请选择"  @change="getoiltype" >
@@ -217,30 +217,30 @@
             </div>
 
 
-          <el-form-item label="锁价单价" prop="lockupPrice">
+          <el-form-item label="锁价活动价" prop="lockPrice">
             <div style="width: 217px">
-              <el-input v-model="ruleForm.lockupPrice" min="1" placeholder="请输入锁价单价">
+              <el-input v-model="ruleForm.lockPrice" min="1" placeholder="请输入锁价活动价">
                 <template slot="append">元/升</template>
               </el-input>
             </div>
 
           </el-form-item>
-          <el-form-item label="满足金额" prop="rechargeBalance">
+          <el-form-item label="锁价满足金额" prop="rechargeBalance">
             <div style="width: 217px">
-              <el-input v-model="ruleForm.rechargeBalance" min="1" placeholder="请输入满足金额">
+              <el-input v-model="ruleForm.rechargeBalance" min="1" placeholder="请输入锁价满足金额">
                 <template slot="append">元</template>
               </el-input>
             </div>
 
           </el-form-item>
-          <el-form-item label="换算升数" prop="incomeLitres">
+<!--          <el-form-item label="换算升数" prop="incomeLitres">
             <div style="width: 217px">
               <el-input v-model="ruleForm.incomeLitres.toFixed(2)">
                 <template slot="append">L</template>
               </el-input>
             </div>
 
-          </el-form-item>
+          </el-form-item>-->
           <el-form-item label="赠送积分" prop="points">
             <div style="width: 217px">
               <el-input v-model="ruleForm.points">
@@ -281,28 +281,24 @@
                   placeholder="结束日期">
                 </el-date-picker>
               </div>
-
-
             </div>
-
-
           </el-form-item>
 
-          <el-form-item label="到期时间" prop="expireTime">
-<!--            <div style="width: 100%;display: flex;align-items: center ">-->
-<!--              <div style="width: 45%">-->
+<!--          <el-form-item label="到期时间" prop="expireTime">
+&lt;!&ndash;            <div style="width: 100%;display: flex;align-items: center ">&ndash;&gt;
+&lt;!&ndash;              <div style="width: 45%">&ndash;&gt;
                 <el-date-picker
                   v-model="ruleForm.expireTime"
                   value-format="yyyy-MM-dd HH:mm:ss"
                   type="datetime"
                   placeholder="到期时间">
                 </el-date-picker>
-<!--              </div>-->
-<!--            </div>-->
+&lt;!&ndash;              </div>&ndash;&gt;
+&lt;!&ndash;            </div>&ndash;&gt;
             <div style="color: red;font-size: 12px;line-height: 18px;margin-top: 5px">注：当前到期时间为用户充值后电子囤油卡的余油的到期时间，如果到期后没有用完则自动转为电子储值卡余额</div>
 
 
-          </el-form-item>
+          </el-form-item>-->
 
           <el-form-item label="活动状态" prop="resource">
             <el-radio-group v-model="ruleForm.activeStatus">
@@ -357,6 +353,8 @@
         ruleForm:{
           oilType:2,
           lockupPrice: "" ,
+          lockPrice: "" ,
+          lockMoney: "" ,
           rechargeBalance:"",
           incomeLitres:0,
           points:'',
@@ -382,16 +380,13 @@
           oilType: [
             { required: true, message: '不能为空', trigger: 'blur' },
           ],
-          lockupPrice: [
-            { required: true, message: '不能为空', trigger: 'blur' },
-          ],
           rechargeBalance: [
             { required: true, message: '不能为空', trigger: 'blur' },
           ],
-          incomeLitres: [
+          points: [
             { required: true, message: '不能为空', trigger: 'blur' },
           ],
-          points: [
+          lockPrice: [
             { required: true, message: '不能为空', trigger: 'blur' },
           ],
         }
@@ -498,7 +493,7 @@
         })
       },
       postadd(formName){
-        if( this.ruleForm.oilType =='' ||  this.ruleForm.lockupPrice =='' || this.ruleForm.rechargeBalance =='' || this.ruleForm.incomeLitres =='' || this.ruleForm.points =='' ){
+        if( this.ruleForm.oilType ==''  || this.ruleForm.rechargeBalance =='' || this.ruleForm.points =='' ){
           this.$message.error("必填项不能为空")
           return
         }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/entity/CardFuelDiesel.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/entity/CardFuelDiesel.java
index d5d66a9c8..64e17d43c 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/entity/CardFuelDiesel.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/entity/CardFuelDiesel.java
@@ -38,6 +38,10 @@ public class CardFuelDiesel extends Model<CardFuelDiesel> {
     private Double rechargeBalance;
     private Double gbPrice;
     private Double oilPrice;
+    //锁价活动价
+    private Double lockPrice;
+    //锁价满足金额
+    private Double lockMoney;
     //所得升数
     private Double incomeLitres;
     //赠送积分
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java
index a32a583e8..5fe1a5aa6 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java
@@ -282,6 +282,7 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
         Double goodsActualPay = Double.valueOf(map.get("goodsActualPay"));
 //        找零金额
         Double seekZero = Double.valueOf(map.get("seekZero"));
+        log.info("11111111111111111111111285:",map.get("levelAmount"));
         Double levelAmount = Double.valueOf(map.get("levelAmount"));
         Double activeAmount = Double.valueOf(map.get("activeAmount"));
 //        优惠券id