修改了注册接口
This commit is contained in:
parent
b946338c6d
commit
72d4be7ed7
|
@ -11,6 +11,7 @@ import com.greenorange.promotion.constant.SystemConstant;
|
||||||
import com.greenorange.promotion.constant.UserConstant;
|
import com.greenorange.promotion.constant.UserConstant;
|
||||||
import com.greenorange.promotion.exception.ThrowUtils;
|
import com.greenorange.promotion.exception.ThrowUtils;
|
||||||
import com.greenorange.promotion.mapper.UserInfoMapper;
|
import com.greenorange.promotion.mapper.UserInfoMapper;
|
||||||
|
import com.greenorange.promotion.model.dto.projectCommission.ProjectCommissionAddRequest;
|
||||||
import com.greenorange.promotion.model.dto.userInfo.*;
|
import com.greenorange.promotion.model.dto.userInfo.*;
|
||||||
import com.greenorange.promotion.model.entity.ProjectCommission;
|
import com.greenorange.promotion.model.entity.ProjectCommission;
|
||||||
import com.greenorange.promotion.model.entity.SubUserProjectCommission;
|
import com.greenorange.promotion.model.entity.SubUserProjectCommission;
|
||||||
|
@ -169,20 +170,22 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo>
|
||||||
// 查询上级用户的项目抽佣记录
|
// 查询上级用户的项目抽佣记录
|
||||||
List<ProjectCommission> projectCommissionList = commonService.findByFieldEqTargetField(ProjectCommission::getUserId, parentUserInfo.getId(), projectCommissionService);
|
List<ProjectCommission> projectCommissionList = commonService.findByFieldEqTargetField(ProjectCommission::getUserId, parentUserInfo.getId(), projectCommissionService);
|
||||||
// 插入当前用户的项目抽佣记录
|
// 插入当前用户的项目抽佣记录
|
||||||
|
List<ProjectCommission> projectCommissions = new ArrayList<>();
|
||||||
for (ProjectCommission projectCommission : projectCommissionList) {
|
for (ProjectCommission projectCommission : projectCommissionList) {
|
||||||
ProjectCommission currentUserProjectCommission = commonService.copyProperties(projectCommission, ProjectCommission.class);
|
ProjectCommissionAddRequest projectCommissionAddRequest = commonService.copyProperties(projectCommission, ProjectCommissionAddRequest.class);
|
||||||
currentUserProjectCommission.setId(null);
|
ProjectCommission proCommission = commonService.copyProperties(projectCommissionAddRequest, ProjectCommission.class);
|
||||||
currentUserProjectCommission.setMyUnitPrice(projectCommission.getMyUnitPrice().multiply(BigDecimal.ONE.subtract(projectCommission.getCurrentCommissionRate())));
|
proCommission.setMyUnitPrice(projectCommission.getMyUnitPrice().multiply(BigDecimal.ONE.subtract(projectCommission.getCurrentCommissionRate())));
|
||||||
currentUserProjectCommission.setCurrentCommissionRate(BigDecimal.ZERO);
|
proCommission.setCurrentCommissionRate(BigDecimal.ZERO);
|
||||||
currentUserProjectCommission.setUserId(myUserInfo.getId());
|
proCommission.setUserId(myUserInfo.getId());
|
||||||
|
projectCommissions.add(proCommission);
|
||||||
}
|
}
|
||||||
projectCommissionService.saveBatch(projectCommissionList);
|
projectCommissionService.saveBatch(projectCommissions);
|
||||||
// 插入下级用户的项目明细抽佣记录
|
// 插入下级用户的项目明细抽佣记录
|
||||||
List<ProjectCommission> proCommissionList = commonService.findByFieldEqTargetField(ProjectCommission::getUserId, parentUserInfo.getId(), projectCommissionService);
|
List<ProjectCommission> proCommissionList = commonService.findByFieldEqTargetField(ProjectCommission::getUserId, parentUserInfo.getId(), projectCommissionService);
|
||||||
List<SubUserProjectCommission> subUserProjectCommissionList = new ArrayList<>();
|
List<SubUserProjectCommission> subUserProjectCommissionList = new ArrayList<>();
|
||||||
for (ProjectCommission projectCommission : proCommissionList) {
|
for (ProjectCommission projectCommission : proCommissionList) {
|
||||||
SubUserProjectCommission subUserProjectCommission = commonService.copyProperties(projectCommission, SubUserProjectCommission.class);
|
ProjectCommissionAddRequest projectCommissionAddRequest = commonService.copyProperties(projectCommission, ProjectCommissionAddRequest.class);
|
||||||
subUserProjectCommission.setId(null);
|
SubUserProjectCommission subUserProjectCommission = commonService.copyProperties(projectCommissionAddRequest, SubUserProjectCommission.class);
|
||||||
subUserProjectCommission.setSubUserId(myUserInfo.getId());
|
subUserProjectCommission.setSubUserId(myUserInfo.getId());
|
||||||
subUserProjectCommissionList.add(subUserProjectCommission);
|
subUserProjectCommissionList.add(subUserProjectCommission);
|
||||||
}
|
}
|
||||||
|
|
32
src/test/java/com/greenorange/promotion/list/ListTest.java
Normal file
32
src/test/java/com/greenorange/promotion/list/ListTest.java
Normal file
|
@ -0,0 +1,32 @@
|
||||||
|
package com.greenorange.promotion.list;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
public class ListTest {
|
||||||
|
public static void main(String[] args) {
|
||||||
|
List<Node> list = new ArrayList<>();
|
||||||
|
list.add(new Node(1));
|
||||||
|
list.add(new Node(2));
|
||||||
|
list.add(new Node(3));
|
||||||
|
for (Node node : list) {
|
||||||
|
System.out.println(node.val);
|
||||||
|
}
|
||||||
|
for (Node node : list) {
|
||||||
|
node.setVal(1);
|
||||||
|
}
|
||||||
|
for (Node node : list) {
|
||||||
|
System.out.println(node.val);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class Node {
|
||||||
|
int val;
|
||||||
|
public Node(int val) {
|
||||||
|
this.val = val;
|
||||||
|
}
|
||||||
|
public void setVal(int val) {
|
||||||
|
this.val = val;
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user