From 14d70ea884654e744987f90313f50068adbc12e3 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期五, 20 十月 2023 13:45:32 +0800
Subject: [PATCH] 10.20.1
---
cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java | 42 ++++++++++++++++++++++++++++++++++++------
1 files changed, 36 insertions(+), 6 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
index 5b2a892..03f305a 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
@@ -386,7 +386,7 @@
tAppUser = new TAppUser();
tAppUser.setCode(UUIDUtil.getNumberRandom(16));
tAppUser.setPhone(addAppUserVo.getPhone());
- tAppUser.setPassword(Md5Util.MD5Encode(addAppUserVo.getPassword(), null));
+ tAppUser.setPassword(addAppUserVo.getPassword());
tAppUser.setIsVip(0);
tAppUser.setState(1);
tAppUser.setInsertTime(new Date());
@@ -435,7 +435,7 @@
return ResultUtil.error("请先注册", "");
}
if(tAppUser.getState() == 2){
- return ResultUtil.error("您的账号已被冻结", "");
+ return ResultUtil.errorCode("您的账号已被冻结", "");
}
// password = Md5Util.MD5Encode(password, null);
if(!tAppUser.getPassword().equals(password)){
@@ -556,10 +556,13 @@
return ResultUtil.error("验证码无效");
}
TAppUser tAppUser = this.baseMapper.selectOne(new QueryWrapper<TAppUser>().eq("phone", phone).ne("state", 3));
+ if(tAppUser==null){
+ return ResultUtil.error("该账号未注册", "");
+ }
if(tAppUser.getState() == 2){
return ResultUtil.error("您的账号已被冻结", "");
}
- tAppUser.setPassword(Md5Util.MD5Encode(password, null));
+ tAppUser.setPassword(password);
this.updateById(tAppUser);
return ResultUtil.success();
}
@@ -616,7 +619,7 @@
for (Store store : stores) {
Map<String, Double> distance = GeodesyUtil.getDistance(lon + "," + lat, store.getLon() + "," + store.getLat());
Double wgs84 = distance.get("WGS84");
- if(s == null || d.compareTo(wgs84) < 0){
+ if(s == null || d>wgs84){
s = store;
d = wgs84;
}
@@ -626,6 +629,10 @@
joinPlayPaiVo.setLat(s.getLat());
joinPlayPaiVo.setStoreId(s.getId());
joinPlayPaiVo.setPhone(s.getPhone());
+ joinPlayPaiVo.setProvince(s.getProvince());
+ joinPlayPaiVo.setProvinceCode(s.getProvinceCode());
+ joinPlayPaiVo.setCity(s.getCity());
+ joinPlayPaiVo.setCityCode(s.getCityCode());
}
return joinPlayPaiVo;
}
@@ -835,7 +842,7 @@
if (vicinityGood.getRedemptionMethod() == 1) {
commodity.setIntegral(vicinityGood.getIntegral().intValue());
} else {
- commodity.setIntegral(vicinityGood.getIntegral().intValue());
+ commodity.setIntegral(ToolUtil.isEmpty(vicinityGood.getIntegral())?0:vicinityGood.getIntegral());
commodity.setAmount(vicinityGood.getCash());
}
commodity.setBelongsType(vicinityGood.getUserPopulation());
@@ -869,7 +876,7 @@
if (vicinityGood.getRedemptionMethod() == 1) {
commodity.setIntegral(vicinityGood.getIntegral().intValue());
} else {
- commodity.setIntegral(vicinityGood.getIntegral().intValue());
+ commodity.setIntegral(ToolUtil.isEmpty(vicinityGood.getIntegral())?0:vicinityGood.getIntegral());
commodity.setAmount(vicinityGood.getCash());
}
commodity.setBelongsType(vicinityGood.getUserPopulation());
@@ -1032,7 +1039,27 @@
if (ToolUtil.isEmpty(merchandise)){
return ResultUtil.error("商品不存在");
}
+
+
TAppUser tAppUser = this.baseMapper.selectById(userIdFormRedis);
+
+
+ if(merchandise.getUserPopulation()==2){
+ if(tAppUser.getIsVip()==0){
+ return ResultUtil.error("该商品只能年度会员购买");
+ }
+ }
+
+
+
+ if(merchandise.getUserPopulation()==3){
+ List<TStudent> students = tsmapper.selectList(new LambdaQueryWrapper<TStudent>().eq(TStudent::getAppUserId, userIdFormRedis));
+ if(students.size()==0){
+ return ResultUtil.error("该商品只能已有学员用户购买");
+ }
+ }
+
+
if (ToolUtil.isEmpty(tAppUser)){
return ResultUtil.error("用户不存在");
}
@@ -1049,6 +1076,9 @@
if (ToolUtil.isNotEmpty(count) && count >= merchandise.getPickUpQuantity()){
return ResultUtil.error("超过限领数量");
}
+ if (ToolUtil.isNotEmpty(count) && count >= merchandise.getQuantityIssued()){
+ return ResultUtil.error("超过发放数量");
+ }
for (int i = 0; i < goodsNums; i++) {
// 新增积分商品兑换记录
--
Gitblit v1.7.1