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/activity/dao/ActivitySignReceiveRecordDao.java | 29 ++++++++++++++++++++++++++++- 1 files changed, 28 insertions(+), 1 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/activity/dao/ActivitySignReceiveRecordDao.java b/zq-erp/src/main/java/com/matrix/system/activity/dao/ActivitySignReceiveRecordDao.java index 727435b..2c395a8 100644 --- a/zq-erp/src/main/java/com/matrix/system/activity/dao/ActivitySignReceiveRecordDao.java +++ b/zq-erp/src/main/java/com/matrix/system/activity/dao/ActivitySignReceiveRecordDao.java @@ -2,13 +2,40 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.matrix.system.activity.dto.CouponDto; +import com.matrix.system.activity.dto.GoodsDto; +import com.matrix.system.activity.dto.SignReceiveListDto; import com.matrix.system.activity.entity.ActivitySignReceiveRecord; +import com.matrix.system.activity.vo.CouponVo; +import com.matrix.system.activity.vo.GoodsVo; +import com.matrix.system.activity.vo.SignReceiveListVo; +import com.matrix.system.shopXcx.api.dto.SeeAwardTextDto; +import com.matrix.system.shopXcx.api.dto.SignAwardDto; +import com.matrix.system.shopXcx.api.vo.SeeAwardTextVo; +import com.matrix.system.shopXcx.api.vo.SignAwardListVo; +import com.matrix.system.shopXcx.vo.SalesOrderVo; + +import org.apache.ibatis.annotations.Param; /** - * @description 领 * @author yourName * @date 2021-03-31 16:57 */ public interface ActivitySignReceiveRecordDao extends BaseMapper<ActivitySignReceiveRecord>{ + IPage<SignReceiveListVo> findSignReceiveList(Page<SignReceiveListVo> page, + @Param("record")SignReceiveListDto signReceiveListDto); + + IPage<CouponVo> selectCouponList(Page<CouponVo> page, @Param("record")CouponDto couponDto); + + IPage<GoodsVo> selectGoodsList(Page<GoodsVo> page, @Param("record")GoodsDto goodsDto); + + int getSignAwardReceiveCount(@Param("userId")Long userId, @Param("companyId")Long companyId); + + IPage<SignAwardListVo> selectSignAwardList(Page<SalesOrderVo> page, @Param("record")SignAwardDto signAwardDto); + + SeeAwardTextVo selectSeeAwardTextVOById(@Param("record")SeeAwardTextDto seeAwardTextDto); + } \ No newline at end of file -- Gitblit v1.9.1