From 241a49f9653aa83d1dcd9bf646208da3157df35a Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Mon, 05 Apr 2021 22:48:14 +0800
Subject: [PATCH] 合并BizUser表与SysVipInfo表 大部分逻辑已经修正 可能存在问题的 1、拼团秒杀 2、分享图 3、分销结算
---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java | 142 +++++++++++++++++++++-------------------------
1 files changed, 65 insertions(+), 77 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 4f0b0d9..7e39d58 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,8 +3,8 @@
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.biz.bean.BizUser;
-import com.matrix.biz.dao.BizUserDao;
+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;
@@ -70,7 +70,7 @@
private RedisUserLoginUtils redisUserLoginUtils;
@Autowired
- private BizUserDao bizUserDao;
+ private SysVipInfoDao sysVipInfoDao;
@Autowired
WeChatApiTools weChatApiTools;
@@ -93,13 +93,10 @@
BusParameterSettings fxSwith = busParameterSettingsDao.selectCompanyParamByCode(FenxiaoSettingConstant.FX_SWITCH, HostInterceptor.getCompanyId());
BusParameterSettings fxModel = busParameterSettingsDao.selectCompanyParamByCode(FenxiaoSettingConstant.FX_MODEL, HostInterceptor.getCompanyId());
AjaxResult ajaxResult = AjaxResult.buildSuccessInstance("查询成功");
- ajaxResult.putInMap("fxSwith",fxSwith.getParamValue());
- ajaxResult.putInMap("fxModel",fxModel.getParamValue());
+ ajaxResult.putInMap("fxSwith", fxSwith.getParamValue());
+ ajaxResult.putInMap("fxModel", fxModel.getParamValue());
return ajaxResult;
}
-
-
-
@ApiOperation(value = "申请成为推广员", notes = "传入参数invitationId 邀请人openId ,非必填 例： {invitationId:openId}")
@@ -108,21 +105,21 @@
})
@PostMapping(value = "/applyToBeAnSalesman")
@Transactional
- public AjaxResult applyToBeAnSalesman(@RequestBody Map<String,String> param) {
- BizUser loginUser = redisUserLoginUtils.getLoginUser(BizUser.class);
- String invitationId = param.get("invitationId");
- if(StringUtils.isNotBlank(invitationId)){
- BizUser invitationUser = bizUserDao.findByOpenId(invitationId);
- if(invitationUser!=null && invitationUser.getOpenId().equals(loginUser.getOpenId())) {
+ public AjaxResult applyToBeAnSalesman(@RequestBody Map<String, String> param) {
+ SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
+ Long invitationId=null;
+ if(StringUtils.isNotBlank(param.get("invitationId"))){
+ invitationId = Long.parseLong(param.get("invitationId"));
+
+ SysVipInfo invitationUser = sysVipInfoDao.selectById(invitationId);
+ if (invitationUser != null && invitationUser.getId().equals(loginUser.getId())) {
return AjaxResult.buildFailInstance("不能邀请自己成为推广员");
}
}
-
- ShopSalesmanApply shopSalesmanApply= shopSalesmanApplyService.applyToBeAnSalesman(loginUser.getOpenId(),"",invitationId,ShopSalesmanApply.APPLY_WAY_SELF);
- loginUser=bizUserDao.selectById(loginUser.getUserId());
+ ShopSalesmanApply shopSalesmanApply = shopSalesmanApplyService.applyToBeAnSalesman(loginUser.getId(), null, invitationId, ShopSalesmanApply.APPLY_WAY_SELF);
+ loginUser = sysVipInfoDao.selectById(loginUser.getId());
redisUserLoginUtils.updateUserInfo(loginUser);
return AjaxResult.buildSuccessInstance(shopSalesmanApply);
-
}
@@ -134,10 +131,10 @@
})
@GetMapping(value = "/queryApplyProgress")
public AjaxResult queryApplyProgress() {
- BizUser loginUser = redisUserLoginUtils.getLoginUser(BizUser.class);
+ SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
QueryWrapper<ShopSalesmanApply> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("user_id",loginUser.getOpenId());
- queryWrapper.eq("apply_status",ShopSalesmanApply.APPLY_STATUS_DSH);
+ queryWrapper.eq("user_id", loginUser.getId());
+ queryWrapper.eq("apply_status", ShopSalesmanApply.APPLY_STATUS_DSH);
ShopSalesmanApply shopSalesmanApply = salesmanApplyDao.selectOne(queryWrapper);
return AjaxResult.buildSuccessInstance(shopSalesmanApply);
}
@@ -148,42 +145,39 @@
@ApiResponse(code = 200, message = "ok", response = Map.class)
})
@PostMapping(value = "/bindingParentSalesman")
- public AjaxResult bindingParentSalesman(@RequestBody Map<String,String> param) {
- String invitationId = param.get("invitationId");
+ public AjaxResult bindingParentSalesman(@RequestBody Map<String, Long> param) {
+ Long invitationId = param.get("invitationId");
- if (StringUtils.isBlank(invitationId)) {
- return AjaxResult.buildFailInstance("请求参数错误");
- }
- BizUser invitationUser = bizUserDao.selectById(Long.parseLong(invitationId));
- if (invitationUser==null) {
+
+ SysVipInfo invitationUser = sysVipInfoDao.selectById(invitationId);
+ if (invitationUser == null) {
return AjaxResult.buildFailInstance("请求参数错误");
}
- BizUser loginUser = redisUserLoginUtils.getLoginUser(BizUser.class);
- if(invitationId.equals(loginUser.getUserId())){
+ SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
+ if (invitationId.equals(loginUser.getId())) {
return AjaxResult.buildSuccessInstance("不能绑定自己");
}
- loginUser = bizUserDao.selectById(loginUser.getUserId());
- if(loginUser.getIsSales()==1){
+ loginUser = sysVipInfoDao.selectById(loginUser.getId());
+ if (loginUser.getIsSales() == 1) {
return AjaxResult.buildSuccessInstance("只有非分销员才能被绑定成客户");
- }if (StringUtils.isNotBlank(loginUser.getParentOpenId())){
+ }
+ if (loginUser.getRecommendId()!=null) {
return AjaxResult.buildSuccessInstance("已经被绑定");
- }else{
- if (StringUtils.isBlank(loginUser.getParentOpenId())) {
+ } else {
+ if (loginUser.getRecommendId()==null) {
Map<String, Object> updateParam = new HashMap<>();
- updateParam.put("userId", loginUser.getUserId());
- updateParam.put("parentOpenId", invitationUser.getOpenId());
- updateParam.put("bindingParentTime",new Date());
- bizUserDao.updateByMap(updateParam);
+ updateParam.put("id", loginUser.getId());
+ loginUser.setRecommendId(invitationUser.getId());
+ loginUser.setBindingParentTime(new Date());
+ sysVipInfoDao.update(loginUser);
return AjaxResult.buildSuccessInstance("绑定成功");
} else {
return AjaxResult.buildSuccessInstance("已经存在上级");
}
}
-
-
}
@@ -193,32 +187,32 @@
@PostMapping(value = "/getInvitationPoster")
AjaxResult getInvitationPoster() {
try {
- BizUser loginUser = redisUserLoginUtils.getLoginUser(BizUser.class);
+ SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
String baseSavePath = PropertiesUtil.getString(AppConstance.FILES_TORAGE_PATH);
// 图片访问URL
String baseSaveUrl = PropertiesUtil.getString(AppConstance.NGINX_URL);
//目标海报物理存储路径
- String targetImg=MD5Util.strToMD5(loginUser.getOpenId()) +"haibao.png";
- String targetImgPath=baseSavePath+"wxacode" + File.separatorChar+targetImg ;
+ String targetImg = MD5Util.strToMD5(loginUser.getOpenId()) + "haibao.png";
+ String targetImgPath = baseSavePath + "wxacode" + File.separatorChar + targetImg;
String urlPath = baseSaveUrl + "/" + "wxacode" + "/" + targetImg;
- String qrcodeSavePath = WxacodeUtil.getWxacode(loginUser.getUserId() + "", "pages/distributorCenter/applyFor/applyFor", MD5Util.strToMD5(loginUser.getOpenId())+"qrcode"
- ,weChatApiTools.getAppid(loginUser.getCompanyId()),weChatApiTools.getSecret(loginUser.getCompanyId()));
+ 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));
//获取海报
BusParameterSettings posterSetting = busParameterSettingsDao.selectCompanyParamByCode(FenxiaoSettingConstant.FX_TG_POSTER, loginUser.getCompanyId());
- String posterPath=baseSavePath+"wxacode" + File.separatorChar+MD5Util.strToMD5(loginUser.getOpenId())+"poster.png";
- ImageUtil.downloadPicture(posterSetting.getParamValue(),posterPath);
+ String posterPath = baseSavePath + "wxacode" + File.separatorChar + MD5Util.strToMD5(loginUser.getOpenId()) + "poster.png";
+ ImageUtil.downloadPicture(posterSetting.getParamValue(), posterPath);
BufferedImage posterImgBuf = ImageIO.read(new File(posterPath));
//获取用户头像
- String userPhotoPath=baseSavePath+"wxacode" + File.separatorChar+MD5Util.strToMD5(loginUser.getOpenId())+"userPhoto.png";
- ImageUtil.downloadPicture(loginUser.getAvatarUrl(),userPhotoPath);
+ String userPhotoPath = baseSavePath + "wxacode" + File.separatorChar + MD5Util.strToMD5(loginUser.getOpenId()) + "userPhoto.png";
+ ImageUtil.downloadPicture(loginUser.getAvatarUrl(), userPhotoPath);
BufferedImage userPhotoImgBuf = ImageIO.read(new File(userPhotoPath));
@@ -226,18 +220,18 @@
//绘制背景+产品
Graphics2D g = backgroundImgBuf.createGraphics();
g.setColor(Color.WHITE);
- g.fillRect(0,0,700,900);
- g.drawImage(posterImgBuf,0,0,700, 700,null);
+ g.fillRect(0, 0, 700, 900);
+ g.drawImage(posterImgBuf, 0, 0, 700, 700, null);
- g.drawImage(userPhotoImgBuf,20,720,80,80,null);
+ g.drawImage(userPhotoImgBuf, 20, 720, 80, 80, null);
- g.drawImage(qrcordImgBuf,500,720,150,150,null);
+ g.drawImage(qrcordImgBuf, 500, 720, 150, 150, null);
- g.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING,RenderingHints.VALUE_TEXT_ANTIALIAS_LCD_HRGB);
+ g.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_LCD_HRGB);
g.setFont(new Font("WenQuanYi Micro Hei", Font.BOLD, 24));
g.setColor(Color.BLACK);
- g.drawString(loginUser.getNickName()+"邀请你一起推广赚佣金",120,750);
+ g.drawString(loginUser.getNickName() + "邀请你一起推广赚佣金", 120, 750);
g.dispose();
ImageIO.write(backgroundImgBuf, "png", new File(targetImgPath));
@@ -245,7 +239,7 @@
return AjaxResult.buildSuccessInstance(urlPath);
} catch (Exception e) {
LogUtil.error("推广二维码生成错误:{}", e, "");
- return AjaxResult.buildFailInstance("二维码生成失败");
+ return AjaxResult.buildFailInstance("二维码生成失败");
}
}
@@ -257,10 +251,10 @@
@ApiResponse(code = 200, message = "ok", response = SalesmanVo.class)
})
AjaxResult getInvitationuserList(@RequestBody BasePageQueryDto pageDto) {
- BizUser loginUser = redisUserLoginUtils.getLoginUser(BizUser.class);
- Page<SalesmanVo> page=new Page<>(pageDto.getPageNum(),pageDto.getPageSize());
- IPage<SalesmanVo> shopSalesmanApplyIPage = salesmanApplyDao.selectInvitationuserInPage(page, loginUser.getOpenId(),pageDto.getKeywords());
- AjaxResult result=AjaxResult.buildSuccessInstance(shopSalesmanApplyIPage.getRecords());
+ SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
+ 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());
return result;
}
@@ -271,8 +265,8 @@
@ApiResponse(code = 200, message = "ok", response = SalesmanCenterInfo.class)
})
AjaxResult getSalesmanCenterInfo() {
- BizUser loginUser = redisUserLoginUtils.getLoginUser(BizUser.class);
- SalesmanCenterInfo salesmanCenterInfo= salesmanApplyDao.selectSalesmanCenterInfo(loginUser.getOpenId());
+ SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
+ SalesmanCenterInfo salesmanCenterInfo = salesmanApplyDao.selectSalesmanCenterInfo(loginUser.getId());
return AjaxResult.buildSuccessInstance(salesmanCenterInfo);
}
@@ -282,15 +276,15 @@
@ApiResponse(code = 200, message = "ok", response = SalesmanApplyCondition.class)
})
AjaxResult getSalesmanApplyCondition() {
- BizUser loginUser = redisUserLoginUtils.getLoginUser(BizUser.class);
- VerificationResult ableToBeAnSalesman = shopSalesmanApplyService.isAbleToBeAnSalesman(loginUser.getOpenId(),loginUser.getCompanyId());
- SalesmanApplyCondition applyConditionInfo=new SalesmanApplyCondition();
+ SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
+ VerificationResult ableToBeAnSalesman = shopSalesmanApplyService.isAbleToBeAnSalesman(loginUser.getId(), loginUser.getCompanyId());
+ SalesmanApplyCondition applyConditionInfo = new SalesmanApplyCondition();
applyConditionInfo.setIsAbleApply(ableToBeAnSalesman.isJudgeResult());
applyConditionInfo.setMsg(ableToBeAnSalesman.getMsg());
//申请条件
BusParameterSettings applyCondition = busParameterSettingsDao.selectCompanyParamByCode(FenxiaoSettingConstant.FX_APPLY_CONDITION, loginUser.getCompanyId());
- switch (applyCondition.getParamValue()){
+ switch (applyCondition.getParamValue()) {
case FenxiaoSettingConstant.FX_APPLY_CONDITION_WTJ:
applyConditionInfo.setCondition("您已满足申请条件");
break;
@@ -298,9 +292,9 @@
applyConditionInfo.setCondition("消费指定产品并确认收货");
List<String> strings = StringUtils.strToColl(applyCondition.getParamValue1(), ",");
List<Integer> ids = strings.stream().filter(i -> StringUtils.isNotBlank(i)).map(i -> Integer.parseInt(i + "")).distinct().collect(Collectors.toList());
- if(CollectionUtils.isNotEmpty(ids)){
+ if (CollectionUtils.isNotEmpty(ids)) {
applyConditionInfo.setProductList(shopProductDao.selectByIds(ids));
- }else{
+ } else {
return AjaxResult.buildFailInstance("未配置消费产品，请联系管理员");
}
@@ -310,19 +304,13 @@
applyConditionInfo.setCondition("消费任意产品并确认收货");
break;
case FenxiaoSettingConstant.FX_APPLY_CONDITION_XCZDJE:
- Double zdje=Double.parseDouble(applyCondition.getParamValue2());
- applyConditionInfo.setCondition("消费满"+zdje+"元确认收货");
+ Double zdje = Double.parseDouble(applyCondition.getParamValue2());
+ applyConditionInfo.setCondition("消费满" + zdje + "元确认收货");
applyConditionInfo.setMinAmount(zdje);
}
return AjaxResult.buildSuccessInstance(applyConditionInfo);
}
-
-
-
-
-
-
}
--
Gitblit v1.9.1