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/app/mapper/SysStoreInfoMapper.java | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/app/mapper/SysStoreInfoMapper.java b/zq-erp/src/main/java/com/matrix/system/app/mapper/SysStoreInfoMapper.java index b8a0719..86e99cf 100644 --- a/zq-erp/src/main/java/com/matrix/system/app/mapper/SysStoreInfoMapper.java +++ b/zq-erp/src/main/java/com/matrix/system/app/mapper/SysStoreInfoMapper.java @@ -1,7 +1,9 @@ package com.matrix.system.app.mapper; +import com.matrix.system.app.vo.StoreInOutListVo; import com.matrix.system.app.vo.StoreListVo; import com.matrix.system.hive.bean.SysStoreInfo; +import com.matrix.system.hive.pojo.StoreInOutRecordVO; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.factory.Mappers; @@ -23,4 +25,9 @@ public abstract StoreListVo entityToStoreVo(SysStoreInfo sysStoreInfo); public abstract List<StoreListVo> entitiesToStoreVos(List<SysStoreInfo> list); + + @Mapping(target = "content", source = "orderType") + public abstract StoreInOutListVo recordVoToInOutListVo(StoreInOutRecordVO recordVO); + + public abstract List<StoreInOutListVo> recordVosToInOutListVos(List<StoreInOutRecordVO> list); } -- Gitblit v1.9.1