BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 551a968449bc318679e7da3ed75d0c7ab4221ab0

Authored by YunaiV
2 parents 292f23c4 883bdc65

Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 

# Conflicts:
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberExperienceLogService.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelLogService.java
Inline Side-by-side
Showing 55 changed files with 1050 additions and 545 deletions
sql/mysql/member_group.sql 0 → 100644
  View file @551a968
  1 +create table member_group
  2 +(
  3 + id bigint auto_increment comment '编号' primary key,
  4 + name varchar(30) default '' not null comment '名称',
  5 + remark varchar(255) default '' not null comment '备注',
  6 + status tinyint default 0 not null comment '状态',
  7 + creator varchar(64) default '' null comment '创建者',
  8 + create_time datetime default CURRENT_TIMESTAMP not null comment '创建时间',
  9 + updater varchar(64) default '' null comment '更新者',
  10 + update_time datetime default CURRENT_TIMESTAMP not null on update CURRENT_TIMESTAMP comment '更新时间',
  11 + deleted bit default b'0' not null comment '是否删除',
  12 + tenant_id bigint default 0 not null comment '租户编号'
  13 +)
  14 + comment '用户分组';
  15 +
  16 +alter table member_user add column group_id bigint null comment '用户分组编号';
  17 +
  18 +-- 菜单 SQL
  19 +INSERT INTO system_menu(name, permission, type, sort, parent_id, path, icon, component, status, component_name)
  20 +VALUES ('用户分组', '', 2, 5, 2262, 'group', '', 'member/group/index', 0, 'MemberGroup');
  21 +
  22 +-- 按钮父菜单ID
  23 +-- 暂时只支持 MySQL。如果你是 Oracle、PostgreSQL、SQLServer 的话，需要手动修改 @parentId 的部分的代码
  24 +SELECT @parentId := LAST_INSERT_ID();
  25 +
  26 +-- 按钮 SQL
  27 +INSERT INTO system_menu(name, permission, type, sort, parent_id, path, icon, component, status)
  28 +VALUES ('用户分组查询', 'member:group:query', 3, 1, @parentId, '', '', '', 0);
  29 +INSERT INTO system_menu(name, permission, type, sort, parent_id, path, icon, component, status)
  30 +VALUES ('用户分组创建', 'member:group:create', 3, 2, @parentId, '', '', '', 0);
  31 +INSERT INTO system_menu(name, permission, type, sort, parent_id, path, icon, component, status)
  32 +VALUES ('用户分组更新', 'member:group:update', 3, 3, @parentId, '', '', '', 0);
  33 +INSERT INTO system_menu(name, permission, type, sort, parent_id, path, icon, component, status)
  34 +VALUES ('用户分组删除', 'member:group:delete', 3, 4, @parentId, '', '', '', 0);
  35 +INSERT INTO system_menu(name, permission, type, sort, parent_id, path, icon, component, status)
  36 +VALUES ('用户分组导出', 'member:group:export', 3, 5, @parentId, '', '', '', 0);
... ...
yudao-framework/yudao-spring-boot-starter-biz-pay/src/test/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AbstractAlipayClientTest.java 0 → 100644
  View file @551a968
  1 +package cn.iocoder.yudao.framework.pay.core.client.impl.alipay;
  2 +
  3 +import cn.hutool.core.date.LocalDateTimeUtil;
  4 +import cn.hutool.core.util.ReflectUtil;
  5 +import cn.iocoder.yudao.framework.common.exception.ServiceException;
  6 +import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants;
  7 +import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
  8 +import cn.iocoder.yudao.framework.pay.core.client.dto.refund.PayRefundRespDTO;
  9 +import cn.iocoder.yudao.framework.pay.core.client.dto.refund.PayRefundUnifiedReqDTO;
  10 +import cn.iocoder.yudao.framework.pay.core.client.exception.PayException;
  11 +import cn.iocoder.yudao.framework.pay.core.enums.refund.PayRefundStatusRespEnum;
  12 +import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest;
  13 +import com.alipay.api.AlipayApiException;
  14 +import com.alipay.api.DefaultAlipayClient;
  15 +import com.alipay.api.DefaultSigner;
  16 +import com.alipay.api.domain.AlipayTradeRefundModel;
  17 +import com.alipay.api.request.AlipayTradeRefundRequest;
  18 +import com.alipay.api.response.AlipayTradeRefundResponse;
  19 +import org.junit.jupiter.api.DisplayName;
  20 +import org.junit.jupiter.api.Test;
  21 +import org.mockito.ArgumentMatcher;
  22 +import org.mockito.Mock;
  23 +
  24 +import javax.validation.ConstraintViolationException;
  25 +import java.util.Date;
  26 +
  27 +import static cn.iocoder.yudao.framework.pay.core.client.impl.alipay.AlipayPayClientConfig.MODE_PUBLIC_KEY;
  28 +import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
  29 +import static org.junit.jupiter.api.Assertions.*;
  30 +import static org.mockito.ArgumentMatchers.argThat;
  31 +import static org.mockito.Mockito.when;
  32 +
  33 +/**
  34 + * @author jason
  35 + */
  36 +public abstract class AbstractAlipayClientTest extends BaseMockitoUnitTest {
  37 +
  38 + private final String privateKey = randomString();
  39 +
  40 + protected AlipayPayClientConfig config = randomPojo(AlipayPayClientConfig.class, t -> {
  41 + t.setServerUrl(randomURL());
  42 + t.setPrivateKey(privateKey);
  43 + t.setMode(MODE_PUBLIC_KEY);
  44 + t.setSignType(AlipayPayClientConfig.SIGN_TYPE_DEFAULT);
  45 + t.setAppCertContent("");
  46 + t.setAlipayPublicCertContent("");
  47 + t.setRootCertContent("");
  48 + });
  49 +
  50 + @Mock
  51 + protected DefaultAlipayClient defaultAlipayClient;
  52 +
  53 + private AbstractAlipayPayClient client;
  54 +
  55 + public void setClient(AbstractAlipayPayClient client) {
  56 + this.client = client;
  57 + }
  58 +
  59 + @Test
  60 + @DisplayName("支付宝 Client 初始化")
  61 + public void test_do_init() {
  62 + client.doInit();
  63 + DefaultAlipayClient realClient = (DefaultAlipayClient) ReflectUtil.getFieldValue(client, "client");
  64 + assertNotSame(defaultAlipayClient, realClient);
  65 + assertInstanceOf(DefaultSigner.class, realClient.getSigner());
  66 + assertEquals(privateKey, ((DefaultSigner) realClient.getSigner()).getPrivateKey());
  67 + }
  68 +
  69 + @Test
  70 + @DisplayName("支付宝 Client 统一退款成功")
  71 + public void test_unified_refund_success() throws AlipayApiException {
  72 + // 准备返回对象
  73 + String notifyUrl = randomURL();
  74 + Date refundTime = randomDate();
  75 + String outRefundNo = randomString();
  76 + String outTradeNo = randomString();
  77 + Integer refundAmount = randomInteger();
  78 + AlipayTradeRefundResponse response = randomPojo(AlipayTradeRefundResponse.class, o -> {
  79 + o.setSubCode("");
  80 + o.setGmtRefundPay(refundTime);
  81 + });
  82 + // mock
  83 + when(defaultAlipayClient.execute(argThat((ArgumentMatcher<AlipayTradeRefundRequest>) request -> {
  84 + assertInstanceOf(AlipayTradeRefundModel.class, request.getBizModel());
  85 + AlipayTradeRefundModel bizModel = (AlipayTradeRefundModel) request.getBizModel();
  86 + assertEquals(outRefundNo, bizModel.getOutRequestNo());
  87 + assertEquals(outTradeNo, bizModel.getOutTradeNo());
  88 + assertEquals(String.valueOf(refundAmount / 100.0), bizModel.getRefundAmount());
  89 + return true;
  90 + }))).thenReturn(response);
  91 + // 准备请求参数
  92 + PayRefundUnifiedReqDTO refundReqDTO = randomPojo(PayRefundUnifiedReqDTO.class, o -> {
  93 + o.setOutRefundNo(outRefundNo);
  94 + o.setOutTradeNo(outTradeNo);
  95 + o.setNotifyUrl(notifyUrl);
  96 + o.setRefundPrice(refundAmount);
  97 + });
  98 + PayRefundRespDTO resp = client.unifiedRefund(refundReqDTO);
  99 + // 断言
  100 + assertEquals(PayRefundStatusRespEnum.SUCCESS.getStatus(), resp.getStatus());
  101 + assertNull(resp.getChannelRefundNo());
  102 + assertEquals(LocalDateTimeUtil.of(refundTime), resp.getSuccessTime());
  103 + assertEquals(outRefundNo, resp.getOutRefundNo());
  104 + assertSame(response, resp.getRawData());
  105 + }
  106 +
  107 + @Test
  108 + @DisplayName("支付宝 Client 统一退款,渠道返回失败")
  109 + public void test_unified_refund_channel_failed() throws AlipayApiException {
  110 + // 准备返回对象
  111 + String notifyUrl = randomURL();
  112 + String subCode = randomString();
  113 + String subMsg = randomString();
  114 + AlipayTradeRefundResponse response = randomPojo(AlipayTradeRefundResponse.class, o -> {
  115 + o.setSubCode(subCode);
  116 + o.setSubMsg(subMsg);
  117 + });
  118 + // mock
  119 + when(defaultAlipayClient.execute(argThat((ArgumentMatcher<AlipayTradeRefundRequest>) request -> {
  120 + assertInstanceOf(AlipayTradeRefundModel.class, request.getBizModel());
  121 + return true;
  122 + }))).thenReturn(response);
  123 + // 准备请求参数
  124 + String outRefundNo = randomString();
  125 + String outTradeNo = randomString();
  126 + PayRefundUnifiedReqDTO refundReqDTO = randomPojo(PayRefundUnifiedReqDTO.class, o -> {
  127 + o.setOutRefundNo(outRefundNo);
  128 + o.setOutTradeNo(outTradeNo);
  129 + o.setNotifyUrl(notifyUrl);
  130 + });
  131 + PayRefundRespDTO resp = client.unifiedRefund(refundReqDTO);
  132 + // 断言
  133 + assertEquals(PayRefundStatusRespEnum.FAILURE.getStatus(), resp.getStatus());
  134 + assertNull(resp.getChannelRefundNo());
  135 + assertEquals(subCode, resp.getChannelErrorCode());
  136 + assertEquals(subMsg, resp.getChannelErrorMsg());
  137 + assertNull(resp.getSuccessTime());
  138 + assertEquals(outRefundNo, resp.getOutRefundNo());
  139 + assertSame(response, resp.getRawData());
  140 + }
  141 +
  142 + @Test
  143 + @DisplayName("支付宝 Client 统一退款,参数校验不通过")
  144 + public void test_unified_refund_param_validate() {
  145 + // 准备请求参数
  146 + String notifyUrl = randomURL();
  147 + PayRefundUnifiedReqDTO refundReqDTO = randomPojo(PayRefundUnifiedReqDTO.class, o -> {
  148 + o.setOutTradeNo("");
  149 + o.setNotifyUrl(notifyUrl);
  150 + });
  151 + // 断言
  152 + assertThrows(ConstraintViolationException.class, () -> client.unifiedRefund(refundReqDTO));
  153 + }
  154 +
  155 + @Test
  156 + @DisplayName("支付宝 Client 统一退款,抛出业务异常")
  157 + public void test_unified_refund_throw_service_exception() throws AlipayApiException {
  158 + // mock
  159 + when(defaultAlipayClient.execute(argThat((ArgumentMatcher<AlipayTradeRefundRequest>) request -> true)))
  160 + .thenThrow(ServiceExceptionUtil.exception(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR));
  161 + // 准备请求参数
  162 + String notifyUrl = randomURL();
  163 + PayRefundUnifiedReqDTO refundReqDTO = randomPojo(PayRefundUnifiedReqDTO.class, o -> o.setNotifyUrl(notifyUrl));
  164 + // 断言
  165 + assertThrows(ServiceException.class, () -> client.unifiedRefund(refundReqDTO));
  166 + }
  167 +
  168 + @Test
  169 + @DisplayName("支付宝 Client 统一退款,抛出系统异常")
  170 + public void test_unified_refund_throw_pay_exception() throws AlipayApiException {
  171 + // mock
  172 + when(defaultAlipayClient.execute(argThat((ArgumentMatcher<AlipayTradeRefundRequest>) request -> true)))
  173 + .thenThrow(new RuntimeException("系统异常"));
  174 + // 准备请求参数
  175 + String notifyUrl = randomURL();
  176 + PayRefundUnifiedReqDTO refundReqDTO = randomPojo(PayRefundUnifiedReqDTO.class, o -> o.setNotifyUrl(notifyUrl));
  177 + // 断言
  178 + assertThrows(PayException.class, () -> client.unifiedRefund(refundReqDTO));
  179 + }
  180 +}
... ...
yudao-framework/yudao-spring-boot-starter-biz-pay/src/test/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AlipayQrPayClientTest.java
  View file @551a968
1 1 package cn.iocoder.yudao.framework.pay.core.client.impl.alipay;
2 2  
3   -import cn.hutool.core.date.LocalDateTimeUtil;
4 3 import cn.hutool.core.util.RandomUtil;
5   -import cn.hutool.core.util.ReflectUtil;
6 4 import cn.iocoder.yudao.framework.common.exception.ServiceException;
7 5 import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants;
8 6 import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
9 7 import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderRespDTO;
10 8 import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderUnifiedReqDTO;
11   -import cn.iocoder.yudao.framework.pay.core.client.dto.refund.PayRefundRespDTO;
12   -import cn.iocoder.yudao.framework.pay.core.client.dto.refund.PayRefundUnifiedReqDTO;
13 9 import cn.iocoder.yudao.framework.pay.core.client.exception.PayException;
14 10 import cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderDisplayModeEnum;
15   -import cn.iocoder.yudao.framework.pay.core.enums.refund.PayRefundStatusRespEnum;
16   -import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest;
17 11 import com.alipay.api.AlipayApiException;
18   -import com.alipay.api.DefaultAlipayClient;
19   -import com.alipay.api.domain.AlipayTradeRefundModel;
20 12 import com.alipay.api.request.AlipayTradePrecreateRequest;
21   -import com.alipay.api.request.AlipayTradeRefundRequest;
22 13 import com.alipay.api.response.AlipayTradePrecreateResponse;
23   -import com.alipay.api.response.AlipayTradeRefundResponse;
  14 +import org.junit.jupiter.api.BeforeEach;
24 15 import org.junit.jupiter.api.DisplayName;
25 16 import org.junit.jupiter.api.Test;
26 17 import org.mockito.ArgumentMatcher;
27 18 import org.mockito.InjectMocks;
28   -import org.mockito.Mock;
29 19  
30 20 import javax.validation.ConstraintViolationException;
31   -import java.util.Date;
32 21  
33   -import static cn.iocoder.yudao.framework.pay.core.client.impl.alipay.AlipayPayClientConfig.MODE_PUBLIC_KEY;
34 22 import static cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderStatusRespEnum.CLOSED;
35 23 import static cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderStatusRespEnum.WAITING;
36 24 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
37 25 import static org.junit.jupiter.api.Assertions.*;
38 26 import static org.mockito.ArgumentMatchers.argThat;
39 27 import static org.mockito.Mockito.when;
  28 +
40 29 /**
41 30 * {@link AlipayQrPayClient} 单元测试
42 31 *
43 32 * @author jason
44 33 */
45   -public class AlipayQrPayClientTest extends BaseMockitoUnitTest {
46   -
47   - private final AlipayPayClientConfig config = randomPojo(AlipayPayClientConfig.class, t -> {
48   - t.setServerUrl(randomURL());
49   - t.setMode(MODE_PUBLIC_KEY);
50   - t.setSignType(AlipayPayClientConfig.SIGN_TYPE_DEFAULT);
51   - t.setAppCertContent("");
52   - t.setAlipayPublicCertContent("");
53   - t.setRootCertContent("");
54   - });
  34 +public class AlipayQrPayClientTest extends AbstractAlipayClientTest {
55 35  
56 36 @InjectMocks
57   - AlipayQrPayClient client = new AlipayQrPayClient(randomLongId(), config);
58   -
59   - @Mock
60   - private DefaultAlipayClient defaultAlipayClient;
  37 + private AlipayQrPayClient client = new AlipayQrPayClient(randomLongId(), config);
61 38  
62   - @Test
63   - public void test_do_init() {
64   - client.doInit();
65   - assertNotSame(defaultAlipayClient, ReflectUtil.getFieldValue(client, "defaultAlipayClient"));
  39 + @BeforeEach
  40 + public void setUp() {
  41 + setClient(client);
66 42 }
67 43  
68 44 @Test
... ... @@ -176,119 +152,4 @@ public class AlipayQrPayClientTest extends BaseMockitoUnitTest {
176 152 o.setBody(RandomUtil.randomString(32));
177 153 });
178 154 }
179   -
180   - @Test
181   - @DisplayName("支付包扫描退款成功")
182   - public void test_unified_refund_success() throws AlipayApiException {
183   - // 准备返回对象
184   - String notifyUrl = randomURL();
185   - Date refundTime = randomDate();
186   - String outRefundNo = randomString();
187   - String outTradeNo = randomString();
188   - Integer refundAmount = randomInteger();
189   - AlipayTradeRefundResponse response = randomPojo(AlipayTradeRefundResponse.class, o -> {
190   - o.setSubCode("");
191   - o.setGmtRefundPay(refundTime);
192   - });
193   - // mock
194   - when(defaultAlipayClient.execute(argThat((ArgumentMatcher<AlipayTradeRefundRequest>) request -> {
195   - assertInstanceOf(AlipayTradeRefundModel.class, request.getBizModel());
196   - AlipayTradeRefundModel bizModel = (AlipayTradeRefundModel) request.getBizModel();
197   - assertEquals(outRefundNo, bizModel.getOutRequestNo());
198   - assertEquals(outTradeNo, bizModel.getOutTradeNo());
199   - assertEquals(String.valueOf(refundAmount / 100.0), bizModel.getRefundAmount());
200   - return true;
201   - }))).thenReturn(response);
202   - // 准备请求参数
203   - PayRefundUnifiedReqDTO refundReqDTO = randomPojo(PayRefundUnifiedReqDTO.class, o -> {
204   - o.setOutRefundNo(outRefundNo);
205   - o.setOutTradeNo(outTradeNo);
206   - o.setNotifyUrl(notifyUrl);
207   - o.setRefundPrice(refundAmount);
208   - });
209   - PayRefundRespDTO resp = client.unifiedRefund(refundReqDTO);
210   - // 断言
211   - assertEquals(PayRefundStatusRespEnum.SUCCESS.getStatus(), resp.getStatus());
212   - assertNull(resp.getChannelRefundNo());
213   - assertEquals(LocalDateTimeUtil.of(refundTime), resp.getSuccessTime());
214   - assertEquals(outRefundNo, resp.getOutRefundNo());
215   - assertSame(response, resp.getRawData());
216   - }
217   -
218   - @Test
219   - @DisplayName("支付包扫描退款,渠道返回失败")
220   - public void test_unified_refund_channel_failed() throws AlipayApiException {
221   - // 准备返回对象
222   - String notifyUrl = randomURL();
223   - String subCode = randomString();
224   - String subMsg = randomString();
225   - AlipayTradeRefundResponse response = randomPojo(AlipayTradeRefundResponse.class, o -> {
226   - o.setSubCode(subCode);
227   - o.setSubMsg(subMsg);
228   - });
229   - // mock
230   - when(defaultAlipayClient.execute(argThat((ArgumentMatcher<AlipayTradeRefundRequest>) request -> {
231   - assertInstanceOf(AlipayTradeRefundModel.class, request.getBizModel());
232   - return true;
233   - }))).thenReturn(response);
234   - // 准备请求参数
235   - String outRefundNo = randomString();
236   - String outTradeNo = randomString();
237   - PayRefundUnifiedReqDTO refundReqDTO = randomPojo(PayRefundUnifiedReqDTO.class, o -> {
238   - o.setOutRefundNo(outRefundNo);
239   - o.setOutTradeNo(outTradeNo);
240   - o.setNotifyUrl(notifyUrl);
241   - });
242   - PayRefundRespDTO resp = client.unifiedRefund(refundReqDTO);
243   - // 断言
244   - assertEquals(PayRefundStatusRespEnum.FAILURE.getStatus(), resp.getStatus());
245   - assertNull(resp.getChannelRefundNo());
246   - assertEquals(subCode, resp.getChannelErrorCode());
247   - assertEquals(subMsg, resp.getChannelErrorMsg());
248   - assertNull(resp.getSuccessTime());
249   - assertEquals(outRefundNo, resp.getOutRefundNo());
250   - assertSame(response, resp.getRawData());
251   - }
252   -
253   - @Test
254   - @DisplayName("支付包扫描退款,参数校验不通过")
255   - public void test_unified_refund_param_validate() {
256   - // 准备请求参数
257   - String notifyUrl = randomURL();
258   - PayRefundUnifiedReqDTO refundReqDTO = randomPojo(PayRefundUnifiedReqDTO.class, o -> {
259   - o.setOutTradeNo("");
260   - o.setNotifyUrl(notifyUrl);
261   - });
262   - // 断言
263   - assertThrows(ConstraintViolationException.class, () -> client.unifiedRefund(refundReqDTO));
264   - }
265   -
266   - @Test
267   - @DisplayName("支付包扫描退款,抛出业务异常")
268   - public void test_unified_refund_throw_service_exception() throws AlipayApiException {
269   - // mock
270   - when(defaultAlipayClient.execute(argThat((ArgumentMatcher<AlipayTradeRefundRequest>) request -> true)))
271   - .thenThrow(ServiceExceptionUtil.exception(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR));
272   - // 准备请求参数
273   - String notifyUrl = randomURL();
274   - PayRefundUnifiedReqDTO refundReqDTO = randomPojo(PayRefundUnifiedReqDTO.class, o -> {
275   - o.setNotifyUrl(notifyUrl);
276   - });
277   - // 断言
278   - assertThrows(ServiceException.class, () -> client.unifiedRefund(refundReqDTO));
279   - }
280   - @Test
281   - @DisplayName("支付包扫描退款,抛出系统异常")
282   - public void test_unified_refund_throw_pay_exception() throws AlipayApiException {
283   - // mock
284   - when(defaultAlipayClient.execute(argThat((ArgumentMatcher<AlipayTradeRefundRequest>) request -> true)))
285   - .thenThrow(new RuntimeException("系统异常"));
286   - // 准备请求参数
287   - String notifyUrl = randomURL();
288   - PayRefundUnifiedReqDTO refundReqDTO = randomPojo(PayRefundUnifiedReqDTO.class, o -> {
289   - o.setNotifyUrl(notifyUrl);
290   - });
291   - // 断言
292   - assertThrows(PayException.class, () -> client.unifiedRefund(refundReqDTO));
293   - }
294 155 }
... ...
yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
  View file @551a968
... ... @@ -24,9 +24,10 @@ public interface ErrorCodeConstants {
24 24 // ========== 用户收件地址 1004004000 ==========
25 25 ErrorCode ADDRESS_NOT_EXISTS = new ErrorCode(1004004000, "用户收件地址不存在");
26 26  
27   - //========== 会员标签 1004006000 ==========
28   - ErrorCode TAG_NOT_EXISTS = new ErrorCode(1004006000, "会员标签不存在");
29   - ErrorCode TAG_NAME_EXISTS = new ErrorCode(1004006001, "会员标签已经存在");
  27 + //========== 用户标签 1004006000 ==========
  28 + ErrorCode TAG_NOT_EXISTS = new ErrorCode(1004006000, "用户标签不存在");
  29 + ErrorCode TAG_NAME_EXISTS = new ErrorCode(1004006001, "用户标签已经存在");
  30 + ErrorCode TAG_HAS_USER = new ErrorCode(1004006002, "用户标签下存在用户，无法删除");
30 31  
31 32 //========== 积分配置 1004007000 ==========
32 33  
... ... @@ -39,14 +40,20 @@ public interface ErrorCodeConstants {
39 40 //========== 签到配置 1004010000 ==========
40 41  
41 42  
42   - //========== 会员等级 1004007000 ==========
43   - ErrorCode LEVEL_NOT_EXISTS = new ErrorCode(1004007000, "会员等级不存在");
44   - ErrorCode LEVEL_NAME_EXISTS = new ErrorCode(1004007001, "会员等级名称[{}]已被使用");
45   - ErrorCode LEVEL_VALUE_EXISTS = new ErrorCode(1004007002, "会员等级值[{}]已被[{}]使用");
46   - ErrorCode LEVEL_EXPERIENCE_MIN = new ErrorCode(1004007003, "升级经验必须大于上一个等级[{}]设置的升级经验[{}]");
47   - ErrorCode LEVEL_EXPERIENCE_MAX = new ErrorCode(1004007004, "升级经验必须小于下一个等级[{}]设置的升级经验[{}]");
  43 + //========== 用户等级 1004011000 ==========
  44 + ErrorCode LEVEL_NOT_EXISTS = new ErrorCode(1004011000, "用户等级不存在");
  45 + ErrorCode LEVEL_NAME_EXISTS = new ErrorCode(1004011001, "用户等级名称[{}]已被使用");
  46 + ErrorCode LEVEL_VALUE_EXISTS = new ErrorCode(1004011002, "用户等级值[{}]已被[{}]使用");
  47 + ErrorCode LEVEL_EXPERIENCE_MIN = new ErrorCode(1004011003, "升级经验必须大于上一个等级[{}]设置的升级经验[{}]");
  48 + ErrorCode LEVEL_EXPERIENCE_MAX = new ErrorCode(1004011004, "升级经验必须小于下一个等级[{}]设置的升级经验[{}]");
  49 + ErrorCode LEVEL_HAS_USER = new ErrorCode(1004011005, "用户等级下存在用户，无法删除");
  50 +
  51 + ErrorCode LEVEL_LOG_NOT_EXISTS = new ErrorCode(1004011100, "用户等级记录不存在");
  52 + ErrorCode EXPERIENCE_LOG_NOT_EXISTS = new ErrorCode(1004011200, "用户经验记录不存在");
  53 + ErrorCode LEVEL_REASON_NOT_EXISTS = new ErrorCode(1004011300, "用户等级调整原因不能为空");
  54 +
  55 + //========== 用户分组 1004012000 ==========
  56 + ErrorCode GROUP_NOT_EXISTS = new ErrorCode(1004012000, "用户分组不存在");
  57 + ErrorCode GROUP_HAS_USER = new ErrorCode(1004012001, "用户分组下存在用户，无法删除");
48 58  
49   - ErrorCode LEVEL_LOG_NOT_EXISTS = new ErrorCode(1004007100, "会员等级记录不存在");
50   - ErrorCode EXPERIENCE_LOG_NOT_EXISTS = new ErrorCode(1004007200, "会员经验记录不存在");
51   - ErrorCode LEVEL_REASON_NOT_EXISTS = new ErrorCode(1004007300, "会员等级调整原因不能为空");
52 59 }
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/group/MemberGroupController.java 0 → 100644
  View file @551a968
  1 +package cn.iocoder.yudao.module.member.controller.admin.group;
  2 +
  3 +import cn.iocoder.yudao.framework.common.pojo.CommonResult;
  4 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  5 +import cn.iocoder.yudao.module.member.controller.admin.group.vo.*;
  6 +import cn.iocoder.yudao.module.member.convert.group.MemberGroupConvert;
  7 +import cn.iocoder.yudao.module.member.dal.dataobject.group.MemberGroupDO;
  8 +import cn.iocoder.yudao.module.member.service.group.MemberGroupService;
  9 +import io.swagger.v3.oas.annotations.Operation;
  10 +import io.swagger.v3.oas.annotations.Parameter;
  11 +import io.swagger.v3.oas.annotations.tags.Tag;
  12 +import org.springframework.security.access.prepost.PreAuthorize;
  13 +import org.springframework.validation.annotation.Validated;
  14 +import org.springframework.web.bind.annotation.*;
  15 +
  16 +import javax.annotation.Resource;
  17 +import javax.validation.Valid;
  18 +import java.util.List;
  19 +
  20 +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
  21 +
  22 +
  23 +@Tag(name = "管理后台 - 用户分组")
  24 +@RestController
  25 +@RequestMapping("/member/group")
  26 +@Validated
  27 +public class MemberGroupController {
  28 +
  29 + @Resource
  30 + private MemberGroupService groupService;
  31 +
  32 + @PostMapping("/create")
  33 + @Operation(summary = "创建用户分组")
  34 + @PreAuthorize("@ss.hasPermission('member:group:create')")
  35 + public CommonResult<Long> createGroup(@Valid @RequestBody MemberGroupCreateReqVO createReqVO) {
  36 + return success(groupService.createGroup(createReqVO));
  37 + }
  38 +
  39 + @PutMapping("/update")
  40 + @Operation(summary = "更新用户分组")
  41 + @PreAuthorize("@ss.hasPermission('member:group:update')")
  42 + public CommonResult<Boolean> updateGroup(@Valid @RequestBody MemberGroupUpdateReqVO updateReqVO) {
  43 + groupService.updateGroup(updateReqVO);
  44 + return success(true);
  45 + }
  46 +
  47 + @DeleteMapping("/delete")
  48 + @Operation(summary = "删除用户分组")
  49 + @Parameter(name = "id", description = "编号", required = true)
  50 + @PreAuthorize("@ss.hasPermission('member:group:delete')")
  51 + public CommonResult<Boolean> deleteGroup(@RequestParam("id") Long id) {
  52 + groupService.deleteGroup(id);
  53 + return success(true);
  54 + }
  55 +
  56 + @GetMapping("/get")
  57 + @Operation(summary = "获得用户分组")
  58 + @Parameter(name = "id", description = "编号", required = true, example = "1024")
  59 + @PreAuthorize("@ss.hasPermission('member:group:query')")
  60 + public CommonResult<MemberGroupRespVO> getGroup(@RequestParam("id") Long id) {
  61 + MemberGroupDO group = groupService.getGroup(id);
  62 + return success(MemberGroupConvert.INSTANCE.convert(group));
  63 + }
  64 +
  65 + @GetMapping("/list-all-simple")
  66 + @Operation(summary = "获取会员分组精简信息列表", description = "只包含被开启的会员分组，主要用于前端的下拉选项")
  67 + public CommonResult<List<MemberGroupSimpleRespVO>> getSimpleGroupList() {
  68 + // 获用户列表，只要开启状态的
  69 + List<MemberGroupDO> list = groupService.getEnableGroupList();
  70 + return success(MemberGroupConvert.INSTANCE.convertSimpleList(list));
  71 + }
  72 +
  73 + @GetMapping("/page")
  74 + @Operation(summary = "获得用户分组分页")
  75 + @PreAuthorize("@ss.hasPermission('member:group:query')")
  76 + public CommonResult<PageResult<MemberGroupRespVO>> getGroupPage(@Valid MemberGroupPageReqVO pageVO) {
  77 + PageResult<MemberGroupDO> pageResult = groupService.getGroupPage(pageVO);
  78 + return success(MemberGroupConvert.INSTANCE.convertPage(pageResult));
  79 + }
  80 +
  81 +}
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/group/vo/MemberGroupBaseVO.java 0 → 100644
  View file @551a968
  1 +package cn.iocoder.yudao.module.member.controller.admin.group.vo;
  2 +
  3 +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
  4 +import cn.iocoder.yudao.framework.common.validation.InEnum;
  5 +import io.swagger.v3.oas.annotations.media.Schema;
  6 +import lombok.Data;
  7 +
  8 +import javax.validation.constraints.NotNull;
  9 +
  10 +/**
  11 + * 用户分组 Base VO，提供给添加、修改、详细的子 VO 使用
  12 + * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
  13 + */
  14 +@Data
  15 +public class MemberGroupBaseVO {
  16 +
  17 + @Schema(description = "名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "购物达人")
  18 + @NotNull(message = "名称不能为空")
  19 + private String name;
  20 +
  21 + @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "你猜")
  22 + private String remark;
  23 +
  24 + @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
  25 + @NotNull(message = "状态不能为空")
  26 + @InEnum(CommonStatusEnum.class)
  27 + private Integer status;
  28 +
  29 +}
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/group/vo/MemberGroupCreateReqVO.java 0 → 100644
  View file @551a968
  1 +package cn.iocoder.yudao.module.member.controller.admin.group.vo;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +import lombok.EqualsAndHashCode;
  6 +import lombok.ToString;
  7 +
  8 +@Schema(description = "管理后台 - 用户分组创建 Request VO")
  9 +@Data
  10 +@EqualsAndHashCode(callSuper = true)
  11 +@ToString(callSuper = true)
  12 +public class MemberGroupCreateReqVO extends MemberGroupBaseVO {
  13 +
  14 +}
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/group/vo/MemberGroupPageReqVO.java 0 → 100644
  View file @551a968
  1 +package cn.iocoder.yudao.module.member.controller.admin.group.vo;
  2 +
  3 +import cn.iocoder.yudao.framework.common.pojo.PageParam;
  4 +import io.swagger.v3.oas.annotations.media.Schema;
  5 +import lombok.Data;
  6 +import lombok.EqualsAndHashCode;
  7 +import lombok.ToString;
  8 +import org.springframework.format.annotation.DateTimeFormat;
  9 +
  10 +import java.time.LocalDateTime;
  11 +
  12 +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
  13 +
  14 +@Schema(description = "管理后台 - 用户分组分页 Request VO")
  15 +@Data
  16 +@EqualsAndHashCode(callSuper = true)
  17 +@ToString(callSuper = true)
  18 +public class MemberGroupPageReqVO extends PageParam {
  19 +
  20 + @Schema(description = "名称", example = "购物达人")
  21 + private String name;
  22 +
  23 + @Schema(description = "状态", example = "1")
  24 + private Integer status;
  25 +
  26 + @Schema(description = "创建时间")
  27 + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
  28 + private LocalDateTime[] createTime;
  29 +
  30 +}
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/group/vo/MemberGroupRespVO.java 0 → 100644
  View file @551a968
  1 +package cn.iocoder.yudao.module.member.controller.admin.group.vo;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +import lombok.EqualsAndHashCode;
  6 +import lombok.ToString;
  7 +
  8 +import java.time.LocalDateTime;
  9 +
  10 +@Schema(description = "管理后台 - 用户分组 Response VO")
  11 +@Data
  12 +@EqualsAndHashCode(callSuper = true)
  13 +@ToString(callSuper = true)
  14 +public class MemberGroupRespVO extends MemberGroupBaseVO {
  15 +
  16 + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "20357")
  17 + private Long id;
  18 +
  19 + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
  20 + private LocalDateTime createTime;
  21 +
  22 +}
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/group/vo/MemberGroupSimpleRespVO.java 0 → 100644
  View file @551a968
  1 +package cn.iocoder.yudao.module.member.controller.admin.group.vo;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +import lombok.ToString;
  6 +
  7 +@Schema(description = "管理后台 - 用户分组 Response VO")
  8 +@Data
  9 +@ToString(callSuper = true)
  10 +public class MemberGroupSimpleRespVO {
  11 +
  12 + @Schema(description = "编号", example = "6103")
  13 + private Long id;
  14 +
  15 + @Schema(description = "等级名称", example = "芋艿")
  16 + private String name;
  17 +
  18 +}
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/group/vo/MemberGroupUpdateReqVO.java 0 → 100644
  View file @551a968
  1 +package cn.iocoder.yudao.module.member.controller.admin.group.vo;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +import lombok.EqualsAndHashCode;
  6 +import lombok.ToString;
  7 +
  8 +import javax.validation.constraints.NotNull;
  9 +
  10 +@Schema(description = "管理后台 - 用户分组更新 Request VO")
  11 +@Data
  12 +@EqualsAndHashCode(callSuper = true)
  13 +@ToString(callSuper = true)
  14 +public class MemberGroupUpdateReqVO extends MemberGroupBaseVO {
  15 +
  16 + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "20357")
  17 + @NotNull(message = "编号不能为空")
  18 + private Long id;
  19 +
  20 +}
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/MemberExperienceLogController.java
  View file @551a968
... ... @@ -2,10 +2,6 @@ package cn.iocoder.yudao.module.member.controller.admin.level;
2 2  
3 3 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
4 4 import cn.iocoder.yudao.framework.common.pojo.PageResult;
5   -import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
6   -import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
7   -import cn.iocoder.yudao.module.member.controller.admin.level.vo.experience.MemberExperienceLogExcelVO;
8   -import cn.iocoder.yudao.module.member.controller.admin.level.vo.experience.MemberExperienceLogExportReqVO;
9 5 import cn.iocoder.yudao.module.member.controller.admin.level.vo.experience.MemberExperienceLogPageReqVO;
10 6 import cn.iocoder.yudao.module.member.controller.admin.level.vo.experience.MemberExperienceLogRespVO;
11 7 import cn.iocoder.yudao.module.member.convert.level.MemberExperienceLogConvert;
... ... @@ -16,17 +12,15 @@ import io.swagger.v3.oas.annotations.Parameter;
16 12 import io.swagger.v3.oas.annotations.tags.Tag;
17 13 import org.springframework.security.access.prepost.PreAuthorize;
18 14 import org.springframework.validation.annotation.Validated;
19   -import org.springframework.web.bind.annotation.*;
  15 +import org.springframework.web.bind.annotation.GetMapping;
  16 +import org.springframework.web.bind.annotation.RequestMapping;
  17 +import org.springframework.web.bind.annotation.RequestParam;
  18 +import org.springframework.web.bind.annotation.RestController;
20 19  
21 20 import javax.annotation.Resource;
22   -import javax.servlet.http.HttpServletResponse;
23 21 import javax.validation.Valid;
24   -import java.io.IOException;
25   -import java.util.Collection;
26   -import java.util.List;
27 22  
28 23 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
29   -import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
30 24  
31 25 // TODO @疯狂：要不 Log 改成 Record，和 PointRecord 保持一致
32 26 @Tag(name = "管理后台 - 会员经验记录")
... ... @@ -38,16 +32,6 @@ public class MemberExperienceLogController {
38 32 @Resource
39 33 private MemberExperienceLogService experienceLogService;
40 34  
41   - // TODO @疯狂：不允许删除经验哈
42   - @DeleteMapping("/delete")
43   - @Operation(summary = "删除会员经验记录")
44   - @Parameter(name = "id", description = "编号", required = true)
45   - @PreAuthorize("@ss.hasPermission('member:experience-log:delete')")
46   - public CommonResult<Boolean> deleteExperienceLog(@RequestParam("id") Long id) {
47   - experienceLogService.deleteExperienceLog(id);
48   - return success(true);
49   - }
50   -
51 35 @GetMapping("/get")
52 36 @Operation(summary = "获得会员经验记录")
53 37 @Parameter(name = "id", description = "编号", required = true, example = "1024")
... ... @@ -57,16 +41,6 @@ public class MemberExperienceLogController {
57 41 return success(MemberExperienceLogConvert.INSTANCE.convert(experienceLog));
58 42 }
59 43  
60   - // TODO @疯狂：这个接口可以删除哈，应该用不到
61   - @GetMapping("/list")
62   - @Operation(summary = "获得会员经验记录列表")
63   - @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
64   - @PreAuthorize("@ss.hasPermission('member:experience-log:query')")
65   - public CommonResult<List<MemberExperienceLogRespVO>> getExperienceLogList(@RequestParam("ids") Collection<Long> ids) {
66   - List<MemberExperienceLogDO> list = experienceLogService.getExperienceLogList(ids);
67   - return success(MemberExperienceLogConvert.INSTANCE.convertList(list));
68   - }
69   -
70 44 @GetMapping("/page")
71 45 @Operation(summary = "获得会员经验记录分页")
72 46 @PreAuthorize("@ss.hasPermission('member:experience-log:query')")
... ... @@ -75,17 +49,4 @@ public class MemberExperienceLogController {
75 49 return success(MemberExperienceLogConvert.INSTANCE.convertPage(pageResult));
76 50 }
77 51  
78   - // TODO @疯狂：导出可以先不支持，场景不多
79   - @GetMapping("/export-excel")
80   - @Operation(summary = "导出会员经验记录 Excel")
81   - @PreAuthorize("@ss.hasPermission('member:experience-log:export')")
82   - @OperateLog(type = EXPORT)
83   - public void exportExperienceLogExcel(@Valid MemberExperienceLogExportReqVO exportReqVO,
84   - HttpServletResponse response) throws IOException {
85   - List<MemberExperienceLogDO> list = experienceLogService.getExperienceLogList(exportReqVO);
86   - // 导出 Excel
87   - List<MemberExperienceLogExcelVO> datas = MemberExperienceLogConvert.INSTANCE.convertList02(list);
88   - ExcelUtils.write(response, "会员经验记录.xls", "数据", MemberExperienceLogExcelVO.class, datas);
89   - }
90   -
91 52 }
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/MemberLevelController.java
  View file @551a968
... ... @@ -15,7 +15,6 @@ import org.springframework.web.bind.annotation.*;
15 15  
16 16 import javax.annotation.Resource;
17 17 import javax.validation.Valid;
18   -import java.util.Collection;
19 18 import java.util.List;
20 19  
21 20 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
... ... @@ -62,16 +61,6 @@ public class MemberLevelController {
62 61 return success(MemberLevelConvert.INSTANCE.convert(level));
63 62 }
64 63  
65   - // TODO @疯狂：这个应该用不到哈
66   - @GetMapping("/list")
67   - @Operation(summary = "获得会员等级列表")
68   - @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
69   - @PreAuthorize("@ss.hasPermission('member:level:query')")
70   - public CommonResult<List<MemberLevelRespVO>> getLevelList(@RequestParam("ids") Collection<Long> ids) {
71   - List<MemberLevelDO> list = levelService.getLevelList(ids);
72   - return success(MemberLevelConvert.INSTANCE.convertList(list));
73   - }
74   -
75 64 @GetMapping("/list-all-simple")
76 65 @Operation(summary = "获取会员等级精简信息列表", description = "只包含被开启的会员等级，主要用于前端的下拉选项")
77 66 public CommonResult<List<MemberLevelSimpleRespVO>> getSimpleLevelList() {
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/MemberLevelLogController.java
  View file @551a968
... ... @@ -2,10 +2,6 @@ package cn.iocoder.yudao.module.member.controller.admin.level;
2 2  
3 3 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
4 4 import cn.iocoder.yudao.framework.common.pojo.PageResult;
5   -import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
6   -import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
7   -import cn.iocoder.yudao.module.member.controller.admin.level.vo.log.MemberLevelLogExcelVO;
8   -import cn.iocoder.yudao.module.member.controller.admin.level.vo.log.MemberLevelLogExportReqVO;
9 5 import cn.iocoder.yudao.module.member.controller.admin.level.vo.log.MemberLevelLogPageReqVO;
10 6 import cn.iocoder.yudao.module.member.controller.admin.level.vo.log.MemberLevelLogRespVO;
11 7 import cn.iocoder.yudao.module.member.convert.level.MemberLevelLogConvert;
... ... @@ -16,17 +12,15 @@ import io.swagger.v3.oas.annotations.Parameter;
16 12 import io.swagger.v3.oas.annotations.tags.Tag;
17 13 import org.springframework.security.access.prepost.PreAuthorize;
18 14 import org.springframework.validation.annotation.Validated;
19   -import org.springframework.web.bind.annotation.*;
  15 +import org.springframework.web.bind.annotation.GetMapping;
  16 +import org.springframework.web.bind.annotation.RequestMapping;
  17 +import org.springframework.web.bind.annotation.RequestParam;
  18 +import org.springframework.web.bind.annotation.RestController;
20 19  
21 20 import javax.annotation.Resource;
22   -import javax.servlet.http.HttpServletResponse;
23 21 import javax.validation.Valid;
24   -import java.io.IOException;
25   -import java.util.Collection;
26   -import java.util.List;
27 22  
28 23 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
29   -import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
30 24  
31 25 // TODO @疯狂：是不是不用这个 controller；因为日志只是为了记录，db 可以查询、和审计即可，目前暂时不需要开放出来；
32 26 @Tag(name = "管理后台 - 会员等级记录")
... ... @@ -38,16 +32,6 @@ public class MemberLevelLogController {
38 32 @Resource
39 33 private MemberLevelLogService levelLogService;
40 34  
41   - // TODO @疯狂：这个不允许删除哈
42   - @DeleteMapping("/delete")
43   - @Operation(summary = "删除会员等级记录")
44   - @Parameter(name = "id", description = "编号", required = true)
45   - @PreAuthorize("@ss.hasPermission('member:level-log:delete')")
46   - public CommonResult<Boolean> deleteLevelLog(@RequestParam("id") Long id) {
47   - levelLogService.deleteLevelLog(id);
48   - return success(true);
49   - }
50   -
51 35 @GetMapping("/get")
52 36 @Operation(summary = "获得会员等级记录")
53 37 @Parameter(name = "id", description = "编号", required = true, example = "1024")
... ... @@ -57,16 +41,6 @@ public class MemberLevelLogController {
57 41 return success(MemberLevelLogConvert.INSTANCE.convert(levelLog));
58 42 }
59 43  
60   - // TODO @疯狂：这个接口，应该没用
61   - @GetMapping("/list")
62   - @Operation(summary = "获得会员等级记录列表")
63   - @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
64   - @PreAuthorize("@ss.hasPermission('member:level-log:query')")
65   - public CommonResult<List<MemberLevelLogRespVO>> getLevelLogList(@RequestParam("ids") Collection<Long> ids) {
66   - List<MemberLevelLogDO> list = levelLogService.getLevelLogList(ids);
67   - return success(MemberLevelLogConvert.INSTANCE.convertList(list));
68   - }
69   -
70 44 @GetMapping("/page")
71 45 @Operation(summary = "获得会员等级记录分页")
72 46 @PreAuthorize("@ss.hasPermission('member:level-log:query')")
... ... @@ -74,18 +48,4 @@ public class MemberLevelLogController {
74 48 PageResult<MemberLevelLogDO> pageResult = levelLogService.getLevelLogPage(pageVO);
75 49 return success(MemberLevelLogConvert.INSTANCE.convertPage(pageResult));
76 50 }
77   -
78   - // TODO @疯狂：导出可以去掉先
79   - @GetMapping("/export-excel")
80   - @Operation(summary = "导出会员等级记录 Excel")
81   - @PreAuthorize("@ss.hasPermission('member:level-log:export')")
82   - @OperateLog(type = EXPORT)
83   - public void exportLevelLogExcel(@Valid MemberLevelLogExportReqVO exportReqVO,
84   - HttpServletResponse response) throws IOException {
85   - List<MemberLevelLogDO> list = levelLogService.getLevelLogList(exportReqVO);
86   - // 导出 Excel
87   - List<MemberLevelLogExcelVO> datas = MemberLevelLogConvert.INSTANCE.convertList02(list);
88   - ExcelUtils.write(response, "会员等级记录.xls", "数据", MemberLevelLogExcelVO.class, datas);
89   - }
90   -
91 51 }
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/experience/MemberExperienceLogBaseVO.java
  View file @551a968
... ... @@ -8,8 +8,6 @@ import javax.validation.constraints.NotNull;
8 8 /**
9 9 * 会员经验记录 Base VO，提供给添加、修改、详细的子 VO 使用
10 10 * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
11   - *
12   - * @author owen
13 11 */
14 12 @Data
15 13 public class MemberExperienceLogBaseVO {
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/experience/MemberExperienceLogExcelVO.java deleted
View file @292f23c
1   -package cn.iocoder.yudao.module.member.controller.admin.level.vo.experience;
2   -
3   -import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
4   -import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
5   -import cn.iocoder.yudao.module.member.enums.DictTypeConstants;
6   -import com.alibaba.excel.annotation.ExcelProperty;
7   -import lombok.Data;
8   -
9   -import java.time.LocalDateTime;
10   -
11   -
12   -/**
13   - * 会员经验记录 Excel VO
14   - *
15   - * @author owen
16   - */
17   -@Data
18   -public class MemberExperienceLogExcelVO {
19   -
20   - @ExcelProperty("编号")
21   - private Long id;
22   -
23   - @ExcelProperty("用户编号")
24   - private Long userId;
25   -
26   - @ExcelProperty(value = "业务类型", converter = DictConvert.class)
27   - @DictFormat(DictTypeConstants.MEMBER_EXPERIENCE_BIZ_TYPE)
28   - private Integer bizType;
29   -
30   - @ExcelProperty("业务编号")
31   - private String bizId;
32   -
33   - @ExcelProperty("标题")
34   - private String title;
35   -
36   - @ExcelProperty("经验")
37   - private Integer experience;
38   -
39   - @ExcelProperty("变更后的经验")
40   - private Integer totalExperience;
41   -
42   - @ExcelProperty("描述")
43   - private String description;
44   -
45   - @ExcelProperty("创建时间")
46   - private LocalDateTime createTime;
47   -
48   -}
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/experience/MemberExperienceLogExportReqVO.java deleted
View file @292f23c
1   -package cn.iocoder.yudao.module.member.controller.admin.level.vo.experience;
2   -
3   -import io.swagger.v3.oas.annotations.media.Schema;
4   -import lombok.Data;
5   -import org.springframework.format.annotation.DateTimeFormat;
6   -
7   -import java.time.LocalDateTime;
8   -
9   -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
10   -
11   -/**
12   - * @author owen
13   - */
14   -@Schema(description = "管理后台 - 会员经验记录 Excel 导出 Request VO，参数和 MemberExperienceLogPageReqVO 是一致的")
15   -@Data
16   -public class MemberExperienceLogExportReqVO {
17   -
18   - @Schema(description = "用户编号", example = "3638")
19   - private Long userId;
20   -
21   - @Schema(description = "业务类型", example = "1")
22   - private Integer bizType;
23   -
24   - @Schema(description = "业务编号", example = "12164")
25   - private String bizId;
26   -
27   - @Schema(description = "标题", example = "增加经验")
28   - private String title;
29   -
30   - @Schema(description = "创建时间")
31   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
32   - private LocalDateTime[] createTime;
33   -
34   -}
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/experience/MemberExperienceLogPageReqVO.java
  View file @551a968
... ... @@ -11,9 +11,6 @@ import java.time.LocalDateTime;
11 11  
12 12 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
13 13  
14   -/**
15   - * @author owen
16   - */
17 14 @Schema(description = "管理后台 - 会员经验记录分页 Request VO")
18 15 @Data
19 16 @EqualsAndHashCode(callSuper = true)
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/experience/MemberExperienceLogRespVO.java
  View file @551a968
... ... @@ -7,9 +7,6 @@ import lombok.ToString;
7 7  
8 8 import java.time.LocalDateTime;
9 9  
10   -/**
11   - * @author owen
12   - */
13 10 @Schema(description = "管理后台 - 会员经验记录 Response VO")
14 11 @Data
15 12 @EqualsAndHashCode(callSuper = true)
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/level/MemberLevelBaseVO.java
  View file @551a968
... ... @@ -14,8 +14,6 @@ import javax.validation.constraints.Positive;
14 14 /**
15 15 * 会员等级 Base VO，提供给添加、修改、详细的子 VO 使用
16 16 * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
17   - *
18   - * @author owen
19 17 */
20 18 @Data
21 19 public class MemberLevelBaseVO {
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/level/MemberLevelCreateReqVO.java
  View file @551a968
... ... @@ -5,10 +5,6 @@ import lombok.Data;
5 5 import lombok.EqualsAndHashCode;
6 6 import lombok.ToString;
7 7  
8   -// TODO @疯狂：项目的 vo 和 controller 不写 author 信息哈，只写 swagger 注解
9   -/**
10   - * @author owen
11   - */
12 8 @Schema(description = "管理后台 - 会员等级创建 Request VO")
13 9 @Data
14 10 @EqualsAndHashCode(callSuper = true)
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/level/MemberLevelPageReqVO.java
  View file @551a968
... ... @@ -6,9 +6,6 @@ import lombok.Data;
6 6 import lombok.EqualsAndHashCode;
7 7 import lombok.ToString;
8 8  
9   -/**
10   - * @author owen
11   - */
12 9 @Schema(description = "管理后台 - 会员等级分页 Request VO")
13 10 @Data
14 11 @EqualsAndHashCode(callSuper = true)
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/level/MemberLevelRespVO.java
  View file @551a968
... ... @@ -7,9 +7,6 @@ import lombok.ToString;
7 7  
8 8 import java.time.LocalDateTime;
9 9  
10   -/**
11   - * @author owen
12   - */
13 10 @Schema(description = "管理后台 - 会员等级 Response VO")
14 11 @Data
15 12 @EqualsAndHashCode(callSuper = true)
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/level/MemberLevelSimpleRespVO.java
  View file @551a968
... ... @@ -2,15 +2,12 @@ package cn.iocoder.yudao.module.member.controller.admin.level.vo.level;
2 2  
3 3 import io.swagger.v3.oas.annotations.media.Schema;
4 4 import lombok.Data;
5   -import lombok.EqualsAndHashCode;
6 5 import lombok.ToString;
7 6  
8   -// TODO @疯狂：不需要继承 MemberLevelBaseVO
9 7 @Schema(description = "管理后台 - 会员等级 Response VO")
10 8 @Data
11   -@EqualsAndHashCode(callSuper = true)
12 9 @ToString(callSuper = true)
13   -public class MemberLevelSimpleRespVO extends MemberLevelBaseVO {
  10 +public class MemberLevelSimpleRespVO {
14 11  
15 12 @Schema(description = "编号", example = "6103")
16 13 private Long id;
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/level/MemberLevelUpdateReqVO.java
  View file @551a968
... ... @@ -7,9 +7,6 @@ import lombok.ToString;
7 7  
8 8 import javax.validation.constraints.NotNull;
9 9  
10   -/**
11   - * @author owen
12   - */
13 10 @Schema(description = "管理后台 - 会员等级更新 Request VO")
14 11 @Data
15 12 @EqualsAndHashCode(callSuper = true)
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/log/MemberLevelLogBaseVO.java
  View file @551a968
... ... @@ -8,8 +8,6 @@ import javax.validation.constraints.NotNull;
8 8 /**
9 9 * 会员等级记录 Base VO，提供给添加、修改、详细的子 VO 使用
10 10 * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
11   - *
12   - * @author owen
13 11 */
14 12 @Data
15 13 public class MemberLevelLogBaseVO {
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/log/MemberLevelLogExcelVO.java deleted
View file @292f23c
1   -package cn.iocoder.yudao.module.member.controller.admin.level.vo.log;
2   -
3   -import com.alibaba.excel.annotation.ExcelProperty;
4   -import lombok.Data;
5   -
6   -import java.time.LocalDateTime;
7   -
8   -/**
9   - * 会员等级记录 Excel VO
10   - *
11   - * @author owen
12   - */
13   -@Data
14   -public class MemberLevelLogExcelVO {
15   -
16   - @ExcelProperty("编号")
17   - private Long id;
18   -
19   - @ExcelProperty("用户编号")
20   - private Long userId;
21   -
22   - @ExcelProperty("等级编号")
23   - private Long levelId;
24   -
25   - @ExcelProperty("会员等级")
26   - private Integer level;
27   -
28   - @ExcelProperty("享受折扣")
29   - private Integer discount;
30   -
31   - @ExcelProperty("升级经验")
32   - private Integer experience;
33   -
34   - @ExcelProperty("会员此时的经验")
35   - private Integer userExperience;
36   -
37   - @ExcelProperty("备注")
38   - private String remark;
39   -
40   - @ExcelProperty("描述")
41   - private String description;
42   -
43   - @ExcelProperty("创建时间")
44   - private LocalDateTime createTime;
45   -
46   -}
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/log/MemberLevelLogExportReqVO.java deleted
View file @292f23c
1   -package cn.iocoder.yudao.module.member.controller.admin.level.vo.log;
2   -
3   -import io.swagger.v3.oas.annotations.media.Schema;
4   -import lombok.Data;
5   -import org.springframework.format.annotation.DateTimeFormat;
6   -
7   -import java.time.LocalDateTime;
8   -
9   -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
10   -
11   -/**
12   - * @author owen
13   - */
14   -@Schema(description = "管理后台 - 会员等级记录 Excel 导出 Request VO，参数和 MemberLevelLogPageReqVO 是一致的")
15   -@Data
16   -public class MemberLevelLogExportReqVO {
17   -
18   - @Schema(description = "用户编号", example = "25923")
19   - private Long userId;
20   -
21   - @Schema(description = "等级编号", example = "25985")
22   - private Long levelId;
23   -
24   - @Schema(description = "创建时间")
25   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
26   - private LocalDateTime[] createTime;
27   -
28   -}
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/log/MemberLevelLogPageReqVO.java
  View file @551a968
... ... @@ -11,9 +11,6 @@ import java.time.LocalDateTime;
11 11  
12 12 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
13 13  
14   -/**
15   - * @author owen
16   - */
17 14 @Schema(description = "管理后台 - 会员等级记录分页 Request VO")
18 15 @Data
19 16 @EqualsAndHashCode(callSuper = true)
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/log/MemberLevelLogRespVO.java
  View file @551a968
... ... @@ -7,9 +7,6 @@ import lombok.ToString;
7 7  
8 8 import java.time.LocalDateTime;
9 9  
10   -/**
11   - * @author owen
12   - */
13 10 @Schema(description = "管理后台 - 会员等级记录 Response VO")
14 11 @Data
15 12 @EqualsAndHashCode(callSuper = true)
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/MemberUserController.java
  View file @551a968
... ... @@ -7,9 +7,11 @@ import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserPageReq
7 7 import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserRespVO;
8 8 import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserUpdateReqVO;
9 9 import cn.iocoder.yudao.module.member.convert.user.MemberUserConvert;
  10 +import cn.iocoder.yudao.module.member.dal.dataobject.group.MemberGroupDO;
10 11 import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO;
11 12 import cn.iocoder.yudao.module.member.dal.dataobject.tag.MemberTagDO;
12 13 import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO;
  14 +import cn.iocoder.yudao.module.member.service.group.MemberGroupService;
13 15 import cn.iocoder.yudao.module.member.service.level.MemberLevelService;
14 16 import cn.iocoder.yudao.module.member.service.tag.MemberTagService;
15 17 import cn.iocoder.yudao.module.member.service.user.MemberUserService;
... ... @@ -22,10 +24,7 @@ import org.springframework.web.bind.annotation.*;
22 24  
23 25 import javax.annotation.Resource;
24 26 import javax.validation.Valid;
25   -import java.util.Collection;
26   -import java.util.List;
27   -import java.util.Objects;
28   -import java.util.Set;
  27 +import java.util.*;
29 28 import java.util.stream.Collectors;
30 29  
31 30 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
... ... @@ -42,6 +41,8 @@ public class MemberUserController {
42 41 private MemberTagService memberTagService;
43 42 @Resource
44 43 private MemberLevelService memberLevelService;
  44 + @Resource
  45 + private MemberGroupService memberGroupService;
45 46  
46 47 @PutMapping("/update")
47 48 @Operation(summary = "更新会员用户")
... ... @@ -69,17 +70,27 @@ public class MemberUserController {
69 70 return success(PageResult.empty());
70 71 }
71 72  
72   - // 处理会员标签返显
  73 + Set<Long> groupIds = new HashSet<>(pageResult.getList().size());
  74 +
  75 + // 处理用户标签返显
73 76 Set<Long> tagIds = pageResult.getList().stream()
  77 + .peek(m -> {
  78 + if (m.getGroupId() != null) {
  79 + groupIds.add(m.getGroupId());
  80 + }
  81 + })
74 82 .map(MemberUserDO::getTagIds)
75 83 .filter(Objects::nonNull)
76 84 .flatMap(Collection::stream)
77 85 .collect(Collectors.toSet());
78 86 List<MemberTagDO> tags = memberTagService.getTagList(tagIds);
79   - // 处理会员级别返显
  87 +
  88 + // 处理用户级别返显
80 89 List<MemberLevelDO> levels = memberLevelService.getEnableLevelList();
81   - // 拼接
82   - return success(MemberUserConvert.INSTANCE.convertPage(pageResult, tags, levels));
  90 + // 处理用户分组返显
  91 + List<MemberGroupDO> groups = memberGroupService.getGroupList(groupIds);
  92 +
  93 + return success(MemberUserConvert.INSTANCE.convertPage(pageResult, tags, levels, groups));
83 94 }
84 95  
85 96 }
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserBaseVO.java
  View file @551a968
... ... @@ -56,4 +56,7 @@ public class MemberUserBaseVO {
56 56 @Schema(description = "会员等级编号", example = "1")
57 57 private Long levelId;
58 58  
  59 + @Schema(description = "用户分组编号", example = "1")
  60 + private Long groupId;
  61 +
59 62 }
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserPageReqVO.java
  View file @551a968
... ... @@ -35,7 +35,10 @@ public class MemberUserPageReqVO extends PageParam {
35 35 @Schema(description = "会员标签编号列表", example = "[1, 2]")
36 36 private List<Long> tagIds;
37 37  
38   - @Schema(description = "会员等级标号", example = "1")
  38 + @Schema(description = "会员等级编号", example = "1")
39 39 private Long levelId;
40 40  
  41 + @Schema(description = "用户分组编号", example = "1")
  42 + private Long groupId;
  43 +
41 44 }
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserRespVO.java
  View file @551a968
... ... @@ -38,4 +38,7 @@ public class MemberUserRespVO extends MemberUserBaseVO {
38 38 @Schema(description = "会员等级", example = "黄金会员")
39 39 private String levelName;
40 40  
  41 + @Schema(description = "用户分组", example = "购物达人")
  42 + private String groupName;
  43 +
41 44 }
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/group/MemberGroupConvert.java 0 → 100644
  View file @551a968
  1 +package cn.iocoder.yudao.module.member.convert.group;
  2 +
  3 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  4 +import cn.iocoder.yudao.module.member.controller.admin.group.vo.MemberGroupCreateReqVO;
  5 +import cn.iocoder.yudao.module.member.controller.admin.group.vo.MemberGroupRespVO;
  6 +import cn.iocoder.yudao.module.member.controller.admin.group.vo.MemberGroupSimpleRespVO;
  7 +import cn.iocoder.yudao.module.member.controller.admin.group.vo.MemberGroupUpdateReqVO;
  8 +import cn.iocoder.yudao.module.member.dal.dataobject.group.MemberGroupDO;
  9 +import org.mapstruct.Mapper;
  10 +import org.mapstruct.factory.Mappers;
  11 +
  12 +import java.util.List;
  13 +
  14 +/**
  15 + * 用户分组 Convert
  16 + *
  17 + * @author owen
  18 + */
  19 +@Mapper
  20 +public interface MemberGroupConvert {
  21 +
  22 + MemberGroupConvert INSTANCE = Mappers.getMapper(MemberGroupConvert.class);
  23 +
  24 + MemberGroupDO convert(MemberGroupCreateReqVO bean);
  25 +
  26 + MemberGroupDO convert(MemberGroupUpdateReqVO bean);
  27 +
  28 + MemberGroupRespVO convert(MemberGroupDO bean);
  29 +
  30 + List<MemberGroupRespVO> convertList(List<MemberGroupDO> list);
  31 +
  32 + PageResult<MemberGroupRespVO> convertPage(PageResult<MemberGroupDO> page);
  33 +
  34 + List<MemberGroupSimpleRespVO> convertSimpleList(List<MemberGroupDO> list);
  35 +}
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/level/MemberExperienceLogConvert.java
  View file @551a968
1 1 package cn.iocoder.yudao.module.member.convert.level;
2 2  
3 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
4   -import cn.iocoder.yudao.module.member.controller.admin.level.vo.experience.MemberExperienceLogExcelVO;
5 4 import cn.iocoder.yudao.module.member.controller.admin.level.vo.experience.MemberExperienceLogRespVO;
6 5 import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberExperienceLogDO;
7 6 import org.mapstruct.Mapper;
... ... @@ -25,6 +24,4 @@ public interface MemberExperienceLogConvert {
25 24  
26 25 PageResult<MemberExperienceLogRespVO> convertPage(PageResult<MemberExperienceLogDO> page);
27 26  
28   - List<MemberExperienceLogExcelVO> convertList02(List<MemberExperienceLogDO> list);
29   -
30 27 }
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/level/MemberLevelLogConvert.java
  View file @551a968
1 1 package cn.iocoder.yudao.module.member.convert.level;
2 2  
3 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
4   -import cn.iocoder.yudao.module.member.controller.admin.level.vo.log.MemberLevelLogExcelVO;
5 4 import cn.iocoder.yudao.module.member.controller.admin.level.vo.log.MemberLevelLogRespVO;
6 5 import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelLogDO;
7 6 import org.mapstruct.Mapper;
... ... @@ -25,6 +24,4 @@ public interface MemberLevelLogConvert {
25 24  
26 25 PageResult<MemberLevelLogRespVO> convertPage(PageResult<MemberLevelLogDO> page);
27 26  
28   - List<MemberLevelLogExcelVO> convertList02(List<MemberLevelLogDO> list);
29   -
30 27 }
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/user/MemberUserConvert.java
  View file @551a968
... ... @@ -7,6 +7,7 @@ import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
7 7 import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserRespVO;
8 8 import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserUpdateReqVO;
9 9 import cn.iocoder.yudao.module.member.controller.app.user.vo.AppMemberUserInfoRespVO;
  10 +import cn.iocoder.yudao.module.member.dal.dataobject.group.MemberGroupDO;
10 11 import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO;
11 12 import cn.iocoder.yudao.module.member.dal.dataobject.tag.MemberTagDO;
12 13 import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO;
... ... @@ -38,15 +39,20 @@ public interface MemberUserConvert {
38 39  
39 40 default PageResult<MemberUserRespVO> convertPage(PageResult<MemberUserDO> pageResult,
40 41 List<MemberTagDO> tags,
41   - List<MemberLevelDO> levels) {
  42 + List<MemberLevelDO> levels,
  43 + List<MemberGroupDO> groups) {
42 44 PageResult<MemberUserRespVO> result = convertPage(pageResult);
43 45  
44 46 // 处理关联数据
45 47 Map<Long, String> tagMap = convertMap(tags, MemberTagDO::getId, MemberTagDO::getName);
46 48 Map<Long, String> levelMap = convertMap(levels, MemberLevelDO::getId, MemberLevelDO::getName);
  49 + Map<Long, String> groupMap = convertMap(groups, MemberGroupDO::getId, MemberGroupDO::getName);
  50 +
  51 + // 填充关联数据
47 52 for (MemberUserRespVO vo : result.getList()) {
48 53 vo.setTagNames(convertList(vo.getTagIds(), tagMap::get));
49 54 vo.setLevelName(MapUtil.getStr(levelMap, vo.getLevelId(), StrUtil.EMPTY));
  55 + vo.setGroupName(MapUtil.getStr(groupMap, vo.getGroupId(), StrUtil.EMPTY));
50 56 }
51 57 return result;
52 58 }
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/group/MemberGroupDO.java 0 → 100644
  View file @551a968
  1 +package cn.iocoder.yudao.module.member.dal.dataobject.group;
  2 +
  3 +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
  4 +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
  5 +import com.baomidou.mybatisplus.annotation.KeySequence;
  6 +import com.baomidou.mybatisplus.annotation.TableId;
  7 +import com.baomidou.mybatisplus.annotation.TableName;
  8 +import lombok.*;
  9 +
  10 +/**
  11 + * 用户分组 DO
  12 + *
  13 + * @author owen
  14 + */
  15 +@TableName("member_group")
  16 +@KeySequence("member_group_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
  17 +@Data
  18 +@EqualsAndHashCode(callSuper = true)
  19 +@ToString(callSuper = true)
  20 +@Builder
  21 +@NoArgsConstructor
  22 +@AllArgsConstructor
  23 +public class MemberGroupDO extends BaseDO {
  24 +
  25 + /**
  26 + * 编号
  27 + */
  28 + @TableId
  29 + private Long id;
  30 + /**
  31 + * 名称
  32 + */
  33 + private String name;
  34 + /**
  35 + * 备注
  36 + */
  37 + private String remark;
  38 + /**
  39 + * 状态
  40 + * <p>
  41 + * 枚举 {@link CommonStatusEnum}
  42 + */
  43 + private Integer status;
  44 +
  45 +}
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/user/MemberUserDO.java
  View file @551a968
... ... @@ -4,6 +4,7 @@ import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
4 4 import cn.iocoder.yudao.framework.ip.core.Area;
5 5 import cn.iocoder.yudao.framework.mybatis.core.type.LongListTypeHandler;
6 6 import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO;
  7 +import cn.iocoder.yudao.module.member.dal.dataobject.group.MemberGroupDO;
7 8 import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO;
8 9 import cn.iocoder.yudao.module.system.enums.common.SexEnum;
9 10 import com.baomidou.mybatisplus.annotation.KeySequence;
... ... @@ -121,12 +122,18 @@ public class MemberUserDO extends TenantBaseDO {
121 122 /**
122 123 * 会员级别编号
123 124 *
124   - * 关联 {@link MemberLevelDO#getLevel()} 字段
  125 + * 关联 {@link MemberLevelDO#getId()} 字段
125 126 */
126 127 private Long levelId;
127 128 /**
128 129 * 会员经验
129 130 */
130 131 private Integer experience;
  132 + /**
  133 + * 用户分组编号
  134 + *
  135 + * 关联 {@link MemberGroupDO#getId()} 字段
  136 + */
  137 + private Long groupId;
131 138  
132 139 }
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/group/MemberGroupMapper.java 0 → 100644
  View file @551a968
  1 +package cn.iocoder.yudao.module.member.dal.mysql.group;
  2 +
  3 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  4 +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
  5 +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
  6 +import cn.iocoder.yudao.module.member.controller.admin.group.vo.MemberGroupPageReqVO;
  7 +import cn.iocoder.yudao.module.member.dal.dataobject.group.MemberGroupDO;
  8 +import org.apache.ibatis.annotations.Mapper;
  9 +
  10 +import java.util.List;
  11 +
  12 +/**
  13 + * 用户分组 Mapper
  14 + *
  15 + * @author owen
  16 + */
  17 +@Mapper
  18 +public interface MemberGroupMapper extends BaseMapperX<MemberGroupDO> {
  19 +
  20 + default PageResult<MemberGroupDO> selectPage(MemberGroupPageReqVO reqVO) {
  21 + return selectPage(reqVO, new LambdaQueryWrapperX<MemberGroupDO>()
  22 + .likeIfPresent(MemberGroupDO::getName, reqVO.getName())
  23 + .eqIfPresent(MemberGroupDO::getStatus, reqVO.getStatus())
  24 + .betweenIfPresent(MemberGroupDO::getCreateTime, reqVO.getCreateTime())
  25 + .orderByDesc(MemberGroupDO::getId));
  26 + }
  27 +
  28 + default List<MemberGroupDO> selectListByStatus(Integer status) {
  29 + return selectList(MemberGroupDO::getStatus, status);
  30 + }
  31 +}
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/level/MemberExperienceLogMapper.java
  View file @551a968
... ... @@ -3,13 +3,10 @@ package cn.iocoder.yudao.module.member.dal.mysql.level;
3 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
4 4 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
5 5 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
6   -import cn.iocoder.yudao.module.member.controller.admin.level.vo.experience.MemberExperienceLogExportReqVO;
7 6 import cn.iocoder.yudao.module.member.controller.admin.level.vo.experience.MemberExperienceLogPageReqVO;
8 7 import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberExperienceLogDO;
9 8 import org.apache.ibatis.annotations.Mapper;
10 9  
11   -import java.util.List;
12   -
13 10 /**
14 11 * 会员经验记录 Mapper
15 12 *
... ... @@ -28,14 +25,4 @@ public interface MemberExperienceLogMapper extends BaseMapperX&lt;MemberExperienceL
28 25 .orderByDesc(MemberExperienceLogDO::getId));
29 26 }
30 27  
31   - default List<MemberExperienceLogDO> selectList(MemberExperienceLogExportReqVO reqVO) {
32   - return selectList(new LambdaQueryWrapperX<MemberExperienceLogDO>()
33   - .eqIfPresent(MemberExperienceLogDO::getUserId, reqVO.getUserId())
34   - .eqIfPresent(MemberExperienceLogDO::getBizId, reqVO.getBizId())
35   - .eqIfPresent(MemberExperienceLogDO::getBizType, reqVO.getBizType())
36   - .eqIfPresent(MemberExperienceLogDO::getTitle, reqVO.getTitle())
37   - .betweenIfPresent(MemberExperienceLogDO::getCreateTime, reqVO.getCreateTime())
38   - .orderByDesc(MemberExperienceLogDO::getId));
39   - }
40   -
41 28 }
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/level/MemberLevelLogMapper.java
  View file @551a968
... ... @@ -3,13 +3,10 @@ package cn.iocoder.yudao.module.member.dal.mysql.level;
3 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
4 4 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
5 5 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
6   -import cn.iocoder.yudao.module.member.controller.admin.level.vo.log.MemberLevelLogExportReqVO;
7 6 import cn.iocoder.yudao.module.member.controller.admin.level.vo.log.MemberLevelLogPageReqVO;
8 7 import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelLogDO;
9 8 import org.apache.ibatis.annotations.Mapper;
10 9  
11   -import java.util.List;
12   -
13 10 /**
14 11 * 会员等级记录 Mapper
15 12 *
... ... @@ -26,12 +23,4 @@ public interface MemberLevelLogMapper extends BaseMapperX&lt;MemberLevelLogDO&gt; {
26 23 .orderByDesc(MemberLevelLogDO::getId));
27 24 }
28 25  
29   - default List<MemberLevelLogDO> selectList(MemberLevelLogExportReqVO reqVO) {
30   - return selectList(new LambdaQueryWrapperX<MemberLevelLogDO>()
31   - .eqIfPresent(MemberLevelLogDO::getUserId, reqVO.getUserId())
32   - .eqIfPresent(MemberLevelLogDO::getLevelId, reqVO.getLevelId())
33   - .betweenIfPresent(MemberLevelLogDO::getCreateTime, reqVO.getCreateTime())
34   - .orderByDesc(MemberLevelLogDO::getId));
35   - }
36   -
37 26 }
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/user/MemberUserMapper.java
  View file @551a968
... ... @@ -45,6 +45,7 @@ public interface MemberUserMapper extends BaseMapperX&lt;MemberUserDO&gt; {
45 45 .likeIfPresent(MemberUserDO::getNickname, reqVO.getNickname())
46 46 .betweenIfPresent(MemberUserDO::getCreateTime, reqVO.getCreateTime())
47 47 .eqIfPresent(MemberUserDO::getLevelId, reqVO.getLevelId())
  48 + .eqIfPresent(MemberUserDO::getGroupId, reqVO.getGroupId())
48 49 .apply(StrUtil.isNotEmpty(tagIdSql), tagIdSql)
49 50 .orderByDesc(MemberUserDO::getId));
50 51 }
... ... @@ -62,4 +63,18 @@ public interface MemberUserMapper extends BaseMapperX&lt;MemberUserDO&gt; {
62 63 .set(MemberUserDO::getExperience, 0)
63 64 .set(MemberUserDO::getLevelId, null));
64 65 }
  66 +
  67 + default Long selectCountByGroupId(Long groupId) {
  68 + return selectCount(MemberUserDO::getGroupId, groupId);
  69 + }
  70 +
  71 + default Long selectCountByLevelId(Long levelId) {
  72 + return selectCount(MemberUserDO::getLevelId, levelId);
  73 + }
  74 +
  75 + default Long selectCountByTagId(Long tagId) {
  76 + return selectCount(new LambdaQueryWrapperX<MemberUserDO>()
  77 + .apply("FIND_IN_SET({0}, tag_ids)", tagId));
  78 + }
  79 +
65 80 }
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/group/MemberGroupService.java 0 → 100644
  View file @551a968
  1 +package cn.iocoder.yudao.module.member.service.group;
  2 +
  3 +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
  4 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  5 +import cn.iocoder.yudao.module.member.controller.admin.group.vo.MemberGroupCreateReqVO;
  6 +import cn.iocoder.yudao.module.member.controller.admin.group.vo.MemberGroupPageReqVO;
  7 +import cn.iocoder.yudao.module.member.controller.admin.group.vo.MemberGroupUpdateReqVO;
  8 +import cn.iocoder.yudao.module.member.dal.dataobject.group.MemberGroupDO;
  9 +
  10 +import javax.validation.Valid;
  11 +import java.util.Collection;
  12 +import java.util.List;
  13 +
  14 +/**
  15 + * 用户分组 Service 接口
  16 + *
  17 + * @author owen
  18 + */
  19 +public interface MemberGroupService {
  20 +
  21 + /**
  22 + * 创建用户分组
  23 + *
  24 + * @param createReqVO 创建信息
  25 + * @return 编号
  26 + */
  27 + Long createGroup(@Valid MemberGroupCreateReqVO createReqVO);
  28 +
  29 + /**
  30 + * 更新用户分组
  31 + *
  32 + * @param updateReqVO 更新信息
  33 + */
  34 + void updateGroup(@Valid MemberGroupUpdateReqVO updateReqVO);
  35 +
  36 + /**
  37 + * 删除用户分组
  38 + *
  39 + * @param id 编号
  40 + */
  41 + void deleteGroup(Long id);
  42 +
  43 + /**
  44 + * 获得用户分组
  45 + *
  46 + * @param id 编号
  47 + * @return 用户分组
  48 + */
  49 + MemberGroupDO getGroup(Long id);
  50 +
  51 + /**
  52 + * 获得用户分组列表
  53 + *
  54 + * @param ids 编号
  55 + * @return 用户分组列表
  56 + */
  57 + List<MemberGroupDO> getGroupList(Collection<Long> ids);
  58 +
  59 + /**
  60 + * 获得用户分组分页
  61 + *
  62 + * @param pageReqVO 分页查询
  63 + * @return 用户分组分页
  64 + */
  65 + PageResult<MemberGroupDO> getGroupPage(MemberGroupPageReqVO pageReqVO);
  66 +
  67 +
  68 + /**
  69 + * 获得指定状态的用户分组列表
  70 + *
  71 + * @param status 状态
  72 + * @return 用户分组列表
  73 + */
  74 + List<MemberGroupDO> getGroupListByStatus(Integer status);
  75 +
  76 +
  77 + /**
  78 + * 获得开启状态的用户分组列表
  79 + *
  80 + * @return 用户分组列表
  81 + */
  82 + default List<MemberGroupDO> getEnableGroupList() {
  83 + return getGroupListByStatus(CommonStatusEnum.ENABLE.getStatus());
  84 + }
  85 +
  86 +}
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/group/MemberGroupServiceImpl.java 0 → 100644
  View file @551a968
  1 +package cn.iocoder.yudao.module.member.service.group;
  2 +
  3 +import cn.hutool.core.collection.CollUtil;
  4 +import cn.hutool.core.collection.ListUtil;
  5 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  6 +import cn.iocoder.yudao.module.member.controller.admin.group.vo.MemberGroupCreateReqVO;
  7 +import cn.iocoder.yudao.module.member.controller.admin.group.vo.MemberGroupPageReqVO;
  8 +import cn.iocoder.yudao.module.member.controller.admin.group.vo.MemberGroupUpdateReqVO;
  9 +import cn.iocoder.yudao.module.member.convert.group.MemberGroupConvert;
  10 +import cn.iocoder.yudao.module.member.dal.dataobject.group.MemberGroupDO;
  11 +import cn.iocoder.yudao.module.member.dal.mysql.group.MemberGroupMapper;
  12 +import cn.iocoder.yudao.module.member.dal.mysql.user.MemberUserMapper;
  13 +import org.springframework.stereotype.Service;
  14 +import org.springframework.validation.annotation.Validated;
  15 +
  16 +import javax.annotation.Resource;
  17 +import java.util.Collection;
  18 +import java.util.List;
  19 +
  20 +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
  21 +import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.GROUP_HAS_USER;
  22 +import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.GROUP_NOT_EXISTS;
  23 +
  24 +/**
  25 + * 用户分组 Service 实现类
  26 + *
  27 + * @author owen
  28 + */
  29 +@Service
  30 +@Validated
  31 +public class MemberGroupServiceImpl implements MemberGroupService {
  32 +
  33 + @Resource
  34 + private MemberGroupMapper groupMapper;
  35 + @Resource
  36 + private MemberUserMapper memberUserMapper;
  37 +
  38 + @Override
  39 + public Long createGroup(MemberGroupCreateReqVO createReqVO) {
  40 + // 插入
  41 + MemberGroupDO group = MemberGroupConvert.INSTANCE.convert(createReqVO);
  42 + groupMapper.insert(group);
  43 + // 返回
  44 + return group.getId();
  45 + }
  46 +
  47 + @Override
  48 + public void updateGroup(MemberGroupUpdateReqVO updateReqVO) {
  49 + // 校验存在
  50 + validateGroupExists(updateReqVO.getId());
  51 + // 更新
  52 + MemberGroupDO updateObj = MemberGroupConvert.INSTANCE.convert(updateReqVO);
  53 + groupMapper.updateById(updateObj);
  54 + }
  55 +
  56 + @Override
  57 + public void deleteGroup(Long id) {
  58 + // 校验存在
  59 + validateGroupExists(id);
  60 + // 校验分组下是否有用户
  61 + validateGroupHasUser(id);
  62 + // 删除
  63 + groupMapper.deleteById(id);
  64 + }
  65 +
  66 + void validateGroupExists(Long id) {
  67 + if (groupMapper.selectById(id) == null) {
  68 + throw exception(GROUP_NOT_EXISTS);
  69 + }
  70 + }
  71 +
  72 + void validateGroupHasUser(Long id) {
  73 + Long count = memberUserMapper.selectCountByGroupId(id);
  74 + if (count > 0) {
  75 + throw exception(GROUP_HAS_USER);
  76 + }
  77 + }
  78 +
  79 + @Override
  80 + public MemberGroupDO getGroup(Long id) {
  81 + return groupMapper.selectById(id);
  82 + }
  83 +
  84 + @Override
  85 + public List<MemberGroupDO> getGroupList(Collection<Long> ids) {
  86 + if (CollUtil.isEmpty(ids)) {
  87 + return ListUtil.empty();
  88 + }
  89 + return groupMapper.selectBatchIds(ids);
  90 + }
  91 +
  92 + @Override
  93 + public PageResult<MemberGroupDO> getGroupPage(MemberGroupPageReqVO pageReqVO) {
  94 + return groupMapper.selectPage(pageReqVO);
  95 + }
  96 +
  97 + @Override
  98 + public List<MemberGroupDO> getGroupListByStatus(Integer status) {
  99 + return groupMapper.selectListByStatus(status);
  100 + }
  101 +
  102 +}
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberExperienceLogService.java
  View file @551a968
1 1 package cn.iocoder.yudao.module.member.service.level;
2 2  
3 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
4   -import cn.iocoder.yudao.module.member.controller.admin.level.vo.experience.MemberExperienceLogExportReqVO;
5 4 import cn.iocoder.yudao.module.member.controller.admin.level.vo.experience.MemberExperienceLogPageReqVO;
6 5 import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberExperienceLogDO;
7 6 import cn.iocoder.yudao.module.member.enums.MemberExperienceBizTypeEnum;
... ... @@ -17,13 +16,6 @@ import java.util.List;
17 16 public interface MemberExperienceLogService {
18 17  
19 18 /**
20   - * 删除会员经验记录
21   - *
22   - * @param id 编号
23   - */
24   - void deleteExperienceLog(Long id);
25   -
26   - /**
27 19 * 获得会员经验记录
28 20 *
29 21 * @param id 编号
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberExperienceLogServiceImpl.java
  View file @551a968
... ... @@ -2,7 +2,6 @@ package cn.iocoder.yudao.module.member.service.level;
2 2  
3 3 import cn.hutool.core.util.StrUtil;
4 4 import cn.iocoder.yudao.framework.common.pojo.PageResult;
5   -import cn.iocoder.yudao.module.member.controller.admin.level.vo.experience.MemberExperienceLogExportReqVO;
6 5 import cn.iocoder.yudao.module.member.controller.admin.level.vo.experience.MemberExperienceLogPageReqVO;
7 6 import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberExperienceLogDO;
8 7 import cn.iocoder.yudao.module.member.dal.mysql.level.MemberExperienceLogMapper;
... ... @@ -14,9 +13,6 @@ import javax.annotation.Resource;
14 13 import java.util.Collection;
15 14 import java.util.List;
16 15  
17   -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
18   -import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.EXPERIENCE_LOG_NOT_EXISTS;
19   -
20 16 /**
21 17 * 会员经验记录 Service 实现类
22 18 *
... ... @@ -29,19 +25,6 @@ public class MemberExperienceLogServiceImpl implements MemberExperienceLogServic
29 25 @Resource
30 26 private MemberExperienceLogMapper experienceLogMapper;
31 27  
32   - @Override
33   - public void deleteExperienceLog(Long id) {
34   - // 校验存在
35   - validateExperienceLogExists(id);
36   - // 删除
37   - experienceLogMapper.deleteById(id);
38   - }
39   -
40   - private void validateExperienceLogExists(Long id) {
41   - if (experienceLogMapper.selectById(id) == null) {
42   - throw exception(EXPERIENCE_LOG_NOT_EXISTS);
43   - }
44   - }
45 28  
46 29 @Override
47 30 public MemberExperienceLogDO getExperienceLog(Long id) {
... ... @@ -59,11 +42,6 @@ public class MemberExperienceLogServiceImpl implements MemberExperienceLogServic
59 42 }
60 43  
61 44 @Override
62   - public List<MemberExperienceLogDO> getExperienceLogList(MemberExperienceLogExportReqVO exportReqVO) {
63   - return experienceLogMapper.selectList(exportReqVO);
64   - }
65   -
66   - @Override
67 45 public void createAdjustLog(Long userId, int experience, int totalExperience) {
68 46 // 管理员调整时, 没有业务编号, 记录对应的枚举值
69 47 String bizId = MemberExperienceBizTypeEnum.ADMIN.getValue() + "";
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelLogService.java
  View file @551a968
1 1 package cn.iocoder.yudao.module.member.service.level;
2 2  
3 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
4   -import cn.iocoder.yudao.module.member.controller.admin.level.vo.log.MemberLevelLogExportReqVO;
5 4 import cn.iocoder.yudao.module.member.controller.admin.level.vo.log.MemberLevelLogPageReqVO;
6 5 import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO;
7 6 import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelLogDO;
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelLogServiceImpl.java
  View file @551a968
1 1 package cn.iocoder.yudao.module.member.service.level;
2 2  
3 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
4   -import cn.iocoder.yudao.module.member.controller.admin.level.vo.log.MemberLevelLogExportReqVO;
5 4 import cn.iocoder.yudao.module.member.controller.admin.level.vo.log.MemberLevelLogPageReqVO;
6 5 import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO;
7 6 import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelLogDO;
... ... @@ -59,11 +58,6 @@ public class MemberLevelLogServiceImpl implements MemberLevelLogService {
59 58 }
60 59  
61 60 @Override
62   - public List<MemberLevelLogDO> getLevelLogList(MemberLevelLogExportReqVO exportReqVO) {
63   - return levelLogMapper.selectList(exportReqVO);
64   - }
65   -
66   - @Override
67 61 public void createCancelLog(Long userId, String reason) {
68 62 MemberLevelLogDO levelLogDO = new MemberLevelLogDO();
69 63 levelLogDO.setUserId(userId);
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelServiceImpl.java
  View file @551a968
... ... @@ -74,9 +74,10 @@ public class MemberLevelServiceImpl implements MemberLevelService {
74 74  
75 75 @Override
76 76 public void deleteLevel(Long id) {
77   - // TODO @疯狂：校验是否有用户使用该等级
78 77 // 校验存在
79 78 validateLevelExists(id);
  79 + // 校验分组下是否有用户
  80 + validateLevelHasUser(id);
80 81 // 删除
81 82 levelMapper.deleteById(id);
82 83 }
... ... @@ -148,6 +149,14 @@ public class MemberLevelServiceImpl implements MemberLevelService {
148 149 validateExperienceOutRange(list, id, level, experience);
149 150 }
150 151  
  152 + @VisibleForTesting
  153 + void validateLevelHasUser(Long id) {
  154 + Long count = memberUserMapper.selectCountByLevelId(id);
  155 + if (count > 0) {
  156 + throw exception(GROUP_HAS_USER);
  157 + }
  158 + }
  159 +
151 160 @Override
152 161 public MemberLevelDO getLevel(Long id) {
153 162 return levelMapper.selectById(id);
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/tag/MemberTagServiceImpl.java
  View file @551a968
... ... @@ -10,6 +10,7 @@ import cn.iocoder.yudao.module.member.controller.admin.tag.vo.MemberTagUpdateReq
10 10 import cn.iocoder.yudao.module.member.convert.tag.MemberTagConvert;
11 11 import cn.iocoder.yudao.module.member.dal.dataobject.tag.MemberTagDO;
12 12 import cn.iocoder.yudao.module.member.dal.mysql.tag.MemberTagMapper;
  13 +import cn.iocoder.yudao.module.member.dal.mysql.user.MemberUserMapper;
13 14 import org.springframework.stereotype.Service;
14 15 import org.springframework.validation.annotation.Validated;
15 16  
... ... @@ -18,8 +19,7 @@ import java.util.Collection;
18 19 import java.util.List;
19 20  
20 21 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
21   -import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.TAG_NAME_EXISTS;
22   -import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.TAG_NOT_EXISTS;
  22 +import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.*;
23 23  
24 24 /**
25 25 * 会员标签 Service 实现类
... ... @@ -32,6 +32,8 @@ public class MemberTagServiceImpl implements MemberTagService {
32 32  
33 33 @Resource
34 34 private MemberTagMapper tagMapper;
  35 + @Resource
  36 + private MemberUserMapper memberUserMapper;
35 37  
36 38 @Override
37 39 public Long createTag(MemberTagCreateReqVO createReqVO) {
... ... @@ -59,6 +61,8 @@ public class MemberTagServiceImpl implements MemberTagService {
59 61 public void deleteTag(Long id) {
60 62 // 校验存在
61 63 validateTagExists(id);
  64 + // 校验标签下是否有用户
  65 + validateTagHasUser(id);
62 66 // 删除
63 67 tagMapper.deleteById(id);
64 68 }
... ... @@ -87,6 +91,13 @@ public class MemberTagServiceImpl implements MemberTagService {
87 91 }
88 92 }
89 93  
  94 + void validateTagHasUser(Long id) {
  95 + Long count = memberUserMapper.selectCountByTagId(id);
  96 + if (count > 0) {
  97 + throw exception(TAG_HAS_USER);
  98 + }
  99 + }
  100 +
90 101 @Override
91 102 public MemberTagDO getTag(Long id) {
92 103 return tagMapper.selectById(id);
... ...
yudao-module-member/yudao-module-member-biz/src/test/java/cn/iocoder/yudao/module/member/service/group/MemberGroupServiceImplTest.java 0 → 100644
  View file @551a968
  1 +package cn.iocoder.yudao.module.member.service.group;
  2 +
  3 +import cn.hutool.core.util.RandomUtil;
  4 +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
  5 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  6 +import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
  7 +import cn.iocoder.yudao.module.member.controller.admin.group.vo.MemberGroupCreateReqVO;
  8 +import cn.iocoder.yudao.module.member.controller.admin.group.vo.MemberGroupPageReqVO;
  9 +import cn.iocoder.yudao.module.member.controller.admin.group.vo.MemberGroupUpdateReqVO;
  10 +import cn.iocoder.yudao.module.member.dal.dataobject.group.MemberGroupDO;
  11 +import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO;
  12 +import cn.iocoder.yudao.module.member.dal.mysql.group.MemberGroupMapper;
  13 +import cn.iocoder.yudao.module.member.dal.mysql.user.MemberUserMapper;
  14 +import cn.iocoder.yudao.module.system.enums.common.SexEnum;
  15 +import org.junit.jupiter.api.Test;
  16 +import org.springframework.context.annotation.Import;
  17 +
  18 +import javax.annotation.Resource;
  19 +
  20 +import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildBetweenTime;
  21 +import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildTime;
  22 +import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId;
  23 +import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
  24 +import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
  25 +import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
  26 +import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.GROUP_HAS_USER;
  27 +import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.GROUP_NOT_EXISTS;
  28 +import static org.junit.jupiter.api.Assertions.*;
  29 +
  30 +/**
  31 + * {@link MemberGroupServiceImpl} 的单元测试类
  32 + *
  33 + * @author owen
  34 + */
  35 +@Import(MemberGroupServiceImpl.class)
  36 +public class MemberGroupServiceImplTest extends BaseDbUnitTest {
  37 +
  38 + @Resource
  39 + private MemberGroupServiceImpl groupService;
  40 +
  41 + @Resource
  42 + private MemberGroupMapper groupMapper;
  43 + @Resource
  44 + private MemberUserMapper memberUserMapper;
  45 +
  46 + @Test
  47 + public void testCreateGroup_success() {
  48 + // 准备参数
  49 + MemberGroupCreateReqVO reqVO = randomPojo(MemberGroupCreateReqVO.class);
  50 +
  51 + // 调用
  52 + Long groupId = groupService.createGroup(reqVO);
  53 + // 断言
  54 + assertNotNull(groupId);
  55 + // 校验记录的属性是否正确
  56 + MemberGroupDO group = groupMapper.selectById(groupId);
  57 + assertPojoEquals(reqVO, group);
  58 + }
  59 +
  60 + @Test
  61 + public void testUpdateGroup_success() {
  62 + // mock 数据
  63 + MemberGroupDO dbGroup = randomPojo(MemberGroupDO.class);
  64 + groupMapper.insert(dbGroup);// @Sql: 先插入出一条存在的数据
  65 + // 准备参数
  66 + MemberGroupUpdateReqVO reqVO = randomPojo(MemberGroupUpdateReqVO.class, o -> {
  67 + o.setId(dbGroup.getId()); // 设置更新的 ID
  68 + });
  69 +
  70 + // 调用
  71 + groupService.updateGroup(reqVO);
  72 + // 校验是否更新正确
  73 + MemberGroupDO group = groupMapper.selectById(reqVO.getId()); // 获取最新的
  74 + assertPojoEquals(reqVO, group);
  75 + }
  76 +
  77 + @Test
  78 + public void testUpdateGroup_notExists() {
  79 + // 准备参数
  80 + MemberGroupUpdateReqVO reqVO = randomPojo(MemberGroupUpdateReqVO.class);
  81 +
  82 + // 调用, 并断言异常
  83 + assertServiceException(() -> groupService.updateGroup(reqVO), GROUP_NOT_EXISTS);
  84 + }
  85 +
  86 + @Test
  87 + public void testDeleteGroup_success() {
  88 + // mock 数据
  89 + MemberGroupDO dbGroup = randomPojo(MemberGroupDO.class);
  90 + groupMapper.insert(dbGroup);// @Sql: 先插入出一条存在的数据
  91 + // 准备参数
  92 + Long id = dbGroup.getId();
  93 +
  94 + // 调用
  95 + groupService.deleteGroup(id);
  96 + // 校验数据不存在了
  97 + assertNull(groupMapper.selectById(id));
  98 + }
  99 +
  100 + @Test
  101 + public void testDeleteGroup_notExists() {
  102 + // 准备参数
  103 + Long id = randomLongId();
  104 +
  105 + // 调用, 并断言异常
  106 + assertServiceException(() -> groupService.deleteGroup(id), GROUP_NOT_EXISTS);
  107 + }
  108 +
  109 + @Test
  110 + public void testDeleteGroup_hasUser() {
  111 + // mock 数据
  112 + MemberGroupDO dbGroup = randomPojo(MemberGroupDO.class);
  113 + groupMapper.insert(dbGroup);// @Sql: 先插入出一条存在的数据
  114 + // 准备参数
  115 + Long id = dbGroup.getId();
  116 +
  117 + // mock 会员数据
  118 + MemberUserDO dbUser = randomPojo(MemberUserDO.class, o -> {
  119 + o.setGroupId(id);
  120 + o.setSex(RandomUtil.randomEle(SexEnum.values()).getSex());
  121 + });
  122 + memberUserMapper.insert(dbUser);
  123 +
  124 + // 调用, 并断言异常
  125 + assertServiceException(() -> groupService.deleteGroup(id), GROUP_HAS_USER);
  126 + }
  127 +
  128 + @Test
  129 + public void testGetGroupPage() {
  130 + String name = randomString();
  131 + int status = CommonStatusEnum.ENABLE.getStatus();
  132 +
  133 + // mock 数据
  134 + MemberGroupDO dbGroup = randomPojo(MemberGroupDO.class, o -> { // 等会查询到
  135 + o.setName(name);
  136 + o.setStatus(status);
  137 + o.setCreateTime(buildTime(2023, 2, 18));
  138 + });
  139 + groupMapper.insert(dbGroup);
  140 + // 测试 name 不匹配
  141 + groupMapper.insert(cloneIgnoreId(dbGroup, o -> o.setName("")));
  142 + // 测试 status 不匹配
  143 + groupMapper.insert(cloneIgnoreId(dbGroup, o -> o.setStatus(CommonStatusEnum.DISABLE.getStatus())));
  144 + // 测试 createTime 不匹配
  145 + groupMapper.insert(cloneIgnoreId(dbGroup, o -> o.setCreateTime(null)));
  146 + // 准备参数
  147 + MemberGroupPageReqVO reqVO = new MemberGroupPageReqVO();
  148 + reqVO.setName(name);
  149 + reqVO.setStatus(status);
  150 + reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
  151 +
  152 + // 调用
  153 + PageResult<MemberGroupDO> pageResult = groupService.getGroupPage(reqVO);
  154 + // 断言
  155 + assertEquals(1, pageResult.getTotal());
  156 + assertEquals(1, pageResult.getList().size());
  157 + assertPojoEquals(dbGroup, pageResult.getList().get(0));
  158 + }
  159 +
  160 +}
... ...
yudao-module-member/yudao-module-member-biz/src/test/resources/sql/clean.sql
  View file @551a968
1 1 DELETE FROM "member_user";
2 2 DELETE FROM "member_address";
3 3 DELETE FROM "member_tag";
4   -DELETE FROM "member_level";
5 4 \ No newline at end of file
  5 +DELETE FROM "member_level";
  6 +DELETE FROM "member_group";
6 7 \ No newline at end of file
... ...
yudao-module-member/yudao-module-member-biz/src/test/resources/sql/create_tables.sql
  View file @551a968
1   -CREATE TABLE IF NOT EXISTS "member_user" (
2   - "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY COMMENT '编号',
3   - "nickname" varchar(30) NOT NULL DEFAULT '' COMMENT '用户昵称',
4   - "avatar" varchar(255) NOT NULL DEFAULT '' COMMENT '头像',
5   - "status" tinyint NOT NULL COMMENT '状态',
6   - "mobile" varchar(11) NOT NULL COMMENT '手机号',
7   - "password" varchar(100) NOT NULL DEFAULT '' COMMENT '密码',
  1 +CREATE TABLE IF NOT EXISTS "member_user"
  2 +(
  3 + "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY COMMENT '编号',
  4 + "nickname" varchar(30) NOT NULL DEFAULT '' COMMENT '用户昵称',
  5 + "name" varchar(30) NULL COMMENT '真实名字',
  6 + sex tinyint null comment '性别',
  7 + birthday datetime null comment '出生日期',
  8 + area_id int null comment '所在地',
  9 + mark varchar(255) null comment '用户备注',
  10 + point int default 0 null comment '积分',
  11 + "avatar" varchar(255) NOT NULL DEFAULT '' COMMENT '头像',
  12 + "status" tinyint NOT NULL COMMENT '状态',
  13 + "mobile" varchar(11) NOT NULL COMMENT '手机号',
  14 + "password" varchar(100) NOT NULL DEFAULT '' COMMENT '密码',
8 15 "register_ip" varchar(32) NOT NULL COMMENT '注册 IP',
9   - "login_ip" varchar(50) NULL DEFAULT '' COMMENT '最后登录IP',
10   - "login_date" datetime NULL DEFAULT NULL COMMENT '最后登录时间',
11   - "creator" varchar(64) NULL DEFAULT '' COMMENT '创建者',
12   - "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
13   - "updater" varchar(64) NULL DEFAULT '' COMMENT '更新者',
14   - "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
15   - "deleted" bit(1) NOT NULL DEFAULT '0' COMMENT '是否删除',
16   - "tenant_id" bigint not null default '0',
  16 + "login_ip" varchar(50) NULL DEFAULT '' COMMENT '最后登录IP',
  17 + "login_date" datetime NULL DEFAULT NULL COMMENT '最后登录时间',
  18 + "tag_ids" varchar(255) NULL DEFAULT NULL COMMENT '用户标签编号列表,以逗号分隔',
  19 + "level_id" bigint NULL DEFAULT NULL COMMENT '等级编号',
  20 + "experience" bigint NULL DEFAULT NULL COMMENT '经验',
  21 + "group_id" bigint NULL DEFAULT NULL COMMENT '用户分组编号',
  22 + "creator" varchar(64) NULL DEFAULT '' COMMENT '创建者',
  23 + "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
  24 + "updater" varchar(64) NULL DEFAULT '' COMMENT '更新者',
  25 + "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
  26 + "deleted" bit(1) NOT NULL DEFAULT '0' COMMENT '是否删除',
  27 + "tenant_id" bigint not null default '0',
17 28 PRIMARY KEY ("id")
18 29 ) COMMENT '会员表';
19 30  
... ... @@ -63,4 +74,19 @@ CREATE TABLE IF NOT EXISTS &quot;member_level&quot;
63 74 "tenant_id" bigint not null default '0',
64 75 "status" int NOT NULL,
65 76 PRIMARY KEY ("id")
66   -) COMMENT '会员等级';
67 77 \ No newline at end of file
  78 +) COMMENT '会员等级';
  79 +
  80 +CREATE TABLE IF NOT EXISTS "member_group"
  81 +(
  82 + "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
  83 + "name" varchar NOT NULL,
  84 + "remark" varchar NOT NULL,
  85 + "status" varchar NOT NULL,
  86 + "creator" varchar DEFAULT '',
  87 + "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
  88 + "updater" varchar DEFAULT '',
  89 + "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
  90 + "deleted" bit NOT NULL DEFAULT FALSE,
  91 + "tenant_id" bigint not null default '0',
  92 + PRIMARY KEY ("id")
  93 +) COMMENT '用户分组';
68 94 \ No newline at end of file
... ...