9.14

fuintAdmin/src/views/EventMarketing/openCardGift/TimeLimited.vue

@@ -843,7 +843,7 @@ export default {
 
 .hui-text {
   font-weight: 400;
-  font-size: 16px;
+  font-size: 14px;
   color: #999999;
   line-height: 30px;
   width: 380px;

fuintAdmin/src/views/EventMarketing/openCardGift/separate.vue

@@ -314,7 +314,7 @@
         <div style="display: flex;width: 100%; margin-bottom: 20px">
           <div style="width: 50%">
             <el-form-item label="分时优惠名称" prop="activeId">
-              <el-select v-model="ruleForm1.activeId" placeholder="请选择优惠名称">
+              <el-select v-model="ruleForm1.activeId" placeholder="请选择优惠名称" style="width: 100%">
                 <el-option
                   v-for="(item,index) in timeShareList"
                   :key="index"
@@ -333,7 +333,7 @@
               </el-checkbox-group>
             </el-form-item>
             <el-form-item label=" 会员标签" prop="babelIds">
-              <el-select v-model="ruleForm1.babelIds" multiple placeholder="请选择会员标签">
+              <el-select v-model="ruleForm1.babelIds" multiple placeholder="请选择会员标签" style="width: 100%">
                 <el-option
                   v-for="item in userLabelList"
                   :key="item.id+''"
@@ -341,16 +341,22 @@
                   :value="item.id+''"></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="适用实收金额" required>
+            <el-form-item label="消费条件" required>
-              <el-col :span="11">
+              <el-col :span="7">
+                <el-select v-model="ruleForm1.consumeType" multiple style="width: 90%">
+                  <el-option label="实收金额" value="0"></el-option>
+                  <el-option label="加油升数" value="1"></el-option>
+                </el-select>
+              </el-col>
+              <el-col :span="7">
                 <el-form-item prop="moneyMin">
                   <el-input v-model="ruleForm1.moneyMin"></el-input>
                 </el-form-item>
               </el-col>
-              <el-col :span="2">
+              <el-col :span="3">
-                <div style="margin-left: 5px">到</div>
+                <div style="margin-left: 10px">到</div>
               </el-col>
-              <el-col :span="11">
+              <el-col :span="7">
                 <el-form-item prop="moneyMax">
                   <el-input v-model="ruleForm1.moneyMax"></el-input>
                 </el-form-item>
@@ -383,7 +389,7 @@
               <el-input v-model="ruleForm1.ruleName"></el-input>
             </el-form-item>
             <el-form-item label="适用会员等级" prop="levelId">
-              <el-select v-model="ruleForm1.levelId" clearable placeholder="请选择会员等级">
+              <el-select v-model="ruleForm1.levelId" clearable placeholder="请选择会员等级" style="width: 100%">
                 <el-option
                   v-for="(item,index) in userGradeList"
                   :label="item.name"
@@ -400,7 +406,7 @@
                 </el-form-item>
               </el-col>
               <el-col :span="1">
-                <div style="margin:0px, 6px">至</div>
+                <div style="margin:0px 6px">至</div>
               </el-col>
               <el-col :span="11">
                 <el-form-item prop="activeEndTime">
@@ -840,7 +846,7 @@ export default {
 
 .hui-text {
   font-weight: 400;
-  font-size: 16px;
+  font-size: 14px;
   color: #999999;
   line-height: 30px;
   width: 380px;

fuintAdmin/src/views/power/page/record.vue

@@ -57,7 +57,7 @@
       <!--    &lt;!&ndash;          &ndash;&gt;-->
       <!--    &lt;!&ndash;    列表信息&ndash;&gt;-->
       <!--    <el-card style="margin-top: 20px" >-->
-      <div style="height: 65vh;overflow: auto">
+      <div style="height: 69vh;overflow: auto">
         <el-table :data="tableData" style="width: 100%" border>
           <el-table-column align="center" type="index" label="序号"></el-table-column>
           <el-table-column align="center" prop="notificationName" label="通知名称"></el-table-column>
@@ -71,7 +71,7 @@
           </el-table-column>
           <el-table-column align="center" prop="sendStatus" label="通知状态">
             <template slot-scope="scope">
-              <span v-if="scope.row.sendStatus==1">发送</span>
+              <span v-if="scope.row.sendStatus==1">已发送</span>
               <span v-else>未发送</span>
             </template>
           </el-table-column>
@@ -101,6 +101,7 @@
                 type="text"
                 icon="el-icon-edit"
                 @click="send(scope.row.id)"
+                v-if="scope.row.sendStatus!=1"
                 v-hasPermi="['system:notify:send']"
               >发送通知
               </el-button>
@@ -122,12 +123,12 @@
       <el-form ref="form" :model="form" label-width="80px">
         <!-- 通知名称 -->
         <el-form-item label="通知名称" :required="true">
-          <el-input v-model="form.notificationName" placeholder="请输入通知名称" style="width: 300px;"></el-input>
+          <el-input v-model="form.notificationName" placeholder="请输入通知名称"></el-input>
         </el-form-item>
 
         <!-- 通知类型 -->
         <el-form-item label="通知类型" :required="true">
-          <el-select v-model="form.notificationType" placeholder="请选择通知类型" style="width: 300px;">
+          <el-select v-model="form.notificationType" placeholder="请选择通知类型" style="width: 100%;">
             <el-option label="到期提醒" value="到期提醒"></el-option>
             <el-option label="系统升级" value="系统升级"></el-option>
             <!-- 添加其他选项 -->
@@ -138,19 +139,19 @@
         <!-- 通知模板 -->
         <el-form-item label="通知模板" :required="true">
           <el-input type="textarea" v-model="form.templateContent" placeholder="请输入通知内容" :maxlength="200"
-                    show-word-limit style="width: 300px;"></el-input>
+                    show-word-limit></el-input>
         </el-form-item>
 
         <!-- 接收角色 -->
         <el-form-item label="接收角色" :required="true">
           <el-select v-model="form.recipientRoles" multiple placeholder="请选择角色" @change="getUserByRoles"
-                     style="width: 300px;">
+                     style="width: 100%;">
             <el-option v-for="item in dutyList1" :label="item.dutyName" :value="item.dutyId"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="接收用户" :required="true">
           <div
-            style="border: 1px solid #DCDFE6;width: 300px;height: 100px;  border-radius: 4px; flex-wrap: wrap;overflow-y: scroll;">
+            style="border: 1px solid #DCDFE6;width: 100%;height: 100px;  border-radius: 4px; flex-wrap: wrap;overflow-y: scroll;">
             <div style="display: flex;margin: 10px;">
               <div @click="clickAdd" style="height: 32px;display: flex;
                 justify-content: center; /* 水平居中 */
@@ -173,8 +174,10 @@
 
       </el-form>
 
+      <div style="display: flex; justify-content: center; align-items: center;margin-top: 30px">
         <el-button type="primary" @click="userEnter1">确定</el-button>
         <el-button @click="userCe2">取消</el-button>
+      </div>
     </el-dialog>
     <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open1" width="50%" append-to-body>
       <el-table v-loading="" :data="userList" @selection-change="handleSelectionChange" border>
@@ -294,12 +297,14 @@ export default {
         type: 'warning'
       }).then(() => {
         getSendNotifyApi({id: data}).then(res => {
-          if (res.code == 200) {
+          if (res.data == true) {
             this.$message({
               type: 'success',
               message: '发送成功!'
             });
             this.getList()
+          } else {
+            this.$message.error("发送失败")
           }
         })
 

fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activePrice/entity/ActivePriceRule.java

@@ -42,6 +42,8 @@ public class ActivePriceRule extends Model<ActivePriceRule> {
     /** 生效截止时间 */
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     private Date activeEndTime ;
+    /** 消费条件：0实收金额；1加油金额 */
+    private String consumeType ;
     /** 适用实收金额下限 */
     private Double moneyMin ;
     /** 适用实收金额上限 */

fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/impl/LJStaffServiceImpl.java

@@ -309,9 +309,9 @@ public class LJStaffServiceImpl extends ServiceImpl<LJStaffMapper, LJStaff> impl
                     tAccount.setPassword(staff.getPassword());
                     accountService.entryptPassword(tAccount);
                 }
-                if (tAccount.getAccountName().matches("\\d+")) {
+//                if (tAccount.getAccountName().matches("\\d+")) {
-                    tAccount.setAccountName(staff.getMobile());
+                    tAccount.setAccountName(staff.getAccountName());
-                }
+//                }
                 tAccount.setRealName(staff.getRealName());
                 try {
                     accountService.editAccount(tAccount, null);
@@ -322,9 +322,9 @@ public class LJStaffServiceImpl extends ServiceImpl<LJStaffMapper, LJStaff> impl
         } else {
             TAccount tAccount = accountService.selectAccountByStaffId(staff.getId());
             if (ObjectUtil.isNotEmpty(tAccount)) {
-                if (tAccount.getAccountName().matches("\\d+")) {
+//                if (tAccount.getAccountName().matches("\\d+")) {
-                    tAccount.setAccountName(staff.getMobile());
+                    tAccount.setAccountName(staff.getAccountName());
-                }
+//                }
                 tAccount.setRealName(staff.getRealName());
                 try {
                     accountService.editAccount(tAccount, null);

fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/controller/SysNotifyController.java

@@ -62,8 +62,7 @@ public class SysNotifyController extends BaseController {
     }
     @GetMapping("/sendNotify")
     public ResponseObject sendNotify(Integer id) {
-        this.sysNotifyService.sendNotifyOne(id);
+        return getSuccessResult(this.sysNotifyService.sendNotifyOne(id));
-        return getSuccessResult(true);
     }
 
     /**

fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/service/SysNotifyService.java

@@ -41,7 +41,7 @@ public interface SysNotifyService extends IService<SysNotify> {
     SysNotify insert(SysNotify sysNotify);
 
     void sendNotify();
-    void sendNotifyOne(Integer id);
+    boolean sendNotifyOne(Integer id);
     /**
      * 修改数据
      *

fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/service/impl/SysNotifyServiceImpl.java

@@ -281,7 +281,7 @@ public class SysNotifyServiceImpl  extends ServiceImpl<SysNotifyMapper, SysNotif
     AccountService accountService;
     @Resource
     private TAccountMapper tAccountMapper;
-    public void sendNotifyOne(Integer id) {
+    public boolean sendNotifyOne(Integer id) {
         SysNotify sysNotify = baseMapper.queryById(id);
 //        String recipientRoles = sysNotify.getRecipientRoles();
 //        String[] array = recipientRoles.split("[\\[\\], ]");
@@ -310,6 +310,7 @@ public class SysNotifyServiceImpl  extends ServiceImpl<SysNotifyMapper, SysNotif
                     this.baseMapper.updateById(sysNotify);
                 }
             }
+            return true;
 
         }
         // 根据dutyId查询员工id
@@ -328,7 +329,7 @@ public class SysNotifyServiceImpl  extends ServiceImpl<SysNotifyMapper, SysNotif
 //            sysNotify1.setType(1);
 //            this.baseMapper.updateById(sysNotify1);
 //        }
-
+        return false;
     }
     private void sendNotification(SysNotify sysNotify,TAccount account) {
         // 发送通知的实现