From 8211fcd054ba3b5e495ee9f87dcb4bef6db05142 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 10 Mar 2021 15:20:48 +0800
Subject: [PATCH] modify

---
 zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java
index 20c6415..bc32f12 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java
@@ -701,6 +701,14 @@
             return true;
         } else {
             // 不是一卡通,
+            // 判断卡是否可应用于所有产品
+            ShoppingGoods cardGoods = shoppingGoodsDao.selectById(moneyCardUse.getGoodsId());
+            if (cardGoods != null) {
+                if (Dictionary.FLAG_YES.equals(cardGoods.getCarIsAll())) {
+                    return true;
+                }
+            }
+
             // 比较分类
             MoneyCardAssemble moneyCardAssemble = new MoneyCardAssemble();
             moneyCardAssemble.setCardId(moneyCardUse.getGoodsId());

--
Gitblit v1.9.1