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/wechart/templateMsg/Task/messageBulderDemo/YycgTemplateMessageBulder.java | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/wechart/templateMsg/Task/messageBulderDemo/YycgTemplateMessageBulder.java b/zq-erp/src/main/java/com/matrix/system/wechart/templateMsg/Task/messageBulderDemo/YycgTemplateMessageBulder.java index 2e70fcc..82a4a06 100644 --- a/zq-erp/src/main/java/com/matrix/system/wechart/templateMsg/Task/messageBulderDemo/YycgTemplateMessageBulder.java +++ b/zq-erp/src/main/java/com/matrix/system/wechart/templateMsg/Task/messageBulderDemo/YycgTemplateMessageBulder.java @@ -18,9 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; +import java.util.*; /** * 预约成功提醒 @@ -77,13 +75,13 @@ //如果一个项目存在多个护理项目则发送多次消息 String projectInfo=""; - String staffName=""; + Set<String> staffNames=new HashSet<>(); for (SysBeauticianState beauticianState:beauticianStateList){ projectInfo+=beauticianState.getProjInfo().getName()+beauticianState.getCount()+"次,"; - staffName+=beauticianState.getBeautiStaffInfo().getSuName()+","; + staffNames.add(beauticianState.getBeautiStaffInfo().getSuName()); } projectInfo=projectInfo.substring(0,projectInfo.length()-1); - staffName=staffName.substring(0,staffName.length()-1); + String staffName=StringUtils.collToStr(staffNames,","); UniformMsgPojo uniformMsgPojo=new UniformMsgPojo(); GzhTemplateMessagePojo messagePojo=new GzhTemplateMessagePojo(); uniformMsgPojo.setTouser(touser); -- Gitblit v1.9.1