From 112473768acb75b2f9bd7eca3da035ed624e5123 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 15 Apr 2021 17:52:06 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShareProductAction.java | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShareProductAction.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShareProductAction.java
index 696e9aa..db91c07 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShareProductAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShareProductAction.java
@@ -19,7 +19,6 @@
import com.matrix.system.shopXcx.api.vo.WxActivitiesGroupBuyVO;
import com.matrix.system.shopXcx.bean.*;
import com.matrix.system.shopXcx.dao.*;
-import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
@@ -105,7 +104,7 @@
}
ShopShareQrcord queryOrcode = new ShopShareQrcord();
queryOrcode.setProductId(qrcodeVo.getProductId());
- queryOrcode.setUserId(loginUser.getOpenId());
+ queryOrcode.setUserId(loginUser.getId());
if (isGroupProduct ) {
queryOrcode.setProductId(Integer.parseInt(qrcodeVo.getActId() + ""));
@@ -120,7 +119,7 @@
//如果未查询到就先插入数据再更新数据
shareQrcord.setCreateBy(loginUser.getOpenId());
shareQrcord.setUpdateBy(loginUser.getOpenId());
- shareQrcord.setUserId(loginUser.getOpenId());
+ shareQrcord.setUserId(loginUser.getId());
shareQrcord.setShopId(qrcodeVo.getShopId());
//拼团活动
if (isGroupProduct ) {
@@ -237,7 +236,6 @@
return qrcodeImgParam;
}
- @NotNull
private QrcodeImgParam getQrcodeImgParam(SysVipInfo loginUser, QrcodeVo qrcodeVo) throws Exception {
ShopProduct shopProduct = shopProductDao.selectById(qrcodeVo.getProductId());
--
Gitblit v1.9.1