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/hive/action/SupplierInfoController.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/SupplierInfoController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/SupplierInfoController.java
index e381a62..b43c080 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/action/SupplierInfoController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/action/SupplierInfoController.java
@@ -8,9 +8,12 @@
import com.matrix.core.tools.WebUtil;
import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.hive.action.util.QueryUtil;
+import com.matrix.system.hive.bean.SysShopInfo;
import com.matrix.system.hive.bean.SysSupplierInfo;
+import com.matrix.system.hive.dao.SysShopInfoDao;
import com.matrix.system.hive.service.CodeService;
import com.matrix.system.hive.service.SysSupplierInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -31,6 +34,8 @@
@Resource
private CodeService codeService;
+ @Autowired
+ private SysShopInfoDao shopInfoDao;
@@ -93,8 +98,9 @@
@RequestMapping(value = "/all")
public @ResponseBody AjaxResult all(SysSupplierInfo sysSupplierInfo) {
SysUsers sysUsers = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
- sysSupplierInfo.setShopId(sysUsers.getShopId());
- sysSupplierInfo.setCompanyId(sysUsers.getCompanyId());
+ SysShopInfo shopInfo = shopInfoDao.selectZbShop(sysUsers.getCompanyId());
+ sysSupplierInfo.setShopId(shopInfo.getId());
+ sysSupplierInfo.setCompanyId(shopInfo.getCompanyId());
return new AjaxResult(AjaxResult.STATUS_SUCCESS, currentService.findByModel(sysSupplierInfo), 0);
}
--
Gitblit v1.9.1