From 4bc4270eb46bd06db2013b234aab3e54e1150e2a Mon Sep 17 00:00:00 2001 From: 935090232@qq.com <ak473600000> Date: Sun, 24 Apr 2022 23:56:35 +0800 Subject: [PATCH] Merge branch 'developer' into alpha --- zq-erp/src/main/java/com/matrix/system/common/service/impl/SysUsersServiceImpl.java | 3 + zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/impl/WxShopActivitiesSecKillServiceImpl.java | 4 + zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java | 1 zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java | 12 +++--- zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/YuyueAction.java | 8 ++-- zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml | 1 zq-erp/src/main/java/com/matrix/system/hive/action/ProjUseController.java | 11 ++++- zq-erp/src/main/java/com/matrix/system/common/tools/LocationUtil.java | 9 +++- zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxUserAction.java | 26 ++++++------ zq-erp/src/main/resources/config/application.properties | 2 10 files changed, 47 insertions(+), 30 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/common/tools/LocationUtil.java b/zq-erp/src/main/java/com/matrix/system/common/tools/LocationUtil.java index a741b00..c9b423e 100644 --- a/zq-erp/src/main/java/com/matrix/system/common/tools/LocationUtil.java +++ b/zq-erp/src/main/java/com/matrix/system/common/tools/LocationUtil.java @@ -1,5 +1,7 @@ package com.matrix.system.common.tools; +import java.math.BigDecimal; + public class LocationUtil { private static final double EARTH_RADIUS = 6378.137; @@ -17,7 +19,7 @@ * shopX 店铺位置经度 * shopY 店铺位置纬度 */ - public static double getDistance(double locX, double locY, double shopX, double shopY) { + public static BigDecimal getDistance(double locX, double locY, double shopX, double shopY) { double a, b, d, sa2, sb2; locY = rad(locY); shopY = rad(shopY); @@ -29,12 +31,13 @@ d = 2 * EARTH_RADIUS * Math.asin(Math.sqrt(sa2 * sa2 + Math.cos(locY) * Math.cos(shopY) * sb2 * sb2)); - return d; + return BigDecimal.valueOf(d); } public static void main(String[] args) { // 112.886891,28.222562,114.061937,22.626003 -- 634093.3209722887 // 113.930692,22.939454 -- 597367.3546527711 - System.out.println(getDistance(112.886891d, 28.222562d, 113.930692, 22.939454)); +// System.out.println(getDistance(112.886891d, 28.222562d, 113.930692, 22.939454)); + System.out.println(BigDecimal.ONE.compareTo(BigDecimal.ZERO)>0); } } diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java index c31ba85..36f8eb7 100644 --- a/zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java +++ b/zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java @@ -218,6 +218,7 @@ if (!DataAuthUtil.hasAllShopAuth()) { sysOrder.setShopId(getMe().getShopId()); } + sysOrder.setCompanyId(getMe().getCompanyId()); return new AjaxResult(AjaxResult.STATUS_SUCCESS, orderService.findInPage(sysOrder, pageVo), orderService.findTotal(sysOrder)); } 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/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/java/com/matrix/system/shopXcx/api/action/YuyueAction.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/YuyueAction.java index 19fc17f..47420ba 100644 --- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/YuyueAction.java +++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/YuyueAction.java @@ -122,7 +122,7 @@ return new AjaxResult(AjaxResult.STATUS_SUCCESS, shopList); } - Double distance = null; + BigDecimal distance = null; SysShopInfo nearestShop = null; AjaxResult ajaxResult = new AjaxResult("200", shopList); @@ -130,9 +130,9 @@ for (SysShopInfo shopInfo : shopList) { Double shopX = Double.parseDouble(shopInfo.getLongitude()); Double shopY = Double.parseDouble(shopInfo.getLatitude()); - Double disResult = LocationUtil.getDistance(Double.parseDouble(locX), Double.parseDouble(locY), shopX, shopY); - shopInfo.setDistance(new BigDecimal(disResult).setScale(1, BigDecimal.ROUND_HALF_UP)); - if (distance == null || distance > disResult) { + BigDecimal disResult = LocationUtil.getDistance(Double.parseDouble(locX), Double.parseDouble(locY), shopX, shopY); + shopInfo.setDistance(disResult); + if (distance == null || distance.compareTo(disResult)>0) { distance = disResult; nearestShop = shopInfo; } diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/impl/WxShopActivitiesSecKillServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/impl/WxShopActivitiesSecKillServiceImpl.java index b7f8f78..3efb015 100644 --- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/impl/WxShopActivitiesSecKillServiceImpl.java +++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/impl/WxShopActivitiesSecKillServiceImpl.java @@ -23,6 +23,7 @@ import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.util.ArrayList; @@ -60,6 +61,7 @@ private ShopActivitiesSeckillRecordDao shopActivitiesSeckillRecordDao; @Override + @Transactional(rollbackFor = Exception.class) public AjaxResult createSecKillOrder(CreateSecKillDTO secKillDTO) throws Exception { SysVipInfo sysVipInfo = userCacheManager.getLoginUser(); ShopActivitiesSeckillInfo seckillInfo = shopActivitiesSeckillInfoDao.selectById(secKillDTO.getId()); @@ -173,7 +175,7 @@ //TODO 更新库存和销量 更新库存和销量[考虑和erp库存联动] wxShopOrderUtil.updateProductAndSkuInfo(details); - shopOrder.setUserId(secKillDTO.getId()); + shopOrder.setUserId(sysVipInfo.getId()); shopOrder.setCreateBy("微信小程序生成"); shopOrder.setUpdateBy("微信小程序生成"); shopOrder.setCommodityPrice(secKillDTO.getPrice()); 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 diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml index 709e6c9..dd72e3c 100644 --- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml +++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml @@ -334,6 +334,7 @@ and a.STATE !='预约取消' and a.STATE !='待确认' and a.STATE !='待预约' + and a.STATE !='服务单结束' order by a.BEGIN_TIME asc </select> -- Gitblit v1.9.1