admin1/qingcheng-houduan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

初步完成小程序模块

Browse Source
This commit is contained in:
chen-xin-zhi 2025-05-11 23:53:39 +08:00
parent cb05e82118
commit a968035860
12 changed files with 147 additions and 185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/greenorange/promotion/controller/project/ProjectDetailController.java
View File

@ -239,5 +239,4 @@ public class ProjectDetailController {
return ResultUtils.success(projectDetailVOS);
}
}

148
src/main/java/com/greenorange/promotion/controller/project/UserProjectController.java
View File

@ -1,148 +0,0 @@
package com.greenorange.promotion.controller.project;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.greenorange.promotion.annotation.RequiresPermission;
import com.greenorange.promotion.annotation.SysLog;
import com.greenorange.promotion.common.BaseResponse;
import com.greenorange.promotion.common.ErrorCode;
import com.greenorange.promotion.common.ResultUtils;
import com.greenorange.promotion.constant.UserConstant;
import com.greenorange.promotion.exception.ThrowUtils;
import com.greenorange.promotion.model.dto.CommonBatchRequest;
import com.greenorange.promotion.model.dto.userProject.UserProjectAddRequest;
import com.greenorange.promotion.model.dto.userProject.UserProjectQueryRequest;
import com.greenorange.promotion.model.dto.userProject.UserProjectUpdateRequest;
import com.greenorange.promotion.model.entity.UserProject;
import com.greenorange.promotion.model.vo.userProject.UserProjectVO;
import com.greenorange.promotion.service.common.CommonService;
import com.greenorange.promotion.service.project.UserProjectService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.greenorange.promotion.model.dto.CommonRequest;
import jakarta.validation.Valid;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* 用户项目 控制器
*/
@RestController
@RequestMapping("userProject")
@Slf4j
@Tag(name = "用户项目管理")
public class UserProjectController {
@Resource
private UserProjectService userProjectService;
@Resource
private CommonService commonService;
/**
* web端管理员添加用户项目
* @param userProjectAddRequest 用户项目添加请求体
* @return 是否添加成功
*/
@PostMapping("add")
@Operation(summary = "web端管理员添加用户项目", description = "参数：用户项目添加请求体，权限：管理员，方法名：addUserProject")
@RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
@SysLog(title = "用户项目管理", content = "web端管理员添加用户项目")
public BaseResponse<Boolean> addUserProject(@Valid @RequestBody UserProjectAddRequest userProjectAddRequest) {
UserProject userProject = commonService.copyProperties(userProjectAddRequest, UserProject.class);
userProjectService.save(userProject);
return ResultUtils.success(true);
}
/**
* web端管理员根据id修改用户项目信息
* @param userProjectUpdateRequest 用户项目更新请求体
* @return 是否更新成功
*/
@PostMapping("update")
@Operation(summary = "web端管理员更新用户项目", description = "参数：用户项目更新请求体，权限：管理员，方法名：updateUserProject")
@RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
@SysLog(title = "用户项目管理", content = "web端管理员根据id修改用户项目信息")
public BaseResponse<Boolean> updateUserProject(@Valid @RequestBody UserProjectUpdateRequest userProjectUpdateRequest) {
UserProject userProject = commonService.copyProperties(userProjectUpdateRequest, UserProject.class);
userProjectService.updateById(userProject);
return ResultUtils.success(true);
}
/**
* web端管理员根据id删除用户项目
* @param commonRequest 用户项目删除请求体
* @return 是否删除成功
*/
@PostMapping("delete")
@Operation(summary = "web端管理员根据id删除用户项目", description = "参数：用户项目删除请求体，权限：管理员，方法名：delUserProject")
@RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
@SysLog(title = "用户项目管理", content = "web端管理员根据id删除用户项目")
public BaseResponse<Boolean> delUserProject(@Valid @RequestBody CommonRequest commonRequest) {
Long id = commonRequest.getId();
userProjectService.removeById(id);
return ResultUtils.success(true);
}
/**
* web端管理员批量删除用户项目
* @param commonBatchRequest 用户项目批量删除请求体
* @return 是否删除成功
*/
@PostMapping("delBatch")
@Operation(summary = "web端管理员批量删除用户项目", description = "参数：用户项目批量删除请求体，权限：管理员，方法名：delBatchUserProject")
@RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
@SysLog(title = "用户项目管理", content = "web端管理员批量删除用户项目")
public BaseResponse<Boolean> delBatchUserProject(@Valid @RequestBody CommonBatchRequest commonBatchRequest) {
List<Long> ids = commonBatchRequest.getIds();
userProjectService.removeByIds(ids);
return ResultUtils.success(true);
}
/**
* web端管理员根据id查询用户项目
* @param commonRequest 用户项目查询请求体
* @return 用户项目信息
*/
@PostMapping("queryById")
@Operation(summary = "web端管理员根据id查询用户项目", description = "参数：用户项目查询请求体，权限：管理员，方法名：queryUserProjectById")
@RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
@SysLog(title = "用户项目管理", content = "web端管理员根据id查询用户项目")
public BaseResponse<UserProjectVO> queryUserProjectById(@Valid @RequestBody CommonRequest commonRequest) {
Long id = commonRequest.getId();
UserProject userProject = userProjectService.getById(id);
ThrowUtils.throwIf(userProject == null, ErrorCode.OPERATION_ERROR, "当前用户项目不存在");
UserProjectVO userProjectVO = commonService.copyProperties(userProject, UserProjectVO.class);
return ResultUtils.success(userProjectVO);
}
// /**
// * Web端管理员分页查询用户项目
// * @param userProjectQueryRequest 用户项目查询请求体
// * @return 用户项目列表
// */
// @PostMapping("page")
// @Operation(summary = "Web端管理员分页查询用户项目", description = "参数：用户项目查询请求体，权限：管理员，方法名：listUserProjectByPage")
// @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
// @SysLog(title = "用户项目管理", content = "Web端管理员分页查询用户项目")
// public BaseResponse<Page<UserProjectVO>> listUserProjectByPage(@Valid @RequestBody UserProjectQueryRequest userProjectQueryRequest) {
// long current = userProjectQueryRequest.getCurrent();
// long pageSize = userProjectQueryRequest.getPageSize();
// QueryWrapper<UserProject> queryWrapper = userProjectService.getQueryWrapper(userProjectQueryRequest);
// Page<UserProject> page = userProjectService.page(new Page<>(current, pageSize), queryWrapper);
// List<UserProject> userProjectList = page.getRecords();
// List<UserProjectVO> userProjectVOList = commonService.convertList(userProjectList, UserProjectVO.class);
// Page<UserProjectVO> voPage = new Page<>(current, pageSize);
// voPage.setRecords(userProjectVOList);
// voPage.setPages(page.getPages());
// voPage.setTotal(page.getTotal());
// return ResultUtils.success(voPage);
// }
}

89
src/main/java/com/greenorange/promotion/controller/projectSettlement/ProjectSettlementController.java
View File

@ -21,6 +21,7 @@ import com.greenorange.promotion.service.userInfo.UserMainInfoService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.validation.Valid;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.PostMapping;
@ -56,6 +57,44 @@ public class ProjectSettlementController {
@Resource
private UserMainInfoService userMainInfoService;
/**
* 小程序端用户根据推广码申请记录id查询结算记录
* @param commonRequest 项目结算记录添加请求体
* @return 是否添加成功
*/
@PostMapping("query/settle")
@Operation(summary = "小程序端用户根据推广码申请记录id查询结算记录", description = "参数：项目结算记录添加请求体，权限：管理员，方法名：queryProjectSettlementRecordByPid")
@RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE)
@SysLog(title = "项目结算记录管理", content = "小程序端用户根据推广码申请记录id查询结算记录")
public BaseResponse<List<ProjectSettlementVO>> queryProjectSettlementRecordByPid(@Valid @RequestBody CommonRequest commonRequest) {
Long id = commonRequest.getId();
LambdaQueryWrapper<ProjectSettlement> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(ProjectSettlement::getPromoCodeRequestRecordId, id);
lambdaQueryWrapper.eq(ProjectSettlement::getRevenueSource, 0);
List<ProjectSettlement> projectSettlementList = projectSettlementService.list(lambdaQueryWrapper);
List<ProjectSettlementVO> projectSettlementVOS = commonService.convertList(projectSettlementList, ProjectSettlementVO.class);
return ResultUtils.success(projectSettlementVOS);
}
/**
* 小程序端用户查询当前推广项目的所有结算明细
* @param commonRequest 项目id
* @return 是否添加成功
*/
@PostMapping("query/all/settle")
@Operation(summary = "小程序端用户查询当前推广项目的所有结算明细", description = "参数：项目结算记录添加请求体，权限：管理员，方法名：queryProjectSettlementRecordByProjectId")
@RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE)
@SysLog(title = "项目结算记录管理", content = "小程序端用户查询当前推广项目的所有结算明细")
public BaseResponse<List<ProjectSettlementVO>> queryProjectSettlementRecordByProjectId(@Valid @RequestBody CommonRequest commonRequest) {
Long id = commonRequest.getId();
LambdaQueryWrapper<ProjectSettlement> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(ProjectSettlement::getProjectId, id);
List<ProjectSettlement> projectSettlementList = projectSettlementService.list(lambdaQueryWrapper);
List<ProjectSettlementVO> projectSettlementVOS = commonService.convertList(projectSettlementList, ProjectSettlementVO.class);
return ResultUtils.success(projectSettlementVOS);
}
/**
* web端管理员添加项目结算记录
* @param projectSettlementAddRequest 项目结算记录添加请求体
@ -95,31 +134,31 @@ public class ProjectSettlementController {
return ResultUtils.success(true);
}
/**
* web端管理员根据id修改项目结算记录信息
* @param projectSettlementUpdateRequest 项目结算记录更新请求体
* @return 是否更新成功
*/
@PostMapping("update")
@Operation(summary = "web端管理员根据id修改项目结算记录信息", description = "参数：项目结算记录更新请求体，权限：管理员，方法名：updateProjectSettlement")
@RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
@SysLog(title = "项目结算记录管理", content = "web端管理员根据id修改项目结算记录信息")
public BaseResponse<Boolean> updateProjectSettlement(@Valid @RequestBody ProjectSettlementUpdateRequest projectSettlementUpdateRequest) {
ProjectSettlement projectSettlement = commonService.copyProperties(projectSettlementUpdateRequest, ProjectSettlement.class);
projectSettlementService.updateById(projectSettlement);
// 修改资金变动记录
Long id = projectSettlement.getId();
LambdaQueryWrapper<FundsChange> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(FundsChange::getProjectSettlementId, id);
FundsChange fundsChange = fundsChangeService.getOne(lambdaQueryWrapper);
BigDecimal changeAmount = fundsChange.getChangeAmount();
BigDecimal currentAmount = fundsChange.getCurrentAmount();
BigDecimal originAmount = currentAmount.subtract(changeAmount);
fundsChange.setChangeAmount(projectSettlement.getSettlementRevenue());
fundsChange.setCurrentAmount(originAmount.add(projectSettlement.getSettlementRevenue()));
fundsChangeService.updateById(fundsChange);
return ResultUtils.success(true);
}
// /**
//// * web端管理员根据id修改项目结算记录信息
//// * @param projectSettlementUpdateRequest 项目结算记录更新请求体
//// * @return 是否更新成功
//// */
//// @PostMapping("update")
//// @Operation(summary = "web端管理员根据id修改项目结算记录信息", description = "参数：项目结算记录更新请求体，权限：管理员，方法名：updateProjectSettlement")
//// @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
//// @SysLog(title = "项目结算记录管理", content = "web端管理员根据id修改项目结算记录信息")
//// public BaseResponse<Boolean> updateProjectSettlement(@Valid @RequestBody ProjectSettlementUpdateRequest projectSettlementUpdateRequest) {
//// ProjectSettlement projectSettlement = commonService.copyProperties(projectSettlementUpdateRequest, ProjectSettlement.class);
//// projectSettlementService.updateById(projectSettlement);
//// // 修改资金变动记录
//// Long id = projectSettlement.getId();
//// LambdaQueryWrapper<FundsChange> lambdaQueryWrapper = new LambdaQueryWrapper<>();
//// lambdaQueryWrapper.eq(FundsChange::getProjectSettlementId, id);
//// FundsChange fundsChange = fundsChangeService.getOne(lambdaQueryWrapper);
//// BigDecimal changeAmount = fundsChange.getChangeAmount();
//// BigDecimal currentAmount = fundsChange.getCurrentAmount();
//// BigDecimal originAmount = currentAmount.subtract(changeAmount);
//// fundsChange.setChangeAmount(projectSettlement.getSettlementRevenue());
//// fundsChange.setCurrentAmount(originAmount.add(projectSettlement.getSettlementRevenue()));
//// fundsChangeService.updateById(fundsChange);
//// return ResultUtils.success(true);
//// }
/**
* web端管理员根据id删除项目结算记录

5
src/main/java/com/greenorange/promotion/controller/userInfo/UserInfoController.java
View File

@ -356,11 +356,6 @@ public class UserInfoController {
@RequiresPermission(mustRole = UserConstant.BOSS_ROLE)
@SysLog(title = "用户管理", content = "web端管理员根据id查询用户")
public BaseResponse<UserInfoVO> queryUserInfoById(@Valid @RequestBody CommonRequest commonRequest) {
try {
Thread.sleep(2000);
} catch (InterruptedException e) {
e.printStackTrace();
}
Long id = commonRequest.getId();
UserInfo userInfo = userInfoService.getById(id);
ThrowUtils.throwIf(userInfo == null, ErrorCode.OPERATION_ERROR, "当前用户不存在");

15
src/main/java/com/greenorange/promotion/controller/userInfo/UserMainInfoController.java
View File

@ -64,7 +64,7 @@ public class UserMainInfoController {
@Operation(summary = "小程序用户查询团队信息", description = "参数：用户主要信息添加请求体，权限：管理员，方法名：queryUserTeamInfo")
@RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE)
@SysLog(title = "用户主要信息管理", content = "小程序用户查询团队信息")
public BaseResponse<Boolean> queryUserTeamInfo(HttpServletRequest request) {
public BaseResponse<UserTeamInfoVO> queryUserTeamInfo(HttpServletRequest request) {
Long userId = (Long) request.getAttribute("userId");
LambdaQueryWrapper<UserInfo> userInfoLambdaQueryWrapper = new LambdaQueryWrapper<>();
userInfoLambdaQueryWrapper.eq(UserInfo::getParentUserId, userId);
@ -95,8 +95,17 @@ public class UserMainInfoController {
.build();
userMemberInfoVOList.add(userMemberInfoVO);
}
// 3
return ResultUtils.success(true);
UserInfo userInfo = userInfoService.getById(userId);
UserTeamInfoVO userTeamInfoVO = commonService.copyProperties(userInfo, UserTeamInfoVO.class);
userTeamInfoVO.setDirectAgentSize(userInfoList.size());
LambdaQueryWrapper<UserMainInfo> userMainInfoLambdaQueryWrapper = new LambdaQueryWrapper<>();
userMainInfoLambdaQueryWrapper.eq(UserMainInfo::getUserId, userId);
UserMainInfo userMainInfo = userMainInfoService.getOne(userMainInfoLambdaQueryWrapper);
userTeamInfoVO.setInviteQrCode(userMainInfo.getInviteQrCode());
userTeamInfoVO.setUserMemberInfoVOList(userMemberInfoVOList);
return ResultUtils.success(userTeamInfoVO);
}

3
src/main/java/com/greenorange/promotion/controller/wechat/WechatGetQrcodeController.java
View File

@ -12,6 +12,7 @@ import com.greenorange.promotion.constant.UserConstant;
import com.greenorange.promotion.model.dto.CommonStringRequest;
import com.greenorange.promotion.service.wechat.WechatGetQrcodeService;
import com.greenorange.promotion.utils.QRCodeUtil;
import io.swagger.v3.oas.annotations.Hidden;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
@ -52,6 +53,7 @@ public class WechatGetQrcodeController {
/**
* (小程序端)获取接口调用凭据
*/
@Hidden
@GetMapping("/get/token")
@Operation(summary = "(小程序端)获取接口调用凭据", description = "参数：无, 权限：所有人, 方法名：getAccessToken")
public BaseResponse<WxAccessToken> getAccessToken() {
@ -65,6 +67,7 @@ public class WechatGetQrcodeController {
* @return
* @throws IOException
*/
@Hidden
@PostMapping("/get/qrcode")
@Operation(summary = "微信小程序获取二维码", description = "参数：无, 权限：所有人, 方法名：getQrcode")
// @RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE)

2
src/main/java/com/greenorange/promotion/controller/wechat/WechatPayoutsController.java
View File

@ -6,6 +6,7 @@ import cn.hutool.json.JSONUtil;
import com.greenorange.promotion.common.BaseResponse;
import com.greenorange.promotion.common.ResultUtils;
import com.greenorange.promotion.utils.OrderNumberUtils;
import io.swagger.v3.oas.annotations.Hidden;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletRequest;
@ -29,6 +30,7 @@ public class WechatPayoutsController {
/**
* 微信小程序积分提现到银行卡
*/
@Hidden
@PostMapping("/points")
@Operation(summary = "微信小程序积分提现到银行卡", description = "参数：无, 权限：所有人, 方法名：getQrcode")
public BaseResponse<Boolean> pointsWithdrawnToBankCard(HttpServletRequest request) throws IOException {

16
src/main/java/com/greenorange/promotion/model/dto/projectSettlement/ProjectSettlementAddRequest.java
View File

@ -21,6 +21,8 @@ import java.time.LocalDateTime;
"workTime",
"settlementTime",
"promoCodeRequestRecordId",
"projectId",
"projectDetailId"
})
public class ProjectSettlementAddRequest implements Serializable {
@ -62,6 +64,20 @@ public class ProjectSettlementAddRequest implements Serializable {
@Schema(description = "推广码申请记录id", example = "1")
private Long promoCodeRequestRecordId;
/**
* 项目id
*/
@Min(value = 1L, message = "项目id ID不能小于1")
@Schema(description = "项目id", example = "1")
private Long projectId;
/**
* 项目明细id
*/
@Min(value = 1L, message = "项目明细id ID不能小于1")
@Schema(description = "项目明细", example = "1")
private Long projectDetailId;
@Serial
private static final long serialVersionUID = 1L;

14
src/main/java/com/greenorange/promotion/model/dto/projectSettlement/ProjectSettlementQueryRequest.java
View File

@ -63,6 +63,20 @@ public class ProjectSettlementQueryRequest extends PageRequest implements Serial
@Schema(description = "推广码申请记录id", example = "1")
private Long promoCodeRequestRecordId;
/**
* 项目id
*/
@Min(value = 1L, message = "项目id ID不能小于1")
@Schema(description = "项目id", example = "1")
private Long projectId;
/**
* 项目明细id
*/
@Min(value = 1L, message = "项目明细id ID不能小于1")
@Schema(description = "项目明细", example = "1")
private Long projectDetailId;
@Serial
private static final long serialVersionUID = 1L;

16
src/main/java/com/greenorange/promotion/model/dto/projectSettlement/ProjectSettlementUpdateRequest.java
View File

@ -22,6 +22,8 @@ import java.time.LocalDateTime;
"workTime",
"settlementTime",
"promoCodeRequestRecordId",
"projectId",
"projectDetailId"
})
public class ProjectSettlementUpdateRequest implements Serializable {
@ -70,6 +72,20 @@ public class ProjectSettlementUpdateRequest implements Serializable {
@Schema(description = "推广码申请记录id", example = "1")
private Long promoCodeRequestRecordId;
/**
* 项目id
*/
@Min(value = 1L, message = "项目id ID不能小于1")
@Schema(description = "项目id", example = "1")
private Long projectId;
/**
* 项目明细id
*/
@Min(value = 1L, message = "项目明细id ID不能小于1")
@Schema(description = "项目明细", example = "1")
private Long projectDetailId;
@Serial
private static final long serialVersionUID = 1L;

15
src/main/java/com/greenorange/promotion/model/entity/ProjectSettlement.java
View File

@ -52,6 +52,21 @@ public class ProjectSettlement implements Serializable {
*/
private Long promoCodeRequestRecordId;
/**
* 收益来源（true:抽成，false：推广码）
*/
private Boolean revenueSource;
/**
* 项目id
*/
private Long projectId;
/**
* 项目明细id
*/
private Long projectDetailId;
/**
* 是否删除
*/

8
src/main/java/com/greenorange/promotion/model/vo/projectSettlement/ProjectSettlementVO.java
View File

@ -52,11 +52,13 @@ public class ProjectSettlementVO implements Serializable {
@Schema(description = "结算时间", example = "2025-05-12 10:00:00")
private LocalDateTime settlementTime;
/**
* 推广码申请记录id
* 收益来源（true:抽成，false：推广码）
*/
@Schema(description = "推广码申请记录id", example = "1")
private Long promoCodeRequestRecordId;
@Schema(description = "收益来源（true:抽成，false：推广码）", example = "false")
private Boolean revenueSource;
@Serial