Compare commits
3 Commits
5c6b502c1e
...
yyt
Author | SHA1 | Date | |
---|---|---|---|
78403af455 | |||
f51d42230c | |||
e880431e07 |
7
pom.xml
7
pom.xml
@ -214,6 +214,13 @@
|
|||||||
<version>2.6.9</version>
|
<version>2.6.9</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.springframework.security</groupId>
|
||||||
|
<artifactId>spring-security-crypto</artifactId>
|
||||||
|
<version>5.8.7</version> <!-- 换成你项目里使用的 Spring Security 版本 -->
|
||||||
|
</dependency>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -33,8 +33,11 @@ import jakarta.servlet.http.HttpServletRequest;
|
|||||||
import jakarta.validation.Valid;
|
import jakarta.validation.Valid;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.data.redis.core.RedisTemplate;
|
import org.springframework.data.redis.core.RedisTemplate;
|
||||||
|
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
|
||||||
|
import org.springframework.security.crypto.password.PasswordEncoder;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
|
import java.lang.reflect.GenericDeclaration;
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
import java.math.RoundingMode;
|
import java.math.RoundingMode;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
@ -138,6 +141,16 @@ public class ProjectCommissionController {
|
|||||||
return ResultUtils.success(projectCommissionVOList);
|
return ResultUtils.success(projectCommissionVOList);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// public static void main(String[] args) {
|
||||||
|
// PasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
|
||||||
|
// String encode = passwordEncoder.encode("123456");
|
||||||
|
// System.out.println(encode);
|
||||||
|
// boolean matches = passwordEncoder.matches("123456", "$2a$10$/yBGQqsHK78vlEtuMGTVY.bU/TamHQbr4wQIzj1B1H1ud/ZKPGICC");
|
||||||
|
// System.out.println(matches);
|
||||||
|
// }
|
||||||
|
|
||||||
|
|
||||||
//
|
//
|
||||||
// /**
|
// /**
|
||||||
// * 小程序用户修改项目的抽佣比例
|
// * 小程序用户修改项目的抽佣比例
|
||||||
|
@ -9,6 +9,7 @@ import com.greenorange.promotion.common.BaseResponse;
|
|||||||
import com.greenorange.promotion.common.ErrorCode;
|
import com.greenorange.promotion.common.ErrorCode;
|
||||||
import com.greenorange.promotion.common.ResultUtils;
|
import com.greenorange.promotion.common.ResultUtils;
|
||||||
import com.greenorange.promotion.constant.UserConstant;
|
import com.greenorange.promotion.constant.UserConstant;
|
||||||
|
import com.greenorange.promotion.exception.BusinessException;
|
||||||
import com.greenorange.promotion.exception.ThrowUtils;
|
import com.greenorange.promotion.exception.ThrowUtils;
|
||||||
import com.greenorange.promotion.model.dto.CommonBatchRequest;
|
import com.greenorange.promotion.model.dto.CommonBatchRequest;
|
||||||
import com.greenorange.promotion.model.dto.promoCodeApply.PromoCodeApplyAddRequest;
|
import com.greenorange.promotion.model.dto.promoCodeApply.PromoCodeApplyAddRequest;
|
||||||
@ -82,6 +83,12 @@ public class PromoCodeApplyController {
|
|||||||
Long userId = (Long) request.getAttribute("userId");
|
Long userId = (Long) request.getAttribute("userId");
|
||||||
// 取出当前项目的推广码
|
// 取出当前项目的推广码
|
||||||
Long projectId = promoCodeApplyRequest.getProjectId();
|
Long projectId = promoCodeApplyRequest.getProjectId();
|
||||||
|
//项目状态如果不是运行中的话无法申请推广码
|
||||||
|
LambdaQueryWrapper<Project> projectLambdaQueryWrapper = new LambdaQueryWrapper<>();
|
||||||
|
projectLambdaQueryWrapper.eq(Project::getId, projectId);
|
||||||
|
Project project2 = projectService.getOne(projectLambdaQueryWrapper);
|
||||||
|
String projectStatus = project2.getProjectStatus();
|
||||||
|
if(!projectStatus.equals("running")) throw new BusinessException(ErrorCode.OPERATION_ERROR,"该项目未处于运行状态,无法申请推广码");
|
||||||
String phoneNumber = promoCodeApplyRequest.getSalespersonPhone();
|
String phoneNumber = promoCodeApplyRequest.getSalespersonPhone();
|
||||||
// 判断是否重复绑定了手机号
|
// 判断是否重复绑定了手机号
|
||||||
Map<SFunction<PromoCodeApply, ?>, Object> applyConditions = Map.of(PromoCodeApply::getUserId, userId, PromoCodeApply::getProjectId, projectId, PromoCodeApply::getSalespersonPhone, phoneNumber);
|
Map<SFunction<PromoCodeApply, ?>, Object> applyConditions = Map.of(PromoCodeApply::getUserId, userId, PromoCodeApply::getProjectId, projectId, PromoCodeApply::getSalespersonPhone, phoneNumber);
|
||||||
@ -100,6 +107,9 @@ public class PromoCodeApplyController {
|
|||||||
String promoCodeImage = promoCode.getPromoCodeImage();
|
String promoCodeImage = promoCode.getPromoCodeImage();
|
||||||
// 获取项目的参数信息
|
// 获取项目的参数信息
|
||||||
Project project = projectService.getById(projectId);
|
Project project = projectService.getById(projectId);
|
||||||
|
// 检查项目是否处于运行中
|
||||||
|
// String projectStatus = project.getProjectStatus();
|
||||||
|
// ThrowUtils.throwIf(!projectStatus.equals("running"), ErrorCode.OPERATION_ERROR, "该项目未处于运行状态,无法申请推广码");
|
||||||
|
|
||||||
// 更新项目的推广人数
|
// 更新项目的推广人数
|
||||||
Map<SFunction<UserProject, ?>, Object> projectConditions = Map.of(UserProject::getProjectId, projectId, UserProject::getUserId, userId);
|
Map<SFunction<UserProject, ?>, Object> projectConditions = Map.of(UserProject::getProjectId, projectId, UserProject::getUserId, userId);
|
||||||
@ -110,6 +120,8 @@ public class PromoCodeApplyController {
|
|||||||
String projectName = project.getProjectName();
|
String projectName = project.getProjectName();
|
||||||
String projectImage = project.getProjectImage();
|
String projectImage = project.getProjectImage();
|
||||||
Integer projectSettlementCycle = project.getProjectSettlementCycle();
|
Integer projectSettlementCycle = project.getProjectSettlementCycle();
|
||||||
|
//判断项目推广人数是否满了
|
||||||
|
|
||||||
// 获取业务员信息
|
// 获取业务员信息
|
||||||
String salespersonName = promoCodeApplyRequest.getSalespersonName();
|
String salespersonName = promoCodeApplyRequest.getSalespersonName();
|
||||||
String salespersonPhone = promoCodeApplyRequest.getSalespersonPhone();
|
String salespersonPhone = promoCodeApplyRequest.getSalespersonPhone();
|
||||||
|
@ -65,7 +65,7 @@ public class ProjectCommissionServiceImpl extends ServiceImpl<ProjectCommissionM
|
|||||||
public void updateProjectCommissionRate(ProjectCommissionUpdateRequest projectCommissionUpdateRequest) {
|
public void updateProjectCommissionRate(ProjectCommissionUpdateRequest projectCommissionUpdateRequest) {
|
||||||
Long id = projectCommissionUpdateRequest.getId();
|
Long id = projectCommissionUpdateRequest.getId();
|
||||||
BigDecimal currentCommissionRate = projectCommissionUpdateRequest.getCurrentCommissionRate();
|
BigDecimal currentCommissionRate = projectCommissionUpdateRequest.getCurrentCommissionRate();
|
||||||
// 获取当前项目明细信息
|
// 获取当前项目明细抽佣信息
|
||||||
ProjectCommission projectCommission = this.getById(id);
|
ProjectCommission projectCommission = this.getById(id);
|
||||||
ThrowUtils.throwIf(projectCommission == null, ErrorCode.OPERATION_ERROR, "项目明细抽佣信息不存在");
|
ThrowUtils.throwIf(projectCommission == null, ErrorCode.OPERATION_ERROR, "项目明细抽佣信息不存在");
|
||||||
Long projectDetailId = projectCommission.getProjectDetailId();
|
Long projectDetailId = projectCommission.getProjectDetailId();
|
||||||
@ -356,7 +356,7 @@ public class ProjectCommissionServiceImpl extends ServiceImpl<ProjectCommissionM
|
|||||||
|
|
||||||
startTime = System.currentTimeMillis();
|
startTime = System.currentTimeMillis();
|
||||||
|
|
||||||
// 更新用户项目明细抽佣记录
|
// 批量更新用户项目明细抽佣记录
|
||||||
List<SubUserProjectCommission> proCommissions = subProjectCommissions.stream().filter(subProjectCommission -> subProjectCommission.getSubUserId() == -1L).toList();
|
List<SubUserProjectCommission> proCommissions = subProjectCommissions.stream().filter(subProjectCommission -> subProjectCommission.getSubUserId() == -1L).toList();
|
||||||
List<ProjectCommission> proCommissionList = commonService.convertList(proCommissions, ProjectCommission.class);
|
List<ProjectCommission> proCommissionList = commonService.convertList(proCommissions, ProjectCommission.class);
|
||||||
// this.updateBatchById(proCommissionList);
|
// this.updateBatchById(proCommissionList);
|
||||||
|
@ -1,15 +1,21 @@
|
|||||||
spring:
|
spring:
|
||||||
datasource:
|
datasource:
|
||||||
|
# driver-class-name: com.mysql.cj.jdbc.Driver
|
||||||
|
# url: jdbc:mysql://27.30.77.229:3306/qingcheng_caozhe?serverTimezone=Asia/Shanghai
|
||||||
|
# username: qingcheng
|
||||||
|
# password: Qc@8ls2jf
|
||||||
|
# hikari:
|
||||||
|
# maximum-pool-size: 300
|
||||||
|
# max-lifetime: 120000
|
||||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
driver-class-name: com.mysql.cj.jdbc.Driver
|
||||||
url: jdbc:mysql://27.30.77.229:3306/qingcheng_caozhe?serverTimezone=Asia/Shanghai
|
url: jdbc:mysql://43.143.28.121:3306/easybbs?serverTimezone=Asia/Shanghai
|
||||||
username: qingcheng
|
username: easybbs
|
||||||
password: Qc@8ls2jf
|
password: root
|
||||||
hikari:
|
hikari:
|
||||||
maximum-pool-size: 300
|
maximum-pool-size: 300
|
||||||
max-lifetime: 120000
|
max-lifetime: 120000
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
data:
|
data:
|
||||||
redis:
|
redis:
|
||||||
port: 6379
|
port: 6379
|
||||||
|
Reference in New Issue
Block a user