Skip to content

S
shop-Mall
Commit bb3cbffe authored by liqin's avatar liqin 💬
Browse files
Options

Merge branch 'master' of http://111.203.232.171:8888/licc/shop-mall into master

parents 7f44559d 77206465
Hide whitespace changes
Inline Side-by-side
Showing with 259 additions and 186 deletions
wisenergy-mapper/src/main/java/cn/wisenergy/mapper/UsersMapper.java
View file @ bb3cbffe
......@@ -214,4 +214,18 @@ public interface UsersMapper extends BaseMapper<User> {
* @return
*/
User getuserByBeInvitedCode(String beInvitedCode);
/**
* 获取在团队中处于同一位置的用户集合
* @param beInvitedCode
* @return
*/
List<User> getListUserByBeInvitedCode(String beInvitedCode);
/**
* 通过邀请码获取用户信息
* @param inviteCode
* @return
*/
User getUserByInviteCode(String inviteCode);
}
wisenergy-mapper/src/main/resources/mapper/UsersMapper.xml
View file @ bb3cbffe
......@@ -411,4 +411,22 @@
invite_code = #{be_invited_code}
</select>
<select id="getListUserByBeInvitedCode" resultType="cn.wisenergy.model.app.User">
select
<include refid="cols_all"/>
from
<include refid="table"/>
where
be_invited_code = #{be_invited_code}
</select>
<select id="getUserByInviteCode" resultType="cn.wisenergy.model.app.User">
select
<include refid="cols_all"/>
from
<include refid="table"/>
where
invite_code = #{inviteCode}
</select>
</mapper>
wisenergy-service/src/main/java/cn/wisenergy/service/app/AerialDeliveryUserService.java
View file @ bb3cbffe
......@@ -7,4 +7,11 @@ public interface AerialDeliveryUserService {
* 空投池用户随机分配推荐人邀请码
*/
void aerialDeliveryUserRand();
/**
* 设置邀请码接口
* @param userId 当前用户id
* @param userInvitedId 推荐人用户id
*/
void userSetBeinviteCode(String userId, String userInvitedId);
}
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/AerialDeliveryUserServiceImpl.java
View file @ bb3cbffe
......@@ -8,7 +8,7 @@ import cn.wisenergy.model.app.TeamUserInfo;
import cn.wisenergy.model.app.User;
import cn.wisenergy.service.app.AerialDeliveryUserService;
import lombok.extern.slf4j.Slf4j;
import org.checkerframework.checker.index.qual.LengthOf;
import org.bouncycastle.pqc.crypto.newhope.NHOtherInfoGenerator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -61,10 +61,9 @@ public class AerialDeliveryUserServiceImpl implements AerialDeliveryUserService
List<User> aerialDeliveryUserList = usersMapper.getAerialDeliveryUserBeforOneMonth(before,now);
if (aerialDeliveryUserList.size()>0){
for (User user : aerialDeliveryUserList) {
int userLevel = user.getUserLevel();
Integer id = user.getId();
String userId = user.getUserId();
log.info("当前用户id--------------"+userId+"当前用户等级----------------"+userLevel);
log.info("当前用户id--------------"+userId);
//2、随机获取比当前用户早注册的用户
User randUser = usersMapper.randOneGetUserByUserId(id);
String randUserId = randUser.getUserId();
......@@ -73,147 +72,166 @@ public class AerialDeliveryUserServiceImpl implements AerialDeliveryUserService
//2.2、设置当前用户的推荐人邀请码为 随机用户的inviteCode
user.setBeInvitedCode(inviteCode);
usersMapper.edit(user);
//3、随机用户的直推表数据维护
RecommendUser recommendUserMapperByRandUser = recommendUserMapper.getByUserId(randUser.getUserId());
if (userLevel == 0){
//普通用户数量 + 1
Integer normalUserNum = recommendUserMapperByRandUser.getNormalUserNum();
recommendUserMapperByRandUser.setNormalUserNum(normalUserNum +1);
recommendUserMapper.updateById(recommendUserMapperByRandUser);
}else if (userLevel == 1){
//幼苗用户数量 + 1
Integer seedlingNum = recommendUserMapperByRandUser.getSeedlingNum();
recommendUserMapperByRandUser.setSeedlingNum(seedlingNum + 1);
recommendUserMapper.updateById(recommendUserMapperByRandUser);
}else if (userLevel == 2){
//青铜用户数量 + 1
Integer bronzeTreeNum = recommendUserMapperByRandUser.getBronzeTreeNum();
recommendUserMapperByRandUser.setBronzeTreeNum(bronzeTreeNum + 1 );
recommendUserMapper.updateById(recommendUserMapperByRandUser);
}else if (userLevel == 3){
//白银用户数量 + 1
Integer silverTreeNum = recommendUserMapperByRandUser.getSilverTreeNum();
recommendUserMapperByRandUser.setSilverTreeNum(silverTreeNum + 1 );
recommendUserMapper.updateById(recommendUserMapperByRandUser);
}else if (userLevel == 4){
//黄金用户数量 + 1
Integer goldTreeNum = recommendUserMapperByRandUser.getGoldTreeNum();
recommendUserMapperByRandUser.setGoldTreeNum(goldTreeNum + 1);
recommendUserMapper.updateById(recommendUserMapperByRandUser);
}else if (userLevel == 5){
//农场主用户数量 + 1
Integer farmerNum = recommendUserMapperByRandUser.getFarmerNum();
recommendUserMapperByRandUser.setFarmerNum(farmerNum + 1);
recommendUserMapper.updateById(recommendUserMapperByRandUser);
}else if (userLevel == 6){
//森林之星用户数量 + 1
Integer forestStartNum = recommendUserMapperByRandUser.getForestStartNum();
recommendUserMapperByRandUser.setForestStartNum(forestStartNum + 1);
recommendUserMapper.updateById(recommendUserMapperByRandUser);
}else if (userLevel == 7){
//西田森合伙人用户数量 + 1
Integer partnerNum = recommendUserMapperByRandUser.getPartnerNum();
recommendUserMapperByRandUser.setFarmerNum(partnerNum + 1);
recommendUserMapper.updateById(recommendUserMapperByRandUser);
}
//4、用户的团队表数据维护
teamUserInfoByAerialDelivery(randUserId,userId);
//5、查看当前用户是否要进行升级
userLevelService.userLevelUpgrade(randUser.getUserId());
userSetBeinviteCode(userId,randUserId);
}
}
log.info("--------------------------空投池用户随机分派开始执行完成---------------------------------");
}
@Override
public void userSetBeinviteCode(String userId, String userInvitedId){
//3、上级用户的直推表数据维护
recommendInfoDataPreserve(userId,userInvitedId);
//4、用户的团队表数据维护
Map<String, Integer> teamDataMap = teamUserInfoByAerialDelivery(userInvitedId, userId);
//4.1获取当前团队中最上级的用户对象
User highUser = highUser(userId);
if (null != highUser){
//4.2 最上级用户id
String highUserId = highUser.getUserId();
//4.1整体团队数据维护
teamData(teamDataMap, highUserId);
}
//5、查看当前用户是否要进行升级
userLevelService.userLevelUpgrade(userInvitedId);
}
/**
* 直推数据维护
* @param userId 当前用户id
* @param beInvitedCodeUserId 推荐人id
*/
public void recommendInfoDataPreserve(String userId,String beInvitedCodeUserId){
User byUserId = usersMapper.getByUserId(userId);
int userLevel = byUserId.getUserLevel();
RecommendUser recommendUserMapperByRandUser = recommendUserMapper.getByUserId(beInvitedCodeUserId);
if (userLevel == 0){
//普通用户数量 + 1
Integer normalUserNum = recommendUserMapperByRandUser.getNormalUserNum();
recommendUserMapperByRandUser.setNormalUserNum(normalUserNum +1);
recommendUserMapper.updateById(recommendUserMapperByRandUser);
}else if (userLevel == 1){
//幼苗用户数量 + 1
Integer seedlingNum = recommendUserMapperByRandUser.getSeedlingNum();
recommendUserMapperByRandUser.setSeedlingNum(seedlingNum + 1);
recommendUserMapper.updateById(recommendUserMapperByRandUser);
}else if (userLevel == 2){
//青铜用户数量 + 1
Integer bronzeTreeNum = recommendUserMapperByRandUser.getBronzeTreeNum();
recommendUserMapperByRandUser.setBronzeTreeNum(bronzeTreeNum + 1 );
recommendUserMapper.updateById(recommendUserMapperByRandUser);
}else if (userLevel == 3){
//白银用户数量 + 1
Integer silverTreeNum = recommendUserMapperByRandUser.getSilverTreeNum();
recommendUserMapperByRandUser.setSilverTreeNum(silverTreeNum + 1 );
recommendUserMapper.updateById(recommendUserMapperByRandUser);
}else if (userLevel == 4){
//黄金用户数量 + 1
Integer goldTreeNum = recommendUserMapperByRandUser.getGoldTreeNum();
recommendUserMapperByRandUser.setGoldTreeNum(goldTreeNum + 1);
recommendUserMapper.updateById(recommendUserMapperByRandUser);
}else if (userLevel == 5){
//农场主用户数量 + 1
Integer farmerNum = recommendUserMapperByRandUser.getFarmerNum();
recommendUserMapperByRandUser.setFarmerNum(farmerNum + 1);
recommendUserMapper.updateById(recommendUserMapperByRandUser);
}else if (userLevel == 6){
//森林之星用户数量 + 1
Integer forestStartNum = recommendUserMapperByRandUser.getForestStartNum();
recommendUserMapperByRandUser.setForestStartNum(forestStartNum + 1);
recommendUserMapper.updateById(recommendUserMapperByRandUser);
}else if (userLevel == 7){
//西田森合伙人用户数量 + 1
Integer partnerNum = recommendUserMapperByRandUser.getPartnerNum();
recommendUserMapperByRandUser.setFarmerNum(partnerNum + 1);
recommendUserMapper.updateById(recommendUserMapperByRandUser);
}
}
/**
* 团队数据维护
* @param beInvitedUserId 推荐人userId
* @param userId 当前用户的userId
*/
private void teamUserInfoByAerialDelivery(String beInvitedUserId, String userId) {
public Map<String, Integer> teamUserInfoByAerialDelivery(String beInvitedUserId, String userId) {
TeamUserInfo teamUserInfoByIntvitedUser = teamUserInfoMapper.getByUserId(beInvitedUserId);
TeamUserInfo teamUserInfoByUserId = teamUserInfoMapper.getByUserId(userId);
//1、当前用户团队中各等级的用户数量
Integer normalUserNumUser = teamUserInfoByUserId.getNormalUserNum();
Integer seedlingNumUser = teamUserInfoByUserId.getSeedlingNum();
Integer bronzeTreeNumUser = teamUserInfoByUserId.getBronzeTreeNum();
Integer silverTreeNumUser = teamUserInfoByUserId.getSilverTreeNum();
Integer goldTreeNumUser = teamUserInfoByUserId.getGoldTreeNum();
Integer farmerNumUser = teamUserInfoByUserId.getFarmerNum();
Integer forestStartNumUser = teamUserInfoByUserId.getForestStartNum();
Integer partnerNumUser = teamUserInfoByUserId.getPartnerNum();
Map<String, Integer> teamDataMap = new ConcurrentHashMap<String, Integer>();
if (null != teamUserInfoByUserId){
//2、推荐人的团队中各等级的用户数量
Integer normalUserNumTeamIntvitedUser = teamUserInfoByIntvitedUser.getNormalUserNum();
Integer seedlingNumIntvitedUser = teamUserInfoByIntvitedUser.getSeedlingNum();
Integer bronzeTreeNumIntvitedUser = teamUserInfoByIntvitedUser.getBronzeTreeNum();
Integer silverTreeNumIntvitedUser = teamUserInfoByIntvitedUser.getSilverTreeNum();
Integer goldTreeNumIntvitedUser = teamUserInfoByIntvitedUser.getGoldTreeNum();
Integer farmerNumIntvitedUser = teamUserInfoByIntvitedUser.getFarmerNum();
Integer forestStartNumIntvitedUser = teamUserInfoByIntvitedUser.getForestStartNum();
Integer partnerNumIntvitedUser = teamUserInfoByIntvitedUser.getPartnerNum();
//1、当前用户团队中各等级的用户数量
Integer normalUserNumUser = teamUserInfoByUserId.getNormalUserNum();
Integer seedlingNumUser = teamUserInfoByUserId.getSeedlingNum();
Integer bronzeTreeNumUser = teamUserInfoByUserId.getBronzeTreeNum();
Integer silverTreeNumUser = teamUserInfoByUserId.getSilverTreeNum();
Integer goldTreeNumUser = teamUserInfoByUserId.getGoldTreeNum();
Integer farmerNumUser = teamUserInfoByUserId.getFarmerNum();
Integer forestStartNumUser = teamUserInfoByUserId.getForestStartNum();
Integer partnerNumUser = teamUserInfoByUserId.getPartnerNum();
//3、最终团队各个等级的人数 推荐人用户本身的数量 + 当前用户的数量 + 当前用户自身（1）
Integer resultTeamNormalNum = normalUserNumTeamIntvitedUser + normalUserNumUser;
Integer resultTeamSeedlingNum = seedlingNumIntvitedUser + seedlingNumUser;
Integer resultTeamBronzeTreeNum = bronzeTreeNumIntvitedUser + bronzeTreeNumUser;
Integer resultTeamSilverTreeNum = silverTreeNumIntvitedUser + silverTreeNumUser;
Integer resultTeamGoldTreeNum = goldTreeNumIntvitedUser + goldTreeNumUser;
Integer resultTeamFarmerNum = farmerNumIntvitedUser + farmerNumUser;
Integer resultTeamForestStartNum = forestStartNumIntvitedUser + forestStartNumUser;
Integer resultTeamPartnerNum = partnerNumIntvitedUser + partnerNumUser;
//2、推荐人的团队中各等级的用户数量
Integer normalUserNumTeamIntvitedUser = teamUserInfoByIntvitedUser.getNormalUserNum();
Integer seedlingNumIntvitedUser = teamUserInfoByIntvitedUser.getSeedlingNum();
Integer bronzeTreeNumIntvitedUser = teamUserInfoByIntvitedUser.getBronzeTreeNum();
Integer silverTreeNumIntvitedUser = teamUserInfoByIntvitedUser.getSilverTreeNum();
Integer goldTreeNumIntvitedUser = teamUserInfoByIntvitedUser.getGoldTreeNum();
Integer farmerNumIntvitedUser = teamUserInfoByIntvitedUser.getFarmerNum();
Integer forestStartNumIntvitedUser = teamUserInfoByIntvitedUser.getForestStartNum();
Integer partnerNumIntvitedUser = teamUserInfoByIntvitedUser.getPartnerNum();
//3.1、判断当前用户的等级
User byUserId = usersMapper.getByUserId(userId);
if (null != byUserId){
int userLevel = byUserId.getUserLevel();
if (0 == userLevel){
resultTeamNormalNum = resultTeamNormalNum + 1;
}if (1 == userLevel){
resultTeamSeedlingNum = resultTeamSeedlingNum + 1;
}if (2 == userLevel){
resultTeamBronzeTreeNum = resultTeamBronzeTreeNum + 1;
}if (3 == userLevel){
resultTeamSilverTreeNum = resultTeamSilverTreeNum + 1;
}if (4 == userLevel){
resultTeamGoldTreeNum = resultTeamGoldTreeNum + 1;
}if (5 == userLevel){
resultTeamFarmerNum = resultTeamFarmerNum + 1;
}if (6 == userLevel){
resultTeamForestStartNum = resultTeamForestStartNum + 1;
}if (7 == userLevel){
resultTeamPartnerNum = resultTeamPartnerNum + 1;
}
}
//3、最终团队各个等级的人数 推荐人用户本身的数量 + 当前用户的数量
Integer resultTeamNormalNum = normalUserNumTeamIntvitedUser + normalUserNumUser;
Integer resultTeamSeedlingNum = seedlingNumIntvitedUser + seedlingNumUser;
Integer resultTeamBronzeTreeNum = bronzeTreeNumIntvitedUser + bronzeTreeNumUser;
Integer resultTeamSilverTreeNum = silverTreeNumIntvitedUser + silverTreeNumUser;
Integer resultTeamGoldTreeNum = goldTreeNumIntvitedUser + goldTreeNumUser;
Integer resultTeamFarmerNum = farmerNumIntvitedUser + farmerNumUser;
Integer resultTeamForestStartNum = forestStartNumIntvitedUser + forestStartNumUser;
Integer resultTeamPartnerNum = partnerNumIntvitedUser + partnerNumUser;
Map<String, Integer> teamDataMap = new ConcurrentHashMap<String, Integer>();
teamDataMap.put("resultTeamNormalNum",resultTeamNormalNum);
teamDataMap.put("resultTeamSeedlingNum",resultTeamSeedlingNum);
teamDataMap.put("resultTeamBronzeTreeNum",resultTeamBronzeTreeNum);
teamDataMap.put("resultTeamSilverTreeNum",resultTeamSilverTreeNum);
teamDataMap.put("resultTeamGoldTreeNum",resultTeamGoldTreeNum);
teamDataMap.put("resultTeamFarmerNum",resultTeamFarmerNum);
teamDataMap.put("resultTeamForestStartNum",resultTeamForestStartNum);
teamDataMap.put("resultTeamPartnerNum",resultTeamPartnerNum);
//4.1 根据当前用户向上维护数据
upWardDataPreserve(teamDataMap,beInvitedUserId);
//3.1、判断当前用户的等级
User byUserId = usersMapper.getByUserId(userId);
if (null != byUserId){
int userLevel = byUserId.getUserLevel();
if (0 == userLevel){
resultTeamNormalNum = resultTeamNormalNum + 1;
}if (1 == userLevel){
resultTeamSeedlingNum = resultTeamSeedlingNum + 1;
}if (2 == userLevel){
resultTeamBronzeTreeNum = resultTeamBronzeTreeNum + 1;
}if (3 == userLevel){
resultTeamSilverTreeNum = resultTeamSilverTreeNum + 1;
}if (4 == userLevel){
resultTeamGoldTreeNum = resultTeamGoldTreeNum + 1;
}if (5 == userLevel){
resultTeamFarmerNum = resultTeamFarmerNum + 1;
}if (6 == userLevel){
resultTeamForestStartNum = resultTeamForestStartNum + 1;
}if (7 == userLevel){
resultTeamPartnerNum = resultTeamPartnerNum + 1;
}
}
//4.2 根据当前用户向下维护数据（包括当前用户自身）
downWardDataPreserve(teamDataMap,userId);
}
teamDataMap.put("resultTeamNormalNum",resultTeamNormalNum);
teamDataMap.put("resultTeamSeedlingNum",resultTeamSeedlingNum);
teamDataMap.put("resultTeamBronzeTreeNum",resultTeamBronzeTreeNum);
teamDataMap.put("resultTeamSilverTreeNum",resultTeamSilverTreeNum);
teamDataMap.put("resultTeamGoldTreeNum",resultTeamGoldTreeNum);
teamDataMap.put("resultTeamFarmerNum",resultTeamFarmerNum);
teamDataMap.put("resultTeamForestStartNum",resultTeamForestStartNum);
teamDataMap.put("resultTeamPartnerNum",resultTeamPartnerNum);
/**
* 根据推荐人的id向上进行团队数据维护
* @param teamDataMap 团队表数据
* @param beInvitedUserId 当前用户的推荐人id
*/
private void upWardDataPreserve(Map<String, Integer> teamDataMap, String beInvitedUserId) {
}
return teamDataMap;
User userById = usersMapper.getByUserId(beInvitedUserId);
TeamUserInfo teamUserInfoMapperByUserId = teamUserInfoMapper.getByUserId(beInvitedUserId);
}
//整体团队数据维护
public void teamData(Map<String, Integer> teamDataMap, String userId){
//最上级用户对象
User user = usersMapper.getByUserId(userId);
TeamUserInfo teamUserInfoMapperByUserId = teamUserInfoMapper.getByUserId(userId);
teamUserInfoMapperByUserId.setNormalUserNum(teamDataMap.get("resultTeamNormalNum"));
teamUserInfoMapperByUserId.setSeedlingNum(teamDataMap.get("resultTeamSeedlingNum"));
teamUserInfoMapperByUserId.setBronzeTreeNum(teamDataMap.get("resultTeamBronzeTreeNum"));
......@@ -222,54 +240,38 @@ public class AerialDeliveryUserServiceImpl implements AerialDeliveryUserService
teamUserInfoMapperByUserId.setFarmerNum(teamDataMap.get("resultTeamFarmerNum"));
teamUserInfoMapperByUserId.setForestStartNum(teamDataMap.get("resultTeamForestStartNum"));
teamUserInfoMapperByUserId.setPartnerNum(teamDataMap.get("resultTeamPartnerNum"));
//修改团队用户数据
teamUserInfoMapper.updateById(teamUserInfoMapperByUserId);
//推荐人的用户表对象
User invitedUserId = usersMapper.getByUserId(beInvitedUserId);
//推荐人的推荐人用户对象
//todo: 推荐人用户id获取推荐人的上级用户
User user = usersMapper.getuserByBeInvitedCode(invitedUserId.getBeInvitedCode());
if (null != user){
String userId = user.getUserId();
upWardDataPreserve(teamDataMap,userId);
}else {
return;
String inviteCode = user.getInviteCode();
List<User> listUserByBeInvitedCode = usersMapper.getListUserByBeInvitedCode(inviteCode);
if (listUserByBeInvitedCode.size() >0){
for (User user1 : listUserByBeInvitedCode) {
TeamUserInfo teamUserInfoMapperByUserId1 = teamUserInfoMapper.getByUserId(user1.getUserId());
teamUserInfoMapperByUserId1.setNormalUserNum(teamDataMap.get("resultTeamNormalNum"));
teamUserInfoMapperByUserId1.setSeedlingNum(teamDataMap.get("resultTeamSeedlingNum"));
teamUserInfoMapperByUserId1.setBronzeTreeNum(teamDataMap.get("resultTeamBronzeTreeNum"));
teamUserInfoMapperByUserId1.setSilverTreeNum(teamDataMap.get("resultTeamSilverTreeNum"));
teamUserInfoMapperByUserId1.setGoldTreeNum(teamDataMap.get("resultTeamGoldTreeNum"));
teamUserInfoMapperByUserId1.setFarmerNum(teamDataMap.get("resultTeamFarmerNum"));
teamUserInfoMapperByUserId1.setForestStartNum(teamDataMap.get("resultTeamForestStartNum"));
teamUserInfoMapperByUserId1.setPartnerNum(teamDataMap.get("resultTeamPartnerNum"));
teamUserInfoMapper.updateById(teamUserInfoMapperByUserId1);
teamData(teamDataMap, user1.getUserId());
}
}
}
}
/**
* 根据推荐人的id向下进行团队数据维护
* @param teamDataMap 团队数据
* @param userId 当前用户的id
*/
private void downWardDataPreserve(Map<String, Integer> teamDataMap, String userId) {
TeamUserInfo teamUserInfoMapperByUserId = teamUserInfoMapper.getByUserId(userId);
teamUserInfoMapperByUserId.setNormalUserNum(teamDataMap.get("resultTeamNormalNum"));
teamUserInfoMapperByUserId.setSeedlingNum(teamDataMap.get("resultTeamSeedlingNum"));
teamUserInfoMapperByUserId.setBronzeTreeNum(teamDataMap.get("resultTeamBronzeTreeNum"));
teamUserInfoMapperByUserId.setSilverTreeNum(teamDataMap.get("resultTeamSilverTreeNum"));
teamUserInfoMapperByUserId.setGoldTreeNum(teamDataMap.get("resultTeamGoldTreeNum"));
teamUserInfoMapperByUserId.setFarmerNum(teamDataMap.get("resultTeamFarmerNum"));
teamUserInfoMapperByUserId.setForestStartNum(teamDataMap.get("resultTeamForestStartNum"));
teamUserInfoMapperByUserId.setPartnerNum(teamDataMap.get("resultTeamPartnerNum"));
//当前用户对象中获取当前用户的邀请码
User userByUserId = usersMapper.getByUserId(userId);
String inviteCode = userByUserId.getInviteCode();
//获取当前用户的所有下一级用户
List<User> listByIntvitedCode = usersMapper.getListByIntvitedCode(inviteCode);
//当前用户有下级用户
if (listByIntvitedCode.size() > 0){
for (User user : listByIntvitedCode) {
String downUserId = user.getUserId();
downWardDataPreserve(teamDataMap,downUserId);
}
}else {
//当前用户没有下级用户是退出
return;
//查询顶级用户
public User highUser(String userId) {
User byUserId = usersMapper.getByUserId(userId);
String beInvitedCode = byUserId.getBeInvitedCode();
User userByInviteCode = null;
while (!"1".equals(beInvitedCode) && !"88888888".equals(beInvitedCode)){
userByInviteCode = usersMapper.getUserByInviteCode(beInvitedCode);
beInvitedCode = userByInviteCode.getBeInvitedCode();
}
return userByInviteCode;
}
}
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserLevelServiceImpl.java
View file @ bb3cbffe
......@@ -68,7 +68,6 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
orderMapper.updateById(orderInfo);
}
log.info("-------------------------用户升级结束--------------------------------------");
}
@Override
......
wisenergy-web-admin/src/main/java/cn/wisenergy/Application.java
View file @ bb3cbffe
......@@ -4,6 +4,7 @@ import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.web.servlet.MultipartAutoConfiguration;
import org.springframework.cache.annotation.EnableCaching;
import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.annotation.EnableScheduling;
import springfox.documentation.swagger2.annotations.EnableSwagger2;
......@@ -14,6 +15,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
@SpringBootApplication(exclude = {MultipartAutoConfiguration.class})
@EnableSwagger2
@EnableScheduling
@Configuration
public class Application {
public static void main(String[] args) {
SpringApplication.run(Application.class, args);
......
wisenergy-web-admin/src/main/java/cn/wisenergy/web/config/FileUploadConfig.java
View file @ bb3cbffe
package cn.wisenergy.web.config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.multipart.MultipartResolver;
import org.springframework.web.multipart.commons.CommonsMultipartResolver;
/**
* 文件上传配置
*
* @author wyy
* @date 2019-08-22 19:20
*/
//@Configuration
//public class FileUploadConfig {
//
// /**
// * 重新定义文件上传对象【springBoot request转化成MultipartHttpServletRequest】
// */
// @Bean(name = "multipartResolver")
// public MultipartResolver multipartResolver() {
// CommonsMultipartResolver resolver = new CommonsMultipartResolver();
// resolver.setDefaultEncoding("UTF-8");
// resolver.setResolveLazily(true);
// resolver.setMaxInMemorySize(1024 * 1024 * 1024);
// resolver.setMaxUploadSize(1024 * 1024 * 1024);
// resolver.setMaxUploadSizePerFile(1024 * 1024 * 1024);
// return resolver;
// }
//
//}
@Configuration
public class FileUploadConfig {
/**
* 重新定义文件上传对象【springBoot request转化成MultipartHttpServletRequest】
*/
@Bean(name = "multipartResolver")
public MultipartResolver multipartResolver() {
CommonsMultipartResolver resolver = new CommonsMultipartResolver();
resolver.setDefaultEncoding("UTF-8");
resolver.setResolveLazily(true);
resolver.setMaxInMemorySize(1024 * 1024 * 1024);
resolver.setMaxUploadSize(1024 * 1024 * 1024);
resolver.setMaxUploadSizePerFile(1024 * 1024 * 1024);
return resolver;
}
}
wisenergy-web-admin/src/main/resources/application-dev.yml
View file @ bb3cbffe
spring:
main:
allow-bean-definition-overriding: true
# jackson时间格式化
jackson:
time-zone: GMT+8
date-format: yyyy-MM-dd HH:mm:ss
servlet:
multipart:
max-file-size: 1024MB
max-request-size: 2048MB
enabled: true
mvc:
throw-exception-if-no-handler-found: true
datasource:
type: com.alibaba.druid.pool.DruidDataSource
druid:
......
wisenergy-web-admin/src/main/resources/application-test.yml
View file @ bb3cbffe
spring:
main:
allow-bean-definition-overriding: true
# jackson时间格式化
jackson:
time-zone: GMT+8
date-format: yyyy-MM-dd HH:mm:ss
servlet:
multipart:
max-file-size: 1024MB
max-request-size: 2048MB
enabled: true
datasource:
type: com.alibaba.druid.pool.DruidDataSource
druid:
......@@ -32,6 +43,7 @@ spring:
wall:
config:
multi-statement-allow: true
#/www/server/redis/src/redis-server
redis:
open: false # 是否开启redis缓存 true开启 false关闭
......
wisenergy-web-admin/src/main/resources/application.yml
View file @ bb3cbffe
......@@ -6,6 +6,8 @@ server:
min-spare: 30
max-swallow-size: 1024MB
max-http-form-post-size: 1024MB
# 1 073 741 824
port: 8997
servlet:
context-path: /shop-mall
......@@ -25,7 +27,6 @@ spring:
max-file-size: 1024MB
max-request-size: 2048MB
enabled: true
resolve-lazily: true
mvc:
throw-exception-if-no-handler-found: true
# resources:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment