From 53c1254eca0fc83c517ad6c66076560af31eb98e Mon Sep 17 00:00:00 2001 From: cun-nan <19819293608@163.com> Date: Sat, 14 Sep 2024 16:21:44 +0800 Subject: [PATCH] 9.14 --- .../openCardGift/TimeLimited.vue | 2 +- .../EventMarketing/openCardGift/separate.vue | 26 +++++++++++------- fuintAdmin/src/views/power/page/record.vue | 27 +++++++++++-------- .../activePrice/entity/ActivePriceRule.java | 2 ++ .../service/impl/LJStaffServiceImpl.java | 12 ++++----- .../sys/controller/SysNotifyController.java | 3 +-- .../sys/service/SysNotifyService.java | 2 +- .../service/impl/SysNotifyServiceImpl.java | 5 ++-- 8 files changed, 46 insertions(+), 33 deletions(-) diff --git a/fuintAdmin/src/views/EventMarketing/openCardGift/TimeLimited.vue b/fuintAdmin/src/views/EventMarketing/openCardGift/TimeLimited.vue index 63f4d4a83..9bcda3f98 100644 --- a/fuintAdmin/src/views/EventMarketing/openCardGift/TimeLimited.vue +++ b/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; diff --git a/fuintAdmin/src/views/EventMarketing/openCardGift/separate.vue b/fuintAdmin/src/views/EventMarketing/openCardGift/separate.vue index 8c7296ca1..96c8e3b0f 100644 --- a/fuintAdmin/src/views/EventMarketing/openCardGift/separate.vue +++ b/fuintAdmin/src/views/EventMarketing/openCardGift/separate.vue @@ -314,7 +314,7 @@
- + - + - - + + + + + + + + - -
到
+ +
到
 - + @@ -383,7 +389,7 @@ - + -
至
+
至
 @@ -840,7 +846,7 @@ export default { .hui-text { font-weight: 400; - font-size: 16px; + font-size: 14px; color: #999999; line-height: 30px; width: 380px; diff --git a/fuintAdmin/src/views/power/page/record.vue b/fuintAdmin/src/views/power/page/record.vue index 2493af87c..6a57a3dcb 100644 --- a/fuintAdmin/src/views/power/page/record.vue +++ b/fuintAdmin/src/views/power/page/record.vue @@ -57,7 +57,7 @@ -
+
@@ -71,7 +71,7 @@ @@ -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']" >发送通知 @@ -122,12 +123,12 @@ - + - + @@ -138,19 +139,19 @@ + show-word-limit> + style="width: 100%;">
+ style="border: 1px solid #DCDFE6;width: 100%;height: 100px; border-radius: 4px; flex-wrap: wrap;overflow-y: scroll;">
确定 - 取消 +
+ 确定 + 取消 +
@@ -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("发送失败") } }) @@ -419,7 +424,7 @@ export default { this.form = res.data if (this.form.recipientUser) { this.form.recipientUser = JSON.parse(this.form.recipientUser) - }else { + } else { this.form.recipientUser = [] } this.form.recipientRoles = JSON.parse(this.form.recipientRoles) diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activePrice/entity/ActivePriceRule.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activePrice/entity/ActivePriceRule.java index 99046cb5d..047130200 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activePrice/entity/ActivePriceRule.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activePrice/entity/ActivePriceRule.java @@ -42,6 +42,8 @@ public class ActivePriceRule extends Model { /** 生效截止时间 */ @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8") private Date activeEndTime ; + /** 消费条件：0实收金额；1加油金额 */ + private String consumeType ; /** 适用实收金额下限 */ private Double moneyMin ; /** 适用实收金额上限 */ diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/impl/LJStaffServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/impl/LJStaffServiceImpl.java index a26a00539..70179b368 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/impl/LJStaffServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/impl/LJStaffServiceImpl.java @@ -309,9 +309,9 @@ public class LJStaffServiceImpl extends ServiceImpl impl tAccount.setPassword(staff.getPassword()); accountService.entryptPassword(tAccount); } - if (tAccount.getAccountName().matches("\\d+")) { - tAccount.setAccountName(staff.getMobile()); - } +// if (tAccount.getAccountName().matches("\\d+")) { + tAccount.setAccountName(staff.getAccountName()); +// } tAccount.setRealName(staff.getRealName()); try { accountService.editAccount(tAccount, null); @@ -322,9 +322,9 @@ public class LJStaffServiceImpl extends ServiceImpl impl } else { TAccount tAccount = accountService.selectAccountByStaffId(staff.getId()); if (ObjectUtil.isNotEmpty(tAccount)) { - if (tAccount.getAccountName().matches("\\d+")) { - tAccount.setAccountName(staff.getMobile()); - } +// if (tAccount.getAccountName().matches("\\d+")) { + tAccount.setAccountName(staff.getAccountName()); +// } tAccount.setRealName(staff.getRealName()); try { accountService.editAccount(tAccount, null); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/controller/SysNotifyController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/controller/SysNotifyController.java index b0a685fd9..cc8ef7fc4 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/controller/SysNotifyController.java +++ b/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(true); + return getSuccessResult(this.sysNotifyService.sendNotifyOne(id)); } /** diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/service/SysNotifyService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/service/SysNotifyService.java index f8a226de1..1a644465f 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/service/SysNotifyService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/service/SysNotifyService.java @@ -41,7 +41,7 @@ public interface SysNotifyService extends IService { SysNotify insert(SysNotify sysNotify); void sendNotify(); - void sendNotifyOne(Integer id); + boolean sendNotifyOne(Integer id); /** * 修改数据 * diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/service/impl/SysNotifyServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/service/impl/SysNotifyServiceImpl.java index ac004f1c4..d414aea84 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/service/impl/SysNotifyServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/service/impl/SysNotifyServiceImpl.java @@ -281,7 +281,7 @@ public class SysNotifyServiceImpl extends ServiceImpl