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/action/ApiFollowupAction.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiFollowupAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiFollowupAction.java
index 13455fa..25fa419 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiFollowupAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiFollowupAction.java
@@ -6,6 +6,8 @@
import com.matrix.core.tools.WebUtil;
import com.matrix.system.app.dto.*;
import com.matrix.system.common.bean.SysUsers;
+import com.matrix.system.common.tools.DataAuthUtil;
+import com.matrix.system.hive.action.util.QueryUtil;
import com.matrix.system.hive.bean.*;
import com.matrix.system.hive.dao.*;
import com.matrix.system.hive.plugin.util.CollectionUtils;
@@ -113,18 +115,18 @@
SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
SysFollowup followup = followupDao.selectById(id);
String zans=followup.getZans();
- if(StringUtils.isBlank(zans)){
+ if(StringUtils.isNotBlank(zans)){
List<Long> zanIds = StringUtils.strToCollToLong(zans, ",");
List<Long> zaned = zanIds.stream().filter(zanid -> zanid.equals(user.getSuId())).collect(Collectors.toList());
- if(CollectionUtils.isEmpty(zaned)){
+ if(CollectionUtils.isNotEmpty(zaned)){
//取消赞
List<Long> newZaned = zanIds.stream().filter(zanid -> !zanid.equals(user.getSuId())).collect(Collectors.toList());
zans=StringUtils.collToStr(newZaned,",");
}else{
//点赞
- zaned.add(user.getSuId());
- zans=StringUtils.collToStr(zaned,",");
+ zanIds.add(user.getSuId());
+ zans=StringUtils.collToStr(zanIds,",");
}
}else{
//直接点赞
@@ -157,7 +159,9 @@
@PostMapping(value = "/findFollowup")
public AjaxResult findFollowup(@RequestBody @Validated FollowupListDto followupListDto) {
SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
- followupListDto.setShopId(user.getShopId());
+ if(!DataAuthUtil.hasAllShopAuth()){
+ followupListDto.setShopId(user.getShopId());
+ }
followupListDto.setCompanyId(user.getCompanyId());
followupListDto.setSelfStaff(user.getSuId());
//TODO 需要设置跨店数据权限
--
Gitblit v1.9.1