From 446868d70ffeecaeeffb3bed900c0be97ecadbab Mon Sep 17 00:00:00 2001 From: 935090232@qq.com <ak473600000> Date: Wed, 20 Apr 2022 08:24:41 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- zq-erp/src/main/java/com/matrix/system/common/service/impl/SysUsersServiceImpl.java | 3 +++ zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java | 12 ++++++------ zq-erp/src/main/java/com/matrix/system/hive/action/ProjUseController.java | 11 +++++++++-- zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxUserAction.java | 26 +++++++++++++------------- zq-erp/src/main/resources/config/application.properties | 2 +- zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java | 2 +- 6 files changed, 33 insertions(+), 23 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/common/service/impl/SysUsersServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/common/service/impl/SysUsersServiceImpl.java index 2d14f86..1e26967 100644 --- a/zq-erp/src/main/java/com/matrix/system/common/service/impl/SysUsersServiceImpl.java +++ b/zq-erp/src/main/java/com/matrix/system/common/service/impl/SysUsersServiceImpl.java @@ -9,6 +9,7 @@ import com.matrix.core.tools.LogUtil; import com.matrix.core.tools.ModelUtils; import com.matrix.core.tools.WebUtil; +import com.matrix.system.app.authority.AppAuthorityManager; import com.matrix.system.common.authority.DefaultAuthorityManager; import com.matrix.system.common.bean.SysUserLoginRecord; import com.matrix.system.common.bean.SysUsers; @@ -134,8 +135,10 @@ //删除用户权限缓存 String redisKey=DefaultAuthorityManager.USER_POWER_REDISKEY+ SecureUtil.md5(oldSysUsers.getSuId()+""); String redisKeyPc=DefaultAuthorityManager.USER_POWER_REDISKEY_PC+ SecureUtil.md5(oldSysUsers.getSuId()+""); + String appRedisKey = AppAuthorityManager.USER_POWER_REDISKEY_APP + SecureUtil.md5(oldSysUsers.getSuId()+""); LocalCache.remove(redisKey); LocalCache.remove(redisKeyPc); + LocalCache.remove(appRedisKey); return MatrixConstance.DML_SUCCESSS; } diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/ProjUseController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/ProjUseController.java index ab9b83e..a3883d9 100644 --- a/zq-erp/src/main/java/com/matrix/system/hive/action/ProjUseController.java +++ b/zq-erp/src/main/java/com/matrix/system/hive/action/ProjUseController.java @@ -248,8 +248,15 @@ // String dirPath = "E:"; String dirPath = fileStoragePath; - File saveFile = new File(dirPath + "/" + fileName); - file.transferTo(saveFile); + File saveFile =new File (new File(dirPath).getAbsolutePath() + File.separator + fileName); + if (!saveFile.exists()) + { + if (!saveFile.getParentFile().exists()) + { + saveFile.getParentFile().mkdirs(); + } + } + file.transferTo(saveFile.getAbsoluteFile()); SysUsers sysUsers = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY); 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 8660274..f0b2641 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 @@ -1353,7 +1353,7 @@ //赠送项目是否计算消耗业绩否则 赠送产品按原价计算消耗 boolean zsConsumeAchieve = projServicesService.skipServiceOrderStep(Dictionary.ZS_CONSUME_ACHIEVE); if (zsConsumeAchieve) { - if (sysOrderItem.getPrice() <= 0) { + if (sysOrderItem.getZkPrice() <= 0) { //等于0取原价 if (taocanId == null) { puse.setPrice(goodsAssemble.getShoppingGoods().getPrice()); diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java index 11a6648..2cc0337 100644 --- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java +++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java @@ -797,15 +797,15 @@ BusParameterSettings principalConsumption = busParameterSettingsDao.selectCompanyParamByCode(ScoreSettingConstant.PRINCIPAL_CONSUMPTION, vipInfo.getCompanyId()); //本金消耗 if (principalPrice > 0 - && StringUtils.isNotBlank(principalConsumption.getParamValue())) { + && StringUtils.isNotBlank(principalConsumption.getParamValue()) && Double.parseDouble(principalConsumption.getParamValue()) > 0 ) { principalConsumScore[0] = (int) (principalPrice / Double.parseDouble(principalConsumption.getParamValue())); - if (StringUtils.isNotBlank(principalConsumption.getParamValue1())) { + if (StringUtils.isNotBlank(principalConsumption.getParamValue1()) && Double.parseDouble(principalConsumption.getParamValue1()) > 0 ) { principalConsumScore[1] = (int) (principalPrice / Double.parseDouble(principalConsumption.getParamValue1())); } - if (StringUtils.isNotBlank(principalConsumption.getParamValue2())) { + if (StringUtils.isNotBlank(principalConsumption.getParamValue2()) && Double.parseDouble(principalConsumption.getParamValue2()) > 0 ) { principalConsumScore[2] = (int) (principalPrice / Double.parseDouble(principalConsumption.getParamValue2())); } } @@ -814,15 +814,15 @@ BusParameterSettings giveConsumption = busParameterSettingsDao.selectCompanyParamByCode(ScoreSettingConstant.GIVE_CONSUMPTION, vipInfo.getCompanyId()); //本金消耗 if (giftPrice > 0 - && StringUtils.isNotBlank(giveConsumption.getParamValue())) { + && StringUtils.isNotBlank(giveConsumption.getParamValue()) && Double.parseDouble(giveConsumption.getParamValue())>0) { giveConsumScore[0] = (int) (giftPrice / Double.parseDouble(giveConsumption.getParamValue())); - if (StringUtils.isNotBlank(giveConsumption.getParamValue1())) { + if (StringUtils.isNotBlank(giveConsumption.getParamValue1()) && Double.parseDouble(giveConsumption.getParamValue1())>0) { giveConsumScore[1] = (int) (giftPrice / Double.parseDouble(giveConsumption.getParamValue1())); } - if (StringUtils.isNotBlank(giveConsumption.getParamValue2())) { + if (StringUtils.isNotBlank(giveConsumption.getParamValue2()) && Double.parseDouble(giveConsumption.getParamValue2())>0 ) { giveConsumScore[2] = (int) (giftPrice / Double.parseDouble(giveConsumption.getParamValue2())); } } diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxUserAction.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxUserAction.java index ee68131..4691ceb 100644 --- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxUserAction.java +++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxUserAction.java @@ -158,6 +158,7 @@ @RequestMapping(value = "/findUserInfo") public @ResponseBody AjaxResult findUserInfo() { + AjaxResult res = new AjaxResult(); SysVipInfo loginUser = userCacheManager.getLoginUser(); SysVipInfo sysVipInfo = sysVipInfoService.findById(loginUser.getId()); @@ -169,20 +170,19 @@ sysVipInfo.setBalance(0D); sysVipInfo.setPointAll(0); } - } - AjaxResult res = new AjaxResult(); - res.putInMap("couponCount", shopCouponRecordDao.countUnuseCouponRecord(loginUser.getId())); - res.putInMap("prizeCount", activitySignReceiveRecordDao.getSignAwardReceiveCount(loginUser.getId(), loginUser.getCompanyId())); - res.putInMap("userInfo", sysVipInfo); - //查询会员等级 - if (sysVipInfo.getSalesmanGrade() != null) { - ShopSalesmanGrade shopSalesmanGrade = shopSalesmanGradeDao.selectById(sysVipInfo.getSalesmanGrade()); - res.putInMap("vipLevel", shopSalesmanGrade.getName()); - } else if (sysVipInfo.getVipLevel() != null) { - res.putInMap("vipLevel", sysVipInfo.getVipLevel().getLevelName()); - } else { - res.putInMap("vipLevel", "初级会员"); + res.putInMap("couponCount", shopCouponRecordDao.countUnuseCouponRecord(loginUser.getId())); + res.putInMap("prizeCount", activitySignReceiveRecordDao.getSignAwardReceiveCount(loginUser.getId(), loginUser.getCompanyId())); + res.putInMap("userInfo", sysVipInfo); + //查询会员等级 + if (sysVipInfo.getSalesmanGrade() != null) { + ShopSalesmanGrade shopSalesmanGrade = shopSalesmanGradeDao.selectById(sysVipInfo.getSalesmanGrade()); + res.putInMap("vipLevel", shopSalesmanGrade.getName()); + } else if (sysVipInfo.getVipLevel() != null) { + res.putInMap("vipLevel", sysVipInfo.getVipLevel().getLevelName()); + } else { + res.putInMap("vipLevel", "初级会员"); + } } res.setStatus(AjaxResult.STATUS_SUCCESS); return res; diff --git a/zq-erp/src/main/resources/config/application.properties b/zq-erp/src/main/resources/config/application.properties index ddb6608..7ab9f40 100644 --- a/zq-erp/src/main/resources/config/application.properties +++ b/zq-erp/src/main/resources/config/application.properties @@ -1,5 +1,5 @@ -spring.profiles.active=test +spring.profiles.active=meidu evn=dev server.port=8080 -- Gitblit v1.9.1