From fc589e7f8354696a8d51bcc3e86e5dcefea94af2 Mon Sep 17 00:00:00 2001 From: cun-nan <19819293608@163.com> Date: Wed, 18 Sep 2024 16:02:56 +0800 Subject: [PATCH 1/6] 9.18 --- fuintAdmin/src/views/power/message.vue | 71 ++++++++++++------ fuintAdmin/src/views/power/payment/index.vue | 6 +- .../src/views/components/Service/payment.vue | 13 ++-- .../api/fuyou/entity/MerchantConfig.java | 4 + .../fuyou/service/MerchantConfigService.java | 6 ++ .../api/fuyou/service/OilConfigService.java | 7 ++ .../impl/MerchantConfigServiceImpl.java | 22 ++++++ .../service/impl/OilConfigServiceImpl.java | 7 ++ .../impl/PaymentRuleConfigServiceImpl.java | 28 ++++++- .../controller/MessageTemplateController.java | 73 ++++++++++--------- .../setting/entity/MessageTemplate.java | 14 ++++ 11 files changed, 181 insertions(+), 70 deletions(-) diff --git a/fuintAdmin/src/views/power/message.vue b/fuintAdmin/src/views/power/message.vue index 832a901f0..046a8383d 100644 --- a/fuintAdmin/src/views/power/message.vue +++ b/fuintAdmin/src/views/power/message.vue @@ -51,7 +51,7 @@ -
+
@@ -69,9 +69,9 @@ {{ scope.row.content }} - + @@ -396,7 +396,7 @@ - + @@ -411,23 +411,46 @@ -
- - - - + + + + + + + + + + + + + + + + + + + +
+ + + + - + - - + + + + + + + +
@@ -584,7 +607,7 @@ export default { ], // tableData: [], form: { - conditions: [] + conditions: [{field:'',operator:"",value:""}] }, deptListSelect: [], systemPositionList: [{ @@ -706,8 +729,8 @@ export default { }, methods: { // 计算短信条数 - countNum(){ - if (this.form3.amount && this.form3.unitPrice){ + countNum() { + if (this.form3.amount && this.form3.unitPrice) { this.form3.messageNum = (this.form3.amount / this.form3.unitPrice).toFixed(0) } }, @@ -767,7 +790,7 @@ export default { // 充值 recharge(data) { this.form3 = { - deptId : data.deptId + deptId: data.deptId } this.open3 = true; this.title = "充值" @@ -1063,8 +1086,8 @@ export default { current: 1, size: 10, deviceName: '', - }, - this.getList() + } + this.getList() }, handleAdd(e) { this.clean() @@ -1075,7 +1098,13 @@ export default { this.clean() this.open = true; this.title = "修改短信" + console.log("1078", e) this.form = e + if (e.roleIds) this.form.roleIds = e.roleIds.split(",") + // getOneApi(e.id).then(res => { + // this.form = res.data + // if (res.data.roleIds) this.form.roleIds = res.data.roleIds.split(",") + // }) }, del(e) { this.$confirm('此操作将永久删除该短信, 是否继续?', '提示', { @@ -1111,7 +1140,7 @@ export default { bannerStatus: false, // Banner状态 note: '', // 备注 createByName: '', // - conditions: [] + conditions: [{field:'',operator:"",value:""}] }; this.selectedDat = undefined; }, diff --git a/fuintAdmin/src/views/power/payment/index.vue b/fuintAdmin/src/views/power/payment/index.vue index 90a83eb48..358f9a6ad 100644 --- a/fuintAdmin/src/views/power/payment/index.vue +++ b/fuintAdmin/src/views/power/payment/index.vue @@ -254,7 +254,7 @@ label="使用状态" width="100"> @@ -283,7 +283,7 @@ width="100" label="操作"> @@ -541,7 +541,7 @@
-
+
取 消 确 定
diff --git a/fuintAdmin_zt/src/views/components/Service/payment.vue b/fuintAdmin_zt/src/views/components/Service/payment.vue index 4665f7574..1e790f082 100644 --- a/fuintAdmin_zt/src/views/components/Service/payment.vue +++ b/fuintAdmin_zt/src/views/components/Service/payment.vue @@ -49,7 +49,7 @@ label="使用状态" width="100"> @@ -78,7 +78,7 @@ width="100" label="操作"> @@ -192,9 +192,10 @@ label="操作"> @@ -335,7 +336,7 @@
-
+
取 消 确 定
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/MerchantConfig.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/MerchantConfig.java index 7a80b5145..1b986de4c 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/MerchantConfig.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/MerchantConfig.java @@ -61,6 +61,10 @@ public class MerchantConfig extends BaseEntity implements Serializable { * 是否使用当前账户收款：0不使用，1使用 */ private String isUse; + /** + * 规则正在使用：0不使用，1使用 + */ + private String ruleIsUse; /** * 是否开启规则：0不开启，1开启 */ diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/MerchantConfigService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/MerchantConfigService.java index d6f92a089..82fe36013 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/MerchantConfigService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/MerchantConfigService.java @@ -140,4 +140,10 @@ public interface MerchantConfigService extends IService { IPage selectListPage(Page page, MerchantConfigVo merchantConfig); MerchantConfigVo selectInfo(Integer id); + + /** + * 修改商户使用状态 + * @param ruleId + */ + void updateRuleIsUse(Integer ruleId,Integer storeId); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/OilConfigService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/OilConfigService.java index d89fd1a0f..ca2c6a4d6 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/OilConfigService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/OilConfigService.java @@ -84,4 +84,11 @@ public interface OilConfigService extends IService { List selectListByRuleConfigId(Integer ruleId); void deleteOilConfigByRuleId(Integer ruleId); + + /** + * 根据支付规则配置id查询商户配置信息ids + * @param ruleId + * @return + */ + List selectMerchIdsByRuleId(Integer ruleId); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/MerchantConfigServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/MerchantConfigServiceImpl.java index 564ca3a15..96b3b74ef 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/MerchantConfigServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/MerchantConfigServiceImpl.java @@ -322,5 +322,27 @@ public class MerchantConfigServiceImpl extends ServiceImpl merchIds = oilConfigService.selectMerchIdsByRuleId(ruleId); + // 修改规则使用状态 + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("store_id",storeId); + List list = baseMapper.selectList(queryWrapper); + for (MerchantConfig merchantConfig : list) { + boolean flag = false; + for (Integer merchId : merchIds) { + if (merchId.equals(merchantConfig.getId())) flag = true; + } + if (!flag){ + merchantConfig.setRuleIsUse("0"); + }else { + merchantConfig.setRuleIsUse("1"); + } + baseMapper.updateById(merchantConfig); + } + + } + } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/OilConfigServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/OilConfigServiceImpl.java index 81344a41d..1fb7d21c8 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/OilConfigServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/OilConfigServiceImpl.java @@ -284,4 +284,11 @@ public class OilConfigServiceImpl extends ServiceImpl selectMerchIdsByRuleId(Integer ruleId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.select("merch_config_id").eq("rule_config_id",ruleId); + return listObjs(queryWrapper); + } } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/PaymentRuleConfigServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/PaymentRuleConfigServiceImpl.java index 25dc60697..1cfa5a641 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/PaymentRuleConfigServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/PaymentRuleConfigServiceImpl.java @@ -88,6 +88,7 @@ public class PaymentRuleConfigServiceImpl extends ServiceImpl(); + queryWrapper.eq("store_id", storeId); + List list = baseMapper.selectList(queryWrapper); + for (PaymentRuleConfig paymentRuleConfig : list) { + paymentRuleConfig.setHandEnable("0"); + baseMapper.updateById(paymentRuleConfig); + } + } + @Override public PaymentRuleConfig selectInfoByStoreId(Integer storeId) { QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -181,9 +199,10 @@ public class PaymentRuleConfigServiceImpl extends ServiceImpl queryWrapper =new LambdaQueryWrapper<>(); - if (!StringUtils.isEmpty(messageTemplate.getName())){ - queryWrapper.like(MessageTemplate::getName,messageTemplate.getName()); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + if (!StringUtils.isEmpty(messageTemplate.getName())) { + queryWrapper.like(MessageTemplate::getName, messageTemplate.getName()); } - if (!StringUtils.isEmpty(messageTemplate.getStatus())){ - queryWrapper.eq(MessageTemplate::getStatus,messageTemplate.getStatus()); + if (!StringUtils.isEmpty(messageTemplate.getStatus())) { + queryWrapper.eq(MessageTemplate::getStatus, messageTemplate.getStatus()); } - queryWrapper.eq(MessageTemplate::getStoreId,nowAccountInfo.getStoreId()); - if (messageTemplate.getRoeleList() != null && messageTemplate.getRoeleList().size() > 0 ) { + queryWrapper.eq(MessageTemplate::getStoreId, nowAccountInfo.getStoreId()); + if (messageTemplate.getRoeleList() != null && messageTemplate.getRoeleList().size() > 0) { queryWrapper.like(MessageTemplate::getRoleIds, messageTemplate.getRoeleList().get(0)); } queryWrapper.orderByDesc(MessageTemplate::getCreateTime); - IPage page1 = this.messageTemplateService.page(page,queryWrapper); + IPage page1 = this.messageTemplateService.page(page, queryWrapper); for (MessageTemplate record : page1.getRecords()) { - List deptIdList =new ArrayList<>(); + List deptIdList = new ArrayList<>(); for (String s : record.getDeptIds().split(",")) { deptIdList.add(Integer.parseInt(s)); } @@ -82,11 +82,11 @@ public class MessageTemplateController extends BaseController { if (record.getRoleIds() != null && !record.getRoleIds().equals("")) { String roleById = ""; for (String s : record.getRoleIds().split(",")) { - roleById += dutyService.getRoleById(Long.parseLong(s)).getDutyName(); + roleById += dutyService.getRoleById(Long.parseLong(s)).getDutyName() + ","; } - record.setRoleIds(roleById); - } + record.setRoleName(roleById); } + } return getSuccessResult(page1); } @@ -111,33 +111,33 @@ public class MessageTemplateController extends BaseController { public ResponseObject insert(@RequestBody MessageTemplate messageTemplate) { AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); messageTemplate.setCreateName(nowAccountInfo.getRealName()); - SysLog sysLog =new SysLog(); + SysLog sysLog = new SysLog(); sysLog.setSystemName("1"); sysLog.setMoudle("短信模版"); - sysLog.setContent("新增了模版名称为"+messageTemplate.getName()+"的数据"); + sysLog.setContent("新增了模版名称为" + messageTemplate.getName() + "的数据"); sysLogService.saveVo(sysLog); String tempName = ""; String tempId = ""; for (Integer deptId : messageTemplate.getDeptIdList()) { SysDept dept = deptService.getById(deptId); - tempName+=dept.getDeptName()+","; - tempId+=dept.getDeptId()+","; + tempName += dept.getDeptName() + ","; + tempId += dept.getDeptId() + ","; } - String roleIds = ""; - for (Integer integer : messageTemplate.getRoeleList()) { - roleIds += integer + ","; - } - messageTemplate.setRoleIds(roleIds); - messageTemplate.setDeptNames(tempName.substring(0,tempName.length()-1)); - messageTemplate.setDeptIds(tempId.substring(0,tempId.length()-1)); +// String roleIds = ""; +// for (Integer integer : messageTemplate.getRoeleList()) { +// roleIds += integer + ","; +// } +// messageTemplate.setRoleIds(roleIds); + messageTemplate.setDeptNames(tempName.substring(0, tempName.length() - 1)); + messageTemplate.setDeptIds(tempId.substring(0, tempId.length() - 1)); messageTemplate.setStoreId(nowAccountInfo.getStoreId()); // 校验添加时名称是否存在 int nameList = messageTemplateService.selectMessagesName(messageTemplate.getName()); if (nameList == 1) { - return getFailureResult(201,"模版名称已存在"); + return getFailureResult(201, "模版名称已存在"); } return getSuccessResult(this.messageTemplateService.save(messageTemplate)); } @@ -150,21 +150,21 @@ public class MessageTemplateController extends BaseController { */ @PutMapping public ResponseObject update(@RequestBody MessageTemplate messageTemplate) { - SysLog sysLog =new SysLog(); + SysLog sysLog = new SysLog(); sysLog.setSystemName("1"); sysLog.setMoudle("短信模版"); - sysLog.setContent("更新了模版名称为"+messageTemplate.getName()+"的数据"); + sysLog.setContent("更新了模版名称为" + messageTemplate.getName() + "的数据"); sysLogService.saveVo(sysLog); String tempName = ""; String tempId = ""; for (Integer deptId : messageTemplate.getDeptIdList()) { SysDept dept = deptService.getById(deptId); - tempName+=dept.getDeptName()+","; - tempId+=dept.getDeptId()+","; + tempName += dept.getDeptName() + ","; + tempId += dept.getDeptId() + ","; } - messageTemplate.setDeptNames(tempName.substring(0,tempName.length()-1)); - messageTemplate.setDeptIds(tempId.substring(0,tempId.length()-1)); + messageTemplate.setDeptNames(tempName.substring(0, tempName.length() - 1)); + messageTemplate.setDeptIds(tempId.substring(0, tempId.length() - 1)); // // 校验添加时名称是否存在 // int nameList = this.getNameList(messageTemplate.getName()); // if (nameList == 1) { @@ -183,10 +183,10 @@ public class MessageTemplateController extends BaseController { public ResponseObject delete(@RequestParam("idList") List idList) { for (Long aLong : idList) { MessageTemplate messageTemplate = messageTemplateService.getById(aLong); - SysLog sysLog =new SysLog(); + SysLog sysLog = new SysLog(); sysLog.setSystemName("1"); sysLog.setMoudle("短信模版"); - sysLog.setContent("删除了模版名称为"+messageTemplate.getName()+"的数据"); + sysLog.setContent("删除了模版名称为" + messageTemplate.getName() + "的数据"); sysLogService.saveVo(sysLog); } return getSuccessResult(this.messageTemplateService.removeByIds(idList)); @@ -194,12 +194,13 @@ public class MessageTemplateController extends BaseController { /** * 查询消息模板名称是否存在 + * * @param name 模板名称 * @return 1 , 0 */ @GetMapping("/getMessageTemplate") - public ResponseObject getMessageTemplate(String name){ - return getSuccessResult( messageTemplateService.selectMessagesName(name)); + public ResponseObject getMessageTemplate(String name) { + return getSuccessResult(messageTemplateService.selectMessagesName(name)); } private int getNameList(String name) { diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/setting/entity/MessageTemplate.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/setting/entity/MessageTemplate.java index 5658deb91..f2b0f719b 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/setting/entity/MessageTemplate.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/setting/entity/MessageTemplate.java @@ -33,6 +33,16 @@ public class MessageTemplate extends Model { private String roleIds; //状态0停用1启用 private String status; + //发送条件：0商品库存数量；1剩余可挂账额度；2车队总余额 + private String sendCondition; + //满足条件：大于、等于、小于 + private String meetCondition; + //商品库存 + private Integer goodsStock; + //剩余可挂账额度 + private Double creditAmount; + //车队总余额 + private Double fleetAmount; //创建者名称 private String createName; //创建时间 @@ -54,5 +64,9 @@ public class MessageTemplate extends Model { @TableField(exist = false) private List roeleList; + @TableField(exist = false) + private String roleName; + + } From b8366bb7b4eafcd927b49a83af59acd74fdf1ef2 Mon Sep 17 00:00:00 2001 From: zhaotianfeng <12345678> Date: Wed, 18 Sep 2024 16:47:21 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E9=A1=B5=E9=9D=A2=20=E5=A2=9E=E5=8A=A0=E5=8F=96?= =?UTF-8?q?=E6=B6=88=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fuintAdmin_zt/src/views/setting/app/index.vue | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/fuintAdmin_zt/src/views/setting/app/index.vue b/fuintAdmin_zt/src/views/setting/app/index.vue index 46be8b838..80fd902b6 100644 --- a/fuintAdmin_zt/src/views/setting/app/index.vue +++ b/fuintAdmin_zt/src/views/setting/app/index.vue @@ -148,6 +148,7 @@ 提交 + 取消 @@ -262,6 +263,11 @@ export default { }) } }, + resetForm(formName) { + this.$refs[formName].resetFields(); + this.clean(); + this.open=false; + }, changeStatus(data){ console.log(123123123) updateAppApi(data).then(res=>{ From 7ea65678639b5ab4b753d3721dcd47df0b9bd840 Mon Sep 17 00:00:00 2001 From: zhaotianfeng <12345678> Date: Wed, 18 Sep 2024 16:48:09 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=B8=AD=E5=8F=B0-=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E9=85=8D=E7=BD=AE=E9=A1=B5=E9=9D=A2-=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=20=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3=20=E5=8A=A0?= =?UTF-8?q?=E9=AA=8C=E8=AF=81=E6=9C=BA=E6=9E=84=E6=98=AF=E5=90=A6=E5=AD=98?= =?UTF-8?q?=E5=9C=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/sys/controller/SysAppController.java | 14 ++++++++++++++ .../fuint/business/sys/mapper/xml/SysAppMapper.xml | 3 +++ .../fuint/business/sys/service/SysAppService.java | 2 ++ .../sys/service/impl/SysAppServiceImpl.java | 6 ++++++ 4 files changed, 25 insertions(+) diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/controller/SysAppController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/controller/SysAppController.java index dfee6c5bc..7ed0ab92c 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/controller/SysAppController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/controller/SysAppController.java @@ -70,6 +70,13 @@ public class SysAppController extends BaseController { @PostMapping public ResponseObject add(@RequestBody SysApp sysApp) { try { +// 先判断机构名称是否重复 + SysApp s1 = new SysApp(); + s1.setOrgId(sysApp.getOrgId()); + Long aLong = sysAppService.queryCount(s1); + if (aLong>0){ + return getFailureResult(500,"机构名称已经存在"); + } SysLog sysLog =new SysLog(); sysLog.setSystemName("2"); sysLog.setMoudle("小程序配置"); @@ -88,6 +95,13 @@ public class SysAppController extends BaseController { @PutMapping public ResponseObject edit(@RequestBody SysApp sysApp) { try { + // 先判断机构名称是否重复 + SysApp s1= new SysApp(); + s1.setOrgId(sysApp.getOrgId()); + Long aLong = sysAppService.queryCount(s1); + if (aLong>0){ + return getFailureResult(500,"机构名称已经存在"); + } SysLog sysLog =new SysLog(); sysLog.setSystemName("2"); sysLog.setMoudle("小程序配置"); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/mapper/xml/SysAppMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/mapper/xml/SysAppMapper.xml index 22fefa5a4..60eae83e0 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/mapper/xml/SysAppMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/mapper/xml/SysAppMapper.xml @@ -67,6 +67,9 @@ legal_representative_id,legal_representative_contact,app_status,create_time,crea select count(1) from sys_app + + and org_id = #{orgId} + and id = #{id} diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/service/SysAppService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/service/SysAppService.java index 8b71666dd..ff9e20e1f 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/service/SysAppService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/service/SysAppService.java @@ -30,7 +30,9 @@ public interface SysAppService { * @return 查询结果 */ IPage queryByPage(@Param("page") Page page, SysApp sysApp); +// 根据机构名称查询 + Long queryCount(SysApp sysApp); /** * 新增数据 * diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/service/impl/SysAppServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/service/impl/SysAppServiceImpl.java index 340c61b98..d282b5fb0 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/service/impl/SysAppServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/service/impl/SysAppServiceImpl.java @@ -50,6 +50,12 @@ public class SysAppServiceImpl implements SysAppService { return this.sysAppMapper.queryAllByLimit(page, sysApp); } + @Override + public Long queryCount(SysApp sysApp) { + long count = sysAppMapper.count(sysApp); + return count; + } + /** * 新增数据 * From fdfd89903aa2b94263b7b36044c017b6aabfe95a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=85=81=E6=9E=9E?= <3422692813@qq.com> Date: Wed, 18 Sep 2024 16:53:51 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=9B=B4=E6=96=B09.18?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../integral/entity/IntegralDetail.java | 3 + .../mapper/xml/IntegralDetailMapper.xml | 3 + .../impl/IntegralDetailServiceImpl.java | 8 ++ .../impl/CardFavorableServiceImpl.java | 9 ++ .../mapper/xml/CardValueOrdersMapper.xml | 4 +- .../controller/CardValueRuleController.java | 12 ++ .../cardValueRule/dto/CardValueOrdersDTO.java | 14 +++ .../cardValueRule/vo/CardValueOrdersVo.java | 12 ++ .../order/dto/CardBalanceChangeDto.java | 9 ++ .../order/mapper/AllOrderInfoMapper.java | 4 + .../service/impl/UserBalanceServiceImpl.java | 13 +- .../controller/ClientBalanceController.java | 117 ++++++++++++++++++ 12 files changed, 204 insertions(+), 4 deletions(-) create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueRule/dto/CardValueOrdersDTO.java create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueRule/vo/CardValueOrdersVo.java create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/order/dto/CardBalanceChangeDto.java diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/entity/IntegralDetail.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/entity/IntegralDetail.java index 2488e4ae9..df1ee4bcc 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/entity/IntegralDetail.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/entity/IntegralDetail.java @@ -51,6 +51,9 @@ public class IntegralDetail extends BaseEntity implements Serializable { */ private Integer chainStoreId; + private String startTime; + private String endTime; + } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralDetailMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralDetailMapper.xml index a1dde2895..140981a58 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralDetailMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralDetailMapper.xml @@ -42,6 +42,9 @@ and id.user_id = #{integralDetail.userId} + + and id.create_time between #{integralDetail.startTime} and #{integralDetail.endTime} + order by create_time desc diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralDetailServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralDetailServiceImpl.java index 4b88daa49..b5ba22898 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralDetailServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralDetailServiceImpl.java @@ -1,5 +1,8 @@ package com.fuint.business.integral.service.impl; +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.fuint.business.integral.entity.IntegralDetail; @@ -56,6 +59,11 @@ public class IntegralDetailServiceImpl implements IntegralDetailService { public IPage queryByPageUni(@Param("page") Page page, IntegralDetail integralDetail) { AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); integralDetail.setUserId(nowAccountInfo.getId()); + if (ObjectUtil.isNotEmpty(integralDetail.getStartTime())) { + DateTime parse = DateUtil.parse(integralDetail.getStartTime(), "yyyy-MM"); + integralDetail.setStartTime(DateUtil.beginOfMonth(parse).toString()); + integralDetail.setEndTime(DateUtil.endOfMonth(parse).toString()); + } return this.integralDetailMapper.queryAllByLimit(page, integralDetail); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/impl/CardFavorableServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/impl/CardFavorableServiceImpl.java index 381e34ecf..601a28491 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/impl/CardFavorableServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/impl/CardFavorableServiceImpl.java @@ -21,6 +21,8 @@ import com.fuint.common.dto.AccountInfo; import com.fuint.common.util.TokenUtil; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -42,6 +44,9 @@ import java.util.stream.Collectors; @Service("cardFavorableService") public class CardFavorableServiceImpl extends ServiceImpl implements CardFavorableService { + private static final Logger log = LoggerFactory.getLogger(CardFavorableServiceImpl.class); + + @Resource private StoreService storeService; @Resource @@ -151,8 +156,10 @@ public class CardFavorableServiceImpl extends ServiceImpl - - and user_id = #{order.userId} + + and mt_user_id = #{order.mtUserId} and status = #{order.status} diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueRule/controller/CardValueRuleController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueRule/controller/CardValueRuleController.java index f9aac5764..8adba5374 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueRule/controller/CardValueRuleController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueRule/controller/CardValueRuleController.java @@ -106,5 +106,17 @@ public class CardValueRuleController extends BaseController { public ResponseObject delete(@RequestParam("idList") List idList) { return getSuccessResult(this.cardValueRuleService.removeByIds(idList)); } + + /** + * 获取储值卡权益说明与规则说明(小程序端) + * @return + */ + @GetMapping("/getQyAndGz") + public ResponseObject getQyDetails(Integer storeId){ + LambdaQueryWrapper queryWrapper =new LambdaQueryWrapper(); + queryWrapper.eq(CardValueRule::getStoreId, storeId); + queryWrapper.eq(CardValueRule::getType,"0"); + return getSuccessResult(this.cardValueRuleService.getOne(queryWrapper)); + } } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueRule/dto/CardValueOrdersDTO.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueRule/dto/CardValueOrdersDTO.java new file mode 100644 index 000000000..cd0436ebc --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueRule/dto/CardValueOrdersDTO.java @@ -0,0 +1,14 @@ +package com.fuint.business.marketingActivity.cardValueRule.dto; + +import cn.hutool.core.date.DateTime; +import com.fuint.business.marketingActivity.cardValueOrders.entity.CardValueOrders; +import lombok.Data; + +import java.util.Date; + +@Data +public class CardValueOrdersDTO extends CardValueOrders { + private String startTime; + private int page; + private int pageSize; +} diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueRule/vo/CardValueOrdersVo.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueRule/vo/CardValueOrdersVo.java new file mode 100644 index 000000000..8bbd210d6 --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueRule/vo/CardValueOrdersVo.java @@ -0,0 +1,12 @@ +package com.fuint.business.marketingActivity.cardValueRule.vo; + +import com.fuint.business.marketingActivity.cardValueOrders.entity.CardValueOrders; +import lombok.Data; + +@Data +public class CardValueOrdersVo { + private String orderNo; + private Integer userId; + private String afterBalance; + private String storeName; +} diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/dto/CardBalanceChangeDto.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/dto/CardBalanceChangeDto.java new file mode 100644 index 000000000..75c6c8884 --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/dto/CardBalanceChangeDto.java @@ -0,0 +1,9 @@ +package com.fuint.business.order.dto; + +import com.fuint.business.order.entity.CardBalanceChange; +import lombok.Data; + +@Data +public class CardBalanceChangeDto extends CardBalanceChange { + private String startTime; +} diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/AllOrderInfoMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/AllOrderInfoMapper.java index 236a1a392..aed3a7749 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/AllOrderInfoMapper.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/AllOrderInfoMapper.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.fuint.business.marketingActivity.cardValueOrders.entity.CardValueOrders; +import com.fuint.business.marketingActivity.cardValueRule.dto.CardValueOrdersDTO; +import com.fuint.business.marketingActivity.cardValueRule.vo.CardValueOrdersVo; import com.fuint.business.order.dto.AllOrderInfoDto; import com.fuint.business.order.entity.AllOrderInfo; import com.fuint.business.order.entity.CardBalanceChange; @@ -89,4 +91,6 @@ public interface AllOrderInfoMapper extends BaseMapper { IPage runningWaterByInstituion2(Page page,@Param("order") AllOrderInfoDto allOrderInfo); + IPage getBlanceANdOrder(Page page, @Param("order") CardValueOrdersDTO allOrderInfo); + } \ No newline at end of file diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/UserBalanceServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/UserBalanceServiceImpl.java index e77b6aebf..ba72d817c 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/UserBalanceServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/UserBalanceServiceImpl.java @@ -336,12 +336,21 @@ public class UserBalanceServiceImpl extends ServiceImpl(); queryWrapper.eq("mt_user_id",nowAccountInfo.getId()); queryWrapper.eq("chain_store_id",userBalance.getChainStoreId()); UserBalance balance = baseMapper.selectOne(queryWrapper); - UserBlanceUniVo userBlanceUniVo = BeanUtil.copyProperties(balance, UserBlanceUniVo.class); - userBlanceUniVo.setAllBalance(balance.getCardBalance()+balance.getGiveAmount()); + log.info("查询会员储值卡余额："+balance); + UserBlanceUniVo userBlanceUniVo = new UserBlanceUniVo(); + if (ObjectUtil.isNotEmpty(balance)) { + userBlanceUniVo = BeanUtil.copyProperties(balance,UserBlanceUniVo.class); + userBlanceUniVo.setAllBalance(balance.getCardBalance()+balance.getGiveAmount()); + }else { + userBlanceUniVo.setAllBalance(0.0); + userBlanceUniVo.setCardBalance(0.0); + userBlanceUniVo.setGiveAmount(0.0); + } return userBlanceUniVo; } /** diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientBalanceController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientBalanceController.java index a83c1658e..adf4af491 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientBalanceController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientBalanceController.java @@ -1,5 +1,23 @@ package com.fuint.module.clientApi.controller; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.date.DatePattern; +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.fuint.business.marketingActivity.cardValueOrders.entity.CardValueOrders; +import com.fuint.business.marketingActivity.cardValueOrders.mapper.CardValueOrdersMapper; +import com.fuint.business.marketingActivity.cardValueRule.dto.CardValueOrdersDTO; +import com.fuint.business.order.dto.CardBalanceChangeDto; +import com.fuint.business.order.entity.CardBalanceChange; +import com.fuint.business.order.mapper.AllOrderInfoMapper; +import com.fuint.business.order.mapper.CardBalanceChangeMapper; +import com.fuint.business.order.vo.CardBalanceChangeVo; +import com.fuint.business.store.entity.MtStore; +import com.fuint.business.store.mapper.MtStoreMapper; import com.fuint.common.util.Constants; import com.fuint.common.dto.*; import com.fuint.common.enums.*; @@ -17,8 +35,15 @@ import com.fuint.repository.model.MtOrder; import com.fuint.repository.model.MtSetting; import com.fuint.repository.model.MtUser; import com.fuint.utils.StringUtil; +import com.github.pagehelper.Page; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import io.swagger.annotations.Api; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.PageImpl; +import org.springframework.data.domain.PageRequest; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import java.math.BigDecimal; @@ -26,6 +51,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * 余额接口controller @@ -38,6 +64,9 @@ import java.util.Map; @RequestMapping(value = "/clientApi/balance") public class ClientBalanceController extends BaseController { + private static final Logger log = LoggerFactory.getLogger(ClientBalanceController.class); + + /** * 配置服务接口 * */ @@ -74,6 +103,15 @@ public class ClientBalanceController extends BaseController { @Autowired private MerchantService merchantService; + @Autowired + private CardValueOrdersMapper cardValueOrdersMapper; + + @Autowired + private MtStoreMapper mtStoreMapper; + + @Autowired + private CardBalanceChangeMapper cardBalanceChangeMapper; + /** * 充值配置 * @@ -261,4 +299,83 @@ public class ClientBalanceController extends BaseController { return getSuccessResult(result); } + + + /** + * 余额明细(小程序) + * @param + * @param + * @return + */ +// @RequestMapping(value = "/detail", method = RequestMethod.GET) +// public ResponseObject getBalanceDetail(CardValueOrdersDTO order) { +// Page page = PageHelper.startPage(order.getPage(), order.getPageSize()); +// AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); +// log.info("nowAccountInfo:{}", nowAccountInfo); +// order.setMtUserId(nowAccountInfo.getId()); +// order.setStatus("paid"); +// LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); +// if (ObjectUtil.isNotEmpty(order.getRechargeType())) { +// lambdaQueryWrapper.eq(CardValueOrders::getRechargeType, order.getRechargeType()); +// } +// if (ObjectUtil.isNotEmpty(order.getStartTime()) ) { +// DateTime parse = DateUtil.parse(order.getStartTime(), DatePattern.NORM_MONTH_FORMATTER); +// DateTime start = DateUtil.beginOfMonth(parse); +// DateTime end = DateUtil.endOfMonth(parse); +// lambdaQueryWrapper.between(CardValueOrders::getPayTime, start, end); +// } +// lambdaQueryWrapper.eq(CardValueOrders::getMtUserId,nowAccountInfo.getId()); +//// lambdaQueryWrapper.eq(CardValueOrders::getStatus, "paid"); +// List cardValueOrders = cardValueOrdersMapper.selectList(lambdaQueryWrapper); +// PageRequest pageRequest = PageRequest.of(order.getPage(), order.getPageSize()); +// +// //查询商户名称 +// MtStore mtStore = mtStoreMapper.selectOne(new LambdaQueryWrapper() +// .eq(MtStore::getId, order.getStoreId())); +// +// if (CollUtil.isNotEmpty(cardValueOrders) && ObjectUtil.isNotEmpty(mtStore)) { +// cardValueOrders.stream().forEach(item -> item.setStoreName(mtStore.getName())); +// } +// PageImpl pageImpl = new PageImpl(cardValueOrders, pageRequest, page.getTotal()); +// PaginationResponse paginationResponse = new PaginationResponse(pageImpl, CardValueOrders.class); +// paginationResponse.setTotalPages(page.getPages()); +// paginationResponse.setTotalElements(page.getTotal()); +// paginationResponse.setContent(cardValueOrders); +// +// return getSuccessResult(paginationResponse); +// } + @RequestMapping(value = "/detail", method = RequestMethod.GET) + public ResponseObject getBalanceDetail(Integer page, Integer pageSize, CardBalanceChangeDto order) { + Page pageHelper = PageHelper.startPage(page, pageSize); + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(CardBalanceChange::getUserId, nowAccountInfo.getId()); + if (ObjectUtil.isNotEmpty(order.getChangeType())) { + lambdaQueryWrapper.eq(CardBalanceChange::getChangeType, order.getChangeType()); + } + if (ObjectUtil.isNotEmpty(order.getStartTime())) { + DateTime parse = DateUtil.parse(order.getStartTime(), DatePattern.NORM_MONTH_FORMATTER); + DateTime dateTime = DateUtil.beginOfMonth(parse); + DateTime end = DateUtil.endOfMonth(parse); + lambdaQueryWrapper.between(CardBalanceChange::getCreateTime, dateTime, end); + } + lambdaQueryWrapper.eq(CardBalanceChange::getStoreId, order.getStoreId()); + + PageRequest pageRequest = PageRequest.of(page, pageSize); + + List cardBalanceChanges = cardBalanceChangeMapper.selectList(lambdaQueryWrapper); + //查询商户名称 + MtStore mtStore = mtStoreMapper.selectOne(new LambdaQueryWrapper() + .eq(MtStore::getId, order.getStoreId())); + List cardBalanceChangeVos = BeanUtil.copyToList(cardBalanceChanges, CardBalanceChangeVo.class); + if (ObjectUtil.isNotEmpty(mtStore)) { + cardBalanceChangeVos.stream().forEach(item -> item.setStoreName(mtStore.getName())); + } + PageImpl pageImpl = new PageImpl(cardBalanceChanges, pageRequest, pageHelper.getTotal()); + PaginationResponse paginationResponse = new PaginationResponse(pageImpl, CardBalanceChangeVo.class); + paginationResponse.setTotalPages(pageHelper.getPages()); + paginationResponse.setTotalElements(pageHelper.getTotal()); + paginationResponse.setContent(cardBalanceChangeVos); + return getSuccessResult(paginationResponse); + } } From 7fdca324c74577a2190f75cf4b5d086ae3e7c07f Mon Sep 17 00:00:00 2001 From: zhaotianfeng <12345678> Date: Wed, 18 Sep 2024 17:19:35 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E5=8F=82=E6=95=B0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fuint/business/setting/controller/SysLogController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/setting/controller/SysLogController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/setting/controller/SysLogController.java index 036f5de92..c7434e046 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/setting/controller/SysLogController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/setting/controller/SysLogController.java @@ -42,7 +42,7 @@ public class SysLogController extends BaseController { * @return 所有数据 */ @GetMapping - public ResponseObject selectAll(@RequestParam(value = "pageNum",defaultValue = "1") Integer pageNo, + public ResponseObject selectAll(@RequestParam(value = "page",defaultValue = "1") Integer pageNo, @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize, SysLog sysLog) { LambdaQueryWrapper sysLogLambdaQueryWrapper = new LambdaQueryWrapper(); Page page =new Page(pageNo,pageSize); From 941f32aeacd3b0ecc32599bab5c62d8e540de321 Mon Sep 17 00:00:00 2001 From: cun-nan <19819293608@163.com> Date: Wed, 18 Sep 2024 17:24:03 +0800 Subject: [PATCH 6/6] 9.18 --- fuintAdmin/src/layout/components/Navbar.vue | 43 ++++++++++--------- .../activeConsumption/index.vue | 35 ++++++++------- .../EventMarketing/activeNewlyweds/index.vue | 4 +- .../EventMarketing/liJianMarketing/index.vue | 2 +- .../EventMarketing/newCertificate/index.vue | 6 +-- .../openCardGift/TimeLimited.vue | 14 ++++-- .../EventMarketing/openCardGift/birthday.vue | 22 +++++----- .../EventMarketing/openCardGift/invite.vue | 22 +++++----- .../EventMarketing/openCardGift/popUp.vue | 14 +++--- .../EventMarketing/openCardGift/separate.vue | 14 ++++-- .../openCardGift/userConsume.vue | 22 +++++----- .../openCardGift/userRecharge.vue | 22 +++++----- 12 files changed, 119 insertions(+), 101 deletions(-) diff --git a/fuintAdmin/src/layout/components/Navbar.vue b/fuintAdmin/src/layout/components/Navbar.vue index 48f2cf394..a0a874895 100644 --- a/fuintAdmin/src/layout/components/Navbar.vue +++ b/fuintAdmin/src/layout/components/Navbar.vue @@ -51,7 +51,7 @@ - + 修改密码 @@ -66,15 +66,17 @@ + width="30%" + :modal="false" + :before-close="handleClose"> - + - + 取消 保存 @@ -155,19 +157,19 @@ export default { day: -1, storeName: "", isFullscreen: false, - dialogVisible:false, - accountId:"", - ruleForm:{}, + dialogVisible: false, + accountId: "", + ruleForm: {}, rules: { password: [ - { required: true, message: '请输入新密码', trigger: 'blur' }, - { min: 3, max: 15, message: '长度在 3 到 15 个字符', trigger: 'blur' }, - { validator: validatePass, trigger: 'blur' } + {required: true, message: '请输入新密码', trigger: 'blur'}, + {min: 3, max: 15, message: '长度在 3 到 15 个字符', trigger: 'blur'}, + {validator: validatePass, trigger: 'blur'} ], passwords: [ - { required: true, message: '请输入密码', trigger: 'blur' }, - { min: 3, max: 15, message: '长度在 3 到 15 个字符', trigger: 'blur' }, - { validator: validatePass2, trigger: 'blur' } + {required: true, message: '请输入密码', trigger: 'blur'}, + {min: 3, max: 15, message: '长度在 3 到 15 个字符', trigger: 'blur'}, + {validator: validatePass2, trigger: 'blur'} ], } } @@ -216,11 +218,12 @@ export default { .then(_ => { done(); }) - .catch(_ => {}); + .catch(_ => { + }); }, - prsswrod(){ - this.dialogVisible =! this.dialogVisible - getAccountInfo().then(res=>{ + prsswrod() { + this.dialogVisible = !this.dialogVisible + getAccountInfo().then(res => { this.accountId = res.data.accountId }) }, @@ -235,12 +238,12 @@ export default { this.$refs[formName].validate((valid) => { if (valid) { let data = { - acctId : this.accountId, + acctId: this.accountId, password: this.ruleForm.password, } - resetPwd(data).then(res=>{ + resetPwd(data).then(res => { console.log(res) - if(res.code == 200){ + if (res.code == 200) { this.dialogVisible = false this.$store.dispatch('LogOut').then(() => { location.href = '/'; diff --git a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue index 6f58cc396..18a6ccb53 100644 --- a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue +++ b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue @@ -57,7 +57,7 @@
- + - + - +
-
+
消费满 - - + + + 送 - +
-
+
消费满 - - + + + 送 - @@ -197,20 +199,21 @@ @click="addCoupons(couponOrderType)">
-
+
消费满 - - + + + 送 - + - +
-
+
赠送积分
-
+
赠送成长值
diff --git a/fuintAdmin/src/views/EventMarketing/liJianMarketing/index.vue b/fuintAdmin/src/views/EventMarketing/liJianMarketing/index.vue index 32b9e6505..1539ff2da 100644 --- a/fuintAdmin/src/views/EventMarketing/liJianMarketing/index.vue +++ b/fuintAdmin/src/views/EventMarketing/liJianMarketing/index.vue @@ -119,7 +119,7 @@
- +
- + @@ -182,7 +182,7 @@ -
范围
+
范围
@@ -660,7 +660,7 @@ export default { }, uploading: false, fileList: [], - labelPosition: 'left', + labelPosition: 'right', queryParams: { number: '', remark: '', diff --git a/fuintAdmin/src/views/EventMarketing/openCardGift/TimeLimited.vue b/fuintAdmin/src/views/EventMarketing/openCardGift/TimeLimited.vue index fb05d1ce1..7161e21a2 100644 --- a/fuintAdmin/src/views/EventMarketing/openCardGift/TimeLimited.vue +++ b/fuintAdmin/src/views/EventMarketing/openCardGift/TimeLimited.vue @@ -325,7 +325,7 @@ :value="dict.value"> - + { if (valid) { if (this.ruleForm1.paymentType) this.ruleForm1.paymentType = this.ruleForm1.paymentType.toString() diff --git a/fuintAdmin/src/views/EventMarketing/openCardGift/birthday.vue b/fuintAdmin/src/views/EventMarketing/openCardGift/birthday.vue index b70553e54..13d464db3 100644 --- a/fuintAdmin/src/views/EventMarketing/openCardGift/birthday.vue +++ b/fuintAdmin/src/views/EventMarketing/openCardGift/birthday.vue @@ -58,12 +58,12 @@
-
+
赠送积分
-
+
赠送成长值
@@ -74,33 +74,33 @@
-
+
-
赠送
- 赠送
+
-
赠送
- 赠送
+
-
- 赠送 - +
+
赠送
+ - +
-
+
赠送积分
-
+
赠送成长值
@@ -59,33 +59,33 @@
-
+
-
赠送
- 赠送
+
-
赠送
- 赠送
+
-
- 赠送 - +
+
赠送
+ - +
- +
-
+
@@ -95,18 +95,18 @@
-
+
-
- 赠送 - +
+
赠送
+ - + - + { if (valid) { if (this.ruleForm1.paymentType) this.ruleForm1.paymentType = this.ruleForm1.paymentType.toString() diff --git a/fuintAdmin/src/views/EventMarketing/openCardGift/userConsume.vue b/fuintAdmin/src/views/EventMarketing/openCardGift/userConsume.vue index 5d95f98be..b5548ef38 100644 --- a/fuintAdmin/src/views/EventMarketing/openCardGift/userConsume.vue +++ b/fuintAdmin/src/views/EventMarketing/openCardGift/userConsume.vue @@ -70,12 +70,12 @@
-
+
赠送积分
-
+
赠送成长值
@@ -86,33 +86,33 @@
-
+
-
赠送
- 赠送
+
-
赠送
- 赠送
+
-
- 赠送 - +
+
赠送
+ - +
-
+
赠送积分
-
+
赠送成长值
@@ -73,33 +73,33 @@
-
+
-
赠送
- 赠送
+
-
赠送
- 赠送
+
-
- 赠送 - +
+
赠送
+ - +