From acccff9860b271d55c55dc87486f7c20b9896e6c Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 13 一月 2025 16:19:54 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AgentApplicationController.java | 103 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 103 insertions(+), 0 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AgentApplicationController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AgentApplicationController.java
new file mode 100644
index 0000000..8958c81
--- /dev/null
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AgentApplicationController.java
@@ -0,0 +1,103 @@
+package com.ruoyi.account.controller;
+import java.time.LocalDateTime;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ruoyi.account.api.model.AgentApplication;
+import com.ruoyi.account.api.model.AppUser;
+import com.ruoyi.account.api.model.UserChangeLog;
+import com.ruoyi.account.dto.AgentQuery;
+import com.ruoyi.account.api.model.VipSettingDto;
+import com.ruoyi.account.service.AgentApplicationService;
+import com.ruoyi.account.service.AppUserService;
+import com.ruoyi.account.service.UserChangeLogService;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.utils.bean.BeanUtils;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.other.api.domain.VipSetting;
+import com.ruoyi.other.api.feignClient.VipSettingClient;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author luodangjia
+ * @since 2024-11-21
+ */
+@RestController
+@RequestMapping("/agent-application")
+public class AgentApplicationController extends BaseController {
+ @Resource
+ private AgentApplicationService agentApplicationService;
+ @Resource
+ private AppUserService appUserService;
+
+ @PostMapping("/apply")
+ @ApiOperation(value = "会员申请", tags = {"会员中心-小程序"})
+ public R<Void> apply(@RequestBody AgentApplication agentApplication) {
+ agentApplicationService.apply(agentApplication);
+ return R.ok();
+ }
+
+ @PostMapping("/page")
+ @ApiOperation(value = "会员申请列表", tags = {"后台"})
+ public R<IPage<AgentApplication>> page(@RequestBody AgentQuery agentQuery) {
+ IPage<AgentApplication> agentApplicationIPage = agentApplicationService.pageList(agentQuery);
+ for (AgentApplication record : agentApplicationIPage.getRecords()) {
+ AppUser byId = appUserService.getById(record.getAppUserId());
+ if (byId!=null){
+ record.setVipId(byId.getVipId());
+ }
+ }
+ return R.ok(agentApplicationIPage);
+ }
+ @Resource
+ private VipSettingClient vipSettingClient;
+ @GetMapping("/detail")
+ @ApiOperation(value = "会员申请详情", tags = {"会员中心-小程序"})
+ public R<AgentApplication> detail(@RequestParam Long id) {
+ AgentApplication agentApplication = agentApplicationService.getById(id);
+ R<VipSetting> vipSetting = vipSettingClient.getVipSetting(agentApplication.getApplicationVipId());
+ VipSettingDto vipSettingDto = new VipSettingDto();
+ BeanUtils.copyProperties(vipSetting.getData(),vipSettingDto);
+ agentApplication.setVipSettingDto(vipSettingDto);
+ return R.ok(agentApplication);
+ }
+ @Resource
+ private UserChangeLogService userChangeLogService;
+
+ @GetMapping("/auth")
+ @ApiOperation(value = "会员申请审核", tags = {"会员中心-小程序"})
+ public R<AgentApplication> auth(@RequestParam Long id, @ApiParam("2'已处理-同意',3'已处理-拒绝")Integer status,@ApiParam("处理意见") String remark) {
+ AgentApplication byId = agentApplicationService.getById(id);
+ byId.setStatus(status);
+ byId.setRemark(remark);
+ agentApplicationService.updateById(byId);
+ AppUser byId1 = appUserService.getById(byId.getAppUserId());
+ //插入等级变化数据
+ UserChangeLog userChangeLog = new UserChangeLog();
+ userChangeLog.setCreateTime(LocalDateTime.now());
+ userChangeLog.setAppUserId(byId.getAppUserId());
+ userChangeLog.setBeforeVipId(byId1.getVipId());
+ userChangeLog.setAfterVipId(byId.getApplicationVipId());
+ if (userChangeLog.getBeforeVipId()>userChangeLog.getAfterVipId()) {
+ userChangeLog.setChangeType(0);
+ }else {
+ userChangeLog.setChangeType(1);
+ }
+ userChangeLogService.save(userChangeLog);
+ //变更会员等级
+ byId1.setVipId(byId.getApplicationVipId());
+ appUserService.updateById(byId1);
+ return R.ok(byId);
+ }
+
+
+}
+
--
Gitblit v1.7.1