From 1ceabefb451912daa5dda7768b7ef0b89a56c08a Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Fri, 25 Mar 2022 12:28:00 +0800 Subject: [PATCH] 1 --- zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java | 49 ++++++++++++++++++++++++++----------------------- 1 files changed, 26 insertions(+), 23 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java index 7e39d58..49fbdba 100644 --- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java +++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java @@ -3,9 +3,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.matrix.system.hive.bean.SysVipInfo; -import com.matrix.system.hive.dao.SysVipInfoDao; -import com.matrix.component.redis.RedisUserLoginUtils; import com.matrix.component.tools.ImageUtil; import com.matrix.component.tools.WxacodeUtil; import com.matrix.core.pojo.AjaxResult; @@ -13,16 +10,18 @@ import com.matrix.core.pojo.VerificationResult; import com.matrix.core.tools.LogUtil; import com.matrix.core.tools.MD5Util; -import com.matrix.core.tools.PropertiesUtil; import com.matrix.core.tools.StringUtils; import com.matrix.system.common.bean.BusParameterSettings; import com.matrix.system.common.constance.AppConstance; import com.matrix.system.common.dao.BusParameterSettingsDao; +import com.matrix.system.common.init.UserCacheManager; import com.matrix.system.common.interceptor.HostInterceptor; import com.matrix.system.fenxiao.constant.FenxiaoSettingConstant; import com.matrix.system.fenxiao.dao.ShopSalesmanApplyDao; import com.matrix.system.fenxiao.entity.ShopSalesmanApply; import com.matrix.system.fenxiao.service.ShopSalesmanApplyService; +import com.matrix.system.hive.bean.SysVipInfo; +import com.matrix.system.hive.dao.SysVipInfoDao; import com.matrix.system.hive.plugin.util.CollectionUtils; import com.matrix.system.shopXcx.api.WeChatApiTools; import com.matrix.system.shopXcx.dao.ShopProductDao; @@ -34,6 +33,7 @@ import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; @@ -41,8 +41,6 @@ import java.awt.*; import java.awt.image.BufferedImage; import java.io.File; -import java.util.Date; -import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -57,6 +55,9 @@ public class WxSalesmanAction { @Autowired + WxacodeUtil wxacodeUtil; + + @Autowired BusParameterSettingsDao busParameterSettingsDao; @Autowired @@ -67,7 +68,7 @@ ShopSalesmanApplyService shopSalesmanApplyService; @Autowired - private RedisUserLoginUtils redisUserLoginUtils; + private UserCacheManager userCacheManager; @Autowired private SysVipInfoDao sysVipInfoDao; @@ -77,6 +78,12 @@ @Autowired ShopProductDao shopProductDao; + + @Value("${file_storage_path}") + private String fileStoragePath; + + @Value("${static_resource_url}") + private String staticResourceUrl; @ApiOperation(value = "查询推广计划", notes = "") @GetMapping(value = "/getTgPlan") @@ -106,7 +113,7 @@ @PostMapping(value = "/applyToBeAnSalesman") @Transactional public AjaxResult applyToBeAnSalesman(@RequestBody Map<String, String> param) { - SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class); + SysVipInfo loginUser = userCacheManager.getLoginUser(); Long invitationId=null; if(StringUtils.isNotBlank(param.get("invitationId"))){ invitationId = Long.parseLong(param.get("invitationId")); @@ -118,7 +125,7 @@ } ShopSalesmanApply shopSalesmanApply = shopSalesmanApplyService.applyToBeAnSalesman(loginUser.getId(), null, invitationId, ShopSalesmanApply.APPLY_WAY_SELF); loginUser = sysVipInfoDao.selectById(loginUser.getId()); - redisUserLoginUtils.updateUserInfo(loginUser); + userCacheManager.updateUserInfo(loginUser); return AjaxResult.buildSuccessInstance(shopSalesmanApply); @@ -131,7 +138,7 @@ }) @GetMapping(value = "/queryApplyProgress") public AjaxResult queryApplyProgress() { - SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class); + SysVipInfo loginUser = userCacheManager.getLoginUser(); QueryWrapper<ShopSalesmanApply> queryWrapper = new QueryWrapper<>(); queryWrapper.eq("user_id", loginUser.getId()); queryWrapper.eq("apply_status", ShopSalesmanApply.APPLY_STATUS_DSH); @@ -155,7 +162,7 @@ return AjaxResult.buildFailInstance("请求参数错误"); } - SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class); + SysVipInfo loginUser = userCacheManager.getLoginUser(); if (invitationId.equals(loginUser.getId())) { return AjaxResult.buildSuccessInstance("不能绑定自己"); } @@ -168,11 +175,7 @@ return AjaxResult.buildSuccessInstance("已经被绑定"); } else { if (loginUser.getRecommendId()==null) { - Map<String, Object> updateParam = new HashMap<>(); - updateParam.put("id", loginUser.getId()); - loginUser.setRecommendId(invitationUser.getId()); - loginUser.setBindingParentTime(new Date()); - sysVipInfoDao.update(loginUser); + sysVipInfoDao.bindingRecommend(invitationUser.getId(),loginUser.getId()); return AjaxResult.buildSuccessInstance("绑定成功"); } else { return AjaxResult.buildSuccessInstance("已经存在上级"); @@ -187,11 +190,11 @@ @PostMapping(value = "/getInvitationPoster") AjaxResult getInvitationPoster() { try { - SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class); + SysVipInfo loginUser = userCacheManager.getLoginUser(); - String baseSavePath = PropertiesUtil.getString(AppConstance.FILES_TORAGE_PATH); + String baseSavePath = fileStoragePath; // 图片访问URL - String baseSaveUrl = PropertiesUtil.getString(AppConstance.NGINX_URL); + String baseSaveUrl =staticResourceUrl; //目标海报物理存储路径 String targetImg = MD5Util.strToMD5(loginUser.getOpenId()) + "haibao.png"; @@ -199,7 +202,7 @@ String urlPath = baseSaveUrl + "/" + "wxacode" + "/" + targetImg; - String qrcodeSavePath = WxacodeUtil.getWxacode(loginUser.getId() + "", "pages/distributorCenter/applyFor/applyFor", MD5Util.strToMD5(loginUser.getOpenId()) + "qrcode" + String qrcodeSavePath = wxacodeUtil.getWxacode(loginUser.getId() + "", "pages/distributorCenter/applyFor/applyFor", MD5Util.strToMD5(loginUser.getOpenId()) + "qrcode" , weChatApiTools.getAppid(loginUser.getCompanyId()), weChatApiTools.getSecret(loginUser.getCompanyId())); BufferedImage qrcordImgBuf = ImageIO.read(new File(qrcodeSavePath)); @@ -251,7 +254,7 @@ @ApiResponse(code = 200, message = "ok", response = SalesmanVo.class) }) AjaxResult getInvitationuserList(@RequestBody BasePageQueryDto pageDto) { - SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class); + SysVipInfo loginUser = userCacheManager.getLoginUser(); Page<SalesmanVo> page = new Page<>(pageDto.getPageNum(), pageDto.getPageSize()); IPage<SalesmanVo> shopSalesmanApplyIPage = salesmanApplyDao.selectInvitationuserInPage(page, loginUser.getId(), pageDto.getKeywords()); AjaxResult result = AjaxResult.buildSuccessInstance(shopSalesmanApplyIPage.getRecords()); @@ -265,7 +268,7 @@ @ApiResponse(code = 200, message = "ok", response = SalesmanCenterInfo.class) }) AjaxResult getSalesmanCenterInfo() { - SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class); + SysVipInfo loginUser = userCacheManager.getLoginUser(); SalesmanCenterInfo salesmanCenterInfo = salesmanApplyDao.selectSalesmanCenterInfo(loginUser.getId()); return AjaxResult.buildSuccessInstance(salesmanCenterInfo); } @@ -276,7 +279,7 @@ @ApiResponse(code = 200, message = "ok", response = SalesmanApplyCondition.class) }) AjaxResult getSalesmanApplyCondition() { - SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class); + SysVipInfo loginUser = userCacheManager.getLoginUser(); VerificationResult ableToBeAnSalesman = shopSalesmanApplyService.isAbleToBeAnSalesman(loginUser.getId(), loginUser.getCompanyId()); SalesmanApplyCondition applyConditionInfo = new SalesmanApplyCondition(); applyConditionInfo.setIsAbleApply(ableToBeAnSalesman.isJudgeResult()); -- Gitblit v1.9.1