From 911297338aece1dedcddd5caaaf875c51c793aec Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 13 Aug 2021 12:05:02 +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/common/actions/CommonAction.java | 8 ++++++++
zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/impl/WXShopOrderServiceImpl.java | 2 +-
zq-erp/src/main/java/com/matrix/system/common/actions/FileUploadAction.java | 8 +++++++-
3 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/common/actions/CommonAction.java b/zq-erp/src/main/java/com/matrix/system/common/actions/CommonAction.java
index bb52ad3..18bbb30 100644
--- a/zq-erp/src/main/java/com/matrix/system/common/actions/CommonAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/common/actions/CommonAction.java
@@ -11,10 +11,13 @@
import com.matrix.system.common.authority.strategy.AccountPasswordLogin;
import com.matrix.system.common.authority.strategy.LoginStrategy;
import com.matrix.system.common.authority.strategy.ScanQrCodeLogin;
+import com.matrix.system.common.bean.SysCompany;
import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.common.constance.AppConstance;
import com.matrix.system.common.dao.ProjExceptionDao;
+import com.matrix.system.common.dao.SysCompanyDao;
import com.matrix.system.common.dto.WebLoginDto;
+import com.matrix.system.common.interceptor.HostInterceptor;
import com.matrix.system.common.service.SysUsersService;
import com.matrix.system.hive.dao.SysShopInfoDao;
import com.matrix.system.hive.statistics.StatisticsBusinessDataJob;
@@ -64,6 +67,9 @@
@Autowired
SysShopInfoDao sysShopInfoDao;
+
+ @Autowired
+ SysCompanyDao sysCompanyDao;
/**
* 页面定向方法，每个权限模块公用一个，每个模块共享一个一级路径，已便于进行权限过滤
@@ -119,6 +125,8 @@
AjaxResult result = new AjaxResult();
authorityManager.initUserPower(result);
+ SysCompany sysCompany = sysCompanyDao.selectById(user.getCompanyId());
+ WebUtil.setSessionAttribute(HostInterceptor.ATTR_COMPANY, sysCompany);
result.putInMap("user",user);
result.setStatus(AjaxResult.STATUS_SUCCESS);
diff --git a/zq-erp/src/main/java/com/matrix/system/common/actions/FileUploadAction.java b/zq-erp/src/main/java/com/matrix/system/common/actions/FileUploadAction.java
index 2613e92..5dc9eda 100644
--- a/zq-erp/src/main/java/com/matrix/system/common/actions/FileUploadAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/common/actions/FileUploadAction.java
@@ -1,8 +1,12 @@
package com.matrix.system.common.actions;
+import com.matrix.core.constance.MatrixConstance;
import com.matrix.core.tools.FileType;
+import com.matrix.core.tools.WebUtil;
import com.matrix.core.web.BaseAction;
+import com.matrix.system.common.bean.SysCompany;
import com.matrix.system.common.bean.SysUsers;
+import com.matrix.system.common.interceptor.HostInterceptor;
import com.matrix.system.common.tools.UploadUtil;
import org.apache.commons.fileupload.FileUploadException;
import org.springframework.stereotype.Controller;
@@ -41,7 +45,9 @@
public String doImageUpload(HttpServletResponse response, MultipartHttpServletRequest request)
throws IOException, FileUploadException, NoSuchAlgorithmException {
SysUsers user = getSessionUser();
- Map<String, String> fileMap = UploadUtil.doUpload(request, EXT_LIST, folderType, user.getSuId());
+
+ SysCompany company = WebUtil.getSessionAttribute(HostInterceptor.ATTR_COMPANY);
+ Map<String, String> fileMap = UploadUtil.doUpload(request, EXT_LIST, folderType, company.getComId());
String callBack = request.getParameter("callBack");
String inputId = request.getParameter("inputId");
request.setAttribute("callBack", callBack);
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/impl/WXShopOrderServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/impl/WXShopOrderServiceImpl.java
index 38a88a4..c3832e8 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/impl/WXShopOrderServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/impl/WXShopOrderServiceImpl.java
@@ -319,7 +319,7 @@
List<CouponReceiveInfoVO> usefulCoupon = new ArrayList<>();
CouponReceiveInfoVO shopCoupon = new CouponReceiveInfoVO();
//满足店铺活动的订单不能使用优惠券
- if (conditionsGroupCount > 0) {
+ if (conditionsGroupCount <= 0) {
//计算可用优惠券
usefulCoupon = wxShopCouponService.getCartVoCouponList(sysVipInfo.getCompanyId(), orderItemDtos);
//获取用户使用的优惠券
--
Gitblit v1.9.1