~jiangyouyao/beauty-erp.git

			@@ -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;
			@@ -18,11 +15,14 @@
			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;
			@@ -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;
			@@ -67,7 +65,7 @@
			ShopSalesmanApplyService shopSalesmanApplyService;

			@Autowired
			private RedisUserLoginUtils redisUserLoginUtils;
			private UserCacheManager userCacheManager;

			@Autowired
			private SysVipInfoDao sysVipInfoDao;
			@@ -106,7 +104,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 +116,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 +129,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 +153,7 @@
			return AjaxResult.buildFailInstance("请求参数错误");
			}

			SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
			SysVipInfo loginUser = userCacheManager.getLoginUser();
			if (invitationId.equals(loginUser.getId())) {
			return AjaxResult.buildSuccessInstance("不能绑定自己");
			}
			@@ -168,11 +166,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,7 +181,7 @@
			@PostMapping(value = "/getInvitationPoster")
			AjaxResult getInvitationPoster() {
			try {
			SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
			SysVipInfo loginUser = userCacheManager.getLoginUser();

			String baseSavePath = PropertiesUtil.getString(AppConstance.FILES_TORAGE_PATH);
			// 图片访问URL
			@@ -251,7 +245,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 +259,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 +270,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());