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 | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 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 08dc623..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 @@ -11,6 +11,12 @@ 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; /** @@ -28,4 +34,8 @@ 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