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/shopXcx/action/ShopCouponAction.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopCouponAction.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopCouponAction.java
index b08d002..d60a263 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopCouponAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopCouponAction.java
@@ -14,7 +14,6 @@
import com.matrix.core.tools.WebUtil;
import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.constance.Dictionary;
-import com.matrix.system.hive.action.util.QueryUtil;
import com.matrix.system.shopXcx.bean.ShopCoupon;
import com.matrix.system.shopXcx.bean.ShopProduct;
import com.matrix.system.shopXcx.dao.ShopCouponDao;
@@ -269,6 +268,7 @@
* @param shopCoupon
*/
private void productLabeling(ShopCoupon shopCoupon) {
+ SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
Date now = new Date();
Boolean needUpdate = false;
//优惠券处于可用状态
@@ -279,6 +279,7 @@
if (shopCoupon.getIsAll() == 1) {
ShopProduct productQuery = new ShopProduct();
productQuery.setDelFlag(2);
+ productQuery.setCompanyId(user.getCompanyId());
shopProductList = shopProductDao.selectByModel(productQuery);
} else {
if (StringUtils.isNotBlank(shopCoupon.getProductIds())) {
--
Gitblit v1.9.1