~jiangyouyao/beauty-erp.git

			@@ -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);

			@@ -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);

			@@ -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);
			//获取用户使用的优惠券

	zq-erp/src/main/java/com/matrix/system/common/actions/CommonAction.java	8 ●●●●● patch \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/common/actions/FileUploadAction.java	8 ●●●●● patch \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/impl/WXShopOrderServiceImpl.java	2 ●●●●● patch \| view \| raw \| blame \| history