Merge remote-tracking branch 'origin/master'

fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue

@@ -42,11 +42,11 @@
                   <span v-if="scope.row.activeTime == 2">{{scope.row.startTime }}-{{scope.row.endTime }}</span>
                 </template>
               </el-table-column>
-              <el-table-column prop="activityProgress" label="活动进度" align="center" >
+              <el-table-column prop="activeStatus" label="活动状态" align="center" >
                 <template slot-scope="scope">
-                  <span v-if="scope.row.activityProgress == 0"> <el-tag>未开始</el-tag></span>
+<!--                  <span v-if="scope.row.activeStatus == 0"> <el-tag>未开始</el-tag></span>-->
-                  <span v-if="scope.row.activityProgress == 1"> <el-tag>进行中</el-tag></span>
+                  <span v-if="scope.row.activeStatus == 1"> <el-tag>进行中</el-tag></span>
-                  <span v-if="scope.row.activityProgress == 2"> <el-tag type="danger">已结束</el-tag></span>
+                  <span v-if="scope.row.activeStatus == 2"> <el-tag type="danger">已结束</el-tag></span>
                 </template>
               </el-table-column>
               <el-table-column prop="activityProgress" label="上线/下线" align="center" >
@@ -243,8 +243,8 @@
             <div>
             <el-form-item label="活动状态" :label-width="formLabelWidth" prop="activeStatus">
               <el-radio-group v-model="form.activeStatus" :disabled="isOnLine">
-                <el-radio label="1">启用</el-radio>
+                <el-radio label="1">进行中</el-radio>
-                <el-radio label="2">禁用</el-radio>
+                <el-radio label="2">已结束</el-radio>
               </el-radio-group>
             </el-form-item>
 

fuintAdmin/src/views/member/fixingLevel.vue

@@ -1376,7 +1376,7 @@ export default {
       this.gasolinePreferential.push(temp);
     },
     subGasOline(idx){
-      this.gasolinePreferential.splice(idx-1,1);
+      this.gasolinePreferential.splice(idx,1);
     },
     addDiesel(){
       let temp= {
@@ -1387,7 +1387,7 @@ export default {
       this.dieselPreferential.push(temp);
     },
     subDiesel(idx){
-      this.dieselPreferential.splice(idx-1,1);
+      this.dieselPreferential.splice(idx,1);
     },
     addNaturalGas(){
       let temp= {
@@ -1398,7 +1398,7 @@ export default {
       this.naturalGasPreferential.push(temp);
     },
     subNaturalGas(idx){
-      this.naturalGasPreferential.splice(idx-1,1);
+      this.naturalGasPreferential.splice(idx,1);
     },
   }
 }

fuintAdmin/src/views/member/userInfo.vue

@@ -1202,7 +1202,8 @@ export default {
       let quy = {
         pageNo: 1,
         pageSize: 10000,
-        isonline: 0
+        isonline: 0,
+        activeStatus: 1
       }
       await getCardValueListApi(quy).then(res => {
         this.cardValueList = res.data.records;

fuintAdmin/src/views/staffCommission/staffCommission.vue

@@ -157,7 +157,7 @@
               </span>
             </template>
           </el-table-column>
-          <el-table-column label="油品提成" prop="royaltyRate" align="center"/>
+          <el-table-column label="提成信息" prop="royaltyRate" align="center"/>
 <!--          <el-table-column label="生效时间" prop="takeEffect" align="center">-->
 <!--            <template slot-scope="scope">-->
 <!--              <span>-->
@@ -285,9 +285,8 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="提成金额" prop="royaltyRate">
-              <el-input v-model="form.royaltyRate" placeholder="请输入提成">
+              <el-input v-model="form.royaltyRate" placeholder="请输入提成" maxlength="10" oninput="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" >
-                <el-select v-model="select" maxlength="10"
+                <el-select v-model="select"style="width: 70px" slot="append" placeholder="请选择">
-                           oninput="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" style="width: 70px" slot="append" placeholder="请选择">
                   <el-option label="元" value="元"></el-option>
                   <el-option label="%" value="%"></el-option>
                 </el-select>

fuintAdmin/src/views/userGrade/index.vue

@@ -1079,7 +1079,7 @@ export default {
       this.gasolinePreferential.push(temp);
     },
     subGasOline(idx){
-      this.gasolinePreferential.splice(idx-1,1);
+      this.gasolinePreferential.splice(idx,1);
     },
     addDiesel(){
       let temp= {
@@ -1090,7 +1090,7 @@ export default {
       this.dieselPreferential.push(temp);
     },
     subDiesel(idx){
-      this.dieselPreferential.splice(idx-1,1);
+      this.dieselPreferential.splice(idx,1);
     },
     addNaturalGas(){
       let temp= {
@@ -1101,7 +1101,7 @@ export default {
       this.naturalGasPreferential.push(temp);
     },
     subNaturalGas(idx){
-      this.naturalGasPreferential.splice(idx-1,1);
+      this.naturalGasPreferential.splice(idx,1);
     },
     // 获取规则信息
     getRule(){

fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/controller/CardFuelDieselController.java

@@ -2,6 +2,7 @@ package com.fuint.business.marketingActivity.cardFule.controller;
 
 
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -232,6 +233,8 @@ public class CardFuelDieselController extends BaseController {
         if (cardFuelDiesel.getActiveStatus().equals("2")) activeApplet.setActiveStatus("1");
         activeApplet.setIsonline((cardFuelDiesel.getActiveStatus().equals("1")) ? "0" : "1");
         activeAppletService.updateById(activeApplet);
+        if (ObjectUtil.isEmpty(cardFuelDiesel.getExpireTime()))
+            this.cardFuelDieselService.lambdaUpdate().eq(CardFuelDiesel::getId,cardFuelDiesel.getId()).set(CardFuelDiesel::getExpireTime,null).update();
         return getSuccessResult(this.cardFuelDieselService.updateById(cardFuelDiesel));
     }
 

fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java

@@ -495,7 +495,7 @@ public class LJUserServiceImpl extends ServiceImpl<LJUserMapper, LJUser> impleme
     public int updateUser(LJUserVo userVo) {
         int row = 0;
         LJUser user1 = this.selectUserByMobile(userVo.getMobile());
-        if (ObjectUtil.isNotEmpty(user1) && user1.getId()!=userVo.getId()){
+        if (ObjectUtil.isNotEmpty(user1) && !user1.getId().equals(userVo.getId())){
             row = 0;
             return row;
         }

fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue

@@ -186,9 +186,9 @@
             <div>找零</div>
             <div class="bule">{{ seekZero.toFixed(2) }}</div>
           </div>
-          <div class="th-box">
+          <div class="th-box" @click="getStaffList">
-            <div @click="getStaffList">加油员</div>
+            <div>加油员</div>
-            <div style="cursor: pointer;color: crimson" @click="getStaffList" >{{ staff ? staff.realName : "--" }}</div>
+            <div style="cursor: pointer;color: crimson" >{{ staff ? staff.realName : "--" }}</div>
           </div>
         </div>
         </div>
@@ -1701,7 +1701,8 @@
         let quy = {
           pageNo: 1,
           pageSize: 10000,
-          isonline: 0
+          isonline: 0,
+          activeStatus: 1
         }
         await getCardValueListApi(quy).then(res => {
           this.cardValueList = res.data.records;

fuintCashierWeb/src/views/details/index.vue

@@ -1282,7 +1282,8 @@ export default {
       let quy = {
         pageNo: 1,
         pageSize: 10000,
-        isonline: 0
+        isonline: 0,
+        activeStatus: 1
       }
       await getCardValueListApi(quy).then(res => {
         this.cardValueList = res.data.records;