From ad31648c6f7a8bff1f7ccdf84b76006b9ffb78f8 Mon Sep 17 00:00:00 2001 From: jyy <jyy> Date: Sat, 17 Jul 2021 15:59:10 +0800 Subject: [PATCH] 1. 新增套餐中有效和无效的操作 2. 会员修改门店功能 3. 套餐新增编辑次数功能 4. 计算是否为赠送的条件为,全部为赠送金额购买且支付金额大于0 5. 打印小票功能调整间距,和收银人 6. PC端服务单新增划扣金额展示 --- zq-erp/src/main/java/com/matrix/system/hive/dao/SysVipInfoDao.java | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/hive/dao/SysVipInfoDao.java b/zq-erp/src/main/java/com/matrix/system/hive/dao/SysVipInfoDao.java index 6e7f1ec..747dc87 100644 --- a/zq-erp/src/main/java/com/matrix/system/hive/dao/SysVipInfoDao.java +++ b/zq-erp/src/main/java/com/matrix/system/hive/dao/SysVipInfoDao.java @@ -1,6 +1,8 @@ package com.matrix.system.hive.dao; import com.matrix.core.pojo.PaginationVO; +import com.matrix.system.app.dto.VipInfoListDto; +import com.matrix.system.app.vo.VipInfoListVo; import com.matrix.system.hive.bean.SysVipInfo; import com.matrix.system.hive.pojo.VipInfoVo; import org.apache.ibatis.annotations.Param; @@ -36,7 +38,7 @@ public SysVipInfo selectById(Long id); - public List<SysVipInfo> selectByVipNoOrTel(@Param("key") String key, @Param("shopId") Long shopId); + public List<SysVipInfo> selectByVipNoOrTel(@Param("key") String key); /** * 查询是否唯一 @Title: selectTotalByField @@ -132,7 +134,7 @@ * @param keyWord * @return */ - public List<SysVipInfo> selectUserByKey(@Param("keyWord") String keyWord, @Param("shopId") Long shopId); + public List<SysVipInfo> selectUserByKey(@Param("keyWord") String keyWord,@Param("companyId") Long companyId); /** * 会员活跃状态自动修改 @@ -187,7 +189,7 @@ public int selectSecondTotalRecord(@Param("record") SysVipInfo sysVipInfo); - public SysVipInfo selectByPhone(String phone); + public SysVipInfo selectByPhone(@Param("phone") String phone,@Param("companyId") Long companyId); @@ -202,4 +204,14 @@ public int batchInsert(@Param("list") List<SysVipInfo> list); public List<SysVipInfo> selectVipInfoByVipNo(@Param("companyId") Long companyId, @Param("vipNo") String vipNo); + + List<VipInfoListVo> selectVipAddressBookByList(@Param("record") VipInfoListDto vipInfoListDto); + + com.matrix.system.app.vo.VipInfoVo selectVipInfoById(@Param("id") Long id); + + public SysVipInfo findByOpenId(String openId); + + int unbundlingSaleMan(Long userId); + + int bindingRecommend(@Param("recommendId") Long recommendId,@Param("userId") Long userId); } \ No newline at end of file -- Gitblit v1.9.1