From 3d6c34f45d76b78151d6586f93acca2943698b08 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期一, 09 十二月 2024 10:56:42 +0800
Subject: [PATCH] 1.
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/VipCenterServiceImpl.java | 52 +++++++++++++++++
ruoyi-service/ruoyi-order/src/main/resources/mapper/order/OrderGoodMapper.xml | 12 +++-
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderGoodService.java | 4 +
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/OrderGoodMapper.java | 4 +
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderGoodServiceImpl.java | 10 +++
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/VipCenterController.java | 14 +---
ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TechnicianMapper.xml | 4
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderGoodController.java | 5 +
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/VipCenterService.java | 24 ++++++++
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/feignClient/RemoteOrderGoodsClient.java | 6 ++
10 files changed, 121 insertions(+), 14 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/feignClient/RemoteOrderGoodsClient.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/feignClient/RemoteOrderGoodsClient.java
index 2a5b441..ee502f6 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/feignClient/RemoteOrderGoodsClient.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/feignClient/RemoteOrderGoodsClient.java
@@ -26,4 +26,10 @@
*/
@PostMapping("/order/getOrderListByIds")
public R<List<Order>> getOrderListByIds(@RequestBody List<Long> orderIds);
+
+ /**
+ * 根据用户id和商品id查找订单列表
+ */
+ @PostMapping("/order/getOrderListByUserIdAndGoodsId")
+ public R<List<Order>> getOrderListByUserIdAndGoodsId(@RequestBody OrderGood orderGood);
}
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 3a6f8aa..2c1f6f5 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
@@ -127,18 +127,14 @@
public R<Void> test() {
LoginUser loginUserApplet = tokenService.getLoginUserApplet();
AppUser appUser = appUserService.getById(loginUserApplet.getUserid());
- if (appUser.getShopPoint() < 500){
- return R.fail("消费积分不足500");
+ if (appUser.getShopPoint() >= 500){
+ return R.ok();
}
- if (appUser.getSharePoint() < 500){
- return R.fail("返佣积分不足500");
+ if (appUser.getSharePoint() >= 400){
+ return R.ok();
}
- // 当前用户的直推用户
-// List<AppUser> bottomUsers = appUserService.list(new LambdaQueryWrapper<AppUser>()
-// .eq(AppUser::getInviteUserId, loginUserApplet.getUserid())
-// .eq(AppUser::getVipId));
- return null;
+ return R.fail();
}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/VipCenterService.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/VipCenterService.java
new file mode 100644
index 0000000..3539146
--- /dev/null
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/VipCenterService.java
@@ -0,0 +1,24 @@
+package com.ruoyi.account.service;
+
+public interface VipCenterService {
+
+ /**
+ * 校验准代理的申请条件
+ */
+ Boolean checkReadyToBeProxy(Long userId);
+
+ /**
+ * 校验代理的申请条件
+ */
+ Boolean checkReadyToBeAgent(Long userId);
+
+ /**
+ * 校验总代理的申请条件
+ */
+ Boolean checkReadyToBeTotalAgent(Long userId);
+
+ /**
+ * 校验合伙人的申请条件
+ */
+ Boolean checkReadyToBePartner(Long userId);
+}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/VipCenterServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/VipCenterServiceImpl.java
new file mode 100644
index 0000000..7ab046c
--- /dev/null
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/VipCenterServiceImpl.java
@@ -0,0 +1,52 @@
+package com.ruoyi.account.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ruoyi.account.api.model.AppUser;
+import com.ruoyi.account.service.AppUserService;
+import com.ruoyi.account.service.VipCenterService;
+import com.ruoyi.common.core.domain.R;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+@RequiredArgsConstructor
+public class VipCenterServiceImpl implements VipCenterService {
+ private final AppUserService appUserService;
+ @Override
+ public Boolean checkReadyToBeProxy(Long userId) {
+ AppUser appUser = appUserService.getById(userId);
+ if (appUser.getShopPoint() >= 500){
+ return true;
+ }
+ if (appUser.getSharePoint() >= 400){
+ return true;
+ }
+
+ // 当前用户的直推用户
+ List<AppUser> bottomUsers = appUserService.list(new LambdaQueryWrapper<AppUser>()
+ .eq(AppUser::getInviteUserId, userId)
+ .eq(AppUser::getVipId,3));
+ if (bottomUsers.size() >= 5){
+ return true;
+ }
+
+ return false;
+ }
+
+ @Override
+ public Boolean checkReadyToBeAgent(Long userId) {
+ return false;
+ }
+
+ @Override
+ public Boolean checkReadyToBeTotalAgent(Long userId) {
+ return false;
+ }
+
+ @Override
+ public Boolean checkReadyToBePartner(Long userId) {
+ return false;
+ }
+}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderGoodController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderGoodController.java
index 8461bb5..56ad3e3 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderGoodController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderGoodController.java
@@ -35,5 +35,10 @@
.in(OrderGood::getGoodsId, goodsIds));
return R.ok(orderGoods);
}
+
+ @GetMapping("/getOrderListByUserIdAndGoodsId")
+ public R<List<OrderGood>> getOrderListByUserIdAndGoodsId(Long userId, Long goodsId){
+ return R.ok(orderGoodService.getOrderListByUserIdAndGoodsId(userId, goodsId));
+ }
}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/OrderGoodMapper.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/OrderGoodMapper.java
index b9904fc..720b2d2 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/OrderGoodMapper.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/OrderGoodMapper.java
@@ -2,6 +2,9 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.order.model.OrderGood;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* <p>
@@ -12,5 +15,6 @@
* @since 2024-11-21
*/
public interface OrderGoodMapper extends BaseMapper<OrderGood> {
+ public List<OrderGood> getOrderListByUserIdAndGoodsId(@Param("userId") Long userId,@Param("goodsId") Long goodsId);
}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderGoodService.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderGoodService.java
index dbd6f66..a7bb861 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderGoodService.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderGoodService.java
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.order.model.OrderGood;
+import java.util.List;
+
/**
* <p>
* 服务类
@@ -13,4 +15,6 @@
*/
public interface OrderGoodService extends IService<OrderGood> {
+ public List<OrderGood> getOrderListByUserIdAndGoodsId(Long userId, Long goodsId);
+
}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderGoodServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderGoodServiceImpl.java
index 49ba50b..709b485 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderGoodServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderGoodServiceImpl.java
@@ -4,7 +4,11 @@
import com.ruoyi.order.mapper.OrderGoodMapper;
import com.ruoyi.order.model.OrderGood;
import com.ruoyi.order.service.OrderGoodService;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
+
+import java.util.Collections;
+import java.util.List;
/**
* <p>
@@ -15,6 +19,12 @@
* @since 2024-11-21
*/
@Service
+@RequiredArgsConstructor
public class OrderGoodServiceImpl extends ServiceImpl<OrderGoodMapper, OrderGood> implements OrderGoodService {
+ private final OrderGoodMapper orderGoodMapper;
+ @Override
+ public List<OrderGood> getOrderListByUserIdAndGoodsId(Long userId, Long goodsId) {
+ return orderGoodMapper.getOrderListByUserIdAndGoodsId(userId, goodsId);
+ }
}
diff --git a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/OrderGoodMapper.xml b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/OrderGoodMapper.xml
index 8a4dd2b..24c3855 100644
--- a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/OrderGoodMapper.xml
+++ b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/OrderGoodMapper.xml
@@ -1,7 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.account.mapper.OrderGoodMapper">
+<mapper namespace="com.ruoyi.order.mapper.OrderGoodMapper">
-
-
+ <select id="getOrderListByUserIdAndGoodsId" resultType="com.ruoyi.order.model.OrderGood">
+ SELECT
+ *
+ FROM
+ t_order_good og
+ LEFT JOIN t_order o ON og.order_id = o.id
+ WHERE og.goods_id = #{goodsId} and o.app_user_id = #{userId}
+ </select>
</mapper>
diff --git a/ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TechnicianMapper.xml b/ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TechnicianMapper.xml
index 999d216..5e8ebde 100644
--- a/ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TechnicianMapper.xml
+++ b/ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TechnicianMapper.xml
@@ -36,10 +36,10 @@
FROM
t_technician tt
LEFT JOIN t_technician_subscribe tts ON tt.id = tts.technician_id
+ AND tts.`status` != 0
LEFT JOIN t_technician_score ttsc ON ttsc.technician_id = tt.id
WHERE
- tts.`status` != 0
- AND tt.`status` = 2
+ tt.`status` = 2
AND tt.del_flag = 0
AND tt.subscribe_status = 1
AND tt.id = #{technicianId}
--
Gitblit v1.7.1