From 393d296e43f0e5f11e524cab5446bcd3eee94e89 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 12 Jun 2021 17:47:38 +0800
Subject: [PATCH] 新增赠送项目是否计算消耗控制

---
 zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WXShopOrderAction.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WXShopOrderAction.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WXShopOrderAction.java
index 6f80250..47f4f64 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WXShopOrderAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WXShopOrderAction.java
@@ -216,7 +216,7 @@
                     }
                     shopActivitiesGroupJoinDao.updateByModel(groupJoin);
 
-                    SysVipInfo sysVipInfo = sysVipInfoDao.selectByPhone(order.getUserTel());
+                    SysVipInfo sysVipInfo = sysVipInfoDao.selectByPhone(order.getUserTel(),order.getCompanyId());
                     if (sysVipInfo != null) {
                         sysVipInfo.setIsDeal(SysVipInfo.DEAL_VIP);
                         sysVipInfoDao.update(sysVipInfo);

--
Gitblit v1.9.1