From 70b6937ff121a304234486dc59ca400360e82ff2 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期二, 10 十二月 2024 15:45:53 +0800
Subject: [PATCH] 1.
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/AgentApplicationService.java | 2 +
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/VipCenterController.java | 8 ++--
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AgentApplicationServiceImpl.java | 50 +++++++++++++++++++++++++
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AgentApplicationController.java | 21 ++++++++++
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AgentApplication.java | 4 +-
5 files changed, 78 insertions(+), 7 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AgentApplication.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AgentApplication.java
index 12a1d82..2e4d076 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AgentApplication.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AgentApplication.java
@@ -50,11 +50,11 @@
@ApiModelProperty(value = "用户当前消费积分")
@TableField("shop_point")
- private BigDecimal shopPoint;
+ private Integer shopPoint;
@ApiModelProperty(value = "用户当前分佣积分")
@TableField("share_point")
- private BigDecimal sharePoint;
+ private Integer sharePoint;
@ApiModelProperty(value = "直推用户已达钻石会员数")
@TableField("direct_vip_num")
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
index 4c8c7d4..cb7d138 100644
--- 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
@@ -1,8 +1,18 @@
package com.ruoyi.account.controller;
+import com.ruoyi.account.api.model.AgentApplication;
+import com.ruoyi.account.service.AgentApplicationService;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.other.api.domain.VipSetting;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
/**
* <p>
@@ -14,7 +24,16 @@
*/
@RestController
@RequestMapping("/agent-application")
-public class AgentApplicationController {
+public class AgentApplicationController extends BaseController {
+ @Resource
+ private AgentApplicationService agentApplicationService;
+
+ @PostMapping("/apply")
+ @ApiOperation(value = "会员申请", tags = {"会员中心-小程序"})
+ public R<Void> apply(@RequestBody AgentApplication agentApplication) {
+ agentApplicationService.apply(agentApplication);
+ return R.ok();
+ }
}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/VipCenterController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/VipCenterController.java
index aeb40c0..7c21768 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/VipCenterController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/VipCenterController.java
@@ -16,10 +16,7 @@
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.extern.log4j.Log4j2;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.ArrayList;
@@ -127,6 +124,9 @@
}
+
+
+
private boolean checkSuccess(R<?> r) {
if (!R.isSuccess(r)) {
log.error("请求失败: " + r.getMsg());
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/AgentApplicationService.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/AgentApplicationService.java
index 5b5427a..61b9a36 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/AgentApplicationService.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/AgentApplicationService.java
@@ -13,4 +13,6 @@
*/
public interface AgentApplicationService extends IService<AgentApplication> {
+ void apply(AgentApplication agentApplication);
+
}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AgentApplicationServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AgentApplicationServiceImpl.java
index bc7f87e..bbee426 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AgentApplicationServiceImpl.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AgentApplicationServiceImpl.java
@@ -1,10 +1,24 @@
package com.ruoyi.account.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.account.api.model.AgentApplication;
+import com.ruoyi.account.api.model.AppUser;
import com.ruoyi.account.mapper.AgentApplicationMapper;
import com.ruoyi.account.service.AgentApplicationService;
+import com.ruoyi.account.service.AppUserService;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.security.service.TokenService;
+import com.ruoyi.other.api.domain.Shop;
+import com.ruoyi.other.api.feignClient.ShopClient;
+import com.ruoyi.system.api.model.LoginUser;
import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
/**
* <p>
@@ -16,5 +30,41 @@
*/
@Service
public class AgentApplicationServiceImpl extends ServiceImpl<AgentApplicationMapper, AgentApplication> implements AgentApplicationService {
+ @Resource
+ private AgentApplicationMapper agentApplicationMapper;
+ @Resource
+ private TokenService tokenService;
+ @Resource
+ private AppUserService appUserService;
+ @Resource
+ private ShopClient shopClient;
+ @Override
+ public void apply(AgentApplication agentApplication) {
+ LoginUser loginUserApplet = tokenService.getLoginUserApplet();
+ AppUser appUser = appUserService.getById(loginUserApplet.getUserid());
+
+ agentApplication.setAppUserId(loginUserApplet.getUserid());
+ agentApplication.setApplicationTime(LocalDateTime.now());
+ agentApplication.setShopPoint(appUser.getShopPoint());
+ agentApplication.setSharePoint(appUser.getSharePoint());
+
+ // 直推用户已达钻石会员数量
+ List<AppUser> directVipUserList = appUserService.list(new LambdaQueryWrapper<AppUser>()
+ .eq(AppUser::getInviteUserId, appUser.getId())
+ .eq(AppUser::getVipId, 3));
+ agentApplication.setDirectVipNum(directVipUserList.size());
+
+ // 直推用户已成为代理数量
+ List<AppUser> directAgentUserList = appUserService.list(new LambdaQueryWrapper<AppUser>()
+ .eq(AppUser::getInviteUserId, appUser.getId())
+ .eq(AppUser::getUserType, 4));
+ agentApplication.setDirectAgentNum(directAgentUserList.size());
+
+ // 已绑定门店数量
+ R<List<Shop>> R = shopClient.getShopByUserIds(Collections.singletonList(loginUserApplet.getUserid()));
+ List<Shop> shopList = R.getData();
+ agentApplication.setBindShopNum(shopList.size());
+ agentApplicationMapper.insert(agentApplication);
+ }
}
--
Gitblit v1.7.1