From 4c3eb2ac79dba9482dfa43406c439cec457aa302 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=85=81=E6=9E=9E?= <3422692813@qq.com> Date: Fri, 13 Sep 2024 17:47:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EventMarketing/openCardGift/separate.vue | 8 +-- .../src/views/handover/HandoverDetails.vue | 7 +- fuintAdmin/src/views/member/analysis.vue | 9 ++- fuintAdmin/src/views/member/creditIndex.vue | 2 +- fuintAdmin/src/views/setting/print/index.vue | 38 ++++++++--- .../service/impl/CardValueServiceImpl.java | 14 ++++ .../cardValue/vo/CardValueUniVo.java | 4 ++ .../printer/entity/PrintDeviceInfo.java | 5 +- .../printer/mapper/PrintDeviceInfoMapper.java | 3 +- .../impl/PrintDeviceInfoServiceImpl.java | 13 +++- .../repository/mapper/NewMtStaffMapper.java | 19 ++++++ .../fuint/repository/model/NewMtStaff.java | 65 +++++++++++++++++++ 12 files changed, 164 insertions(+), 23 deletions(-) create mode 100644 fuintBackend/fuint-repository/src/main/java/com/fuint/repository/mapper/NewMtStaffMapper.java create mode 100644 fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/NewMtStaff.java diff --git a/fuintAdmin/src/views/EventMarketing/openCardGift/separate.vue b/fuintAdmin/src/views/EventMarketing/openCardGift/separate.vue index b20b45b04..8c7296ca1 100644 --- a/fuintAdmin/src/views/EventMarketing/openCardGift/separate.vue +++ b/fuintAdmin/src/views/EventMarketing/openCardGift/separate.vue @@ -311,7 +311,7 @@ :visible.sync="showDialogVisible" width="60%"> -
+
@@ -400,7 +400,7 @@ -
至
+
至
 @@ -413,13 +413,13 @@
+ :class="{ 'acvtive' : index === tindex3 }" @click="Typeindex3(index)" style="margin-bottom: 20px"> {{ item }} + style="margin-left: 20px;"> @@ -29,7 +30,7 @@ - 搜索 + 搜索 重置 @@ -436,6 +437,9 @@ export default { this.getStatus(); this.getStaffList(); }, + mounted() { + this.queryParams.status = '统一交班'; + }, methods: { getHandover() { getHandoverApi2(this.queryParams).then(res=>{ @@ -546,6 +550,7 @@ export default { this.dateRange = [] this.beginTime = ""; this.endTime = "" + this.queryParams.status = '统一交班'; this.getList(); }, printLocally(data) { diff --git a/fuintAdmin/src/views/member/analysis.vue b/fuintAdmin/src/views/member/analysis.vue index 6090539fe..895fed19e 100644 --- a/fuintAdmin/src/views/member/analysis.vue +++ b/fuintAdmin/src/views/member/analysis.vue @@ -7,7 +7,7 @@ {{ item.name }}
-
+
会员人数
@@ -122,7 +122,7 @@
-
+
@@ -197,7 +197,7 @@
-
+
按月份分布
@@ -275,6 +275,8 @@ export default { }) getUserSex().then(res => { this.sexSpread = res.data + this.sexSpread.maleProportion = Math.round(this.sexSpread.maleProportion) + this.sexSpread.femaleProportion = Math.round(this.sexSpread.femaleProportion) }) await getStoredValue().then(res => { this.storedValue = res.data; @@ -1035,6 +1037,7 @@ export default { box-sizing: border-box; padding: 15px; background: #fff; + width:49.5%; } .hx{ diff --git a/fuintAdmin/src/views/member/creditIndex.vue b/fuintAdmin/src/views/member/creditIndex.vue index a545ae8a9..11cb6f55c 100644 --- a/fuintAdmin/src/views/member/creditIndex.vue +++ b/fuintAdmin/src/views/member/creditIndex.vue @@ -61,7 +61,7 @@
- + diff --git a/fuintAdmin/src/views/setting/print/index.vue b/fuintAdmin/src/views/setting/print/index.vue index 645ff573e..25d5f47cc 100644 --- a/fuintAdmin/src/views/setting/print/index.vue +++ b/fuintAdmin/src/views/setting/print/index.vue @@ -78,27 +78,27 @@ - - - + + + - + - + - + - + - + --> - + staffQueryWrapper = new LambdaQueryWrapper<>(); + staffQueryWrapper.eq(NewMtStaff::getStatus, "qy"); + staffQueryWrapper.eq(NewMtStaff::getStoreId, cardValue.getStoreId()); + List newMtStaffs = mtStaffMapper.selectList(staffQueryWrapper); //page1.setRecords(cardValueVOs); cardValueUniVo.setCardValueList(cardValueVOs); + cardValueUniVo.setStaffList(newMtStaffs); cardValueUniVo.setStoreName(ljStoreService.queryStoreById(cardValue.getStoreId()).getName()); return cardValueUniVo; } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/vo/CardValueUniVo.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/vo/CardValueUniVo.java index 9575178d5..9c8b156c0 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/vo/CardValueUniVo.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/vo/CardValueUniVo.java @@ -1,5 +1,7 @@ package com.fuint.business.marketingActivity.cardValue.vo; +import com.fuint.repository.model.MtStaff; +import com.fuint.repository.model.NewMtStaff; import lombok.Data; import java.util.List; @@ -10,4 +12,6 @@ public class CardValueUniVo { private String storeName; //卡券列表 private List cardValueList; + //可以选择的员工 + private List staffList; } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/entity/PrintDeviceInfo.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/entity/PrintDeviceInfo.java index c09998935..13282ec6f 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/entity/PrintDeviceInfo.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/entity/PrintDeviceInfo.java @@ -1,6 +1,8 @@ package com.fuint.business.printer.entity; import java.util.Date; + +import com.baomidou.mybatisplus.annotation.TableField; import com.fuint.repository.model.base.BaseEntity; import lombok.Data; @@ -61,8 +63,9 @@ public class PrintDeviceInfo extends BaseEntity { * 店铺id */ private Integer storeId; - + @TableField(exist = false) private Integer deptId; + @TableField(exist = false) private String deptName; private String deviceSi; // 设备品牌 diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/mapper/PrintDeviceInfoMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/mapper/PrintDeviceInfoMapper.java index 6b6aaae60..a7d341ab8 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/mapper/PrintDeviceInfoMapper.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/mapper/PrintDeviceInfoMapper.java @@ -1,5 +1,6 @@ package com.fuint.business.printer.mapper; +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.printer.entity.PrintDeviceInfo; @@ -13,7 +14,7 @@ import java.util.List; * @author wangh * @since 2024-04-29 17:31:02 */ -public interface PrintDeviceInfoMapper { +public interface PrintDeviceInfoMapper extends BaseMapper { /** * 通过ID查询单条数据 diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/service/impl/PrintDeviceInfoServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/service/impl/PrintDeviceInfoServiceImpl.java index eeb2cb170..98be371e5 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/service/impl/PrintDeviceInfoServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/service/impl/PrintDeviceInfoServiceImpl.java @@ -1,17 +1,18 @@ package com.fuint.business.printer.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.fuint.business.printer.entity.PrintDeviceInfo; import com.fuint.business.printer.mapper.PrintDeviceInfoMapper; import com.fuint.business.printer.service.PrintDeviceInfoService; +import com.fuint.framework.exception.BusinessCheckException; import org.springframework.stereotype.Service; import com.fuint.common.util.TokenUtil; import io.lettuce.core.dynamic.annotation.Param; import com.fuint.common.dto.AccountInfo; - import javax.annotation.Resource; /** @@ -40,14 +41,14 @@ public class PrintDeviceInfoServiceImpl implements PrintDeviceInfoService { * 分页查询 * * @param printDeviceInfo 筛选条件 - * @param page 分页对象 + * @param page 分页对象 * @return 查询结果 */ @Override public IPage queryByPage(@Param("page") Page page, PrintDeviceInfo printDeviceInfo) { AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); printDeviceInfo.setStoreId(nowAccountInfo.getStoreId()); - return this.printDeviceInfoMapper.queryAllByLimit(page, printDeviceInfo); + return this.printDeviceInfoMapper.queryAllByLimit(page, printDeviceInfo); } /** @@ -63,6 +64,12 @@ public class PrintDeviceInfoServiceImpl implements PrintDeviceInfoService { if (printDeviceInfo.getAcquiesce()) { printDeviceInfoMapper.updateIsAcquiesce(nowAccountInfo.getStoreId()); } + //查询设备终端号是否存在 + PrintDeviceInfo printDeviceInfo1 = printDeviceInfoMapper.selectOne(new LambdaQueryWrapper() + .eq(PrintDeviceInfo::getMachineCode, printDeviceInfo.getMachineCode())); + if (printDeviceInfo1 != null) { + throw new RuntimeException("设备终端号已存在"); + } this.printDeviceInfoMapper.insert(printDeviceInfo); return printDeviceInfo; } diff --git a/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/mapper/NewMtStaffMapper.java b/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/mapper/NewMtStaffMapper.java new file mode 100644 index 000000000..60719ee89 --- /dev/null +++ b/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/mapper/NewMtStaffMapper.java @@ -0,0 +1,19 @@ +package com.fuint.repository.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.fuint.repository.model.MtStaff; +import com.fuint.repository.model.NewMtStaff; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.Date; + +/** + * 店铺员工表 Mapper 接口 + * + * Created by FSQ + * CopyRight https://www.fuint.cn + */ +@Mapper +public interface NewMtStaffMapper extends BaseMapper { +} diff --git a/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/NewMtStaff.java b/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/NewMtStaff.java new file mode 100644 index 000000000..e95e6e5da --- /dev/null +++ b/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/NewMtStaff.java @@ -0,0 +1,65 @@ +package com.fuint.repository.model; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; + +import java.io.Serializable; +import java.util.Date; + +/** + * 店铺员工表 + * + * Created by FSQ + * CopyRight https://www.fuint.cn + */ +@Getter +@Setter +@TableName("mt_staff") +@ApiModel(value = "MtStaff对象", description = "店铺员工表") +public class NewMtStaff implements Serializable { + + private static final long serialVersionUID = 1L; + + private Integer id; // 自增ID + private Integer storeId; // 店铺ID + private Integer userId; // 用户ID + private String mobile; // 手机号码 + private String realName; // 真实姓名 + private Date createTime; // 创建时间 + private Date updateTime; // 更新时间 + private String description; // 备注 + private String createBy; // 创建用户 + private String updateBy; // 修改用户 + private String isRefuel; // 一键加油，显示、隐藏 + private String handoverMode; // 交班模式 + private String handoverPrem; // 交班权限 + private String handoverOut; // 交班退出 + private String record; // 交班记录 + private String merchantStatus; // 交班商户号，启用；禁用 + private String screen; // 员工筛选，启用；禁用 + private String posPrem; // POS权限，存放json数据 + private String appletPrem; // 小程序权限，存放json数据 + private String notice; // 收款通知 + private String oilGunId; // 模板油枪号 + private String timeFrame; // 时间范围 + private String refund; // 退款权限 + private String transaction; // 交易统计 + private String auditPrem; // 审核权限 + private String writeOff; // 核销权限 + private String specialPrem; // 特殊权限 + private String official; // 公众号状态 + private String status; // 员工状态 + private String pos; // POS加油员状态 + private String roleId; // 角色ID + private String refundPassword; // 退款密码 + private String writeOffCode; // 核销码 + private String staffCode; // 员工码 + private String ifDelete; // 是否删除 + +}