From a3a532faaf53dfc2aaf01062efd5893ca898de30 Mon Sep 17 00:00:00 2001 From: cun-nan <19819293608@163.com> Date: Fri, 15 Mar 2024 10:44:21 +0800 Subject: [PATCH] bug --- .../EventMarketing/activeConsumption/index.vue | 10 ++++++---- .../EventMarketing/activeNewlyweds/index.vue | 10 ++++++---- .../EventMarketing/activeRecommend/index.vue | 15 +++++++++------ .../EventMarketing/cardExchange/index.vue | 2 +- .../EventMarketing/cardFavorable/index.vue | 3 ++- fuintAdmin/src/views/staff/list.vue | 1 + fuintAdmin/src/views/userGrade/index.vue | 18 ++++++++++-------- .../member/controller/LJStaffController.java | 3 +++ .../userManager/mapper/xml/LJUserMapper.xml | 3 --- .../service/impl/LJUserServiceImpl.java | 2 ++ 10 files changed, 40 insertions(+), 27 deletions(-) diff --git a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue index 77b1ea9a3..30ff35379 100644 --- a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue +++ b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue @@ -986,9 +986,10 @@ export default { validityOne: null, validityTwo:null, validity:row.validity, - giftCardDetail: row.useInstructions , //券详情 + giftCardDetail: row.cardDetail, //券详情 giftCardTime: row.validity, //券有效期 - giftCardTotal: 1 //券数量 + giftCardTotal: 1, //券数量 + instruction: row.useInstructions, //使用说明 } this.tableDatas.push(data) @@ -1011,14 +1012,15 @@ export default { goodsTotal: "", //商品数量 vouchersId:row.id, //券id giftCardName:row.name, //赠送卡券名称 - giftCardType: row.type, //券类型 + giftCardType: row.discountType, //券类型 timeType: row.timeType, validityZero: row.validityZero, validityOne: row.validityOne, validityTwo:row.validityTwo, giftCardDetail: "满"+ row.satisfiedAmount+"减 "+row.discountAmount+"元" , //券详情 giftCardTime: "", //券有效期 - giftCardTotal: 1//券数量 + giftCardTotal: 1,//券数量 + instruction: row.instruction,//使用说明 } // this.form.tableDatas.push(data) diff --git a/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue b/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue index af9ddddd9..6d53605df 100644 --- a/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue +++ b/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue @@ -785,9 +785,10 @@ export default { validityOne: null, validityTwo:null, validity:row.validity, - giftCardDetail: row.useInstructions , //券详情 + giftCardDetail: row.cardDetail , //券详情 giftCardTime: row.validity, //券有效期 - giftCardTotal: 1 //券数量 + giftCardTotal: 1, //券数量 + instruction: row.useInstructions, //使用说明 } this.tableDatas.push(data) @@ -810,14 +811,15 @@ export default { goodsTotal: "", //商品数量 vouchersId:row.id, //券id giftCardName:row.name, //赠送卡券名称 - giftCardType: row.type, //券类型 + giftCardType: row.discountType, //券类型 timeType: row.timeType, validityZero: row.validityZero, validityOne: row.validityOne, validityTwo:row.validityTwo, giftCardDetail: "满"+ row.satisfiedAmount+"减 "+row.discountAmount+"元" , //券详情 giftCardTime: "", //券有效期 - giftCardTotal: 1//券数量 + giftCardTotal: 1,//券数量 + instruction: row.instruction,//使用说明 } this.form.tableDatas.push(data) diff --git a/fuintAdmin/src/views/EventMarketing/activeRecommend/index.vue b/fuintAdmin/src/views/EventMarketing/activeRecommend/index.vue index 71879c0a0..72a193822 100644 --- a/fuintAdmin/src/views/EventMarketing/activeRecommend/index.vue +++ b/fuintAdmin/src/views/EventMarketing/activeRecommend/index.vue @@ -943,9 +943,10 @@ export default { validityOne: null, validityTwo:null, validity:row.validity, - giftCardDetail: row.useInstructions , //券详情 + giftCardDetail: row.cardDetail , //券详情 giftCardTime: row.validity, //券有效期 - giftCardTotal: 1 //券数量 + giftCardTotal: 1 , //券数量 + instruction: row.useInstructions, //使用说明 } this.ruleForm.dlist.push(data) @@ -979,14 +980,15 @@ export default { goodsTotal: "", //商品数量 vouchersId:row.id, //券id giftCardName:row.name, //赠送卡券名称 - giftCardType: row.type, //券类型 + giftCardType: row.discountType, //券类型 timeType: row.timeType, validityZero: row.validityZero, validityOne: row.validityOne, validityTwo:row.validityTwo, giftCardDetail: "满"+ row.satisfiedAmount+"减 "+row.discountAmount+"元" , //券详情 giftCardTime: "", //券有效期 - giftCardTotal: 1//券数量 + giftCardTotal: 1,//券数量 + instruction: row.instruction,//使用说明 } this.ruleForm.xylist.push(data) this.$message.success("新增成功") @@ -1008,14 +1010,15 @@ export default { goodsTotal: "", //商品数量 vouchersId:row.id, //券id giftCardName:row.name, //赠送卡券名称 - giftCardType: row.type, //券类型 + giftCardType: row.discountType, //券类型 timeType: row.timeType, validityZero: row.validityZero, validityOne: row.validityOne, validityTwo:row.validityTwo, giftCardDetail: "满"+ row.satisfiedAmount+"减 "+row.discountAmount+"元" , //券详情 giftCardTime: "", //券有效期 - giftCardTotal: 1//券数量 + giftCardTotal: 1,//券数量 + instruction: row.instruction,//使用说明 } console.log(data) this.ruleForm.ylist.push(data) diff --git a/fuintAdmin/src/views/EventMarketing/cardExchange/index.vue b/fuintAdmin/src/views/EventMarketing/cardExchange/index.vue index 6807b0c01..3cdc500ef 100644 --- a/fuintAdmin/src/views/EventMarketing/cardExchange/index.vue +++ b/fuintAdmin/src/views/EventMarketing/cardExchange/index.vue @@ -194,8 +194,8 @@ - + 天 + 满减券 + 折扣券 @@ -626,8 +626,8 @@ label="券类型" width="100"> @@ -950,9 +950,10 @@ export default { validityOne: null, validityTwo:null, validity:row.validity, - giftCardDetail: row.useInstructions , //券详情 + giftCardDetail: row.cardDetail , //券详情 giftCardTime: row.validity, //券有效期 - giftCardTotal: 1 //券数量 + giftCardTotal: 1 , //券数量 + instruction: row.useInstructions, //使用说明 } this.tableDatas.push(data) @@ -972,14 +973,15 @@ export default { activeGift: 1, //充值赠送类型：1、赠送优惠券 2、赠送兑换券 vouchersId:row.id, //券id giftCardName:row.name, //赠送卡券名称 - giftCardType: row.type, //券类型 + giftCardType: row.discountType, //券类型 timeType: row.timeType, validityZero: row.validityZero, validityOne: row.validityOne, validityTwo:row.validityTwo, giftCardDetail: "满"+ row.satisfiedAmount+"减 "+row.discountAmount+"元" , //券详情 giftCardTime: "", //券有效期 - giftCardTotal: 1//券数量 + giftCardTotal: 1,//券数量 + instruction: row.instruction,//使用说明 } this.tableDatas1.push(data) diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/controller/LJStaffController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/controller/LJStaffController.java index c2e167f5a..3ad20b4be 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/controller/LJStaffController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/controller/LJStaffController.java @@ -1,5 +1,6 @@ package com.fuint.business.member.controller; +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.member.entity.LJStaff; @@ -148,6 +149,8 @@ public class LJStaffController extends BaseController { */ @PutMapping public ResponseObject edit(@Validated @RequestBody LJStaff staff){ + if (ObjectUtil.isEmpty(staff.getAuditPrem())) + mtStaffService.lambdaUpdate().eq(LJStaff::getId,staff.getId()).set(LJStaff::getAuditPrem,null).update(); return getSuccessResult(mtStaffService.updateStaff(staff)); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/LJUserMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/LJUserMapper.xml index eb0784dad..b7c223308 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/LJUserMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/LJUserMapper.xml @@ -133,9 +133,6 @@ and mub.chain_store_id = #{user.chainStoreId} - - and mub.store_id = #{user.storeId} - and mu.mobile like concat('%', #{user.mobile}, '%') diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java index 82ceb1c48..aa80d6120 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java @@ -147,11 +147,13 @@ public class LJUserServiceImpl extends ServiceImpl impleme // Double refuelMoney = baseMapper.selectSumByStore(storeId, "refuel_money"); QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("chain_store_id",chainStoreId); queryWrapper.apply(true, "TO_DAYS(NOW())-TO_DAYS(create_time) = 0"); // Integer addNum = baseMapper.selectCount(queryWrapper); Integer addNum = userBalanceMapper.selectCount(queryWrapper); QueryWrapper queryWrapper1 = new QueryWrapper<>(); + queryWrapper1.eq("chain_store_id",chainStoreId); queryWrapper1.apply(true, "TO_DAYS(NOW())-TO_DAYS(create_time) = 1"); // Integer yesterdayAddNum = baseMapper.selectCount(queryWrapper1);