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/ApiVipLabelAction.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiVipLabelAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiVipLabelAction.java
index 5ba12c4..3399e91 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiVipLabelAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiVipLabelAction.java
@@ -42,7 +42,7 @@
sysVipLabel.setUserId(getMe().getSuId());
sysVipLabel.setLabel(labelDto.getLabel());
List<SysVipLabel> userLabel = sysVipLabelDao.selectByModel(sysVipLabel);
- AjaxResult ajaxResult = new AjaxResult();
+ AjaxResult ajaxResult = AjaxResult.buildSuccessInstance("获取成功");
ajaxResult.putInMap("allLabel", zbLabel);
ajaxResult.putInMap("myLabel", userLabel);
return ajaxResult;
@@ -53,6 +53,7 @@
@PostMapping(value = "/addLabel")
public AjaxResult addLabel(@RequestBody LabelDto labelDto) {
SysVipLabel sysVipLabel = new SysVipLabel();
+ sysVipLabel.setCreateBy(getMe().getSuName());
sysVipLabel.setLabel(labelDto.getLabel());
sysVipLabel.setColor(labelDto.getColor());
sysVipLabel.setShopId(getMe().getShopId());
--
Gitblit v1.9.1