BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 498edfffb1fc1bf4bcd564efb24439f33c7f8e5d

Authored by puhui999
2 parents 655eefc3 1baa7f4a

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

Inline Side-by-side
Showing 94 changed files with 1656 additions and 878 deletions
sql/mysql/member_level.sql deleted
View file @655eefc
1 --- 增加字典  
2 -insert system_dict_type(name, type) values ('会员经验业务类型', 'member_experience_biz_type');  
3 -insert system_dict_data(dict_type, label, value, sort) values ('member_experience_biz_type', '管理员调整', '0', 0);  
4 -insert system_dict_data(dict_type, label, value, sort) values ('member_experience_biz_type', '邀新奖励', '1', 1);  
5 -insert system_dict_data(dict_type, label, value, sort) values ('member_experience_biz_type', '下单奖励', '2', 2);  
6 -insert system_dict_data(dict_type, label, value, sort) values ('member_experience_biz_type', '退单扣除', '3', 3);  
7 -insert system_dict_data(dict_type, label, value, sort) values ('member_experience_biz_type', '签到奖励', '4', 4);  
8 -insert system_dict_data(dict_type, label, value, sort) values ('member_experience_biz_type', '抽奖奖励', '5', 5);  
sql/mysql/pay_wallet.sql 0 → 100644
  View file @498edff
  1 +-- ----------------------------
  2 +-- 支付-钱包表
  3 +-- ----------------------------
  4 +DROP TABLE IF EXISTS `pay_wallet`;
  5 +CREATE TABLE `pay_wallet`
  6 +(
  7 + `id` bigint NOT NULL AUTO_INCREMENT COMMENT '编号',
  8 + `user_id` bigint NOT NULL COMMENT '用户 id',
  9 + `user_type` tinyint NOT NULL DEFAULT 0 COMMENT '用户类型',
  10 + `balance` int NOT NULL DEFAULT 0 COMMENT '余额, 单位分',
  11 + `total_expense` bigint NOT NULL DEFAULT 0 COMMENT '累计支出, 单位分',
  12 + `total_recharge` bigint NOT NULL DEFAULT 0 COMMENT '累计充值, 单位分',
  13 + `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '创建者',
  14 + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
  15 + `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '更新者',
  16 + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
  17 + `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
  18 + `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
  19 + PRIMARY KEY (`id`) USING BTREE
  20 +) ENGINE=InnoDB COMMENT='支付钱包表';
  21 +
  22 +-- ----------------------------
  23 +-- 支付- 钱包余额明细表
  24 +-- ----------------------------
  25 +DROP TABLE IF EXISTS `pay_wallet_transaction`;
  26 +CREATE TABLE `pay_wallet_transaction`
  27 +(
  28 + `id` bigint NOT NULL AUTO_INCREMENT COMMENT '编号',
  29 + `wallet_id` bigint NOT NULL COMMENT '会员钱包 id',
  30 + `biz_type` tinyint NOT NULL COMMENT '关联类型',
  31 + `biz_id` bigint NOT NULL COMMENT '关联业务编号',
  32 + `no` varchar(64) NOT NULL COMMENT '流水号',
  33 + `description` varchar(255) COMMENT '操作说明',
  34 + `amount` int NOT NULL COMMENT '交易金额, 单位分',
  35 + `balance` int NOT NULL COMMENT '余额, 单位分',
  36 + `transaction_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '交易时间',
  37 + `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '创建者',
  38 + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
  39 + `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '更新者',
  40 + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
  41 + `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
  42 + `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
  43 + PRIMARY KEY (`id`) USING BTREE
  44 +) ENGINE=InnoDB COMMENT='支付钱包余额明细表';
0 \ No newline at end of file 45 \ No newline at end of file
yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AbstractAlipayPayClient.java
  View file @498edff
@@ -27,6 +27,7 @@ import com.alipay.api.request.AlipayTradeRefundRequest; @@ -27,6 +27,7 @@ import com.alipay.api.request.AlipayTradeRefundRequest;
27 import com.alipay.api.response.AlipayTradeFastpayRefundQueryResponse; 27 import com.alipay.api.response.AlipayTradeFastpayRefundQueryResponse;
28 import com.alipay.api.response.AlipayTradeQueryResponse; 28 import com.alipay.api.response.AlipayTradeQueryResponse;
29 import com.alipay.api.response.AlipayTradeRefundResponse; 29 import com.alipay.api.response.AlipayTradeRefundResponse;
  30 +import lombok.Getter;
30 import lombok.SneakyThrows; 31 import lombok.SneakyThrows;
31 import lombok.extern.slf4j.Slf4j; 32 import lombok.extern.slf4j.Slf4j;
32 33
@@ -47,6 +48,7 @@ import static cn.hutool.core.date.DatePattern.NORM_DATETIME_FORMATTER; @@ -47,6 +48,7 @@ import static cn.hutool.core.date.DatePattern.NORM_DATETIME_FORMATTER;
47 @Slf4j 48 @Slf4j
48 public abstract class AbstractAlipayPayClient extends AbstractPayClient<AlipayPayClientConfig> { 49 public abstract class AbstractAlipayPayClient extends AbstractPayClient<AlipayPayClientConfig> {
49 50
  51 + @Getter // 仅用于单测场景
50 protected DefaultAlipayClient client; 52 protected DefaultAlipayClient client;
51 53
52 public AbstractAlipayPayClient(Long channelId, String channelCode, AlipayPayClientConfig config) { 54 public AbstractAlipayPayClient(Long channelId, String channelCode, AlipayPayClientConfig config) {
yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AlipayBarPayClient.java
  View file @498edff
@@ -13,6 +13,8 @@ import com.alipay.api.request.AlipayTradePayRequest; @@ -13,6 +13,8 @@ import com.alipay.api.request.AlipayTradePayRequest;
13 import com.alipay.api.response.AlipayTradePayResponse; 13 import com.alipay.api.response.AlipayTradePayResponse;
14 import lombok.extern.slf4j.Slf4j; 14 import lombok.extern.slf4j.Slf4j;
15 15
  16 +import java.time.LocalDateTime;
  17 +
16 import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants.BAD_REQUEST; 18 import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants.BAD_REQUEST;
17 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception0; 19 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception0;
18 20
@@ -63,8 +65,10 @@ public class AlipayBarPayClient extends AbstractAlipayPayClient { @@ -63,8 +65,10 @@ public class AlipayBarPayClient extends AbstractAlipayPayClient {
63 return buildClosedPayOrderRespDTO(reqDTO, response); 65 return buildClosedPayOrderRespDTO(reqDTO, response);
64 } 66 }
65 if ("10000".equals(response.getCode())) { // 免密支付 67 if ("10000".equals(response.getCode())) { // 免密支付
66 - return PayOrderRespDTO.successOf(response.getTradeNo(), response.getBuyerUserId(), LocalDateTimeUtil.of(response.getGmtPayment()),  
67 - response.getOutTradeNo(), response); 68 + LocalDateTime successTime = LocalDateTimeUtil.of(response.getGmtPayment());
  69 + return PayOrderRespDTO.successOf(response.getTradeNo(), response.getBuyerUserId(), successTime,
  70 + response.getOutTradeNo(), response)
  71 + .setDisplayMode(displayMode).setDisplayContent("");
68 } 72 }
69 // 大额支付，需要用户输入密码，所以返回 waiting。此时，前端一般会进行轮询 73 // 大额支付，需要用户输入密码，所以返回 waiting。此时，前端一般会进行轮询
70 return PayOrderRespDTO.waitingOf(displayMode, "", 74 return PayOrderRespDTO.waitingOf(displayMode, "",
yudao-framework/yudao-spring-boot-starter-biz-pay/src/test/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AbstractAlipayClientTest.java
  View file @498edff
@@ -2,7 +2,6 @@ package cn.iocoder.yudao.framework.pay.core.client.impl.alipay; @@ -2,7 +2,6 @@ package cn.iocoder.yudao.framework.pay.core.client.impl.alipay;
2 2
3 import cn.hutool.core.date.LocalDateTimeUtil; 3 import cn.hutool.core.date.LocalDateTimeUtil;
4 import cn.hutool.core.util.RandomUtil; 4 import cn.hutool.core.util.RandomUtil;
5 -import cn.hutool.core.util.ReflectUtil;  
6 import cn.iocoder.yudao.framework.common.exception.ServiceException; 5 import cn.iocoder.yudao.framework.common.exception.ServiceException;
7 import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants; 6 import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants;
8 import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil; 7 import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
@@ -18,6 +17,7 @@ import com.alipay.api.DefaultSigner; @@ -18,6 +17,7 @@ import com.alipay.api.DefaultSigner;
18 import com.alipay.api.domain.AlipayTradeRefundModel; 17 import com.alipay.api.domain.AlipayTradeRefundModel;
19 import com.alipay.api.request.AlipayTradeRefundRequest; 18 import com.alipay.api.request.AlipayTradeRefundRequest;
20 import com.alipay.api.response.AlipayTradeRefundResponse; 19 import com.alipay.api.response.AlipayTradeRefundResponse;
  20 +import lombok.Setter;
21 import org.junit.jupiter.api.BeforeEach; 21 import org.junit.jupiter.api.BeforeEach;
22 import org.junit.jupiter.api.DisplayName; 22 import org.junit.jupiter.api.DisplayName;
23 import org.junit.jupiter.api.Test; 23 import org.junit.jupiter.api.Test;
@@ -34,25 +34,26 @@ import static org.mockito.ArgumentMatchers.argThat; @@ -34,25 +34,26 @@ import static org.mockito.ArgumentMatchers.argThat;
34 import static org.mockito.Mockito.when; 34 import static org.mockito.Mockito.when;
35 35
36 /** 36 /**
  37 + * 支付宝 Client 的测试基类
  38 + *
37 * @author jason 39 * @author jason
38 */ 40 */
39 public abstract class AbstractAlipayClientTest extends BaseMockitoUnitTest { 41 public abstract class AbstractAlipayClientTest extends BaseMockitoUnitTest {
40 42
41 - private final String privateKey = randomString();  
42 -  
43 - protected AlipayPayClientConfig config = randomPojo(AlipayPayClientConfig.class, t -> {  
44 - t.setServerUrl(randomURL());  
45 - t.setPrivateKey(privateKey);  
46 - t.setMode(MODE_PUBLIC_KEY);  
47 - t.setSignType(AlipayPayClientConfig.SIGN_TYPE_DEFAULT);  
48 - t.setAppCertContent("");  
49 - t.setAlipayPublicCertContent("");  
50 - t.setRootCertContent(""); 43 + protected AlipayPayClientConfig config = randomPojo(AlipayPayClientConfig.class, o -> {
  44 + o.setServerUrl(randomURL());
  45 + o.setPrivateKey(randomString());
  46 + o.setMode(MODE_PUBLIC_KEY);
  47 + o.setSignType(AlipayPayClientConfig.SIGN_TYPE_DEFAULT);
  48 + o.setAppCertContent("");
  49 + o.setAlipayPublicCertContent("");
  50 + o.setRootCertContent("");
51 }); 51 });
52 52
53 @Mock 53 @Mock
54 protected DefaultAlipayClient defaultAlipayClient; 54 protected DefaultAlipayClient defaultAlipayClient;
55 55
  56 + @Setter
56 private AbstractAlipayPayClient client; 57 private AbstractAlipayPayClient client;
57 58
58 /** 59 /**
@@ -61,24 +62,22 @@ public abstract class AbstractAlipayClientTest extends BaseMockitoUnitTest { @@ -61,24 +62,22 @@ public abstract class AbstractAlipayClientTest extends BaseMockitoUnitTest {
61 @BeforeEach 62 @BeforeEach
62 public abstract void setUp(); 63 public abstract void setUp();
63 64
64 - public void setClient(AbstractAlipayPayClient client) {  
65 - this.client = client;  
66 - }  
67 -  
68 @Test 65 @Test
69 @DisplayName("支付宝 Client 初始化") 66 @DisplayName("支付宝 Client 初始化")
70 - public void test_do_init() { 67 + public void testDoInit() {
  68 + // 调用
71 client.doInit(); 69 client.doInit();
72 - DefaultAlipayClient realClient = (DefaultAlipayClient) ReflectUtil.getFieldValue(client, "client"); 70 + // 断言
  71 + DefaultAlipayClient realClient = client.getClient();
73 assertNotSame(defaultAlipayClient, realClient); 72 assertNotSame(defaultAlipayClient, realClient);
74 assertInstanceOf(DefaultSigner.class, realClient.getSigner()); 73 assertInstanceOf(DefaultSigner.class, realClient.getSigner());
75 - assertEquals(privateKey, ((DefaultSigner) realClient.getSigner()).getPrivateKey()); 74 + assertEquals(config.getPrivateKey(), ((DefaultSigner) realClient.getSigner()).getPrivateKey());
76 } 75 }
77 76
78 @Test 77 @Test
79 - @DisplayName("支付宝 Client 统一退款成功")  
80 - public void test_unified_refund_success() throws AlipayApiException {  
81 - // 准备返回对象 78 + @DisplayName("支付宝 Client 统一退款：成功")
  79 + public void testUnifiedRefund_success() throws AlipayApiException {
  80 + // mock 方法
82 String notifyUrl = randomURL(); 81 String notifyUrl = randomURL();
83 Date refundTime = randomDate(); 82 Date refundTime = randomDate();
84 String outRefundNo = randomString(); 83 String outRefundNo = randomString();
@@ -88,7 +87,6 @@ public abstract class AbstractAlipayClientTest extends BaseMockitoUnitTest { @@ -88,7 +87,6 @@ public abstract class AbstractAlipayClientTest extends BaseMockitoUnitTest {
88 o.setSubCode(""); 87 o.setSubCode("");
89 o.setGmtRefundPay(refundTime); 88 o.setGmtRefundPay(refundTime);
90 }); 89 });
91 - // mock  
92 when(defaultAlipayClient.execute(argThat((ArgumentMatcher<AlipayTradeRefundRequest>) request -> { 90 when(defaultAlipayClient.execute(argThat((ArgumentMatcher<AlipayTradeRefundRequest>) request -> {
93 assertInstanceOf(AlipayTradeRefundModel.class, request.getBizModel()); 91 assertInstanceOf(AlipayTradeRefundModel.class, request.getBizModel());
94 AlipayTradeRefundModel bizModel = (AlipayTradeRefundModel) request.getBizModel(); 92 AlipayTradeRefundModel bizModel = (AlipayTradeRefundModel) request.getBizModel();
@@ -104,19 +102,23 @@ public abstract class AbstractAlipayClientTest extends BaseMockitoUnitTest { @@ -104,19 +102,23 @@ public abstract class AbstractAlipayClientTest extends BaseMockitoUnitTest {
104 o.setNotifyUrl(notifyUrl); 102 o.setNotifyUrl(notifyUrl);
105 o.setRefundPrice(refundAmount); 103 o.setRefundPrice(refundAmount);
106 }); 104 });
  105 +
  106 + // 调用
107 PayRefundRespDTO resp = client.unifiedRefund(refundReqDTO); 107 PayRefundRespDTO resp = client.unifiedRefund(refundReqDTO);
108 // 断言 108 // 断言
109 assertEquals(PayRefundStatusRespEnum.SUCCESS.getStatus(), resp.getStatus()); 109 assertEquals(PayRefundStatusRespEnum.SUCCESS.getStatus(), resp.getStatus());
  110 + assertEquals(outRefundNo, resp.getOutRefundNo());
110 assertNull(resp.getChannelRefundNo()); 111 assertNull(resp.getChannelRefundNo());
111 assertEquals(LocalDateTimeUtil.of(refundTime), resp.getSuccessTime()); 112 assertEquals(LocalDateTimeUtil.of(refundTime), resp.getSuccessTime());
112 - assertEquals(outRefundNo, resp.getOutRefundNo());  
113 assertSame(response, resp.getRawData()); 113 assertSame(response, resp.getRawData());
  114 + assertNull(resp.getChannelErrorCode());
  115 + assertNull(resp.getChannelErrorMsg());
114 } 116 }
115 117
116 @Test 118 @Test
117 - @DisplayName("支付宝 Client 统一退款,渠道返回失败") 119 + @DisplayName("支付宝 Client 统一退款：渠道返回失败")
118 public void test_unified_refund_channel_failed() throws AlipayApiException { 120 public void test_unified_refund_channel_failed() throws AlipayApiException {
119 - // 准备返回对象 121 + // mock 方法
120 String notifyUrl = randomURL(); 122 String notifyUrl = randomURL();
121 String subCode = randomString(); 123 String subCode = randomString();
122 String subMsg = randomString(); 124 String subMsg = randomString();
@@ -124,7 +126,6 @@ public abstract class AbstractAlipayClientTest extends BaseMockitoUnitTest { @@ -124,7 +126,6 @@ public abstract class AbstractAlipayClientTest extends BaseMockitoUnitTest {
124 o.setSubCode(subCode); 126 o.setSubCode(subCode);
125 o.setSubMsg(subMsg); 127 o.setSubMsg(subMsg);
126 }); 128 });
127 - // mock  
128 when(defaultAlipayClient.execute(argThat((ArgumentMatcher<AlipayTradeRefundRequest>) request -> { 129 when(defaultAlipayClient.execute(argThat((ArgumentMatcher<AlipayTradeRefundRequest>) request -> {
129 assertInstanceOf(AlipayTradeRefundModel.class, request.getBizModel()); 130 assertInstanceOf(AlipayTradeRefundModel.class, request.getBizModel());
130 return true; 131 return true;
@@ -137,59 +138,64 @@ public abstract class AbstractAlipayClientTest extends BaseMockitoUnitTest { @@ -137,59 +138,64 @@ public abstract class AbstractAlipayClientTest extends BaseMockitoUnitTest {
137 o.setOutTradeNo(outTradeNo); 138 o.setOutTradeNo(outTradeNo);
138 o.setNotifyUrl(notifyUrl); 139 o.setNotifyUrl(notifyUrl);
139 }); 140 });
  141 +
  142 + // 调用
140 PayRefundRespDTO resp = client.unifiedRefund(refundReqDTO); 143 PayRefundRespDTO resp = client.unifiedRefund(refundReqDTO);
141 // 断言 144 // 断言
142 assertEquals(PayRefundStatusRespEnum.FAILURE.getStatus(), resp.getStatus()); 145 assertEquals(PayRefundStatusRespEnum.FAILURE.getStatus(), resp.getStatus());
  146 + assertEquals(outRefundNo, resp.getOutRefundNo());
143 assertNull(resp.getChannelRefundNo()); 147 assertNull(resp.getChannelRefundNo());
144 - assertEquals(subCode, resp.getChannelErrorCode());  
145 - assertEquals(subMsg, resp.getChannelErrorMsg());  
146 assertNull(resp.getSuccessTime()); 148 assertNull(resp.getSuccessTime());
147 - assertEquals(outRefundNo, resp.getOutRefundNo());  
148 assertSame(response, resp.getRawData()); 149 assertSame(response, resp.getRawData());
  150 + assertEquals(subCode, resp.getChannelErrorCode());
  151 + assertEquals(subMsg, resp.getChannelErrorMsg());
149 } 152 }
150 153
151 @Test 154 @Test
152 - @DisplayName("支付宝 Client 统一退款,参数校验不通过")  
153 - public void test_unified_refund_param_validate() { 155 + @DisplayName("支付宝 Client 统一退款：参数校验不通过")
  156 + public void testUnifiedRefund_paramInvalidate() {
154 // 准备请求参数 157 // 准备请求参数
155 String notifyUrl = randomURL(); 158 String notifyUrl = randomURL();
156 PayRefundUnifiedReqDTO refundReqDTO = randomPojo(PayRefundUnifiedReqDTO.class, o -> { 159 PayRefundUnifiedReqDTO refundReqDTO = randomPojo(PayRefundUnifiedReqDTO.class, o -> {
157 o.setOutTradeNo(""); 160 o.setOutTradeNo("");
158 o.setNotifyUrl(notifyUrl); 161 o.setNotifyUrl(notifyUrl);
159 }); 162 });
160 - // 断言 163 +
  164 + // 调用，并断言
161 assertThrows(ConstraintViolationException.class, () -> client.unifiedRefund(refundReqDTO)); 165 assertThrows(ConstraintViolationException.class, () -> client.unifiedRefund(refundReqDTO));
162 } 166 }
163 167
164 @Test 168 @Test
165 - @DisplayName("支付宝 Client 统一退款,抛出业务异常")  
166 - public void test_unified_refund_throw_service_exception() throws AlipayApiException { 169 + @DisplayName("支付宝 Client 统一退款：抛出业务异常")
  170 + public void testUnifiedRefund_throwServiceException() throws AlipayApiException {
167 // mock 171 // mock
168 when(defaultAlipayClient.execute(argThat((ArgumentMatcher<AlipayTradeRefundRequest>) request -> true))) 172 when(defaultAlipayClient.execute(argThat((ArgumentMatcher<AlipayTradeRefundRequest>) request -> true)))
169 .thenThrow(ServiceExceptionUtil.exception(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR)); 173 .thenThrow(ServiceExceptionUtil.exception(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR));
170 // 准备请求参数 174 // 准备请求参数
171 String notifyUrl = randomURL(); 175 String notifyUrl = randomURL();
172 PayRefundUnifiedReqDTO refundReqDTO = randomPojo(PayRefundUnifiedReqDTO.class, o -> o.setNotifyUrl(notifyUrl)); 176 PayRefundUnifiedReqDTO refundReqDTO = randomPojo(PayRefundUnifiedReqDTO.class, o -> o.setNotifyUrl(notifyUrl));
173 - // 断言 177 +
  178 + // 调用，并断言
174 assertThrows(ServiceException.class, () -> client.unifiedRefund(refundReqDTO)); 179 assertThrows(ServiceException.class, () -> client.unifiedRefund(refundReqDTO));
175 } 180 }
176 181
177 @Test 182 @Test
178 - @DisplayName("支付宝 Client 统一退款,抛出系统异常")  
179 - public void test_unified_refund_throw_pay_exception() throws AlipayApiException { 183 + @DisplayName("支付宝 Client 统一退款：抛出系统异常")
  184 + public void testUnifiedRefund_throwPayException() throws AlipayApiException {
180 // mock 185 // mock
181 when(defaultAlipayClient.execute(argThat((ArgumentMatcher<AlipayTradeRefundRequest>) request -> true))) 186 when(defaultAlipayClient.execute(argThat((ArgumentMatcher<AlipayTradeRefundRequest>) request -> true)))
182 .thenThrow(new RuntimeException("系统异常")); 187 .thenThrow(new RuntimeException("系统异常"));
183 // 准备请求参数 188 // 准备请求参数
184 String notifyUrl = randomURL(); 189 String notifyUrl = randomURL();
185 PayRefundUnifiedReqDTO refundReqDTO = randomPojo(PayRefundUnifiedReqDTO.class, o -> o.setNotifyUrl(notifyUrl)); 190 PayRefundUnifiedReqDTO refundReqDTO = randomPojo(PayRefundUnifiedReqDTO.class, o -> o.setNotifyUrl(notifyUrl));
186 - // 断言 191 +
  192 + // 调用，并断言
187 assertThrows(PayException.class, () -> client.unifiedRefund(refundReqDTO)); 193 assertThrows(PayException.class, () -> client.unifiedRefund(refundReqDTO));
188 } 194 }
189 195
190 @Test 196 @Test
191 - @DisplayName("支付宝 Client 统一下单, 参数校验不通过")  
192 - public void test_unified_order_param_validate() { 197 + @DisplayName("支付宝 Client 统一下单：参数校验不通过")
  198 + public void testUnifiedOrder_paramInvalidate() {
193 // 准备请求参数 199 // 准备请求参数
194 String outTradeNo = randomString(); 200 String outTradeNo = randomString();
195 String notifyUrl = randomURL(); 201 String notifyUrl = randomURL();
@@ -197,7 +203,8 @@ public abstract class AbstractAlipayClientTest extends BaseMockitoUnitTest { @@ -197,7 +203,8 @@ public abstract class AbstractAlipayClientTest extends BaseMockitoUnitTest {
197 o.setOutTradeNo(outTradeNo); 203 o.setOutTradeNo(outTradeNo);
198 o.setNotifyUrl(notifyUrl); 204 o.setNotifyUrl(notifyUrl);
199 }); 205 });
200 - // 断言 206 +
  207 + // 调用，并断言
201 assertThrows(ConstraintViolationException.class, () -> client.unifiedOrder(reqDTO)); 208 assertThrows(ConstraintViolationException.class, () -> client.unifiedOrder(reqDTO));
202 } 209 }
203 210
@@ -210,4 +217,5 @@ public abstract class AbstractAlipayClientTest extends BaseMockitoUnitTest { @@ -210,4 +217,5 @@ public abstract class AbstractAlipayClientTest extends BaseMockitoUnitTest {
210 o.setBody(RandomUtil.randomString(32)); 217 o.setBody(RandomUtil.randomString(32));
211 }); 218 });
212 } 219 }
  220 +
213 } 221 }
yudao-framework/yudao-spring-boot-starter-biz-pay/src/test/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AlipayBarPayClientTest.java 0 → 100644
  View file @498edff
  1 +package cn.iocoder.yudao.framework.pay.core.client.impl.alipay;
  2 +
  3 +import cn.hutool.core.date.LocalDateTimeUtil;
  4 +import cn.iocoder.yudao.framework.common.exception.ServiceException;
  5 +import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderRespDTO;
  6 +import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderUnifiedReqDTO;
  7 +import cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderDisplayModeEnum;
  8 +import cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderStatusRespEnum;
  9 +import com.alipay.api.AlipayApiException;
  10 +import com.alipay.api.domain.AlipayTradePayModel;
  11 +import com.alipay.api.request.AlipayTradePayRequest;
  12 +import com.alipay.api.response.AlipayTradePayResponse;
  13 +import org.junit.jupiter.api.BeforeEach;
  14 +import org.junit.jupiter.api.DisplayName;
  15 +import org.junit.jupiter.api.Test;
  16 +import org.mockito.ArgumentMatcher;
  17 +import org.mockito.InjectMocks;
  18 +
  19 +import java.util.Date;
  20 +import java.util.HashMap;
  21 +import java.util.Map;
  22 +
  23 +import static cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderStatusRespEnum.CLOSED;
  24 +import static cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderStatusRespEnum.WAITING;
  25 +import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
  26 +import static org.junit.jupiter.api.Assertions.*;
  27 +import static org.mockito.ArgumentMatchers.argThat;
  28 +import static org.mockito.Mockito.when;
  29 +
  30 +/**
  31 + * {@link AlipayBarPayClient} 单元测试
  32 + *
  33 + * @author jason
  34 + */
  35 +public class AlipayBarPayClientTest extends AbstractAlipayClientTest {
  36 +
  37 + @InjectMocks
  38 + private AlipayBarPayClient client = new AlipayBarPayClient(randomLongId(), config);
  39 +
  40 + @Override
  41 + @BeforeEach
  42 + public void setUp() {
  43 + setClient(client);
  44 + }
  45 +
  46 + @Test
  47 + @DisplayName("支付宝条码支付：非免密码支付下单成功")
  48 + public void testUnifiedOrder_success() throws AlipayApiException {
  49 + // mock 方法
  50 + String outTradeNo = randomString();
  51 + String notifyUrl = randomURL();
  52 + Integer price = randomInteger();
  53 + String authCode = randomString();
  54 + AlipayTradePayResponse response = randomPojo(AlipayTradePayResponse.class, o -> o.setSubCode(""));
  55 + when(defaultAlipayClient.execute(argThat((ArgumentMatcher<AlipayTradePayRequest>) request -> {
  56 + assertInstanceOf(AlipayTradePayModel.class, request.getBizModel());
  57 + assertEquals(notifyUrl, request.getNotifyUrl());
  58 + AlipayTradePayModel model = (AlipayTradePayModel) request.getBizModel();
  59 + assertEquals(outTradeNo, model.getOutTradeNo());
  60 + assertEquals(String.valueOf(price / 100.0), model.getTotalAmount());
  61 + assertEquals(authCode, model.getAuthCode());
  62 + return true;
  63 + }))).thenReturn(response);
  64 + // 准备请求参数
  65 + PayOrderUnifiedReqDTO reqDTO = buildOrderUnifiedReqDTO(notifyUrl, outTradeNo, price);
  66 + Map<String, String> extraParam = new HashMap<>();
  67 + extraParam.put("auth_code", authCode);
  68 + reqDTO.setChannelExtras(extraParam);
  69 +
  70 + // 调用方法
  71 + PayOrderRespDTO resp = client.unifiedOrder(reqDTO);
  72 + // 断言
  73 + assertEquals(WAITING.getStatus(), resp.getStatus());
  74 + assertEquals(outTradeNo, resp.getOutTradeNo());
  75 + assertNull(resp.getChannelOrderNo());
  76 + assertNull(resp.getChannelUserId());
  77 + assertNull(resp.getSuccessTime());
  78 + assertEquals(PayOrderDisplayModeEnum.BAR_CODE.getMode(), resp.getDisplayMode());
  79 + assertEquals("", resp.getDisplayContent());
  80 + assertSame(response, resp.getRawData());
  81 + assertNull(resp.getChannelErrorCode());
  82 + assertNull(resp.getChannelErrorMsg());
  83 + }
  84 +
  85 + @Test
  86 + @DisplayName("支付宝条码支付：免密码支付下单成功")
  87 + public void testUnifiedOrder_code10000Success() throws AlipayApiException {
  88 + // mock 方法
  89 + String outTradeNo = randomString();
  90 + String channelNo = randomString();
  91 + String channelUserId = randomString();
  92 + Date payTime = randomDate();
  93 + AlipayTradePayResponse response = randomPojo(AlipayTradePayResponse.class, o -> {
  94 + o.setSubCode("");
  95 + o.setCode("10000");
  96 + o.setOutTradeNo(outTradeNo);
  97 + o.setTradeNo(channelNo);
  98 + o.setBuyerUserId(channelUserId);
  99 + o.setGmtPayment(payTime);
  100 + });
  101 + when(defaultAlipayClient.execute(argThat((ArgumentMatcher<AlipayTradePayRequest>) request -> true)))
  102 + .thenReturn(response);
  103 + // 准备请求参数
  104 + String authCode = randomString();
  105 + PayOrderUnifiedReqDTO reqDTO = buildOrderUnifiedReqDTO(randomURL(), outTradeNo, randomInteger());
  106 + Map<String, String> extraParam = new HashMap<>();
  107 + extraParam.put("auth_code", authCode);
  108 + reqDTO.setChannelExtras(extraParam);
  109 +
  110 + // 下单请求
  111 + PayOrderRespDTO resp = client.unifiedOrder(reqDTO);
  112 + // 断言
  113 + assertEquals(PayOrderStatusRespEnum.SUCCESS.getStatus(), resp.getStatus());
  114 + assertEquals(outTradeNo, resp.getOutTradeNo());
  115 + assertEquals(channelNo, resp.getChannelOrderNo());
  116 + assertEquals(channelUserId, resp.getChannelUserId());
  117 + assertEquals(LocalDateTimeUtil.of(payTime), resp.getSuccessTime());
  118 + assertEquals(PayOrderDisplayModeEnum.BAR_CODE.getMode(), resp.getDisplayMode());
  119 + assertEquals("", resp.getDisplayContent());
  120 + assertSame(response, resp.getRawData());
  121 + assertNull(resp.getChannelErrorCode());
  122 + assertNull(resp.getChannelErrorMsg());
  123 + }
  124 +
  125 + @Test
  126 + @DisplayName("支付宝条码支付：没有传条码")
  127 + public void testUnifiedOrder_emptyAuthCode() {
  128 + // 准备参数
  129 + PayOrderUnifiedReqDTO reqDTO = buildOrderUnifiedReqDTO(randomURL(), randomString(), randomInteger());
  130 +
  131 + // 调用，并断言
  132 + assertThrows(ServiceException.class, () -> client.unifiedOrder(reqDTO));
  133 + }
  134 +
  135 + @Test
  136 + @DisplayName("支付宝条码支付：渠道返回失败")
  137 + public void test_unified_order_channel_failed() throws AlipayApiException {
  138 + // mock 方法
  139 + String subCode = randomString();
  140 + String subMsg = randomString();
  141 + AlipayTradePayResponse response = randomPojo(AlipayTradePayResponse.class, o -> {
  142 + o.setSubCode(subCode);
  143 + o.setSubMsg(subMsg);
  144 + });
  145 + when(defaultAlipayClient.execute(argThat((ArgumentMatcher<AlipayTradePayRequest>) request -> true)))
  146 + .thenReturn(response);
  147 + // 准备请求参数
  148 + String authCode = randomString();
  149 + String outTradeNo = randomString();
  150 + PayOrderUnifiedReqDTO reqDTO = buildOrderUnifiedReqDTO(randomURL(), outTradeNo, randomInteger());
  151 + Map<String, String> extraParam = new HashMap<>();
  152 + extraParam.put("auth_code", authCode);
  153 + reqDTO.setChannelExtras(extraParam);
  154 +
  155 + // 调用方法
  156 + PayOrderRespDTO resp = client.unifiedOrder(reqDTO);
  157 + // 断言
  158 + assertEquals(CLOSED.getStatus(), resp.getStatus());
  159 + assertEquals(outTradeNo, resp.getOutTradeNo());
  160 + assertNull(resp.getChannelOrderNo());
  161 + assertNull(resp.getChannelUserId());
  162 + assertNull(resp.getSuccessTime());
  163 + assertNull(resp.getDisplayMode());
  164 + assertNull(resp.getDisplayContent());
  165 + assertSame(response, resp.getRawData());
  166 + assertEquals(subCode, resp.getChannelErrorCode());
  167 + assertEquals(subMsg, resp.getChannelErrorMsg());
  168 + }
  169 +
  170 +}
yudao-framework/yudao-spring-boot-starter-biz-pay/src/test/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AlipayPcPayClientTest.java
  View file @498edff
@@ -16,13 +16,15 @@ import org.mockito.InjectMocks; @@ -16,13 +16,15 @@ import org.mockito.InjectMocks;
16 import static cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderStatusRespEnum.CLOSED; 16 import static cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderStatusRespEnum.CLOSED;
17 import static cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderStatusRespEnum.WAITING; 17 import static cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderStatusRespEnum.WAITING;
18 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*; 18 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
19 -import static org.junit.jupiter.api.Assertions.assertEquals;  
20 -import static org.junit.jupiter.api.Assertions.assertSame; 19 +import static org.junit.jupiter.api.Assertions.*;
  20 +import static org.junit.jupiter.api.Assertions.assertNull;
21 import static org.mockito.ArgumentMatchers.argThat; 21 import static org.mockito.ArgumentMatchers.argThat;
22 import static org.mockito.ArgumentMatchers.eq; 22 import static org.mockito.ArgumentMatchers.eq;
23 import static org.mockito.Mockito.when; 23 import static org.mockito.Mockito.when;
24 24
25 /** 25 /**
  26 + * {@link AlipayPcPayClient} 单元测试
  27 + *
26 * @author jason 28 * @author jason
27 */ 29 */
28 public class AlipayPcPayClientTest extends AbstractAlipayClientTest { 30 public class AlipayPcPayClientTest extends AbstractAlipayClientTest {
@@ -37,78 +39,93 @@ public class AlipayPcPayClientTest extends AbstractAlipayClientTest { @@ -37,78 +39,93 @@ public class AlipayPcPayClientTest extends AbstractAlipayClientTest {
37 } 39 }
38 40
39 @Test 41 @Test
40 - @DisplayName("支付宝 PC 网站支付 URL Display Mode 下单成功")  
41 - public void test_unified_order_url_display_mode_success() throws AlipayApiException {  
42 - // 准备返回对象 42 + @DisplayName("支付宝 PC 网站支付：URL Display Mode 下单成功")
  43 + public void testUnifiedOrder_urlSuccess() throws AlipayApiException {
  44 + // mock 方法
43 String notifyUrl = randomURL(); 45 String notifyUrl = randomURL();
44 - Integer price = randomInteger();  
45 - AlipayTradePagePayResponse response = randomPojo(AlipayTradePagePayResponse.class, o -> {  
46 - o.setSubCode("");  
47 - });  
48 - // mock 46 + AlipayTradePagePayResponse response = randomPojo(AlipayTradePagePayResponse.class, o -> o.setSubCode(""));
49 when(defaultAlipayClient.pageExecute(argThat((ArgumentMatcher<AlipayTradePagePayRequest>) request -> true), 47 when(defaultAlipayClient.pageExecute(argThat((ArgumentMatcher<AlipayTradePagePayRequest>) request -> true),
50 eq(Method.GET.name()))).thenReturn(response); 48 eq(Method.GET.name()))).thenReturn(response);
51 // 准备请求参数 49 // 准备请求参数
52 String outTradeNo = randomString(); 50 String outTradeNo = randomString();
  51 + Integer price = randomInteger();
53 PayOrderUnifiedReqDTO reqDTO = buildOrderUnifiedReqDTO(notifyUrl, outTradeNo, price); 52 PayOrderUnifiedReqDTO reqDTO = buildOrderUnifiedReqDTO(notifyUrl, outTradeNo, price);
54 - // 设置 displayMode 为 null.  
55 reqDTO.setDisplayMode(null); 53 reqDTO.setDisplayMode(null);
56 54
  55 + // 调用
57 PayOrderRespDTO resp = client.unifiedOrder(reqDTO); 56 PayOrderRespDTO resp = client.unifiedOrder(reqDTO);
58 // 断言 57 // 断言
59 assertEquals(WAITING.getStatus(), resp.getStatus()); 58 assertEquals(WAITING.getStatus(), resp.getStatus());
60 - assertEquals(PayOrderDisplayModeEnum.URL.getMode(), resp.getDisplayMode());  
61 assertEquals(outTradeNo, resp.getOutTradeNo()); 59 assertEquals(outTradeNo, resp.getOutTradeNo());
  60 + assertNull(resp.getChannelOrderNo());
  61 + assertNull(resp.getChannelUserId());
  62 + assertNull(resp.getSuccessTime());
  63 + assertEquals(PayOrderDisplayModeEnum.URL.getMode(), resp.getDisplayMode());
  64 + assertEquals(response.getBody(), resp.getDisplayContent());
62 assertSame(response, resp.getRawData()); 65 assertSame(response, resp.getRawData());
  66 + assertNull(resp.getChannelErrorCode());
  67 + assertNull(resp.getChannelErrorMsg());
63 } 68 }
64 69
65 @Test 70 @Test
66 - @DisplayName("支付宝 PC 网站支付 FORM Display Mode 下单成功")  
67 - public void test_unified_order_form_display_mode_success() throws AlipayApiException {  
68 - // 准备返回对象  
69 - String notifyUrl = randomURL();  
70 - Integer price = randomInteger();  
71 - AlipayTradePagePayResponse response = randomPojo(AlipayTradePagePayResponse.class, o -> {  
72 - o.setSubCode("");  
73 - }); 71 + @DisplayName("支付宝 PC 网站支付：Form Display Mode 下单成功")
  72 + public void testUnifiedOrder_formSuccess() throws AlipayApiException {
74 // mock 73 // mock
  74 + String notifyUrl = randomURL();
  75 + AlipayTradePagePayResponse response = randomPojo(AlipayTradePagePayResponse.class, o -> o.setSubCode(""));
75 when(defaultAlipayClient.pageExecute(argThat((ArgumentMatcher<AlipayTradePagePayRequest>) request -> true), 76 when(defaultAlipayClient.pageExecute(argThat((ArgumentMatcher<AlipayTradePagePayRequest>) request -> true),
76 eq(Method.POST.name()))).thenReturn(response); 77 eq(Method.POST.name()))).thenReturn(response);
77 // 准备请求参数 78 // 准备请求参数
78 String outTradeNo = randomString(); 79 String outTradeNo = randomString();
  80 + Integer price = randomInteger();
79 PayOrderUnifiedReqDTO reqDTO = buildOrderUnifiedReqDTO(notifyUrl, outTradeNo, price); 81 PayOrderUnifiedReqDTO reqDTO = buildOrderUnifiedReqDTO(notifyUrl, outTradeNo, price);
80 reqDTO.setDisplayMode(PayOrderDisplayModeEnum.FORM.getMode()); 82 reqDTO.setDisplayMode(PayOrderDisplayModeEnum.FORM.getMode());
81 83
  84 + // 调用
82 PayOrderRespDTO resp = client.unifiedOrder(reqDTO); 85 PayOrderRespDTO resp = client.unifiedOrder(reqDTO);
83 // 断言 86 // 断言
84 assertEquals(WAITING.getStatus(), resp.getStatus()); 87 assertEquals(WAITING.getStatus(), resp.getStatus());
85 - assertEquals(PayOrderDisplayModeEnum.FORM.getMode(), resp.getDisplayMode());  
86 assertEquals(outTradeNo, resp.getOutTradeNo()); 88 assertEquals(outTradeNo, resp.getOutTradeNo());
  89 + assertNull(resp.getChannelOrderNo());
  90 + assertNull(resp.getChannelUserId());
  91 + assertNull(resp.getSuccessTime());
  92 + assertEquals(PayOrderDisplayModeEnum.FORM.getMode(), resp.getDisplayMode());
  93 + assertEquals(response.getBody(), resp.getDisplayContent());
87 assertSame(response, resp.getRawData()); 94 assertSame(response, resp.getRawData());
  95 + assertNull(resp.getChannelErrorCode());
  96 + assertNull(resp.getChannelErrorMsg());
88 } 97 }
89 98
90 @Test 99 @Test
91 - @DisplayName("支付宝 PC 网站支付,渠道返回失败")  
92 - public void test_unified_order_channel_failed() throws AlipayApiException {  
93 - // 准备响应对象 100 + @DisplayName("支付宝 PC 网站支付：渠道返回失败")
  101 + public void testUnifiedOrder_channelFailed() throws AlipayApiException {
  102 + // mock
94 String subCode = randomString(); 103 String subCode = randomString();
95 String subMsg = randomString(); 104 String subMsg = randomString();
96 AlipayTradePagePayResponse response = randomPojo(AlipayTradePagePayResponse.class, o -> { 105 AlipayTradePagePayResponse response = randomPojo(AlipayTradePagePayResponse.class, o -> {
97 o.setSubCode(subCode); 106 o.setSubCode(subCode);
98 o.setSubMsg(subMsg); 107 o.setSubMsg(subMsg);
99 }); 108 });
100 - // mock  
101 when(defaultAlipayClient.pageExecute(argThat((ArgumentMatcher<AlipayTradePagePayRequest>) request -> true), 109 when(defaultAlipayClient.pageExecute(argThat((ArgumentMatcher<AlipayTradePagePayRequest>) request -> true),
102 eq(Method.GET.name()))).thenReturn(response); 110 eq(Method.GET.name()))).thenReturn(response);
103 // 准备请求参数 111 // 准备请求参数
104 - PayOrderUnifiedReqDTO reqDTO = buildOrderUnifiedReqDTO(randomURL(), randomString(), randomInteger()); 112 + String outTradeNo = randomString();
  113 + PayOrderUnifiedReqDTO reqDTO = buildOrderUnifiedReqDTO(randomURL(), outTradeNo, randomInteger());
105 reqDTO.setDisplayMode(PayOrderDisplayModeEnum.URL.getMode()); 114 reqDTO.setDisplayMode(PayOrderDisplayModeEnum.URL.getMode());
106 115
  116 + // 调用
107 PayOrderRespDTO resp = client.unifiedOrder(reqDTO); 117 PayOrderRespDTO resp = client.unifiedOrder(reqDTO);
108 // 断言 118 // 断言
109 assertEquals(CLOSED.getStatus(), resp.getStatus()); 119 assertEquals(CLOSED.getStatus(), resp.getStatus());
  120 + assertEquals(outTradeNo, resp.getOutTradeNo());
  121 + assertNull(resp.getChannelOrderNo());
  122 + assertNull(resp.getChannelUserId());
  123 + assertNull(resp.getSuccessTime());
  124 + assertNull(resp.getDisplayMode());
  125 + assertNull(resp.getDisplayContent());
  126 + assertSame(response, resp.getRawData());
110 assertEquals(subCode, resp.getChannelErrorCode()); 127 assertEquals(subCode, resp.getChannelErrorCode());
111 assertEquals(subMsg, resp.getChannelErrorMsg()); 128 assertEquals(subMsg, resp.getChannelErrorMsg());
112 - assertSame(response, resp.getRawData());  
113 } 129 }
  130 +
114 } 131 }
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/comment/ProductCommentController.java
  View file @498edff
@@ -51,7 +51,7 @@ public class ProductCommentController { @@ -51,7 +51,7 @@ public class ProductCommentController {
51 return success(true); 51 return success(true);
52 } 52 }
53 53
54 - @PutMapping("/create") 54 + @PostMapping("/create")
55 @Operation(summary = "添加自评") 55 @Operation(summary = "添加自评")
56 @PreAuthorize("@ss.hasPermission('product:comment:update')") 56 @PreAuthorize("@ss.hasPermission('product:comment:update')")
57 public CommonResult<Boolean> createComment(@Valid @RequestBody ProductCommentCreateReqVO createReqVO) { 57 public CommonResult<Boolean> createComment(@Valid @RequestBody ProductCommentCreateReqVO createReqVO) {
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/comment/vo/ProductCommentBaseVO.java
  View file @498edff
@@ -11,11 +11,9 @@ import java.util.List; @@ -11,11 +11,9 @@ import java.util.List;
11 public class ProductCommentBaseVO { 11 public class ProductCommentBaseVO {
12 12
13 @Schema(description = "评价人", requiredMode = Schema.RequiredMode.REQUIRED, example = "16868") 13 @Schema(description = "评价人", requiredMode = Schema.RequiredMode.REQUIRED, example = "16868")
14 - @NotNull(message = "评价人不能为空")  
15 private Long userId; 14 private Long userId;
16 15
17 @Schema(description = "评价订单项", requiredMode = Schema.RequiredMode.REQUIRED, example = "19292") 16 @Schema(description = "评价订单项", requiredMode = Schema.RequiredMode.REQUIRED, example = "19292")
18 - @NotNull(message = "评价订单项不能为空")  
19 private Long orderItemId; 17 private Long orderItemId;
20 18
21 @Schema(description = "评价人名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "小姑凉") 19 @Schema(description = "评价人名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "小姑凉")
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/comment/vo/ProductCommentRespVO.java
  View file @498edff
1 package cn.iocoder.yudao.module.product.controller.admin.comment.vo; 1 package cn.iocoder.yudao.module.product.controller.admin.comment.vo;
2 2
  3 +import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuBaseVO;
3 import io.swagger.v3.oas.annotations.media.Schema; 4 import io.swagger.v3.oas.annotations.media.Schema;
4 import lombok.Data; 5 import lombok.Data;
5 import lombok.EqualsAndHashCode; 6 import lombok.EqualsAndHashCode;
@@ -7,6 +8,7 @@ import lombok.ToString; @@ -7,6 +8,7 @@ import lombok.ToString;
7 8
8 import javax.validation.constraints.NotNull; 9 import javax.validation.constraints.NotNull;
9 import java.time.LocalDateTime; 10 import java.time.LocalDateTime;
  11 +import java.util.List;
10 12
11 @Schema(description = "管理后台 - 商品评价 Response VO") 13 @Schema(description = "管理后台 - 商品评价 Response VO")
12 @Data 14 @Data
@@ -23,10 +25,10 @@ public class ProductCommentRespVO extends ProductCommentBaseVO { @@ -23,10 +25,10 @@ public class ProductCommentRespVO extends ProductCommentBaseVO {
23 @Schema(description = "交易订单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "24428") 25 @Schema(description = "交易订单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "24428")
24 private Long orderId; 26 private Long orderId;
25 27
26 - @Schema(description = "是否可见：[true:显示 false:隐藏]", requiredMode = Schema.RequiredMode.REQUIRED) 28 + @Schema(description = "是否可见", requiredMode = Schema.RequiredMode.REQUIRED)
27 private Boolean visible; 29 private Boolean visible;
28 30
29 - @Schema(description = "商家是否回复：[1:回复 0:未回复]", requiredMode = Schema.RequiredMode.REQUIRED) 31 + @Schema(description = "商家是否回复", requiredMode = Schema.RequiredMode.REQUIRED)
30 private Boolean replyStatus; 32 private Boolean replyStatus;
31 33
32 @Schema(description = "回复管理员编号", example = "9527") 34 @Schema(description = "回复管理员编号", example = "9527")
@@ -52,4 +54,10 @@ public class ProductCommentRespVO extends ProductCommentBaseVO { @@ -52,4 +54,10 @@ public class ProductCommentRespVO extends ProductCommentBaseVO {
52 @NotNull(message = "商品 SPU 名称不能为空") 54 @NotNull(message = "商品 SPU 名称不能为空")
53 private String spuName; 55 private String spuName;
54 56
  57 + @Schema(description = "商品 SKU 图片地址", example = "https://www.iocoder.cn/yudao.jpg")
  58 + private String skuPicUrl;
  59 +
  60 + @Schema(description = "商品 SKU 规格值数组")
  61 + private List<ProductSkuBaseVO.Property> skuProperties;
  62 +
55 } 63 }
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/ProductSkuController.java
  View file @498edff
1 package cn.iocoder.yudao.module.product.controller.admin.sku; 1 package cn.iocoder.yudao.module.product.controller.admin.sku;
2 2
3 -import cn.hutool.core.collection.CollUtil;  
4 -import cn.iocoder.yudao.framework.common.pojo.CommonResult;  
5 -import cn.iocoder.yudao.framework.common.util.collection.MapUtils;  
6 -import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuOptionRespVO;  
7 -import cn.iocoder.yudao.module.product.convert.sku.ProductSkuConvert;  
8 -import cn.iocoder.yudao.module.product.dal.dataobject.sku.ProductSkuDO;  
9 -import cn.iocoder.yudao.module.product.dal.dataobject.spu.ProductSpuDO;  
10 -import cn.iocoder.yudao.module.product.service.sku.ProductSkuService;  
11 -import cn.iocoder.yudao.module.product.service.spu.ProductSpuService;  
12 -import io.swagger.v3.oas.annotations.Operation;  
13 import io.swagger.v3.oas.annotations.tags.Tag; 3 import io.swagger.v3.oas.annotations.tags.Tag;
14 import org.springframework.validation.annotation.Validated; 4 import org.springframework.validation.annotation.Validated;
15 -import org.springframework.web.bind.annotation.GetMapping;  
16 import org.springframework.web.bind.annotation.RequestMapping; 5 import org.springframework.web.bind.annotation.RequestMapping;
17 import org.springframework.web.bind.annotation.RestController; 6 import org.springframework.web.bind.annotation.RestController;
18 7
19 -import javax.annotation.Resource;  
20 -import java.util.Collections;  
21 -import java.util.List;  
22 -import java.util.Map;  
23 -  
24 -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;  
25 -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;  
26 -  
27 -@Tag(name = "管理后台 - 商品 sku") 8 +@Tag(name = "管理后台 - 商品 SKU")
28 @RestController 9 @RestController
29 @RequestMapping("/product/sku") 10 @RequestMapping("/product/sku")
30 @Validated 11 @Validated
31 public class ProductSkuController { 12 public class ProductSkuController {
32 13
33 - @Resource  
34 - private ProductSkuService productSkuService;  
35 - @Resource  
36 - private ProductSpuService productSpuService;  
37 -  
38 - @GetMapping("/get-option-list")  
39 - @Operation(summary = "获得商品 SKU 选项的列表")  
40 -// @PreAuthorize("@ss.hasPermission('product:sku:query')")  
41 - public CommonResult<List<ProductSkuOptionRespVO>> getSkuOptionList() {  
42 - // 获得 SKU 列表  
43 - List<ProductSkuDO> skus = productSkuService.getSkuList();  
44 - if (CollUtil.isEmpty(skus)) {  
45 - return success(Collections.emptyList());  
46 - }  
47 -  
48 - // 获得对应的 SPU 映射  
49 - Map<Long, ProductSpuDO> spuMap = productSpuService.getSpuMap(convertSet(skus, ProductSkuDO::getSpuId));  
50 - // 转换为返回结果  
51 - List<ProductSkuOptionRespVO> skuVOs = ProductSkuConvert.INSTANCE.convertList05(skus);  
52 - skuVOs.forEach(sku -> MapUtils.findAndThen(spuMap, sku.getSpuId(),  
53 - spu -> sku.setSpuId(spu.getId()).setSpuName(spu.getName())));  
54 - return success(skuVOs);  
55 - }  
56 -  
57 } 14 }
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuOptionRespVO.java deleted
View file @655eefc
1 -package cn.iocoder.yudao.module.product.controller.admin.sku.vo;  
2 -  
3 -import io.swagger.v3.oas.annotations.media.Schema;  
4 -import lombok.Data;  
5 -  
6 -@Schema(description = "管理后台 - 商品 SKU 选项 Response VO") // 用于前端 SELECT 选项  
7 -@Data  
8 -public class ProductSkuOptionRespVO {  
9 -  
10 - @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")  
11 - private Long id;  
12 -  
13 - @Schema(description = "商品 SKU 名字", example = "红色")  
14 - private String name;  
15 -  
16 - @Schema(description = "销售价格", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")  
17 - private String price;  
18 -  
19 - @Schema(description = "库存", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")  
20 - private Integer stock;  
21 -  
22 - // ========== 商品 SPU 信息 ==========  
23 -  
24 - @Schema(description = "商品 SPU 编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")  
25 - private Long spuId;  
26 -  
27 - @Schema(description = "商品 SPU 名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "iPhone 11")  
28 - private String spuName;  
29 -  
30 -}  
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/comment/ProductCommentConvert.java
  View file @498edff
@@ -3,7 +3,6 @@ package cn.iocoder.yudao.module.product.convert.comment; @@ -3,7 +3,6 @@ package cn.iocoder.yudao.module.product.convert.comment;
3 import cn.hutool.core.util.ObjectUtil; 3 import cn.hutool.core.util.ObjectUtil;
4 import cn.iocoder.yudao.framework.common.pojo.PageResult; 4 import cn.iocoder.yudao.framework.common.pojo.PageResult;
5 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; 5 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
6 -import cn.iocoder.yudao.framework.common.util.collection.MapUtils;  
7 import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO; 6 import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
8 import cn.iocoder.yudao.module.product.api.comment.dto.ProductCommentCreateReqDTO; 7 import cn.iocoder.yudao.module.product.api.comment.dto.ProductCommentCreateReqDTO;
9 import cn.iocoder.yudao.module.product.controller.admin.comment.vo.ProductCommentCreateReqVO; 8 import cn.iocoder.yudao.module.product.controller.admin.comment.vo.ProductCommentCreateReqVO;
@@ -24,6 +23,8 @@ import java.math.RoundingMode; @@ -24,6 +23,8 @@ import java.math.RoundingMode;
24 import java.util.List; 23 import java.util.List;
25 import java.util.Map; 24 import java.util.Map;
26 25
  26 +import static cn.iocoder.yudao.framework.common.util.collection.MapUtils.findAndThen;
  27 +
27 /** 28 /**
28 * 商品评价 Convert 29 * 商品评价 Convert
29 * 30 *
@@ -60,7 +61,7 @@ public interface ProductCommentConvert { @@ -60,7 +61,7 @@ public interface ProductCommentConvert {
60 item.setUserNickname(ProductCommentDO.NICKNAME_ANONYMOUS); 61 item.setUserNickname(ProductCommentDO.NICKNAME_ANONYMOUS);
61 } 62 }
62 // 设置 SKU 规格值 63 // 设置 SKU 规格值
63 - MapUtils.findAndThen(skuMap, item.getSkuId(), 64 + findAndThen(skuMap, item.getSkuId(),
64 sku -> item.setSkuProperties(convertList01(sku.getProperties()))); 65 sku -> item.setSkuProperties(convertList01(sku.getProperties())));
65 }); 66 });
66 return page; 67 return page;
@@ -87,7 +88,7 @@ public interface ProductCommentConvert { @@ -87,7 +88,7 @@ public interface ProductCommentConvert {
87 88
88 @Mapping(target = "scores", 89 @Mapping(target = "scores",
89 expression = "java(convertScores(createReqDTO.getDescriptionScores(), createReqDTO.getBenefitScores()))") 90 expression = "java(convertScores(createReqDTO.getDescriptionScores(), createReqDTO.getBenefitScores()))")
90 - default ProductCommentDO convert(ProductCommentCreateReqDTO createReqDTO, ProductSpuDO spuDO, MemberUserRespDTO user) { 91 + default ProductCommentDO convert(ProductCommentCreateReqDTO createReqDTO, ProductSpuDO spuDO, ProductSkuDO skuDO, MemberUserRespDTO user) {
91 ProductCommentDO commentDO = convert(createReqDTO); 92 ProductCommentDO commentDO = convert(createReqDTO);
92 if (user != null) { 93 if (user != null) {
93 commentDO.setUserId(user.getId()); 94 commentDO.setUserId(user.getId());
@@ -98,9 +99,15 @@ public interface ProductCommentConvert { @@ -98,9 +99,15 @@ public interface ProductCommentConvert {
98 commentDO.setSpuId(spuDO.getId()); 99 commentDO.setSpuId(spuDO.getId());
99 commentDO.setSpuName(spuDO.getName()); 100 commentDO.setSpuName(spuDO.getName());
100 } 101 }
  102 + if (skuDO != null) {
  103 + commentDO.setSkuPicUrl(skuDO.getPicUrl());
  104 + commentDO.setSkuProperties(skuDO.getProperties());
  105 + }
101 return commentDO; 106 return commentDO;
102 } 107 }
103 108
  109 + @Mapping(target = "visible", constant = "true")
  110 + @Mapping(target = "replyStatus", constant = "false")
104 @Mapping(target = "userId", constant = "0L") 111 @Mapping(target = "userId", constant = "0L")
105 @Mapping(target = "orderId", constant = "0L") 112 @Mapping(target = "orderId", constant = "0L")
106 @Mapping(target = "orderItemId", constant = "0L") 113 @Mapping(target = "orderItemId", constant = "0L")
@@ -111,4 +118,15 @@ public interface ProductCommentConvert { @@ -111,4 +118,15 @@ public interface ProductCommentConvert {
111 118
112 List<AppProductCommentRespVO> convertList02(List<ProductCommentDO> list); 119 List<AppProductCommentRespVO> convertList02(List<ProductCommentDO> list);
113 120
  121 + default ProductCommentDO convert(ProductCommentCreateReqVO createReq, ProductSpuDO spu, ProductSkuDO sku) {
  122 + ProductCommentDO commentDO = convert(createReq);
  123 + if (spu != null) {
  124 + commentDO.setSpuId(spu.getId()).setSpuName(spu.getName());
  125 + }
  126 + if (sku != null) {
  127 + commentDO.setSkuPicUrl(sku.getPicUrl()).setSkuProperties(sku.getProperties());
  128 + }
  129 + return commentDO;
  130 + }
  131 +
114 } 132 }
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/sku/ProductSkuConvert.java
  View file @498edff
@@ -5,7 +5,6 @@ import cn.hutool.core.util.StrUtil; @@ -5,7 +5,6 @@ import cn.hutool.core.util.StrUtil;
5 import cn.iocoder.yudao.module.product.api.sku.dto.ProductSkuRespDTO; 5 import cn.iocoder.yudao.module.product.api.sku.dto.ProductSkuRespDTO;
6 import cn.iocoder.yudao.module.product.api.sku.dto.ProductSkuUpdateStockReqDTO; 6 import cn.iocoder.yudao.module.product.api.sku.dto.ProductSkuUpdateStockReqDTO;
7 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuCreateOrUpdateReqVO; 7 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuCreateOrUpdateReqVO;
8 -import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuOptionRespVO;  
9 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuRespVO; 8 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuRespVO;
10 import cn.iocoder.yudao.module.product.dal.dataobject.sku.ProductSkuDO; 9 import cn.iocoder.yudao.module.product.dal.dataobject.sku.ProductSkuDO;
11 import org.mapstruct.Mapper; 10 import org.mapstruct.Mapper;
@@ -44,8 +43,6 @@ public interface ProductSkuConvert { @@ -44,8 +43,6 @@ public interface ProductSkuConvert {
44 43
45 List<ProductSkuRespDTO> convertList04(List<ProductSkuDO> list); 44 List<ProductSkuRespDTO> convertList04(List<ProductSkuDO> list);
46 45
47 - List<ProductSkuOptionRespVO> convertList05(List<ProductSkuDO> skus);  
48 -  
49 /** 46 /**
50 * 获得 SPU 的库存变化 Map 47 * 获得 SPU 的库存变化 Map
51 * 48 *
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/comment/ProductCommentDO.java
  View file @498edff
@@ -73,11 +73,14 @@ public class ProductCommentDO extends BaseDO { @@ -73,11 +73,14 @@ public class ProductCommentDO extends BaseDO {
73 73
74 /** 74 /**
75 * 商品 SPU 编号 75 * 商品 SPU 编号
  76 + *
76 * 关联 {@link ProductSpuDO#getId()} 77 * 关联 {@link ProductSpuDO#getId()}
77 */ 78 */
78 private Long spuId; 79 private Long spuId;
79 /** 80 /**
80 * 商品 SPU 名称 81 * 商品 SPU 名称
  82 + *
  83 + * 关联 {@link ProductSpuDO#getName()}
81 */ 84 */
82 private String spuName; 85 private String spuName;
83 /** 86 /**
@@ -86,6 +89,19 @@ public class ProductCommentDO extends BaseDO { @@ -86,6 +89,19 @@ public class ProductCommentDO extends BaseDO {
86 * 关联 {@link ProductSkuDO#getId()} 89 * 关联 {@link ProductSkuDO#getId()}
87 */ 90 */
88 private Long skuId; 91 private Long skuId;
  92 + /**
  93 + * 商品 SKU 图片地址
  94 + *
  95 + * 关联 {@link ProductSkuDO#getPicUrl()}
  96 + */
  97 + private String skuPicUrl;
  98 + /**
  99 + * 属性数组，JSON 格式
  100 + *
  101 + * 关联 {@link ProductSkuDO#getProperties()}
  102 + */
  103 + @TableField(typeHandler = ProductSkuDO.PropertyTypeHandler.class)
  104 + private List<ProductSkuDO.Property> skuProperties;
89 105
90 /** 106 /**
91 * 是否可见 107 * 是否可见
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/comment/ProductCommentMapper.java
  View file @498edff
1 package cn.iocoder.yudao.module.product.dal.mysql.comment; 1 package cn.iocoder.yudao.module.product.dal.mysql.comment;
2 2
3 -  
4 import cn.hutool.core.util.ObjectUtil; 3 import cn.hutool.core.util.ObjectUtil;
5 import cn.iocoder.yudao.framework.common.pojo.PageParam; 4 import cn.iocoder.yudao.framework.common.pojo.PageParam;
6 import cn.iocoder.yudao.framework.common.pojo.PageResult; 5 import cn.iocoder.yudao.framework.common.pojo.PageResult;
@@ -20,6 +19,7 @@ public interface ProductCommentMapper extends BaseMapperX&lt;ProductCommentDO&gt; { @@ -20,6 +19,7 @@ public interface ProductCommentMapper extends BaseMapperX&lt;ProductCommentDO&gt; {
20 .eqIfPresent(ProductCommentDO::getOrderId, reqVO.getOrderId()) 19 .eqIfPresent(ProductCommentDO::getOrderId, reqVO.getOrderId())
21 .eqIfPresent(ProductCommentDO::getSpuId, reqVO.getSpuId()) 20 .eqIfPresent(ProductCommentDO::getSpuId, reqVO.getSpuId())
22 .eqIfPresent(ProductCommentDO::getScores, reqVO.getScores()) 21 .eqIfPresent(ProductCommentDO::getScores, reqVO.getScores())
  22 + .eqIfPresent(ProductCommentDO::getReplyStatus, reqVO.getReplyStatus())
23 .betweenIfPresent(ProductCommentDO::getCreateTime, reqVO.getCreateTime()) 23 .betweenIfPresent(ProductCommentDO::getCreateTime, reqVO.getCreateTime())
24 .likeIfPresent(ProductCommentDO::getSpuName, reqVO.getSpuName()) 24 .likeIfPresent(ProductCommentDO::getSpuName, reqVO.getSpuName())
25 .orderByDesc(ProductCommentDO::getId)); 25 .orderByDesc(ProductCommentDO::getId));
@@ -53,11 +53,10 @@ public interface ProductCommentMapper extends BaseMapperX&lt;ProductCommentDO&gt; { @@ -53,11 +53,10 @@ public interface ProductCommentMapper extends BaseMapperX&lt;ProductCommentDO&gt; {
53 return selectPage(reqVO, queryWrapper); 53 return selectPage(reqVO, queryWrapper);
54 } 54 }
55 55
56 - default ProductCommentDO selectByUserIdAndOrderItemIdAndSpuId(Long userId, Long orderItemId, Long skuId) { 56 + default ProductCommentDO selectByUserIdAndOrderItemId(Long userId, Long orderItemId) {
57 return selectOne(new LambdaQueryWrapperX<ProductCommentDO>() 57 return selectOne(new LambdaQueryWrapperX<ProductCommentDO>()
58 .eq(ProductCommentDO::getUserId, userId) 58 .eq(ProductCommentDO::getUserId, userId)
59 - .eq(ProductCommentDO::getOrderItemId, orderItemId)  
60 - .eq(ProductCommentDO::getSpuId, skuId)); 59 + .eq(ProductCommentDO::getOrderItemId, orderItemId));
61 } 60 }
62 61
63 default Long selectCountBySpuId(Long spuId, Boolean visible, Integer type) { 62 default Long selectCountBySpuId(Long spuId, Boolean visible, Integer type) {
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/comment/ProductCommentService.java
  View file @498edff
@@ -25,12 +25,21 @@ import java.util.List; @@ -25,12 +25,21 @@ import java.util.List;
25 public interface ProductCommentService { 25 public interface ProductCommentService {
26 26
27 /** 27 /**
28 - * 获得商品评价分页 28 + * 创建商品评论
  29 + * 后台管理员创建评论使用
29 * 30 *
30 - * @param pageReqVO 分页查询  
31 - * @return 商品评价分页 31 + * @param createReqVO 商品评价创建 Request VO 对象
32 */ 32 */
33 - PageResult<ProductCommentDO> getCommentPage(ProductCommentPageReqVO pageReqVO); 33 + void createComment(ProductCommentCreateReqVO createReqVO);
  34 +
  35 + /**
  36 + * 创建评论
  37 + * 创建商品评论 APP 端创建商品评论使用
  38 + *
  39 + * @param createReqDTO 创建请求 dto
  40 + * @return 返回评论 id
  41 + */
  42 + Long createComment(ProductCommentCreateReqDTO createReqDTO);
34 43
35 /** 44 /**
36 * 修改评论是否可见 45 * 修改评论是否可见
@@ -43,35 +52,26 @@ public interface ProductCommentService { @@ -43,35 +52,26 @@ public interface ProductCommentService {
43 * 商家回复 52 * 商家回复
44 * 53 *
45 * @param replyVO 商家回复 54 * @param replyVO 商家回复
46 - * @param loginUserId 管理后台商家登陆人 ID 55 + * @param userId 管理后台商家登陆人 ID
47 */ 56 */
48 - void replyComment(ProductCommentReplyReqVO replyVO, Long loginUserId); 57 + void replyComment(ProductCommentReplyReqVO replyVO, Long userId);
49 58
50 /** 59 /**
51 - * 获得商品评价分页 60 + * 【管理员】获得商品评价分页
52 * 61 *
53 - * @param pageVO 分页查询  
54 - * @param visible 是否可见 62 + * @param pageReqVO 分页查询
55 * @return 商品评价分页 63 * @return 商品评价分页
56 */ 64 */
57 - PageResult<ProductCommentDO> getCommentPage(AppCommentPageReqVO pageVO, Boolean visible); 65 + PageResult<ProductCommentDO> getCommentPage(ProductCommentPageReqVO pageReqVO);
58 66
59 /** 67 /**
60 - * 创建商品评论  
61 - * 后台管理员创建评论使用 68 + * 【会员】获得商品评价分页
62 * 69 *
63 - * @param createReqVO 商品评价创建 Request VO 对象  
64 - */  
65 - void createComment(ProductCommentCreateReqVO createReqVO);  
66 -  
67 - /**  
68 - * 创建评论  
69 - * 创建商品评论 APP 端创建商品评论使用  
70 - *  
71 - * @param createReqDTO 创建请求 dto  
72 - * @return 返回评论 id 70 + * @param pageVO 分页查询
  71 + * @param visible 是否可见
  72 + * @return 商品评价分页
73 */ 73 */
74 - Long createComment(ProductCommentCreateReqDTO createReqDTO); 74 + PageResult<ProductCommentDO> getCommentPage(AppCommentPageReqVO pageVO, Boolean visible);
75 75
76 /** 76 /**
77 * 获得商品的评价统计 77 * 获得商品的评价统计
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/comment/ProductCommentServiceImpl.java
  View file @498edff
@@ -20,7 +20,6 @@ import cn.iocoder.yudao.module.product.service.sku.ProductSkuService; @@ -20,7 +20,6 @@ import cn.iocoder.yudao.module.product.service.sku.ProductSkuService;
20 import cn.iocoder.yudao.module.product.service.spu.ProductSpuService; 20 import cn.iocoder.yudao.module.product.service.spu.ProductSpuService;
21 import org.springframework.context.annotation.Lazy; 21 import org.springframework.context.annotation.Lazy;
22 import org.springframework.stereotype.Service; 22 import org.springframework.stereotype.Service;
23 -import org.springframework.transaction.annotation.Transactional;  
24 import org.springframework.validation.annotation.Validated; 23 import org.springframework.validation.annotation.Validated;
25 24
26 import javax.annotation.Resource; 25 import javax.annotation.Resource;
@@ -53,69 +52,55 @@ public class ProductCommentServiceImpl implements ProductCommentService { @@ -53,69 +52,55 @@ public class ProductCommentServiceImpl implements ProductCommentService {
53 private MemberUserApi memberUserApi; 52 private MemberUserApi memberUserApi;
54 53
55 @Override 54 @Override
56 - @Transactional(rollbackFor = Exception.class)  
57 - public void updateCommentVisible(ProductCommentUpdateVisibleReqVO updateReqVO) {  
58 - // 校验评论是否存在  
59 - ProductCommentDO productCommentDO = validateCommentExists(updateReqVO.getId());  
60 - productCommentDO.setVisible(updateReqVO.getVisible());  
61 -  
62 - // 更新可见状态  
63 - productCommentMapper.updateById(productCommentDO);  
64 - }  
65 -  
66 - @Override  
67 - @Transactional(rollbackFor = Exception.class)  
68 - public void replyComment(ProductCommentReplyReqVO replyVO, Long loginUserId) {  
69 - // 校验评论是否存在  
70 - ProductCommentDO productCommentDO = validateCommentExists(replyVO.getId());  
71 - productCommentDO.setReplyTime(LocalDateTime.now());  
72 - productCommentDO.setReplyUserId(loginUserId);  
73 - productCommentDO.setReplyStatus(Boolean.TRUE);  
74 - productCommentDO.setReplyContent(replyVO.getReplyContent());  
75 -  
76 - // 回复评论  
77 - productCommentMapper.updateById(productCommentDO);  
78 - }  
79 -  
80 - @Override  
81 - @Transactional(rollbackFor = Exception.class)  
82 public void createComment(ProductCommentCreateReqVO createReqVO) { 55 public void createComment(ProductCommentCreateReqVO createReqVO) {
83 - // 校验评论  
84 - validateComment(createReqVO.getSkuId(), createReqVO.getUserId(), createReqVO.getOrderItemId()); 56 + // 校验 SKU
  57 + ProductSkuDO skuDO = validateSku(createReqVO.getSkuId());
  58 + // 校验 SPU
  59 + ProductSpuDO spuDO = validateSpu(skuDO.getSpuId());
85 60
86 - ProductCommentDO commentDO = ProductCommentConvert.INSTANCE.convert(createReqVO);  
87 - productCommentMapper.insert(commentDO); 61 + // 创建评论
  62 + ProductCommentDO comment = ProductCommentConvert.INSTANCE.convert(createReqVO, spuDO, skuDO);
  63 + productCommentMapper.insert(comment);
88 } 64 }
89 65
90 @Override 66 @Override
91 - @Transactional(rollbackFor = Exception.class)  
92 public Long createComment(ProductCommentCreateReqDTO createReqDTO) { 67 public Long createComment(ProductCommentCreateReqDTO createReqDTO) {
93 - // 通过 sku ID 拿到 spu 相关信息  
94 - ProductSkuDO sku = productSkuService.getSku(createReqDTO.getSkuId());  
95 - if (sku == null) {  
96 - throw exception(SKU_NOT_EXISTS);  
97 - }  
98 - // 校验 spu 如果存在返回详情  
99 - ProductSpuDO spuDO = validateSpu(sku.getSpuId()); 68 + // 校验 SKU
  69 + ProductSkuDO skuDO = validateSku(createReqDTO.getSkuId());
  70 + // 校验 SPU
  71 + ProductSpuDO spuDO = validateSpu(skuDO.getSpuId());
100 // 校验评论 72 // 校验评论
101 - validateComment(spuDO.getId(), createReqDTO.getUserId(), createReqDTO.getOrderId()); 73 + validateCommentExists(createReqDTO.getUserId(), createReqDTO.getOrderId());
102 // 获取用户详细信息 74 // 获取用户详细信息
103 MemberUserRespDTO user = memberUserApi.getUser(createReqDTO.getUserId()); 75 MemberUserRespDTO user = memberUserApi.getUser(createReqDTO.getUserId());
104 76
105 // 创建评论 77 // 创建评论
106 - ProductCommentDO commentDO = ProductCommentConvert.INSTANCE.convert(createReqDTO, spuDO, user);  
107 - productCommentMapper.insert(commentDO);  
108 - return commentDO.getId(); 78 + ProductCommentDO comment = ProductCommentConvert.INSTANCE.convert(createReqDTO, spuDO, skuDO, user);
  79 + productCommentMapper.insert(comment);
  80 + return comment.getId();
109 } 81 }
110 82
111 - private void validateComment(Long skuId, Long userId, Long orderItemId) {  
112 - // 判断当前订单的当前商品用户是否评价过  
113 - ProductCommentDO exist = productCommentMapper.selectByUserIdAndOrderItemIdAndSpuId(userId, orderItemId, skuId);  
114 - if (null != exist) { 83 + /**
  84 + * 判断当前订单的当前商品用户是否评价过
  85 + *
  86 + * @param userId 用户编号
  87 + * @param orderItemId 订单项编号
  88 + */
  89 + private void validateCommentExists(Long userId, Long orderItemId) {
  90 + ProductCommentDO exist = productCommentMapper.selectByUserIdAndOrderItemId(userId, orderItemId);
  91 + if (exist != null) {
115 throw exception(COMMENT_ORDER_EXISTS); 92 throw exception(COMMENT_ORDER_EXISTS);
116 } 93 }
117 } 94 }
118 95
  96 + private ProductSkuDO validateSku(Long skuId) {
  97 + ProductSkuDO sku = productSkuService.getSku(skuId);
  98 + if (sku == null) {
  99 + throw exception(SKU_NOT_EXISTS);
  100 + }
  101 + return sku;
  102 + }
  103 +
119 private ProductSpuDO validateSpu(Long spuId) { 104 private ProductSpuDO validateSpu(Long spuId) {
120 ProductSpuDO spu = productSpuService.getSpu(spuId); 105 ProductSpuDO spu = productSpuService.getSpu(spuId);
121 if (null == spu) { 106 if (null == spu) {
@@ -124,6 +109,26 @@ public class ProductCommentServiceImpl implements ProductCommentService { @@ -124,6 +109,26 @@ public class ProductCommentServiceImpl implements ProductCommentService {
124 return spu; 109 return spu;
125 } 110 }
126 111
  112 + @Override
  113 + public void updateCommentVisible(ProductCommentUpdateVisibleReqVO updateReqVO) {
  114 + // 校验评论是否存在
  115 + validateCommentExists(updateReqVO.getId());
  116 +
  117 + // 更新可见状态
  118 + productCommentMapper.updateById(new ProductCommentDO().setId(updateReqVO.getId())
  119 + .setVisible(true));
  120 + }
  121 +
  122 + @Override
  123 + public void replyComment(ProductCommentReplyReqVO replyVO, Long userId) {
  124 + // 校验评论是否存在
  125 + validateCommentExists(replyVO.getId());
  126 + // 回复评论
  127 + productCommentMapper.updateById(new ProductCommentDO().setId(replyVO.getId())
  128 + .setReplyTime(LocalDateTime.now()).setReplyUserId(userId)
  129 + .setReplyStatus(Boolean.TRUE).setReplyContent(replyVO.getReplyContent()));
  130 + }
  131 +
127 private ProductCommentDO validateCommentExists(Long id) { 132 private ProductCommentDO validateCommentExists(Long id) {
128 ProductCommentDO productComment = productCommentMapper.selectById(id); 133 ProductCommentDO productComment = productCommentMapper.selectById(id);
129 if (productComment == null) { 134 if (productComment == null) {
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java
  View file @498edff
1 package cn.iocoder.yudao.module.product.service.sku; 1 package cn.iocoder.yudao.module.product.service.sku;
2 2
3 import cn.hutool.core.collection.CollUtil; 3 import cn.hutool.core.collection.CollUtil;
  4 +import cn.hutool.core.collection.ListUtil;
4 import cn.hutool.core.util.ObjectUtil; 5 import cn.hutool.core.util.ObjectUtil;
5 import cn.iocoder.yudao.module.product.api.sku.dto.ProductSkuUpdateStockReqDTO; 6 import cn.iocoder.yudao.module.product.api.sku.dto.ProductSkuUpdateStockReqDTO;
6 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuBaseVO; 7 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuBaseVO;
@@ -74,6 +75,9 @@ public class ProductSkuServiceImpl implements ProductSkuService { @@ -74,6 +75,9 @@ public class ProductSkuServiceImpl implements ProductSkuService {
74 75
75 @Override 76 @Override
76 public List<ProductSkuDO> getSkuList(Collection<Long> ids) { 77 public List<ProductSkuDO> getSkuList(Collection<Long> ids) {
  78 + if (CollUtil.isEmpty(ids)) {
  79 + return ListUtil.empty();
  80 + }
77 return productSkuMapper.selectBatchIds(ids); 81 return productSkuMapper.selectBatchIds(ids);
78 } 82 }
79 83
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java
  View file @498edff
@@ -5,6 +5,7 @@ import cn.hutool.core.lang.Assert; @@ -5,6 +5,7 @@ import cn.hutool.core.lang.Assert;
5 import cn.hutool.core.util.IdUtil; 5 import cn.hutool.core.util.IdUtil;
6 import cn.hutool.core.util.ObjectUtil; 6 import cn.hutool.core.util.ObjectUtil;
7 import cn.hutool.core.util.StrUtil; 7 import cn.hutool.core.util.StrUtil;
  8 +import cn.hutool.extra.spring.SpringUtil;
8 import cn.iocoder.yudao.framework.common.core.KeyValue; 9 import cn.iocoder.yudao.framework.common.core.KeyValue;
9 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; 10 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
10 import cn.iocoder.yudao.framework.common.enums.TerminalEnum; 11 import cn.iocoder.yudao.framework.common.enums.TerminalEnum;
@@ -12,8 +13,12 @@ import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; @@ -12,8 +13,12 @@ import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
12 import cn.iocoder.yudao.framework.common.util.json.JsonUtils; 13 import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
13 import cn.iocoder.yudao.module.member.api.address.AddressApi; 14 import cn.iocoder.yudao.module.member.api.address.AddressApi;
14 import cn.iocoder.yudao.module.member.api.address.dto.AddressRespDTO; 15 import cn.iocoder.yudao.module.member.api.address.dto.AddressRespDTO;
  16 +import cn.iocoder.yudao.module.member.api.level.MemberLevelApi;
  17 +import cn.iocoder.yudao.module.member.api.point.MemberPointApi;
15 import cn.iocoder.yudao.module.member.api.user.MemberUserApi; 18 import cn.iocoder.yudao.module.member.api.user.MemberUserApi;
16 import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO; 19 import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
  20 +import cn.iocoder.yudao.module.member.enums.MemberExperienceBizTypeEnum;
  21 +import cn.iocoder.yudao.module.member.enums.point.MemberPointBizTypeEnum;
17 import cn.iocoder.yudao.module.pay.api.order.PayOrderApi; 22 import cn.iocoder.yudao.module.pay.api.order.PayOrderApi;
18 import cn.iocoder.yudao.module.pay.api.order.dto.PayOrderCreateReqDTO; 23 import cn.iocoder.yudao.module.pay.api.order.dto.PayOrderCreateReqDTO;
19 import cn.iocoder.yudao.module.pay.api.order.dto.PayOrderRespDTO; 24 import cn.iocoder.yudao.module.pay.api.order.dto.PayOrderRespDTO;
@@ -57,6 +62,7 @@ import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateReqBO; @@ -57,6 +62,7 @@ import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateReqBO;
57 import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateRespBO; 62 import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateRespBO;
58 import lombok.extern.slf4j.Slf4j; 63 import lombok.extern.slf4j.Slf4j;
59 import org.jetbrains.annotations.NotNull; 64 import org.jetbrains.annotations.NotNull;
  65 +import org.springframework.scheduling.annotation.Async;
60 import org.springframework.stereotype.Service; 66 import org.springframework.stereotype.Service;
61 import org.springframework.transaction.annotation.Transactional; 67 import org.springframework.transaction.annotation.Transactional;
62 68
@@ -101,9 +107,15 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService { @@ -101,9 +107,15 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
101 private AddressApi addressApi; 107 private AddressApi addressApi;
102 @Resource 108 @Resource
103 private CouponApi couponApi; 109 private CouponApi couponApi;
  110 +
104 @Resource 111 @Resource
105 private MemberUserApi memberUserApi; 112 private MemberUserApi memberUserApi;
106 @Resource 113 @Resource
  114 + private MemberLevelApi memberLevelApi;
  115 + @Resource
  116 + private MemberPointApi memberPointApi;
  117 +
  118 + @Resource
107 private ProductCommentApi productCommentApi; 119 private ProductCommentApi productCommentApi;
108 @Resource 120 @Resource
109 private TradeMessageService tradeMessageService; 121 private TradeMessageService tradeMessageService;
@@ -336,6 +348,11 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService { @@ -336,6 +348,11 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
336 // TODO 芋艿：发送站内信 348 // TODO 芋艿：发送站内信
337 349
338 // TODO 芋艿：OrderLog 350 // TODO 芋艿：OrderLog
  351 +
  352 + // 增加用户积分
  353 + getSelf().addUserPointAsync(order.getUserId(), order.getPayPrice(), order.getId());
  354 + // 增加用户经验
  355 + getSelf().addUserExperienceAsync(order.getUserId(), order.getPayPrice(), order.getId());
339 } 356 }
340 357
341 /** 358 /**
@@ -603,6 +620,11 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService { @@ -603,6 +620,11 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
603 } 620 }
604 621
605 // TODO 芋艿：未来如果有分佣，需要更新相关分佣订单为已失效 622 // TODO 芋艿：未来如果有分佣，需要更新相关分佣订单为已失效
  623 +
  624 + // 扣减用户积分
  625 + getSelf().reduceUserPointAsync(order.getUserId(), orderRefundPrice, afterSaleId);
  626 + // 扣减用户经验
  627 + getSelf().reduceUserExperienceAsync(order.getUserId(), orderRefundPrice, afterSaleId);
606 } 628 }
607 629
608 @Override 630 @Override
@@ -650,4 +672,37 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService { @@ -650,4 +672,37 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
650 TradeOrderItemAfterSaleStatusEnum.SUCCESS.getStatus())); 672 TradeOrderItemAfterSaleStatusEnum.SUCCESS.getStatus()));
651 } 673 }
652 674
  675 + @Async
  676 + protected void addUserExperienceAsync(Long userId, Integer payPrice, Long orderId) {
  677 + int bizType = MemberExperienceBizTypeEnum.ORDER.getType();
  678 + memberLevelApi.addExperience(userId, payPrice, bizType, String.valueOf(orderId));
  679 + }
  680 +
  681 + @Async
  682 + protected void reduceUserExperienceAsync(Long userId, Integer refundPrice, Long afterSaleId) {
  683 + int bizType = MemberExperienceBizTypeEnum.REFUND.getType();
  684 + memberLevelApi.addExperience(userId, -refundPrice, bizType, String.valueOf(afterSaleId));
  685 + }
  686 +
  687 + @Async
  688 + protected void addUserPointAsync(Long userId, Integer payPrice, Long orderId) {
  689 + int bizType = MemberPointBizTypeEnum.ORDER_BUY.getType();
  690 + memberPointApi.addPoint(userId, payPrice, bizType, String.valueOf(orderId));
  691 + }
  692 +
  693 + @Async
  694 + protected void reduceUserPointAsync(Long userId, Integer refundPrice, Long afterSaleId) {
  695 + int bizType = MemberPointBizTypeEnum.ORDER_CANCEL.getType();
  696 + memberPointApi.addPoint(userId, -refundPrice, bizType, String.valueOf(afterSaleId));
  697 + }
  698 +
  699 + /**
  700 + * 获得自身的代理对象，解决 AOP 生效问题
  701 + *
  702 + * @return 自己
  703 + */
  704 + private TradeOrderUpdateServiceImpl getSelf() {
  705 + return SpringUtil.getBean(getClass());
  706 + }
  707 +
653 } 708 }
yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/level/MemberLevelApi.java
  View file @498edff
@@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.member.api.level; @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.member.api.level;
3 import cn.iocoder.yudao.module.member.enums.MemberExperienceBizTypeEnum; 3 import cn.iocoder.yudao.module.member.enums.MemberExperienceBizTypeEnum;
4 4
5 /** 5 /**
6 - * 会员等级 API接口 6 + * 会员等级 API 接口
7 * 7 *
8 * @author owen 8 * @author owen
9 */ 9 */
@@ -14,8 +14,9 @@ public interface MemberLevelApi { @@ -14,8 +14,9 @@ public interface MemberLevelApi {
14 * 14 *
15 * @param userId 会员ID 15 * @param userId 会员ID
16 * @param experience 经验 16 * @param experience 经验
17 - * @param bizType 业务类型 17 + * @param bizType 业务类型 {@link MemberExperienceBizTypeEnum}
18 * @param bizId 业务编号 18 * @param bizId 业务编号
19 */ 19 */
20 - void plusExperience(Long userId, Integer experience, MemberExperienceBizTypeEnum bizType, String bizId); 20 + void addExperience(Long userId, Integer experience, Integer bizType, String bizId);
  21 +
21 } 22 }
yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/point/MemberPointApi.java 0 → 100644
  View file @498edff
  1 +package cn.iocoder.yudao.module.member.api.point;
  2 +
  3 +import cn.iocoder.yudao.module.member.enums.point.MemberPointBizTypeEnum;
  4 +
  5 +/**
  6 + * 用户积分的 API 接口
  7 + *
  8 + * @author owen
  9 + */
  10 +public interface MemberPointApi {
  11 +
  12 + /**
  13 + * 增加用户积分
  14 + *
  15 + * @param userId 用户编号
  16 + * @param point 积分
  17 + * @param bizType 业务类型 {@link MemberPointBizTypeEnum}
  18 + * @param bizId 业务编号
  19 + */
  20 + void addPoint(Long userId, Integer point, Integer bizType, String bizId);
  21 +
  22 +}
yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/user/MemberUserApi.java
  View file @498edff
@@ -56,5 +56,4 @@ public interface MemberUserApi { @@ -56,5 +56,4 @@ public interface MemberUserApi {
56 * @return 用户信息 56 * @return 用户信息
57 */ 57 */
58 MemberUserRespDTO getUserByMobile(String mobile); 58 MemberUserRespDTO getUserByMobile(String mobile);
59 -  
60 } 59 }
yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
  View file @498edff
@@ -4,7 +4,7 @@ import cn.iocoder.yudao.framework.common.exception.ErrorCode; @@ -4,7 +4,7 @@ import cn.iocoder.yudao.framework.common.exception.ErrorCode;
4 4
5 /** 5 /**
6 * Member 错误码枚举类 6 * Member 错误码枚举类
7 - * 7 + * <p>
8 * member 系统，使用 1-004-000-000 段 8 * member 系统，使用 1-004-000-000 段
9 */ 9 */
10 public interface ErrorCodeConstants { 10 public interface ErrorCodeConstants {
@@ -32,6 +32,7 @@ public interface ErrorCodeConstants { @@ -32,6 +32,7 @@ public interface ErrorCodeConstants {
32 //========== 积分配置 1004007000 ========== 32 //========== 积分配置 1004007000 ==========
33 33
34 //========== 积分记录 1004008000 ========== 34 //========== 积分记录 1004008000 ==========
  35 + ErrorCode POINT_RECORD_BIZ_NOT_SUPPORT = new ErrorCode(1004008000, "用户积分记录业务类型不支持");
35 36
36 //========== 签到配置 1004009000 ========== 37 //========== 签到配置 1004009000 ==========
37 ErrorCode SIGN_IN_CONFIG_NOT_EXISTS = new ErrorCode(1004009000, "签到天数规则不存在"); 38 ErrorCode SIGN_IN_CONFIG_NOT_EXISTS = new ErrorCode(1004009000, "签到天数规则不存在");
@@ -48,9 +49,7 @@ public interface ErrorCodeConstants { @@ -48,9 +49,7 @@ public interface ErrorCodeConstants {
48 ErrorCode LEVEL_EXPERIENCE_MAX = new ErrorCode(1004011004, "升级经验必须小于下一个等级[{}]设置的升级经验[{}]"); 49 ErrorCode LEVEL_EXPERIENCE_MAX = new ErrorCode(1004011004, "升级经验必须小于下一个等级[{}]设置的升级经验[{}]");
49 ErrorCode LEVEL_HAS_USER = new ErrorCode(1004011005, "用户等级下存在用户，无法删除"); 50 ErrorCode LEVEL_HAS_USER = new ErrorCode(1004011005, "用户等级下存在用户，无法删除");
50 51
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, "用户等级调整原因不能为空"); 52 + ErrorCode EXPERIENCE_BIZ_NOT_SUPPORT = new ErrorCode(1004011201, "用户经验业务类型不支持");
54 53
55 //========== 用户分组 1004012000 ========== 54 //========== 用户分组 1004012000 ==========
56 ErrorCode GROUP_NOT_EXISTS = new ErrorCode(1004012000, "用户分组不存在"); 55 ErrorCode GROUP_NOT_EXISTS = new ErrorCode(1004012000, "用户分组不存在");
yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/MemberExperienceBizTypeEnum.java
  View file @498edff
1 package cn.iocoder.yudao.module.member.enums; 1 package cn.iocoder.yudao.module.member.enums;
2 2
  3 +import cn.hutool.core.util.EnumUtil;
3 import lombok.AllArgsConstructor; 4 import lombok.AllArgsConstructor;
4 import lombok.Getter; 5 import lombok.Getter;
5 6
  7 +import java.util.Objects;
  8 +
6 /** 9 /**
7 * 会员经验 - 业务类型 10 * 会员经验 - 业务类型
8 * 11 *
@@ -11,18 +14,37 @@ import lombok.Getter; @@ -11,18 +14,37 @@ import lombok.Getter;
11 @Getter 14 @Getter
12 @AllArgsConstructor 15 @AllArgsConstructor
13 public enum MemberExperienceBizTypeEnum { 16 public enum MemberExperienceBizTypeEnum {
  17 +
14 /** 18 /**
15 * 管理员调整、邀请新用户、下单、退单、签到、抽奖 19 * 管理员调整、邀请新用户、下单、退单、签到、抽奖
16 */ 20 */
17 - ADMIN(0, "管理员调整","管理员调整获得{}经验"),  
18 - INVITE_REGISTER(1, "邀新奖励","邀请好友获得{}经验"),  
19 - ORDER(2, "下单奖励", "下单获得{}经验"),  
20 - REFUND(3, "退单扣除","退单获得{}经验"),  
21 - SIGN_IN(4, "签到奖励","签到获得{}经验"),  
22 - LOTTERY(5, "抽奖奖励","抽奖获得{}经验"), 21 + ADMIN(0, "管理员调整", "管理员调整获得 {} 经验", true),
  22 + INVITE_REGISTER(1, "邀新奖励", "邀请好友获得 {} 经验", true),
  23 + ORDER(2, "下单奖励", "下单获得 {} 经验", true),
  24 + REFUND(3, "退单扣除", "退单获得 {} 经验", false),
  25 + SIGN_IN(4, "签到奖励", "签到获得 {} 经验", true),
  26 + LOTTERY(5, "抽奖奖励", "抽奖获得 {} 经验", true),
23 ; 27 ;
24 28
25 - private final int value; 29 + /**
  30 + * 业务类型
  31 + */
  32 + private final int type;
  33 + /**
  34 + * 标题
  35 + */
26 private final String title; 36 private final String title;
27 - private final String desc; 37 + /**
  38 + * 描述
  39 + */
  40 + private final String description;
  41 + /**
  42 + * 是否为扣减积分
  43 + */
  44 + private final boolean add;
  45 +
  46 + public static MemberExperienceBizTypeEnum getByType(Integer type) {
  47 + return EnumUtil.getBy(MemberExperienceBizTypeEnum.class,
  48 + e -> Objects.equals(type, e.getType()));
  49 + }
28 } 50 }
yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/point/MemberPointBizTypeEnum.java
  View file @498edff
1 package cn.iocoder.yudao.module.member.enums.point; 1 package cn.iocoder.yudao.module.member.enums.point;
2 2
  3 +import cn.hutool.core.util.EnumUtil;
3 import cn.iocoder.yudao.framework.common.core.IntArrayValuable; 4 import cn.iocoder.yudao.framework.common.core.IntArrayValuable;
4 import lombok.AllArgsConstructor; 5 import lombok.AllArgsConstructor;
5 import lombok.Getter; 6 import lombok.Getter;
6 7
  8 +import java.util.Objects;
  9 +
7 /** 10 /**
8 * 会员积分的业务类型枚举 11 * 会员积分的业务类型枚举
9 * 12 *
@@ -13,9 +16,9 @@ import lombok.Getter; @@ -13,9 +16,9 @@ import lombok.Getter;
13 @Getter 16 @Getter
14 public enum MemberPointBizTypeEnum implements IntArrayValuable { 17 public enum MemberPointBizTypeEnum implements IntArrayValuable {
15 18
16 - SIGN(1, "签到"),  
17 - ORDER_BUY(10, "订单消费"),  
18 - ORDER_CANCEL(11, "订单取消"); // 退回积分 19 + SIGN(1, "签到", "签到获得 {} 积分", true),
  20 + ORDER_BUY(10, "订单消费", "下单获得 {} 积分", true),
  21 + ORDER_CANCEL(11, "订单取消", "退单获得 {} 积分", false); // 退回积分
19 22
20 /** 23 /**
21 * 类型 24 * 类型
@@ -25,10 +28,23 @@ public enum MemberPointBizTypeEnum implements IntArrayValuable { @@ -25,10 +28,23 @@ public enum MemberPointBizTypeEnum implements IntArrayValuable {
25 * 名字 28 * 名字
26 */ 29 */
27 private final String name; 30 private final String name;
  31 + /**
  32 + * 描述
  33 + */
  34 + private final String description;
  35 + /**
  36 + * 是否为扣减积分
  37 + */
  38 + private final boolean add;
28 39
29 @Override 40 @Override
30 public int[] array() { 41 public int[] array() {
31 return new int[0]; 42 return new int[0];
32 } 43 }
33 44
  45 + public static MemberPointBizTypeEnum getByType(Integer type) {
  46 + return EnumUtil.getBy(MemberPointBizTypeEnum.class,
  47 + e -> Objects.equals(type, e.getType()));
  48 + }
  49 +
34 } 50 }
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/level/MemberLevelApiImpl.java
  View file @498edff
@@ -7,6 +7,9 @@ import org.springframework.validation.annotation.Validated; @@ -7,6 +7,9 @@ import org.springframework.validation.annotation.Validated;
7 7
8 import javax.annotation.Resource; 8 import javax.annotation.Resource;
9 9
  10 +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
  11 +import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.EXPERIENCE_BIZ_NOT_SUPPORT;
  12 +
10 /** 13 /**
11 * 会员等级 API 实现类 14 * 会员等级 API 实现类
12 * 15 *
@@ -19,7 +22,13 @@ public class MemberLevelApiImpl implements MemberLevelApi { @@ -19,7 +22,13 @@ public class MemberLevelApiImpl implements MemberLevelApi {
19 @Resource 22 @Resource
20 private MemberLevelService memberLevelService; 23 private MemberLevelService memberLevelService;
21 24
22 - public void plusExperience(Long userId, Integer experience, MemberExperienceBizTypeEnum bizType, String bizId) {  
23 - memberLevelService.plusExperience(userId, experience, bizType, bizId); 25 + @Override
  26 + public void addExperience(Long userId, Integer experience, Integer bizType, String bizId) {
  27 + MemberExperienceBizTypeEnum bizTypeEnum = MemberExperienceBizTypeEnum.getByType(bizType);
  28 + if (bizTypeEnum == null) {
  29 + throw exception(EXPERIENCE_BIZ_NOT_SUPPORT);
  30 + }
  31 + memberLevelService.addExperience(userId, experience, bizTypeEnum, bizId);
24 } 32 }
  33 +
25 } 34 }
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/point/MemberPointApiImpl.java 0 → 100644
  View file @498edff
  1 +package cn.iocoder.yudao.module.member.api.point;
  2 +
  3 +import cn.iocoder.yudao.module.member.enums.point.MemberPointBizTypeEnum;
  4 +import cn.iocoder.yudao.module.member.service.point.MemberPointRecordService;
  5 +import org.springframework.stereotype.Service;
  6 +import org.springframework.validation.annotation.Validated;
  7 +
  8 +import javax.annotation.Resource;
  9 +
  10 +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
  11 +import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.POINT_RECORD_BIZ_NOT_SUPPORT;
  12 +
  13 +/**
  14 + * 用户积分的 API 实现类
  15 + *
  16 + * @author owen
  17 + */
  18 +@Service
  19 +@Validated
  20 +public class MemberPointApiImpl implements MemberPointApi {
  21 +
  22 + @Resource
  23 + private MemberPointRecordService memberPointRecordService;
  24 +
  25 + @Override
  26 + public void addPoint(Long userId, Integer point, Integer bizType, String bizId) {
  27 + MemberPointBizTypeEnum bizTypeEnum = MemberPointBizTypeEnum.getByType(bizType);
  28 + if (bizTypeEnum == null) {
  29 + throw exception(POINT_RECORD_BIZ_NOT_SUPPORT);
  30 + }
  31 + memberPointRecordService.createPointRecord(userId, point, bizTypeEnum, bizId);
  32 + }
  33 +
  34 +}
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/address/AddressController.java 0 → 100644
  View file @498edff
  1 +package cn.iocoder.yudao.module.member.controller.admin.address;
  2 +
  3 +import cn.iocoder.yudao.framework.common.pojo.CommonResult;
  4 +import cn.iocoder.yudao.module.member.controller.admin.address.vo.AddressRespVO;
  5 +import cn.iocoder.yudao.module.member.convert.address.AddressConvert;
  6 +import cn.iocoder.yudao.module.member.dal.dataobject.address.MemberAddressDO;
  7 +import cn.iocoder.yudao.module.member.service.address.AddressService;
  8 +import io.swagger.v3.oas.annotations.Operation;
  9 +import io.swagger.v3.oas.annotations.Parameter;
  10 +import io.swagger.v3.oas.annotations.tags.Tag;
  11 +import org.springframework.security.access.prepost.PreAuthorize;
  12 +import org.springframework.validation.annotation.Validated;
  13 +import org.springframework.web.bind.annotation.GetMapping;
  14 +import org.springframework.web.bind.annotation.RequestMapping;
  15 +import org.springframework.web.bind.annotation.RequestParam;
  16 +import org.springframework.web.bind.annotation.RestController;
  17 +
  18 +import javax.annotation.Resource;
  19 +import java.util.List;
  20 +
  21 +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
  22 +
  23 +@Tag(name = "管理后台 - 用户收件地址")
  24 +@RestController
  25 +@RequestMapping("/member/address")
  26 +@Validated
  27 +public class AddressController {
  28 +
  29 + @Resource
  30 + private AddressService addressService;
  31 +
  32 + @GetMapping("/list")
  33 + @Operation(summary = "获得用户收件地址列表")
  34 + @Parameter(name = "userId", description = "用户编号", required = true)
  35 + @PreAuthorize("@ss.hasPermission('member:user:query')")
  36 + public CommonResult<List<AddressRespVO>> getAddressList(@RequestParam("userId") Long userId) {
  37 + List<MemberAddressDO> list = addressService.getAddressList(userId);
  38 + return success(AddressConvert.INSTANCE.convertList2(list));
  39 + }
  40 +
  41 +}
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/address/vo/AddressBaseVO.java 0 → 100644
  View file @498edff
  1 +package cn.iocoder.yudao.module.member.controller.admin.address.vo;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.*;
  5 +import java.time.LocalDateTime;
  6 +import java.time.LocalDateTime;
  7 +import java.util.*;
  8 +import javax.validation.constraints.*;
  9 +
  10 +/**
  11 + * 用户收件地址 Base VO，提供给添加、修改、详细的子 VO 使用
  12 + * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
  13 + */
  14 +@Data
  15 +public class AddressBaseVO {
  16 +
  17 + @Schema(description = "收件人名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
  18 + @NotNull(message = "收件人名称不能为空")
  19 + private String name;
  20 +
  21 + @Schema(description = "手机号", requiredMode = Schema.RequiredMode.REQUIRED)
  22 + @NotNull(message = "手机号不能为空")
  23 + private String mobile;
  24 +
  25 + @Schema(description = "地区编码", requiredMode = Schema.RequiredMode.REQUIRED, example = "15716")
  26 + @NotNull(message = "地区编码不能为空")
  27 + private Long areaId;
  28 +
  29 + @Schema(description = "收件详细地址", requiredMode = Schema.RequiredMode.REQUIRED)
  30 + @NotNull(message = "收件详细地址不能为空")
  31 + private String detailAddress;
  32 +
  33 + @Schema(description = "是否默认", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
  34 + @NotNull(message = "是否默认不能为空")
  35 + private Boolean defaultStatus;
  36 +
  37 +}
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/address/vo/AddressRespVO.java 0 → 100644
  View file @498edff
  1 +package cn.iocoder.yudao.module.member.controller.admin.address.vo;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.*;
  5 +import java.time.LocalDateTime;
  6 +
  7 +@Schema(description = "管理后台 - 用户收件地址 Response VO")
  8 +@Data
  9 +@EqualsAndHashCode(callSuper = true)
  10 +@ToString(callSuper = true)
  11 +public class AddressRespVO extends AddressBaseVO {
  12 +
  13 + @Schema(description = "收件地址编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "7380")
  14 + private Long id;
  15 +
  16 + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
  17 + private LocalDateTime createTime;
  18 +
  19 +}
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/MemberExperienceLogController.java renamed to yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/MemberExperienceRecordController.java
  View file @498edff
@@ -2,11 +2,11 @@ package cn.iocoder.yudao.module.member.controller.admin.level; @@ -2,11 +2,11 @@ package cn.iocoder.yudao.module.member.controller.admin.level;
2 2
3 import cn.iocoder.yudao.framework.common.pojo.CommonResult; 3 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
4 import cn.iocoder.yudao.framework.common.pojo.PageResult; 4 import cn.iocoder.yudao.framework.common.pojo.PageResult;
5 -import cn.iocoder.yudao.module.member.controller.admin.level.vo.experience.MemberExperienceLogPageReqVO;  
6 -import cn.iocoder.yudao.module.member.controller.admin.level.vo.experience.MemberExperienceLogRespVO;  
7 -import cn.iocoder.yudao.module.member.convert.level.MemberExperienceLogConvert;  
8 -import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberExperienceLogDO;  
9 -import cn.iocoder.yudao.module.member.service.level.MemberExperienceLogService; 5 +import cn.iocoder.yudao.module.member.controller.admin.level.vo.experience.MemberExperienceRecordPageReqVO;
  6 +import cn.iocoder.yudao.module.member.controller.admin.level.vo.experience.MemberExperienceRecordRespVO;
  7 +import cn.iocoder.yudao.module.member.convert.level.MemberExperienceRecordConvert;
  8 +import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberExperienceRecordDO;
  9 +import cn.iocoder.yudao.module.member.service.level.MemberExperienceRecordService;
10 import io.swagger.v3.oas.annotations.Operation; 10 import io.swagger.v3.oas.annotations.Operation;
11 import io.swagger.v3.oas.annotations.Parameter; 11 import io.swagger.v3.oas.annotations.Parameter;
12 import io.swagger.v3.oas.annotations.tags.Tag; 12 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -22,31 +22,31 @@ import javax.validation.Valid; @@ -22,31 +22,31 @@ import javax.validation.Valid;
22 22
23 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; 23 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
24 24
25 -// TODO @疯狂：要不 Log 改成 Record，和 PointRecord 保持一致  
26 @Tag(name = "管理后台 - 会员经验记录") 25 @Tag(name = "管理后台 - 会员经验记录")
27 @RestController 26 @RestController
28 -@RequestMapping("/member/experience-log") 27 +@RequestMapping("/member/experience-record")
29 @Validated 28 @Validated
30 -public class MemberExperienceLogController { 29 +public class MemberExperienceRecordController {
31 30
32 @Resource 31 @Resource
33 - private MemberExperienceLogService experienceLogService; 32 + private MemberExperienceRecordService experienceLogService;
34 33
35 @GetMapping("/get") 34 @GetMapping("/get")
36 @Operation(summary = "获得会员经验记录") 35 @Operation(summary = "获得会员经验记录")
37 @Parameter(name = "id", description = "编号", required = true, example = "1024") 36 @Parameter(name = "id", description = "编号", required = true, example = "1024")
38 - @PreAuthorize("@ss.hasPermission('member:experience-log:query')")  
39 - public CommonResult<MemberExperienceLogRespVO> getExperienceLog(@RequestParam("id") Long id) {  
40 - MemberExperienceLogDO experienceLog = experienceLogService.getExperienceLog(id);  
41 - return success(MemberExperienceLogConvert.INSTANCE.convert(experienceLog)); 37 + @PreAuthorize("@ss.hasPermission('member:experience-record:query')")
  38 + public CommonResult<MemberExperienceRecordRespVO> getExperienceRecord(@RequestParam("id") Long id) {
  39 + MemberExperienceRecordDO experienceLog = experienceLogService.getExperienceRecord(id);
  40 + return success(MemberExperienceRecordConvert.INSTANCE.convert(experienceLog));
42 } 41 }
43 42
44 @GetMapping("/page") 43 @GetMapping("/page")
45 @Operation(summary = "获得会员经验记录分页") 44 @Operation(summary = "获得会员经验记录分页")
46 - @PreAuthorize("@ss.hasPermission('member:experience-log:query')")  
47 - public CommonResult<PageResult<MemberExperienceLogRespVO>> getExperienceLogPage(@Valid MemberExperienceLogPageReqVO pageVO) {  
48 - PageResult<MemberExperienceLogDO> pageResult = experienceLogService.getExperienceLogPage(pageVO);  
49 - return success(MemberExperienceLogConvert.INSTANCE.convertPage(pageResult)); 45 + @PreAuthorize("@ss.hasPermission('member:experience-record:query')")
  46 + public CommonResult<PageResult<MemberExperienceRecordRespVO>> getExperienceRecordPage(
  47 + @Valid MemberExperienceRecordPageReqVO pageVO) {
  48 + PageResult<MemberExperienceRecordDO> pageResult = experienceLogService.getExperienceRecordPage(pageVO);
  49 + return success(MemberExperienceRecordConvert.INSTANCE.convertPage(pageResult));
50 } 50 }
51 51
52 } 52 }
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/MemberLevelController.java
  View file @498edff
1 package cn.iocoder.yudao.module.member.controller.admin.level; 1 package cn.iocoder.yudao.module.member.controller.admin.level;
2 2
3 import cn.iocoder.yudao.framework.common.pojo.CommonResult; 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.level.vo.level.*; 4 import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.*;
6 import cn.iocoder.yudao.module.member.convert.level.MemberLevelConvert; 5 import cn.iocoder.yudao.module.member.convert.level.MemberLevelConvert;
7 import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO; 6 import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO;
@@ -70,13 +69,12 @@ public class MemberLevelController { @@ -70,13 +69,12 @@ public class MemberLevelController {
70 return success(MemberLevelConvert.INSTANCE.convertSimpleList(list)); 69 return success(MemberLevelConvert.INSTANCE.convertSimpleList(list));
71 } 70 }
72 71
73 - // TODO @疯狂：是不是不做分页，直接 list 就好啦；返回的时候，按照经验排序下哈；  
74 - @GetMapping("/page")  
75 - @Operation(summary = "获得会员等级分页") 72 + @GetMapping("/list")
  73 + @Operation(summary = "获得会员等级列表")
76 @PreAuthorize("@ss.hasPermission('member:level:query')") 74 @PreAuthorize("@ss.hasPermission('member:level:query')")
77 - public CommonResult<PageResult<MemberLevelRespVO>> getLevelPage(@Valid MemberLevelPageReqVO pageVO) {  
78 - PageResult<MemberLevelDO> pageResult = levelService.getLevelPage(pageVO);  
79 - return success(MemberLevelConvert.INSTANCE.convertPage(pageResult)); 75 + public CommonResult<List<MemberLevelRespVO>> getLevelList(@Valid MemberLevelListReqVO pageVO) {
  76 + List<MemberLevelDO> result = levelService.getLevelList(pageVO);
  77 + return success(MemberLevelConvert.INSTANCE.convertList(result));
80 } 78 }
81 79
82 } 80 }
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/MemberLevelLogController.java renamed to yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/MemberLevelRecordController.java
  View file @498edff
@@ -2,11 +2,11 @@ package cn.iocoder.yudao.module.member.controller.admin.level; @@ -2,11 +2,11 @@ package cn.iocoder.yudao.module.member.controller.admin.level;
2 2
3 import cn.iocoder.yudao.framework.common.pojo.CommonResult; 3 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
4 import cn.iocoder.yudao.framework.common.pojo.PageResult; 4 import cn.iocoder.yudao.framework.common.pojo.PageResult;
5 -import cn.iocoder.yudao.module.member.controller.admin.level.vo.log.MemberLevelLogPageReqVO;  
6 -import cn.iocoder.yudao.module.member.controller.admin.level.vo.log.MemberLevelLogRespVO;  
7 -import cn.iocoder.yudao.module.member.convert.level.MemberLevelLogConvert;  
8 -import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelLogDO;  
9 -import cn.iocoder.yudao.module.member.service.level.MemberLevelLogService; 5 +import cn.iocoder.yudao.module.member.controller.admin.level.vo.log.MemberLevelRecordPageReqVO;
  6 +import cn.iocoder.yudao.module.member.controller.admin.level.vo.log.MemberLevelRecordRespVO;
  7 +import cn.iocoder.yudao.module.member.convert.level.MemberLevelRecordConvert;
  8 +import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelRecordDO;
  9 +import cn.iocoder.yudao.module.member.service.level.MemberLevelRecordService;
10 import io.swagger.v3.oas.annotations.Operation; 10 import io.swagger.v3.oas.annotations.Operation;
11 import io.swagger.v3.oas.annotations.Parameter; 11 import io.swagger.v3.oas.annotations.Parameter;
12 import io.swagger.v3.oas.annotations.tags.Tag; 12 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -22,30 +22,31 @@ import javax.validation.Valid; @@ -22,30 +22,31 @@ import javax.validation.Valid;
22 22
23 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; 23 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
24 24
25 -// TODO @疯狂：是不是不用这个 controller；因为日志只是为了记录，db 可以查询、和审计即可，目前暂时不需要开放出来；  
26 @Tag(name = "管理后台 - 会员等级记录") 25 @Tag(name = "管理后台 - 会员等级记录")
27 @RestController 26 @RestController
28 -@RequestMapping("/member/level-log") 27 +@RequestMapping("/member/level-record")
29 @Validated 28 @Validated
30 -public class MemberLevelLogController { 29 +public class MemberLevelRecordController {
31 30
32 @Resource 31 @Resource
33 - private MemberLevelLogService levelLogService; 32 + private MemberLevelRecordService levelLogService;
34 33
35 @GetMapping("/get") 34 @GetMapping("/get")
36 @Operation(summary = "获得会员等级记录") 35 @Operation(summary = "获得会员等级记录")
37 @Parameter(name = "id", description = "编号", required = true, example = "1024") 36 @Parameter(name = "id", description = "编号", required = true, example = "1024")
38 - @PreAuthorize("@ss.hasPermission('member:level-log:query')")  
39 - public CommonResult<MemberLevelLogRespVO> getLevelLog(@RequestParam("id") Long id) {  
40 - MemberLevelLogDO levelLog = levelLogService.getLevelLog(id);  
41 - return success(MemberLevelLogConvert.INSTANCE.convert(levelLog)); 37 + @PreAuthorize("@ss.hasPermission('member:level-record:query')")
  38 + public CommonResult<MemberLevelRecordRespVO> getLevelRecord(@RequestParam("id") Long id) {
  39 + MemberLevelRecordDO levelLog = levelLogService.getLevelRecord(id);
  40 + return success(MemberLevelRecordConvert.INSTANCE.convert(levelLog));
42 } 41 }
43 42
44 @GetMapping("/page") 43 @GetMapping("/page")
45 @Operation(summary = "获得会员等级记录分页") 44 @Operation(summary = "获得会员等级记录分页")
46 - @PreAuthorize("@ss.hasPermission('member:level-log:query')")  
47 - public CommonResult<PageResult<MemberLevelLogRespVO>> getLevelLogPage(@Valid MemberLevelLogPageReqVO pageVO) {  
48 - PageResult<MemberLevelLogDO> pageResult = levelLogService.getLevelLogPage(pageVO);  
49 - return success(MemberLevelLogConvert.INSTANCE.convertPage(pageResult)); 45 + @PreAuthorize("@ss.hasPermission('member:level-record:query')")
  46 + public CommonResult<PageResult<MemberLevelRecordRespVO>> getLevelRecordPage(
  47 + @Valid MemberLevelRecordPageReqVO pageVO) {
  48 + PageResult<MemberLevelRecordDO> pageResult = levelLogService.getLevelRecordPage(pageVO);
  49 + return success(MemberLevelRecordConvert.INSTANCE.convertPage(pageResult));
50 } 50 }
  51 +
51 } 52 }
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/experience/MemberExperienceLogBaseVO.java renamed to yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/experience/MemberExperienceRecordBaseVO.java
  View file @498edff
@@ -10,7 +10,7 @@ import javax.validation.constraints.NotNull; @@ -10,7 +10,7 @@ import javax.validation.constraints.NotNull;
10 * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成 10 * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
11 */ 11 */
12 @Data 12 @Data
13 -public class MemberExperienceLogBaseVO { 13 +public class MemberExperienceRecordBaseVO {
14 14
15 @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "3638") 15 @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "3638")
16 @NotNull(message = "用户编号不能为空") 16 @NotNull(message = "用户编号不能为空")
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/experience/MemberExperienceLogPageReqVO.java renamed to yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/experience/MemberExperienceRecordPageReqVO.java
  View file @498edff
@@ -15,7 +15,7 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_ @@ -15,7 +15,7 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
15 @Data 15 @Data
16 @EqualsAndHashCode(callSuper = true) 16 @EqualsAndHashCode(callSuper = true)
17 @ToString(callSuper = true) 17 @ToString(callSuper = true)
18 -public class MemberExperienceLogPageReqVO extends PageParam { 18 +public class MemberExperienceRecordPageReqVO extends PageParam {
19 19
20 @Schema(description = "用户编号", example = "3638") 20 @Schema(description = "用户编号", example = "3638")
21 private Long userId; 21 private Long userId;
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/experience/MemberExperienceLogRespVO.java renamed to yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/experience/MemberExperienceRecordRespVO.java
  View file @498edff
@@ -11,7 +11,7 @@ import java.time.LocalDateTime; @@ -11,7 +11,7 @@ import java.time.LocalDateTime;
11 @Data 11 @Data
12 @EqualsAndHashCode(callSuper = true) 12 @EqualsAndHashCode(callSuper = true)
13 @ToString(callSuper = true) 13 @ToString(callSuper = true)
14 -public class MemberExperienceLogRespVO extends MemberExperienceLogBaseVO { 14 +public class MemberExperienceRecordRespVO extends MemberExperienceRecordBaseVO {
15 15
16 @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "19610") 16 @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "19610")
17 private Long id; 17 private Long id;
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/level/MemberLevelPageReqVO.java renamed to yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/level/MemberLevelListReqVO.java
  View file @498edff
1 package cn.iocoder.yudao.module.member.controller.admin.level.vo.level; 1 package cn.iocoder.yudao.module.member.controller.admin.level.vo.level;
2 2
3 -import cn.iocoder.yudao.framework.common.pojo.PageParam;  
4 import io.swagger.v3.oas.annotations.media.Schema; 3 import io.swagger.v3.oas.annotations.media.Schema;
5 import lombok.Data; 4 import lombok.Data;
6 -import lombok.EqualsAndHashCode;  
7 import lombok.ToString; 5 import lombok.ToString;
8 6
9 -@Schema(description = "管理后台 - 会员等级分页 Request VO") 7 +@Schema(description = "管理后台 - 会员等级列表筛选 Request VO")
10 @Data 8 @Data
11 -@EqualsAndHashCode(callSuper = true)  
12 @ToString(callSuper = true) 9 @ToString(callSuper = true)
13 -public class MemberLevelPageReqVO extends PageParam { 10 +public class MemberLevelListReqVO {
14 11
15 @Schema(description = "等级名称", example = "芋艿") 12 @Schema(description = "等级名称", example = "芋艿")
16 private String name; 13 private String name;
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/log/MemberLevelLogBaseVO.java renamed to yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/log/MemberLevelRecordBaseVO.java
  View file @498edff
@@ -10,7 +10,7 @@ import javax.validation.constraints.NotNull; @@ -10,7 +10,7 @@ import javax.validation.constraints.NotNull;
10 * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成 10 * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
11 */ 11 */
12 @Data 12 @Data
13 -public class MemberLevelLogBaseVO { 13 +public class MemberLevelRecordBaseVO {
14 14
15 @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "25923") 15 @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "25923")
16 @NotNull(message = "用户编号不能为空") 16 @NotNull(message = "用户编号不能为空")
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/log/MemberLevelLogPageReqVO.java renamed to yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/log/MemberLevelRecordPageReqVO.java
  View file @498edff
@@ -15,7 +15,7 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_ @@ -15,7 +15,7 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
15 @Data 15 @Data
16 @EqualsAndHashCode(callSuper = true) 16 @EqualsAndHashCode(callSuper = true)
17 @ToString(callSuper = true) 17 @ToString(callSuper = true)
18 -public class MemberLevelLogPageReqVO extends PageParam { 18 +public class MemberLevelRecordPageReqVO extends PageParam {
19 19
20 @Schema(description = "用户编号", example = "25923") 20 @Schema(description = "用户编号", example = "25923")
21 private Long userId; 21 private Long userId;
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/log/MemberLevelLogRespVO.java renamed to yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/log/MemberLevelRecordRespVO.java
  View file @498edff
@@ -11,7 +11,7 @@ import java.time.LocalDateTime; @@ -11,7 +11,7 @@ import java.time.LocalDateTime;
11 @Data 11 @Data
12 @EqualsAndHashCode(callSuper = true) 12 @EqualsAndHashCode(callSuper = true)
13 @ToString(callSuper = true) 13 @ToString(callSuper = true)
14 -public class MemberLevelLogRespVO extends MemberLevelLogBaseVO { 14 +public class MemberLevelRecordRespVO extends MemberLevelRecordBaseVO {
15 15
16 @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "8741") 16 @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "8741")
17 private Long id; 17 private Long id;
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/MemberUserController.java
  View file @498edff
@@ -5,6 +5,7 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult; @@ -5,6 +5,7 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult;
5 import cn.iocoder.yudao.framework.common.pojo.PageResult; 5 import cn.iocoder.yudao.framework.common.pojo.PageResult;
6 import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserPageReqVO; 6 import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserPageReqVO;
7 import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserRespVO; 7 import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserRespVO;
  8 +import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserUpdateLevelReqVO;
8 import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserUpdateReqVO; 9 import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserUpdateReqVO;
9 import cn.iocoder.yudao.module.member.convert.user.MemberUserConvert; 10 import cn.iocoder.yudao.module.member.convert.user.MemberUserConvert;
10 import cn.iocoder.yudao.module.member.dal.dataobject.group.MemberGroupDO; 11 import cn.iocoder.yudao.module.member.dal.dataobject.group.MemberGroupDO;
@@ -24,10 +25,14 @@ import org.springframework.web.bind.annotation.*; @@ -24,10 +25,14 @@ import org.springframework.web.bind.annotation.*;
24 25
25 import javax.annotation.Resource; 26 import javax.annotation.Resource;
26 import javax.validation.Valid; 27 import javax.validation.Valid;
27 -import java.util.*; 28 +import java.util.Collection;
  29 +import java.util.List;
  30 +import java.util.Objects;
  31 +import java.util.Set;
28 import java.util.stream.Collectors; 32 import java.util.stream.Collectors;
29 33
30 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; 34 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
  35 +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
31 36
32 @Tag(name = "管理后台 - 会员用户") 37 @Tag(name = "管理后台 - 会员用户")
33 @RestController 38 @RestController
@@ -52,6 +57,14 @@ public class MemberUserController { @@ -52,6 +57,14 @@ public class MemberUserController {
52 return success(true); 57 return success(true);
53 } 58 }
54 59
  60 + @PutMapping("/update-level")
  61 + @Operation(summary = "更新会员用户等级")
  62 + @PreAuthorize("@ss.hasPermission('member:user:update-level')")
  63 + public CommonResult<Boolean> updateUserLevel(@Valid @RequestBody MemberUserUpdateLevelReqVO updateReqVO) {
  64 + memberLevelService.updateUserLevel(updateReqVO);
  65 + return success(true);
  66 + }
  67 +
55 @GetMapping("/get") 68 @GetMapping("/get")
56 @Operation(summary = "获得会员用户") 69 @Operation(summary = "获得会员用户")
57 @Parameter(name = "id", description = "编号", required = true, example = "1024") 70 @Parameter(name = "id", description = "编号", required = true, example = "1024")
@@ -70,26 +83,19 @@ public class MemberUserController { @@ -70,26 +83,19 @@ public class MemberUserController {
70 return success(PageResult.empty()); 83 return success(PageResult.empty());
71 } 84 }
72 85
73 - Set<Long> groupIds = new HashSet<>(pageResult.getList().size());  
74 -  
75 // 处理用户标签返显 86 // 处理用户标签返显
76 Set<Long> tagIds = pageResult.getList().stream() 87 Set<Long> tagIds = pageResult.getList().stream()
77 - .peek(m -> {  
78 - if (m.getGroupId() != null) {  
79 - groupIds.add(m.getGroupId());  
80 - }  
81 - })  
82 .map(MemberUserDO::getTagIds) 88 .map(MemberUserDO::getTagIds)
83 .filter(Objects::nonNull) 89 .filter(Objects::nonNull)
84 .flatMap(Collection::stream) 90 .flatMap(Collection::stream)
85 .collect(Collectors.toSet()); 91 .collect(Collectors.toSet());
86 List<MemberTagDO> tags = memberTagService.getTagList(tagIds); 92 List<MemberTagDO> tags = memberTagService.getTagList(tagIds);
87 -  
88 // 处理用户级别返显 93 // 处理用户级别返显
89 - List<MemberLevelDO> levels = memberLevelService.getEnableLevelList(); 94 + List<MemberLevelDO> levels = memberLevelService.getLevelList(
  95 + convertSet(pageResult.getList(), MemberUserDO::getLevelId));
90 // 处理用户分组返显 96 // 处理用户分组返显
91 - List<MemberGroupDO> groups = memberGroupService.getGroupList(groupIds);  
92 - 97 + List<MemberGroupDO> groups = memberGroupService.getGroupList(
  98 + convertSet(pageResult.getList(), MemberUserDO::getGroupId));
93 return success(MemberUserConvert.INSTANCE.convertPage(pageResult, tags, levels, groups)); 99 return success(MemberUserConvert.INSTANCE.convertPage(pageResult, tags, levels, groups));
94 } 100 }
95 101
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserBaseVO.java
  View file @498edff
@@ -40,9 +40,12 @@ public class MemberUserBaseVO { @@ -40,9 +40,12 @@ public class MemberUserBaseVO {
40 @Schema(description = "用户性别", example = "1") 40 @Schema(description = "用户性别", example = "1")
41 private Byte sex; 41 private Byte sex;
42 42
43 - @Schema(description = "所在地", example = "4371") 43 + @Schema(description = "所在地编号", example = "4371")
44 private Long areaId; 44 private Long areaId;
45 45
  46 + @Schema(description = "所在地全程", example = "上海上海市普陀区")
  47 + private String areaName;
  48 +
46 @Schema(description = "出生日期", example = "2023-03-12") 49 @Schema(description = "出生日期", example = "2023-03-12")
47 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY) 50 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
48 private LocalDateTime birthday; 51 private LocalDateTime birthday;
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserRespVO.java
  View file @498edff
@@ -31,9 +31,12 @@ public class MemberUserRespVO extends MemberUserBaseVO { @@ -31,9 +31,12 @@ public class MemberUserRespVO extends MemberUserBaseVO {
31 31
32 // ========== 其它信息 ========== 32 // ========== 其它信息 ==========
33 33
34 - @Schema(description = "积分", example = "100") 34 + @Schema(description = "积分", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
35 private Integer point; 35 private Integer point;
36 36
  37 + @Schema(description = "总积分", requiredMode = Schema.RequiredMode.REQUIRED, example = "2000")
  38 + private Integer totalPoint;
  39 +
37 @Schema(description = "会员标签", example = "[红色, 快乐]") 40 @Schema(description = "会员标签", example = "[红色, 快乐]")
38 private List<String> tagNames; 41 private List<String> tagNames;
39 42
@@ -43,4 +46,7 @@ public class MemberUserRespVO extends MemberUserBaseVO { @@ -43,4 +46,7 @@ public class MemberUserRespVO extends MemberUserBaseVO {
43 @Schema(description = "用户分组", example = "购物达人") 46 @Schema(description = "用户分组", example = "购物达人")
44 private String groupName; 47 private String groupName;
45 48
  49 + @Schema(description = "用户经验值", requiredMode = Schema.RequiredMode.REQUIRED, example = "200")
  50 + private Integer experience;
  51 +
46 } 52 }
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserUpdateLevelReqVO.java 0 → 100644
  View file @498edff
  1 +package cn.iocoder.yudao.module.member.controller.admin.user.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.NotBlank;
  9 +import javax.validation.constraints.NotNull;
  10 +
  11 +@Schema(description = "管理后台 - 会员用户 修改等级 Request VO")
  12 +@Data
  13 +@EqualsAndHashCode(callSuper = true)
  14 +@ToString(callSuper = true)
  15 +public class MemberUserUpdateLevelReqVO extends MemberUserBaseVO {
  16 +
  17 + @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "23788")
  18 + @NotNull(message = "用户编号不能为空")
  19 + private Long id;
  20 +
  21 + /**
  22 + * 取消用户等级时，值为空
  23 + */
  24 + @Schema(description = "用户等级编号", example = "1")
  25 + private Long levelId;
  26 +
  27 + @Schema(description = "修改原因", requiredMode = Schema.RequiredMode.REQUIRED, example = "推广需要")
  28 + @NotBlank(message = "修改原因不能为空")
  29 + private String reason;
  30 +
  31 +}
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserUpdateReqVO.java
  View file @498edff
@@ -17,7 +17,4 @@ public class MemberUserUpdateReqVO extends MemberUserBaseVO { @@ -17,7 +17,4 @@ public class MemberUserUpdateReqVO extends MemberUserBaseVO {
17 @NotNull(message = "编号不能为空") 17 @NotNull(message = "编号不能为空")
18 private Long id; 18 private Long id;
19 19
20 - @Schema(description = "会员级别修改原因", requiredMode = Schema.RequiredMode.REQUIRED, example = "推广需要")  
21 - private String levelReason;  
22 -  
23 } 20 }
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/address/AddressConvert.java
  View file @498edff
@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.member.convert.address; @@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.member.convert.address;
2 2
3 import cn.iocoder.yudao.framework.ip.core.utils.AreaUtils; 3 import cn.iocoder.yudao.framework.ip.core.utils.AreaUtils;
4 import cn.iocoder.yudao.module.member.api.address.dto.AddressRespDTO; 4 import cn.iocoder.yudao.module.member.api.address.dto.AddressRespDTO;
  5 +import cn.iocoder.yudao.module.member.controller.admin.address.vo.AddressRespVO;
5 import cn.iocoder.yudao.module.member.controller.app.address.vo.AppAddressCreateReqVO; 6 import cn.iocoder.yudao.module.member.controller.app.address.vo.AppAddressCreateReqVO;
6 import cn.iocoder.yudao.module.member.controller.app.address.vo.AppAddressRespVO; 7 import cn.iocoder.yudao.module.member.controller.app.address.vo.AppAddressRespVO;
7 import cn.iocoder.yudao.module.member.controller.app.address.vo.AppAddressUpdateReqVO; 8 import cn.iocoder.yudao.module.member.controller.app.address.vo.AppAddressUpdateReqVO;
@@ -39,4 +40,6 @@ public interface AddressConvert { @@ -39,4 +40,6 @@ public interface AddressConvert {
39 return AreaUtils.format(areaId); 40 return AreaUtils.format(areaId);
40 } 41 }
41 42
  43 + List<AddressRespVO> convertList2(List<MemberAddressDO> list);
  44 +
42 } 45 }
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/level/MemberExperienceLogConvert.java renamed to yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/level/MemberExperienceRecordConvert.java
  View file @498edff
1 package cn.iocoder.yudao.module.member.convert.level; 1 package cn.iocoder.yudao.module.member.convert.level;
2 2
3 import cn.iocoder.yudao.framework.common.pojo.PageResult; 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
4 -import cn.iocoder.yudao.module.member.controller.admin.level.vo.experience.MemberExperienceLogRespVO;  
5 -import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberExperienceLogDO; 4 +import cn.iocoder.yudao.module.member.controller.admin.level.vo.experience.MemberExperienceRecordRespVO;
  5 +import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberExperienceRecordDO;
6 import org.mapstruct.Mapper; 6 import org.mapstruct.Mapper;
7 import org.mapstruct.factory.Mappers; 7 import org.mapstruct.factory.Mappers;
8 8
@@ -14,14 +14,17 @@ import java.util.List; @@ -14,14 +14,17 @@ import java.util.List;
14 * @author owen 14 * @author owen
15 */ 15 */
16 @Mapper 16 @Mapper
17 -public interface MemberExperienceLogConvert { 17 +public interface MemberExperienceRecordConvert {
18 18
19 - MemberExperienceLogConvert INSTANCE = Mappers.getMapper(MemberExperienceLogConvert.class); 19 + MemberExperienceRecordConvert INSTANCE = Mappers.getMapper(MemberExperienceRecordConvert.class);
20 20
21 - MemberExperienceLogRespVO convert(MemberExperienceLogDO bean); 21 + MemberExperienceRecordRespVO convert(MemberExperienceRecordDO bean);
22 22
23 - List<MemberExperienceLogRespVO> convertList(List<MemberExperienceLogDO> list); 23 + List<MemberExperienceRecordRespVO> convertList(List<MemberExperienceRecordDO> list);
24 24
25 - PageResult<MemberExperienceLogRespVO> convertPage(PageResult<MemberExperienceLogDO> page); 25 + PageResult<MemberExperienceRecordRespVO> convertPage(PageResult<MemberExperienceRecordDO> page);
26 26
  27 + MemberExperienceRecordDO convert(Long userId, Integer experience, Integer totalExperience,
  28 + String bizId, Integer bizType,
  29 + String title, String description);
27 } 30 }
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/level/MemberLevelConvert.java
  View file @498edff
1 package cn.iocoder.yudao.module.member.convert.level; 1 package cn.iocoder.yudao.module.member.convert.level;
2 2
3 -import cn.iocoder.yudao.framework.common.pojo.PageResult;  
4 import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelCreateReqVO; 3 import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelCreateReqVO;
5 import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelRespVO; 4 import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelRespVO;
6 import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelSimpleRespVO; 5 import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelSimpleRespVO;
@@ -29,7 +28,5 @@ public interface MemberLevelConvert { @@ -29,7 +28,5 @@ public interface MemberLevelConvert {
29 28
30 List<MemberLevelRespVO> convertList(List<MemberLevelDO> list); 29 List<MemberLevelRespVO> convertList(List<MemberLevelDO> list);
31 30
32 - PageResult<MemberLevelRespVO> convertPage(PageResult<MemberLevelDO> page);  
33 -  
34 List<MemberLevelSimpleRespVO> convertSimpleList(List<MemberLevelDO> list); 31 List<MemberLevelSimpleRespVO> convertSimpleList(List<MemberLevelDO> list);
35 } 32 }
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/level/MemberLevelLogConvert.java deleted
View file @655eefc
1 -package cn.iocoder.yudao.module.member.convert.level;  
2 -  
3 -import cn.iocoder.yudao.framework.common.pojo.PageResult;  
4 -import cn.iocoder.yudao.module.member.controller.admin.level.vo.log.MemberLevelLogRespVO;  
5 -import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelLogDO;  
6 -import org.mapstruct.Mapper;  
7 -import org.mapstruct.factory.Mappers;  
8 -  
9 -import java.util.List;  
10 -  
11 -/**  
12 - * 会员等级记录 Convert  
13 - *  
14 - * @author owen  
15 - */  
16 -@Mapper  
17 -public interface MemberLevelLogConvert {  
18 -  
19 - MemberLevelLogConvert INSTANCE = Mappers.getMapper(MemberLevelLogConvert.class);  
20 -  
21 - MemberLevelLogRespVO convert(MemberLevelLogDO bean);  
22 -  
23 - List<MemberLevelLogRespVO> convertList(List<MemberLevelLogDO> list);  
24 -  
25 - PageResult<MemberLevelLogRespVO> convertPage(PageResult<MemberLevelLogDO> page);  
26 -  
27 -}  
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/level/MemberLevelRecordConvert.java 0 → 100644
  View file @498edff
  1 +package cn.iocoder.yudao.module.member.convert.level;
  2 +
  3 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  4 +import cn.iocoder.yudao.module.member.controller.admin.level.vo.log.MemberLevelRecordRespVO;
  5 +import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO;
  6 +import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelRecordDO;
  7 +import org.mapstruct.Mapper;
  8 +import org.mapstruct.factory.Mappers;
  9 +
  10 +import java.util.List;
  11 +
  12 +/**
  13 + * 会员等级记录 Convert
  14 + *
  15 + * @author owen
  16 + */
  17 +@Mapper
  18 +public interface MemberLevelRecordConvert {
  19 +
  20 + MemberLevelRecordConvert INSTANCE = Mappers.getMapper(MemberLevelRecordConvert.class);
  21 +
  22 + MemberLevelRecordRespVO convert(MemberLevelRecordDO bean);
  23 +
  24 + List<MemberLevelRecordRespVO> convertList(List<MemberLevelRecordDO> list);
  25 +
  26 + PageResult<MemberLevelRecordRespVO> convertPage(PageResult<MemberLevelRecordDO> page);
  27 +
  28 + default MemberLevelRecordDO copyTo(MemberLevelDO from, MemberLevelRecordDO to) {
  29 + if (from != null) {
  30 + to.setLevelId(from.getId());
  31 + to.setLevel(from.getLevel());
  32 + to.setDiscountPercent(from.getDiscountPercent());
  33 + to.setExperience(from.getExperience());
  34 + }
  35 + return to;
  36 + }
  37 +}
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/user/MemberUserConvert.java
  View file @498edff
1 package cn.iocoder.yudao.module.member.convert.user; 1 package cn.iocoder.yudao.module.member.convert.user;
2 2
3 -import cn.hutool.core.map.MapUtil;  
4 -import cn.hutool.core.util.StrUtil;  
5 import cn.iocoder.yudao.framework.common.pojo.PageResult; 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
6 import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO; 4 import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
7 import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserRespVO; 5 import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserRespVO;
8 import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserUpdateReqVO; 6 import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserUpdateReqVO;
9 import cn.iocoder.yudao.module.member.controller.app.user.vo.AppMemberUserInfoRespVO; 7 import cn.iocoder.yudao.module.member.controller.app.user.vo.AppMemberUserInfoRespVO;
  8 +import cn.iocoder.yudao.module.member.convert.address.AddressConvert;
10 import cn.iocoder.yudao.module.member.dal.dataobject.group.MemberGroupDO; 9 import cn.iocoder.yudao.module.member.dal.dataobject.group.MemberGroupDO;
11 import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO; 10 import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO;
12 import cn.iocoder.yudao.module.member.dal.dataobject.tag.MemberTagDO; 11 import cn.iocoder.yudao.module.member.dal.dataobject.tag.MemberTagDO;
13 import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO; 12 import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO;
14 import org.mapstruct.Mapper; 13 import org.mapstruct.Mapper;
  14 +import org.mapstruct.Mapping;
15 import org.mapstruct.factory.Mappers; 15 import org.mapstruct.factory.Mappers;
16 16
17 import java.util.List; 17 import java.util.List;
@@ -20,7 +20,7 @@ import java.util.Map; @@ -20,7 +20,7 @@ import java.util.Map;
20 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList; 20 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
21 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap; 21 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap;
22 22
23 -@Mapper 23 +@Mapper(uses = {AddressConvert.class})
24 public interface MemberUserConvert { 24 public interface MemberUserConvert {
25 25
26 MemberUserConvert INSTANCE = Mappers.getMapper(MemberUserConvert.class); 26 MemberUserConvert INSTANCE = Mappers.getMapper(MemberUserConvert.class);
@@ -35,6 +35,7 @@ public interface MemberUserConvert { @@ -35,6 +35,7 @@ public interface MemberUserConvert {
35 35
36 PageResult<MemberUserRespVO> convertPage(PageResult<MemberUserDO> page); 36 PageResult<MemberUserRespVO> convertPage(PageResult<MemberUserDO> page);
37 37
  38 + @Mapping(source = "areaId", target = "areaName", qualifiedByName = "convertAreaIdToAreaName")
38 MemberUserRespVO convert03(MemberUserDO bean); 39 MemberUserRespVO convert03(MemberUserDO bean);
39 40
40 default PageResult<MemberUserRespVO> convertPage(PageResult<MemberUserDO> pageResult, 41 default PageResult<MemberUserRespVO> convertPage(PageResult<MemberUserDO> pageResult,
@@ -42,18 +43,17 @@ public interface MemberUserConvert { @@ -42,18 +43,17 @@ public interface MemberUserConvert {
42 List<MemberLevelDO> levels, 43 List<MemberLevelDO> levels,
43 List<MemberGroupDO> groups) { 44 List<MemberGroupDO> groups) {
44 PageResult<MemberUserRespVO> result = convertPage(pageResult); 45 PageResult<MemberUserRespVO> result = convertPage(pageResult);
45 -  
46 // 处理关联数据 46 // 处理关联数据
47 Map<Long, String> tagMap = convertMap(tags, MemberTagDO::getId, MemberTagDO::getName); 47 Map<Long, String> tagMap = convertMap(tags, MemberTagDO::getId, MemberTagDO::getName);
48 Map<Long, String> levelMap = convertMap(levels, MemberLevelDO::getId, MemberLevelDO::getName); 48 Map<Long, String> levelMap = convertMap(levels, MemberLevelDO::getId, MemberLevelDO::getName);
49 Map<Long, String> groupMap = convertMap(groups, MemberGroupDO::getId, MemberGroupDO::getName); 49 Map<Long, String> groupMap = convertMap(groups, MemberGroupDO::getId, MemberGroupDO::getName);
50 -  
51 // 填充关联数据 50 // 填充关联数据
52 - for (MemberUserRespVO vo : result.getList()) {  
53 - vo.setTagNames(convertList(vo.getTagIds(), tagMap::get));  
54 - vo.setLevelName(MapUtil.getStr(levelMap, vo.getLevelId(), StrUtil.EMPTY));  
55 - vo.setGroupName(MapUtil.getStr(groupMap, vo.getGroupId(), StrUtil.EMPTY));  
56 - } 51 + result.getList().forEach(user -> {
  52 + user.setTagNames(convertList(user.getTagIds(), tagMap::get));
  53 + user.setLevelName(levelMap.get(user.getLevelId()));
  54 + user.setGroupName(groupMap.get(user.getGroupId()));
  55 + });
57 return result; 56 return result;
58 } 57 }
  58 +
59 } 59 }
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/level/MemberExperienceLogDO.java renamed to yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/level/MemberExperienceRecordDO.java
  View file @498edff
@@ -13,15 +13,15 @@ import lombok.*; @@ -13,15 +13,15 @@ import lombok.*;
13 * 13 *
14 * @author owen 14 * @author owen
15 */ 15 */
16 -@TableName("member_experience_log")  
17 -@KeySequence("member_experience_log_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 16 +@TableName("member_experience_record")
  17 +@KeySequence("member_experience_record_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
18 @Data 18 @Data
19 @EqualsAndHashCode(callSuper = true) 19 @EqualsAndHashCode(callSuper = true)
20 @ToString(callSuper = true) 20 @ToString(callSuper = true)
21 @Builder 21 @Builder
22 @NoArgsConstructor 22 @NoArgsConstructor
23 @AllArgsConstructor 23 @AllArgsConstructor
24 -public class MemberExperienceLogDO extends BaseDO { 24 +public class MemberExperienceRecordDO extends BaseDO {
25 25
26 /** 26 /**
27 * 编号 27 * 编号
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/level/MemberLevelLogDO.java renamed to yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/level/MemberLevelRecordDO.java
  View file @498edff
@@ -14,15 +14,15 @@ import lombok.*; @@ -14,15 +14,15 @@ import lombok.*;
14 * 14 *
15 * @author owen 15 * @author owen
16 */ 16 */
17 -@TableName("member_level_log")  
18 -@KeySequence("member_level_log_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 17 +@TableName("member_level_record")
  18 +@KeySequence("member_level_record_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
19 @Data 19 @Data
20 @EqualsAndHashCode(callSuper = true) 20 @EqualsAndHashCode(callSuper = true)
21 @ToString(callSuper = true) 21 @ToString(callSuper = true)
22 @Builder 22 @Builder
23 @NoArgsConstructor 23 @NoArgsConstructor
24 @AllArgsConstructor 24 @AllArgsConstructor
25 -public class MemberLevelLogDO extends BaseDO { 25 +public class MemberLevelRecordDO extends BaseDO {
26 26
27 /** 27 /**
28 * 编号 28 * 编号
@@ -59,7 +59,6 @@ public class MemberLevelLogDO extends BaseDO { @@ -59,7 +59,6 @@ public class MemberLevelLogDO extends BaseDO {
59 * 会员此时的经验 59 * 会员此时的经验
60 */ 60 */
61 private Integer userExperience; 61 private Integer userExperience;
62 - // TODO @疯狂：是不是 remark 和 description 可以合并成 description 就够了  
63 /** 62 /**
64 * 备注 63 * 备注
65 */ 64 */
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/level/MemberExperienceLogMapper.java deleted
View file @655eefc
1 -package cn.iocoder.yudao.module.member.dal.mysql.level;  
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.level.vo.experience.MemberExperienceLogPageReqVO;  
7 -import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberExperienceLogDO;  
8 -import org.apache.ibatis.annotations.Mapper;  
9 -  
10 -/**  
11 - * 会员经验记录 Mapper  
12 - *  
13 - * @author owen  
14 - */  
15 -@Mapper  
16 -public interface MemberExperienceLogMapper extends BaseMapperX<MemberExperienceLogDO> {  
17 -  
18 - default PageResult<MemberExperienceLogDO> selectPage(MemberExperienceLogPageReqVO reqVO) {  
19 - return selectPage(reqVO, new LambdaQueryWrapperX<MemberExperienceLogDO>()  
20 - .eqIfPresent(MemberExperienceLogDO::getUserId, reqVO.getUserId())  
21 - .eqIfPresent(MemberExperienceLogDO::getBizId, reqVO.getBizId())  
22 - .eqIfPresent(MemberExperienceLogDO::getBizType, reqVO.getBizType())  
23 - .eqIfPresent(MemberExperienceLogDO::getTitle, reqVO.getTitle())  
24 - .betweenIfPresent(MemberExperienceLogDO::getCreateTime, reqVO.getCreateTime())  
25 - .orderByDesc(MemberExperienceLogDO::getId));  
26 - }  
27 -  
28 -}  
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/level/MemberExperienceRecordMapper.java 0 → 100644
  View file @498edff
  1 +package cn.iocoder.yudao.module.member.dal.mysql.level;
  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.level.vo.experience.MemberExperienceRecordPageReqVO;
  7 +import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberExperienceRecordDO;
  8 +import org.apache.ibatis.annotations.Mapper;
  9 +
  10 +/**
  11 + * 会员经验记录 Mapper
  12 + *
  13 + * @author owen
  14 + */
  15 +@Mapper
  16 +public interface MemberExperienceRecordMapper extends BaseMapperX<MemberExperienceRecordDO> {
  17 +
  18 + default PageResult<MemberExperienceRecordDO> selectPage(MemberExperienceRecordPageReqVO reqVO) {
  19 + return selectPage(reqVO, new LambdaQueryWrapperX<MemberExperienceRecordDO>()
  20 + .eqIfPresent(MemberExperienceRecordDO::getUserId, reqVO.getUserId())
  21 + .eqIfPresent(MemberExperienceRecordDO::getBizId, reqVO.getBizId())
  22 + .eqIfPresent(MemberExperienceRecordDO::getBizType, reqVO.getBizType())
  23 + .eqIfPresent(MemberExperienceRecordDO::getTitle, reqVO.getTitle())
  24 + .betweenIfPresent(MemberExperienceRecordDO::getCreateTime, reqVO.getCreateTime())
  25 + .orderByDesc(MemberExperienceRecordDO::getId));
  26 + }
  27 +
  28 +}
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/level/MemberLevelMapper.java
  View file @498edff
1 package cn.iocoder.yudao.module.member.dal.mysql.level; 1 package cn.iocoder.yudao.module.member.dal.mysql.level;
2 2
3 -import cn.iocoder.yudao.framework.common.pojo.PageResult;  
4 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; 3 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
5 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; 4 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
6 -import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelPageReqVO; 5 +import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelListReqVO;
7 import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO; 6 import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO;
8 import org.apache.ibatis.annotations.Mapper; 7 import org.apache.ibatis.annotations.Mapper;
9 8
@@ -17,8 +16,8 @@ import java.util.List; @@ -17,8 +16,8 @@ import java.util.List;
17 @Mapper 16 @Mapper
18 public interface MemberLevelMapper extends BaseMapperX<MemberLevelDO> { 17 public interface MemberLevelMapper extends BaseMapperX<MemberLevelDO> {
19 18
20 - default PageResult<MemberLevelDO> selectPage(MemberLevelPageReqVO reqVO) {  
21 - return selectPage(reqVO, new LambdaQueryWrapperX<MemberLevelDO>() 19 + default List<MemberLevelDO> selectList(MemberLevelListReqVO reqVO) {
  20 + return selectList(new LambdaQueryWrapperX<MemberLevelDO>()
22 .likeIfPresent(MemberLevelDO::getName, reqVO.getName()) 21 .likeIfPresent(MemberLevelDO::getName, reqVO.getName())
23 .eqIfPresent(MemberLevelDO::getStatus, reqVO.getStatus()) 22 .eqIfPresent(MemberLevelDO::getStatus, reqVO.getStatus())
24 .orderByAsc(MemberLevelDO::getLevel)); 23 .orderByAsc(MemberLevelDO::getLevel));
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/level/MemberLevelLogMapper.java renamed to yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/level/MemberLevelRecordMapper.java
  View file @498edff
@@ -3,8 +3,8 @@ package cn.iocoder.yudao.module.member.dal.mysql.level; @@ -3,8 +3,8 @@ package cn.iocoder.yudao.module.member.dal.mysql.level;
3 import cn.iocoder.yudao.framework.common.pojo.PageResult; 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
4 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; 4 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
5 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; 5 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
6 -import cn.iocoder.yudao.module.member.controller.admin.level.vo.log.MemberLevelLogPageReqVO;  
7 -import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelLogDO; 6 +import cn.iocoder.yudao.module.member.controller.admin.level.vo.log.MemberLevelRecordPageReqVO;
  7 +import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelRecordDO;
8 import org.apache.ibatis.annotations.Mapper; 8 import org.apache.ibatis.annotations.Mapper;
9 9
10 /** 10 /**
@@ -13,14 +13,14 @@ import org.apache.ibatis.annotations.Mapper; @@ -13,14 +13,14 @@ import org.apache.ibatis.annotations.Mapper;
13 * @author owen 13 * @author owen
14 */ 14 */
15 @Mapper 15 @Mapper
16 -public interface MemberLevelLogMapper extends BaseMapperX<MemberLevelLogDO> { 16 +public interface MemberLevelRecordMapper extends BaseMapperX<MemberLevelRecordDO> {
17 17
18 - default PageResult<MemberLevelLogDO> selectPage(MemberLevelLogPageReqVO reqVO) {  
19 - return selectPage(reqVO, new LambdaQueryWrapperX<MemberLevelLogDO>()  
20 - .eqIfPresent(MemberLevelLogDO::getUserId, reqVO.getUserId())  
21 - .eqIfPresent(MemberLevelLogDO::getLevelId, reqVO.getLevelId())  
22 - .betweenIfPresent(MemberLevelLogDO::getCreateTime, reqVO.getCreateTime())  
23 - .orderByDesc(MemberLevelLogDO::getId)); 18 + default PageResult<MemberLevelRecordDO> selectPage(MemberLevelRecordPageReqVO reqVO) {
  19 + return selectPage(reqVO, new LambdaQueryWrapperX<MemberLevelRecordDO>()
  20 + .eqIfPresent(MemberLevelRecordDO::getUserId, reqVO.getUserId())
  21 + .eqIfPresent(MemberLevelRecordDO::getLevelId, reqVO.getLevelId())
  22 + .betweenIfPresent(MemberLevelRecordDO::getCreateTime, reqVO.getCreateTime())
  23 + .orderByDesc(MemberLevelRecordDO::getId));
24 } 24 }
25 25
26 } 26 }
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/user/MemberUserMapper.java
  View file @498edff
@@ -7,7 +7,6 @@ import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; @@ -7,7 +7,6 @@ import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
7 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; 7 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
8 import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserPageReqVO; 8 import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserPageReqVO;
9 import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO; 9 import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO;
10 -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;  
11 import org.apache.ibatis.annotations.Mapper; 10 import org.apache.ibatis.annotations.Mapper;
12 11
13 import java.util.List; 12 import java.util.List;
@@ -50,20 +49,6 @@ public interface MemberUserMapper extends BaseMapperX&lt;MemberUserDO&gt; { @@ -50,20 +49,6 @@ public interface MemberUserMapper extends BaseMapperX&lt;MemberUserDO&gt; {
50 .orderByDesc(MemberUserDO::getId)); 49 .orderByDesc(MemberUserDO::getId));
51 } 50 }
52 51
53 - // TODO @疯狂：命名可以改成 updateUserLevelToNull；db 侧的操作，尽量无业务含义，更多是 select、update、insert 操作  
54 - /**  
55 - * 取消会员的等级  
56 - *  
57 - * @param userId 会员编号  
58 - * @return 受影响的行数  
59 - */  
60 - default int cancelUserLevel(Long userId) {  
61 - return update(null, new LambdaUpdateWrapper<MemberUserDO>()  
62 - .eq(MemberUserDO::getId, userId)  
63 - .set(MemberUserDO::getExperience, 0)  
64 - .set(MemberUserDO::getLevelId, null));  
65 - }  
66 -  
67 default Long selectCountByGroupId(Long groupId) { 52 default Long selectCountByGroupId(Long groupId) {
68 return selectCount(MemberUserDO::getGroupId, groupId); 53 return selectCount(MemberUserDO::getGroupId, groupId);
69 } 54 }
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/group/MemberGroupServiceImpl.java
  View file @498edff
@@ -9,7 +9,7 @@ import cn.iocoder.yudao.module.member.controller.admin.group.vo.MemberGroupUpdat @@ -9,7 +9,7 @@ import cn.iocoder.yudao.module.member.controller.admin.group.vo.MemberGroupUpdat
9 import cn.iocoder.yudao.module.member.convert.group.MemberGroupConvert; 9 import cn.iocoder.yudao.module.member.convert.group.MemberGroupConvert;
10 import cn.iocoder.yudao.module.member.dal.dataobject.group.MemberGroupDO; 10 import cn.iocoder.yudao.module.member.dal.dataobject.group.MemberGroupDO;
11 import cn.iocoder.yudao.module.member.dal.mysql.group.MemberGroupMapper; 11 import cn.iocoder.yudao.module.member.dal.mysql.group.MemberGroupMapper;
12 -import cn.iocoder.yudao.module.member.dal.mysql.user.MemberUserMapper; 12 +import cn.iocoder.yudao.module.member.service.user.MemberUserService;
13 import org.springframework.stereotype.Service; 13 import org.springframework.stereotype.Service;
14 import org.springframework.validation.annotation.Validated; 14 import org.springframework.validation.annotation.Validated;
15 15
@@ -33,7 +33,7 @@ public class MemberGroupServiceImpl implements MemberGroupService { @@ -33,7 +33,7 @@ public class MemberGroupServiceImpl implements MemberGroupService {
33 @Resource 33 @Resource
34 private MemberGroupMapper groupMapper; 34 private MemberGroupMapper groupMapper;
35 @Resource 35 @Resource
36 - private MemberUserMapper memberUserMapper; 36 + private MemberUserService memberUserService;
37 37
38 @Override 38 @Override
39 public Long createGroup(MemberGroupCreateReqVO createReqVO) { 39 public Long createGroup(MemberGroupCreateReqVO createReqVO) {
@@ -70,7 +70,7 @@ public class MemberGroupServiceImpl implements MemberGroupService { @@ -70,7 +70,7 @@ public class MemberGroupServiceImpl implements MemberGroupService {
70 } 70 }
71 71
72 void validateGroupHasUser(Long id) { 72 void validateGroupHasUser(Long id) {
73 - Long count = memberUserMapper.selectCountByGroupId(id); 73 + Long count = memberUserService.getUserCountByGroupId(id);
74 if (count > 0) { 74 if (count > 0) {
75 throw exception(GROUP_HAS_USER); 75 throw exception(GROUP_HAS_USER);
76 } 76 }
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberExperienceLogService.java renamed to yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberExperienceRecordService.java
  View file @498edff
1 package cn.iocoder.yudao.module.member.service.level; 1 package cn.iocoder.yudao.module.member.service.level;
2 2
3 import cn.iocoder.yudao.framework.common.pojo.PageResult; 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
4 -import cn.iocoder.yudao.module.member.controller.admin.level.vo.experience.MemberExperienceLogPageReqVO;  
5 -import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberExperienceLogDO; 4 +import cn.iocoder.yudao.module.member.controller.admin.level.vo.experience.MemberExperienceRecordPageReqVO;
  5 +import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberExperienceRecordDO;
6 import cn.iocoder.yudao.module.member.enums.MemberExperienceBizTypeEnum; 6 import cn.iocoder.yudao.module.member.enums.MemberExperienceBizTypeEnum;
7 7
8 import java.util.Collection; 8 import java.util.Collection;
@@ -13,7 +13,7 @@ import java.util.List; @@ -13,7 +13,7 @@ import java.util.List;
13 * 13 *
14 * @author owen 14 * @author owen
15 */ 15 */
16 -public interface MemberExperienceLogService { 16 +public interface MemberExperienceRecordService {
17 17
18 /** 18 /**
19 * 获得会员经验记录 19 * 获得会员经验记录
@@ -21,7 +21,7 @@ public interface MemberExperienceLogService { @@ -21,7 +21,7 @@ public interface MemberExperienceLogService {
21 * @param id 编号 21 * @param id 编号
22 * @return 会员经验记录 22 * @return 会员经验记录
23 */ 23 */
24 - MemberExperienceLogDO getExperienceLog(Long id); 24 + MemberExperienceRecordDO getExperienceRecord(Long id);
25 25
26 /** 26 /**
27 * 获得会员经验记录列表 27 * 获得会员经验记录列表
@@ -29,7 +29,7 @@ public interface MemberExperienceLogService { @@ -29,7 +29,7 @@ public interface MemberExperienceLogService {
29 * @param ids 编号 29 * @param ids 编号
30 * @return 会员经验记录列表 30 * @return 会员经验记录列表
31 */ 31 */
32 - List<MemberExperienceLogDO> getExperienceLogList(Collection<Long> ids); 32 + List<MemberExperienceRecordDO> getExperienceRecordList(Collection<Long> ids);
33 33
34 /** 34 /**
35 * 获得会员经验记录分页 35 * 获得会员经验记录分页
@@ -37,18 +37,7 @@ public interface MemberExperienceLogService { @@ -37,18 +37,7 @@ public interface MemberExperienceLogService {
37 * @param pageReqVO 分页查询 37 * @param pageReqVO 分页查询
38 * @return 会员经验记录分页 38 * @return 会员经验记录分页
39 */ 39 */
40 - PageResult<MemberExperienceLogDO> getExperienceLogPage(MemberExperienceLogPageReqVO pageReqVO);  
41 -  
42 - // TODO @疯狂：类似 MemberLevelLogService 的方法，这里也需要提供一个通用的方法，用于创建经验变动记录  
43 -  
44 - /**  
45 - * 创建 手动调整 经验变动记录  
46 - *  
47 - * @param userId 会员编号  
48 - * @param experience 变动经验值  
49 - * @param totalExperience 会员当前的经验  
50 - */  
51 - void createAdjustLog(Long userId, int experience, int totalExperience); 40 + PageResult<MemberExperienceRecordDO> getExperienceRecordPage(MemberExperienceRecordPageReqVO pageReqVO);
52 41
53 /** 42 /**
54 * 根据业务类型, 创建 经验变动记录 43 * 根据业务类型, 创建 经验变动记录
@@ -59,5 +48,6 @@ public interface MemberExperienceLogService { @@ -59,5 +48,6 @@ public interface MemberExperienceLogService {
59 * @param bizType 业务类型 48 * @param bizType 业务类型
60 * @param bizId 业务ID 49 * @param bizId 业务ID
61 */ 50 */
62 - void createBizLog(Long userId, int experience, int totalExperience, MemberExperienceBizTypeEnum bizType, String bizId); 51 + void createExperienceRecord(Long userId, Integer experience, Integer totalExperience,
  52 + MemberExperienceBizTypeEnum bizType, String bizId);
63 } 53 }
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberExperienceLogServiceImpl.java renamed to yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberExperienceRecordServiceImpl.java
  View file @498edff
@@ -2,9 +2,10 @@ package cn.iocoder.yudao.module.member.service.level; @@ -2,9 +2,10 @@ package cn.iocoder.yudao.module.member.service.level;
2 2
3 import cn.hutool.core.util.StrUtil; 3 import cn.hutool.core.util.StrUtil;
4 import cn.iocoder.yudao.framework.common.pojo.PageResult; 4 import cn.iocoder.yudao.framework.common.pojo.PageResult;
5 -import cn.iocoder.yudao.module.member.controller.admin.level.vo.experience.MemberExperienceLogPageReqVO;  
6 -import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberExperienceLogDO;  
7 -import cn.iocoder.yudao.module.member.dal.mysql.level.MemberExperienceLogMapper; 5 +import cn.iocoder.yudao.module.member.controller.admin.level.vo.experience.MemberExperienceRecordPageReqVO;
  6 +import cn.iocoder.yudao.module.member.convert.level.MemberExperienceRecordConvert;
  7 +import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberExperienceRecordDO;
  8 +import cn.iocoder.yudao.module.member.dal.mysql.level.MemberExperienceRecordMapper;
8 import cn.iocoder.yudao.module.member.enums.MemberExperienceBizTypeEnum; 9 import cn.iocoder.yudao.module.member.enums.MemberExperienceBizTypeEnum;
9 import org.springframework.stereotype.Service; 10 import org.springframework.stereotype.Service;
10 import org.springframework.validation.annotation.Validated; 11 import org.springframework.validation.annotation.Validated;
@@ -20,45 +21,34 @@ import java.util.List; @@ -20,45 +21,34 @@ import java.util.List;
20 */ 21 */
21 @Service 22 @Service
22 @Validated 23 @Validated
23 -public class MemberExperienceLogServiceImpl implements MemberExperienceLogService { 24 +public class MemberExperienceRecordServiceImpl implements MemberExperienceRecordService {
24 25
25 @Resource 26 @Resource
26 - private MemberExperienceLogMapper experienceLogMapper;  
27 - 27 + private MemberExperienceRecordMapper experienceLogMapper;
28 28
29 @Override 29 @Override
30 - public MemberExperienceLogDO getExperienceLog(Long id) { 30 + public MemberExperienceRecordDO getExperienceRecord(Long id) {
31 return experienceLogMapper.selectById(id); 31 return experienceLogMapper.selectById(id);
32 } 32 }
33 33
34 @Override 34 @Override
35 - public List<MemberExperienceLogDO> getExperienceLogList(Collection<Long> ids) { 35 + public List<MemberExperienceRecordDO> getExperienceRecordList(Collection<Long> ids) {
36 return experienceLogMapper.selectBatchIds(ids); 36 return experienceLogMapper.selectBatchIds(ids);
37 } 37 }
38 38
39 @Override 39 @Override
40 - public PageResult<MemberExperienceLogDO> getExperienceLogPage(MemberExperienceLogPageReqVO pageReqVO) { 40 + public PageResult<MemberExperienceRecordDO> getExperienceRecordPage(MemberExperienceRecordPageReqVO pageReqVO) {
41 return experienceLogMapper.selectPage(pageReqVO); 41 return experienceLogMapper.selectPage(pageReqVO);
42 } 42 }
43 43
44 @Override 44 @Override
45 - public void createAdjustLog(Long userId, int experience, int totalExperience) {  
46 - // 管理员调整时, 没有业务编号, 记录对应的枚举值  
47 - String bizId = MemberExperienceBizTypeEnum.ADMIN.getValue() + "";  
48 - this.createBizLog(userId, experience, totalExperience, MemberExperienceBizTypeEnum.ADMIN, bizId);  
49 - }  
50 -  
51 - @Override  
52 - public void createBizLog(Long userId, int experience, int totalExperience, MemberExperienceBizTypeEnum bizType, String bizId) {  
53 - MemberExperienceLogDO experienceLogDO = new MemberExperienceLogDO();  
54 - experienceLogDO.setUserId(userId);  
55 - experienceLogDO.setExperience(experience);  
56 - experienceLogDO.setTotalExperience(totalExperience);  
57 - experienceLogDO.setBizId(bizId);  
58 - experienceLogDO.setBizType(bizType.getValue());  
59 - experienceLogDO.setTitle(bizType.getTitle());  
60 - experienceLogDO.setDescription(StrUtil.format(bizType.getDesc(), experience));  
61 - experienceLogMapper.insert(experienceLogDO); 45 + public void createExperienceRecord(Long userId, Integer experience, Integer totalExperience,
  46 + MemberExperienceBizTypeEnum bizType, String bizId) {
  47 + String description = StrUtil.format(bizType.getDescription(), experience);
  48 + MemberExperienceRecordDO record = MemberExperienceRecordConvert.INSTANCE.convert(
  49 + userId, experience, totalExperience,
  50 + bizId, bizType.getType(), bizType.getTitle(), description);
  51 + experienceLogMapper.insert(record);
62 } 52 }
63 53
64 } 54 }
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelLogService.java deleted
View file @655eefc
1 -package cn.iocoder.yudao.module.member.service.level;  
2 -  
3 -import cn.iocoder.yudao.framework.common.pojo.PageResult;  
4 -import cn.iocoder.yudao.module.member.controller.admin.level.vo.log.MemberLevelLogPageReqVO;  
5 -import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO;  
6 -import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelLogDO;  
7 -import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO;  
8 -  
9 -import java.util.Collection;  
10 -import java.util.List;  
11 -  
12 -/**  
13 - * 会员等级记录 Service 接口  
14 - *  
15 - * @author owen  
16 - */  
17 -public interface MemberLevelLogService {  
18 -  
19 - /**  
20 - * 删除会员等级记录  
21 - *  
22 - * @param id 编号  
23 - */  
24 - void deleteLevelLog(Long id);  
25 -  
26 - /**  
27 - * 获得会员等级记录  
28 - *  
29 - * @param id 编号  
30 - * @return 会员等级记录  
31 - */  
32 - MemberLevelLogDO getLevelLog(Long id);  
33 -  
34 - /**  
35 - * 获得会员等级记录列表  
36 - *  
37 - * @param ids 编号  
38 - * @return 会员等级记录列表  
39 - */  
40 - List<MemberLevelLogDO> getLevelLogList(Collection<Long> ids);  
41 -  
42 - /**  
43 - * 获得会员等级记录分页  
44 - *  
45 - * @param pageReqVO 分页查询  
46 - * @return 会员等级记录分页  
47 - */  
48 - PageResult<MemberLevelLogDO> getLevelLogPage(MemberLevelLogPageReqVO pageReqVO);  
49 -  
50 - // TODO @疯狂：把 createCancelLog、createAdjustLog、createAutoUpgradeLog 几个日志合并成一个通用的日志方法；整体的内容，交给 MemberLevelService 去做；以及对应的 level 变化的通知；  
51 -  
52 - /**  
53 - * 创建记录： 取消等级  
54 - *  
55 - * @param userId 会员编号  
56 - * @param reason 调整原因  
57 - */  
58 - void createCancelLog(Long userId, String reason);  
59 -  
60 - /**  
61 - * 创建记录： 手动调整  
62 - *  
63 - * @param user 会员  
64 - * @param level 等级  
65 - * @param experience 变动经验值  
66 - * @param reason 调整原因  
67 - */  
68 - void createAdjustLog(MemberUserDO user, MemberLevelDO level, int experience, String reason);  
69 -  
70 - /**  
71 - * 创建记录： 自动升级  
72 - *  
73 - * @param user 会员  
74 - * @param level 等级  
75 - */  
76 - void createAutoUpgradeLog(MemberUserDO user, MemberLevelDO level);  
77 -}  
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelLogServiceImpl.java deleted
View file @655eefc
1 -package cn.iocoder.yudao.module.member.service.level;  
2 -  
3 -import cn.iocoder.yudao.framework.common.pojo.PageResult;  
4 -import cn.iocoder.yudao.module.member.controller.admin.level.vo.log.MemberLevelLogPageReqVO;  
5 -import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO;  
6 -import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelLogDO;  
7 -import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO;  
8 -import cn.iocoder.yudao.module.member.dal.mysql.level.MemberLevelLogMapper;  
9 -import org.springframework.stereotype.Service;  
10 -import org.springframework.validation.annotation.Validated;  
11 -  
12 -import javax.annotation.Resource;  
13 -import java.util.Collection;  
14 -import java.util.List;  
15 -  
16 -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;  
17 -import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.LEVEL_LOG_NOT_EXISTS;  
18 -  
19 -/**  
20 - * 会员等级记录 Service 实现类  
21 - *  
22 - * @author owen  
23 - */  
24 -@Service  
25 -@Validated  
26 -public class MemberLevelLogServiceImpl implements MemberLevelLogService {  
27 -  
28 - @Resource  
29 - private MemberLevelLogMapper levelLogMapper;  
30 -  
31 - @Override  
32 - public void deleteLevelLog(Long id) {  
33 - // 校验存在  
34 - validateLevelLogExists(id);  
35 - // 删除  
36 - levelLogMapper.deleteById(id);  
37 - }  
38 -  
39 - private void validateLevelLogExists(Long id) {  
40 - if (levelLogMapper.selectById(id) == null) {  
41 - throw exception(LEVEL_LOG_NOT_EXISTS);  
42 - }  
43 - }  
44 -  
45 - @Override  
46 - public MemberLevelLogDO getLevelLog(Long id) {  
47 - return levelLogMapper.selectById(id);  
48 - }  
49 -  
50 - @Override  
51 - public List<MemberLevelLogDO> getLevelLogList(Collection<Long> ids) {  
52 - return levelLogMapper.selectBatchIds(ids);  
53 - }  
54 -  
55 - @Override  
56 - public PageResult<MemberLevelLogDO> getLevelLogPage(MemberLevelLogPageReqVO pageReqVO) {  
57 - return levelLogMapper.selectPage(pageReqVO);  
58 - }  
59 -  
60 - @Override  
61 - public void createCancelLog(Long userId, String reason) {  
62 - MemberLevelLogDO levelLogDO = new MemberLevelLogDO();  
63 - levelLogDO.setUserId(userId);  
64 - levelLogDO.setRemark(reason);  
65 - levelLogDO.setDescription("管理员取消");  
66 - levelLogMapper.insert(levelLogDO);  
67 -  
68 - // 给会员发送等级变动消息  
69 - notifyMember(userId, levelLogDO);  
70 - }  
71 -  
72 - @Override  
73 - public void createAdjustLog(MemberUserDO user, MemberLevelDO level, int experience, String reason) {  
74 - MemberLevelLogDO levelLogDO = new MemberLevelLogDO();  
75 - levelLogDO.setUserId(user.getId());  
76 - levelLogDO.setLevelId(level.getId());  
77 - levelLogDO.setLevel(level.getLevel());  
78 - levelLogDO.setDiscountPercent(level.getDiscountPercent());  
79 - levelLogDO.setUserExperience(level.getExperience());  
80 - levelLogDO.setExperience(experience);  
81 - levelLogDO.setRemark(reason);  
82 - levelLogDO.setDescription("管理员调整为：" + level.getName());  
83 - levelLogMapper.insert(levelLogDO);  
84 -  
85 - // 给会员发送等级变动消息  
86 - notifyMember(user.getId(), levelLogDO);  
87 - }  
88 -  
89 - @Override  
90 - public void createAutoUpgradeLog(MemberUserDO user, MemberLevelDO level) {  
91 - MemberLevelLogDO levelLogDO = new MemberLevelLogDO();  
92 - levelLogDO.setUserId(user.getId());  
93 - levelLogDO.setLevelId(level.getId());  
94 - levelLogDO.setLevel(level.getLevel());  
95 - levelLogDO.setDiscountPercent(level.getDiscountPercent());  
96 - levelLogDO.setExperience(level.getExperience());  
97 - levelLogDO.setUserExperience(user.getExperience());  
98 - levelLogDO.setDescription("成为：" + level.getName());  
99 - levelLogMapper.insert(levelLogDO);  
100 -  
101 - // 给会员发送等级变动消息  
102 - notifyMember(user.getId(), levelLogDO);  
103 - }  
104 -  
105 - private void notifyMember(Long userId, MemberLevelLogDO level) {  
106 - //todo: 给会员发消息  
107 - }  
108 -  
109 -}  
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelRecordService.java 0 → 100644
  View file @498edff
  1 +package cn.iocoder.yudao.module.member.service.level;
  2 +
  3 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  4 +import cn.iocoder.yudao.module.member.controller.admin.level.vo.log.MemberLevelRecordPageReqVO;
  5 +import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelRecordDO;
  6 +
  7 +/**
  8 + * 会员等级记录 Service 接口
  9 + *
  10 + * @author owen
  11 + */
  12 +public interface MemberLevelRecordService {
  13 +
  14 + /**
  15 + * 获得会员等级记录
  16 + *
  17 + * @param id 编号
  18 + * @return 会员等级记录
  19 + */
  20 + MemberLevelRecordDO getLevelRecord(Long id);
  21 +
  22 + /**
  23 + * 获得会员等级记录分页
  24 + *
  25 + * @param pageReqVO 分页查询
  26 + * @return 会员等级记录分页
  27 + */
  28 + PageResult<MemberLevelRecordDO> getLevelRecordPage(MemberLevelRecordPageReqVO pageReqVO);
  29 +
  30 + /**
  31 + * 创建会员等级记录
  32 + *
  33 + * @param levelRecord 会员等级记录
  34 + */
  35 + void createLevelRecord(MemberLevelRecordDO levelRecord);
  36 +
  37 +}
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelRecordServiceImpl.java 0 → 100644
  View file @498edff
  1 +package cn.iocoder.yudao.module.member.service.level;
  2 +
  3 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  4 +import cn.iocoder.yudao.module.member.controller.admin.level.vo.log.MemberLevelRecordPageReqVO;
  5 +import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelRecordDO;
  6 +import cn.iocoder.yudao.module.member.dal.mysql.level.MemberLevelRecordMapper;
  7 +import org.springframework.stereotype.Service;
  8 +import org.springframework.validation.annotation.Validated;
  9 +
  10 +import javax.annotation.Resource;
  11 +
  12 +/**
  13 + * 会员等级记录 Service 实现类
  14 + *
  15 + * @author owen
  16 + */
  17 +@Service
  18 +@Validated
  19 +public class MemberLevelRecordServiceImpl implements MemberLevelRecordService {
  20 +
  21 + @Resource
  22 + private MemberLevelRecordMapper levelLogMapper;
  23 +
  24 + @Override
  25 + public MemberLevelRecordDO getLevelRecord(Long id) {
  26 + return levelLogMapper.selectById(id);
  27 + }
  28 +
  29 + @Override
  30 + public PageResult<MemberLevelRecordDO> getLevelRecordPage(MemberLevelRecordPageReqVO pageReqVO) {
  31 + return levelLogMapper.selectPage(pageReqVO);
  32 + }
  33 +
  34 + @Override
  35 + public void createLevelRecord(MemberLevelRecordDO levelRecord) {
  36 + levelLogMapper.insert(levelRecord);
  37 + }
  38 +
  39 +}
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelService.java
  View file @498edff
1 package cn.iocoder.yudao.module.member.service.level; 1 package cn.iocoder.yudao.module.member.service.level;
2 2
3 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; 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.level.vo.level.MemberLevelCreateReqVO; 4 import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelCreateReqVO;
6 -import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelPageReqVO; 5 +import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelListReqVO;
7 import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelUpdateReqVO; 6 import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelUpdateReqVO;
  7 +import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserUpdateLevelReqVO;
8 import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO; 8 import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO;
9 -import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO;  
10 import cn.iocoder.yudao.module.member.enums.MemberExperienceBizTypeEnum; 9 import cn.iocoder.yudao.module.member.enums.MemberExperienceBizTypeEnum;
11 10
12 -import javax.annotation.Nullable;  
13 import javax.validation.Valid; 11 import javax.validation.Valid;
14 import java.util.Collection; 12 import java.util.Collection;
15 import java.util.List; 13 import java.util.List;
@@ -60,13 +58,12 @@ public interface MemberLevelService { @@ -60,13 +58,12 @@ public interface MemberLevelService {
60 List<MemberLevelDO> getLevelList(Collection<Long> ids); 58 List<MemberLevelDO> getLevelList(Collection<Long> ids);
61 59
62 /** 60 /**
63 - * 获得会员等级分页 61 + * 获得会员等级列表
64 * 62 *
65 - * @param pageReqVO 分页查询  
66 - * @return 会员等级分页 63 + * @param listReqVO 查询参数
  64 + * @return 会员等级列表
67 */ 65 */
68 - PageResult<MemberLevelDO> getLevelPage(MemberLevelPageReqVO pageReqVO);  
69 - 66 + List<MemberLevelDO> getLevelList(MemberLevelListReqVO listReqVO);
70 67
71 /** 68 /**
72 * 获得指定状态的会员等级列表 69 * 获得指定状态的会员等级列表
@@ -76,7 +73,6 @@ public interface MemberLevelService { @@ -76,7 +73,6 @@ public interface MemberLevelService {
76 */ 73 */
77 List<MemberLevelDO> getLevelListByStatus(Integer status); 74 List<MemberLevelDO> getLevelListByStatus(Integer status);
78 75
79 -  
80 /** 76 /**
81 * 获得开启状态的会员等级列表 77 * 获得开启状态的会员等级列表
82 * 78 *
@@ -89,11 +85,9 @@ public interface MemberLevelService { @@ -89,11 +85,9 @@ public interface MemberLevelService {
89 /** 85 /**
90 * 修改会员的等级 86 * 修改会员的等级
91 * 87 *
92 - * @param user 会员  
93 - * @param levelId 要修改的等级编号，编号为空时，代表取消会员的等级  
94 - * @param levelReason 修改原因 88 + * @param updateReqVO 修改参数
95 */ 89 */
96 - void updateUserLevel(MemberUserDO user, @Nullable Long levelId, String levelReason); 90 + void updateUserLevel(MemberUserUpdateLevelReqVO updateReqVO);
97 91
98 /** 92 /**
99 * 增加会员经验 93 * 增加会员经验
@@ -103,5 +97,6 @@ public interface MemberLevelService { @@ -103,5 +97,6 @@ public interface MemberLevelService {
103 * @param bizType 业务类型 97 * @param bizType 业务类型
104 * @param bizId 业务编号 98 * @param bizId 业务编号
105 */ 99 */
106 - void plusExperience(Long userId, Integer experience, MemberExperienceBizTypeEnum bizType, String bizId); 100 + void addExperience(Long userId, Integer experience, MemberExperienceBizTypeEnum bizType, String bizId);
  101 +
107 } 102 }
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelServiceImpl.java
  View file @498edff
@@ -4,17 +4,18 @@ import cn.hutool.core.collection.CollUtil; @@ -4,17 +4,18 @@ import cn.hutool.core.collection.CollUtil;
4 import cn.hutool.core.util.NumberUtil; 4 import cn.hutool.core.util.NumberUtil;
5 import cn.hutool.core.util.ObjUtil; 5 import cn.hutool.core.util.ObjUtil;
6 import cn.hutool.core.util.ObjectUtil; 6 import cn.hutool.core.util.ObjectUtil;
7 -import cn.hutool.core.util.StrUtil;  
8 -import cn.iocoder.yudao.framework.common.pojo.PageResult;  
9 import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelCreateReqVO; 7 import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelCreateReqVO;
10 -import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelPageReqVO; 8 +import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelListReqVO;
11 import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelUpdateReqVO; 9 import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelUpdateReqVO;
  10 +import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserUpdateLevelReqVO;
12 import cn.iocoder.yudao.module.member.convert.level.MemberLevelConvert; 11 import cn.iocoder.yudao.module.member.convert.level.MemberLevelConvert;
  12 +import cn.iocoder.yudao.module.member.convert.level.MemberLevelRecordConvert;
13 import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO; 13 import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO;
  14 +import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelRecordDO;
14 import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO; 15 import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO;
15 import cn.iocoder.yudao.module.member.dal.mysql.level.MemberLevelMapper; 16 import cn.iocoder.yudao.module.member.dal.mysql.level.MemberLevelMapper;
16 -import cn.iocoder.yudao.module.member.dal.mysql.user.MemberUserMapper;  
17 import cn.iocoder.yudao.module.member.enums.MemberExperienceBizTypeEnum; 17 import cn.iocoder.yudao.module.member.enums.MemberExperienceBizTypeEnum;
  18 +import cn.iocoder.yudao.module.member.service.user.MemberUserService;
18 import com.google.common.annotations.VisibleForTesting; 19 import com.google.common.annotations.VisibleForTesting;
19 import lombok.extern.slf4j.Slf4j; 20 import lombok.extern.slf4j.Slf4j;
20 import org.springframework.stereotype.Service; 21 import org.springframework.stereotype.Service;
@@ -23,6 +24,7 @@ import org.springframework.validation.annotation.Validated; @@ -23,6 +24,7 @@ import org.springframework.validation.annotation.Validated;
23 24
24 import javax.annotation.Resource; 25 import javax.annotation.Resource;
25 import java.util.Collection; 26 import java.util.Collection;
  27 +import java.util.Collections;
26 import java.util.Comparator; 28 import java.util.Comparator;
27 import java.util.List; 29 import java.util.List;
28 30
@@ -42,11 +44,11 @@ public class MemberLevelServiceImpl implements MemberLevelService { @@ -42,11 +44,11 @@ public class MemberLevelServiceImpl implements MemberLevelService {
42 @Resource 44 @Resource
43 private MemberLevelMapper levelMapper; 45 private MemberLevelMapper levelMapper;
44 @Resource 46 @Resource
45 - private MemberLevelLogService memberLevelLogService; 47 + private MemberLevelRecordService memberLevelRecordService;
46 @Resource 48 @Resource
47 - private MemberExperienceLogService memberExperienceLogService; 49 + private MemberExperienceRecordService memberExperienceRecordService;
48 @Resource 50 @Resource
49 - private MemberUserMapper memberUserMapper; 51 + private MemberUserService memberUserService;
50 52
51 @Override 53 @Override
52 public Long createLevel(MemberLevelCreateReqVO createReqVO) { 54 public Long createLevel(MemberLevelCreateReqVO createReqVO) {
@@ -97,7 +99,6 @@ public class MemberLevelServiceImpl implements MemberLevelService { @@ -97,7 +99,6 @@ public class MemberLevelServiceImpl implements MemberLevelService {
97 if (ObjUtil.notEqual(levelDO.getName(), name)) { 99 if (ObjUtil.notEqual(levelDO.getName(), name)) {
98 continue; 100 continue;
99 } 101 }
100 -  
101 if (id == null || !id.equals(levelDO.getId())) { 102 if (id == null || !id.equals(levelDO.getId())) {
102 throw exception(LEVEL_NAME_EXISTS, levelDO.getName()); 103 throw exception(LEVEL_NAME_EXISTS, levelDO.getName());
103 } 104 }
@@ -151,9 +152,9 @@ public class MemberLevelServiceImpl implements MemberLevelService { @@ -151,9 +152,9 @@ public class MemberLevelServiceImpl implements MemberLevelService {
151 152
152 @VisibleForTesting 153 @VisibleForTesting
153 void validateLevelHasUser(Long id) { 154 void validateLevelHasUser(Long id) {
154 - Long count = memberUserMapper.selectCountByLevelId(id); 155 + Long count = memberUserService.getUserCountByLevelId(id);
155 if (count > 0) { 156 if (count > 0) {
156 - throw exception(GROUP_HAS_USER); 157 + throw exception(LEVEL_HAS_USER);
157 } 158 }
158 } 159 }
159 160
@@ -164,12 +165,15 @@ public class MemberLevelServiceImpl implements MemberLevelService { @@ -164,12 +165,15 @@ public class MemberLevelServiceImpl implements MemberLevelService {
164 165
165 @Override 166 @Override
166 public List<MemberLevelDO> getLevelList(Collection<Long> ids) { 167 public List<MemberLevelDO> getLevelList(Collection<Long> ids) {
  168 + if (CollUtil.isEmpty(ids)) {
  169 + return Collections.emptyList();
  170 + }
167 return levelMapper.selectBatchIds(ids); 171 return levelMapper.selectBatchIds(ids);
168 } 172 }
169 173
170 @Override 174 @Override
171 - public PageResult<MemberLevelDO> getLevelPage(MemberLevelPageReqVO pageReqVO) {  
172 - return levelMapper.selectPage(pageReqVO); 175 + public List<MemberLevelDO> getLevelList(MemberLevelListReqVO listReqVO) {
  176 + return levelMapper.selectList(listReqVO);
173 } 177 }
174 178
175 @Override 179 @Override
@@ -179,83 +183,81 @@ public class MemberLevelServiceImpl implements MemberLevelService { @@ -179,83 +183,81 @@ public class MemberLevelServiceImpl implements MemberLevelService {
179 183
180 @Override 184 @Override
181 @Transactional(rollbackFor = Exception.class) 185 @Transactional(rollbackFor = Exception.class)
182 - public void updateUserLevel(MemberUserDO user, Long levelId, String reason) {  
183 - // TODO @疯狂：可以直接 ObjUtil.equal(user.getLevelId(), levelId)，解决这 2 个场景  
184 - // 未调整的情况1  
185 - if (user.getLevelId() == null && levelId == null) {  
186 - return; 186 + public void updateUserLevel(MemberUserUpdateLevelReqVO updateReqVO) {
  187 + MemberUserDO user = memberUserService.getUser(updateReqVO.getId());
  188 + if (user == null) {
  189 + throw exception(USER_NOT_EXISTS);
187 } 190 }
188 - // 未调整的情况2  
189 - if (ObjUtil.equal(user.getLevelId(), levelId)) { 191 + // 等级未发生变化
  192 + if (ObjUtil.equal(user.getLevelId(), updateReqVO.getLevelId())) {
190 return; 193 return;
191 } 194 }
192 195
193 - // 需要后台用户填写为什么调整会员的等级  
194 - // TODO @疯狂：这个 reason 是不是可以放到 validator 里做哈；  
195 - if (StrUtil.isBlank(reason)) {  
196 - throw exception(LEVEL_REASON_NOT_EXISTS);  
197 - }  
198 -  
199 - int experience;  
200 - int totalExperience = 0;  
201 - // 记录等级变动  
202 - if (levelId == null) {  
203 - experience = -user.getExperience();  
204 -  
205 - // TODO @疯狂：这里的逻辑，应该和下面的 207 到 210 行的逻辑一致，都是先记录日志，再更新会员表；所以，是不是都可以类似 214 的写法哈。  
206 - // 取消了会员的等级  
207 - memberLevelLogService.createCancelLog(user.getId(), reason);  
208 - memberUserMapper.cancelUserLevel(user.getId()); 196 + // 1. 记录等级变动
  197 + MemberLevelRecordDO levelRecord = new MemberLevelRecordDO()
  198 + .setUserId(user.getId()).setRemark(updateReqVO.getReason());
  199 + MemberLevelDO memberLevel = null;
  200 + if (updateReqVO.getLevelId() == null) {
  201 + // 取消用户等级时，需要扣减经验
  202 + levelRecord.setExperience(-user.getExperience());
  203 + levelRecord.setUserExperience(0);
  204 + levelRecord.setDescription("管理员取消了等级");
209 } else { 205 } else {
210 - MemberLevelDO level = validateLevelExists(levelId); 206 + // 复制等级配置
  207 + memberLevel = validateLevelExists(updateReqVO.getLevelId());
  208 + MemberLevelRecordConvert.INSTANCE.copyTo(memberLevel, levelRecord);
211 // 变动经验值 = 等级的升级经验 - 会员当前的经验；正数为增加经验，负数为扣减经验 209 // 变动经验值 = 等级的升级经验 - 会员当前的经验；正数为增加经验，负数为扣减经验
212 - experience = level.getExperience() - user.getExperience();  
213 - // 会员当前的经验 = 等级的升级经验  
214 - totalExperience = level.getExperience(); 210 + levelRecord.setExperience(memberLevel.getExperience() - user.getExperience());
  211 + levelRecord.setUserExperience(memberLevel.getExperience()); // 会员当前的经验 = 等级的升级经验
  212 + levelRecord.setDescription("管理员调整为：" + memberLevel.getName());
  213 + }
  214 + memberLevelRecordService.createLevelRecord(levelRecord);
215 215
216 - memberLevelLogService.createAdjustLog(user, level, experience, reason); 216 + // 2. 记录会员经验变动
  217 + memberExperienceRecordService.createExperienceRecord(user.getId(),
  218 + levelRecord.getExperience(), levelRecord.getUserExperience(),
  219 + MemberExperienceBizTypeEnum.ADMIN, String.valueOf(MemberExperienceBizTypeEnum.ADMIN.getType()));
217 220
218 - // 更新会员表上的等级编号、经验值  
219 - updateUserLevelIdAndExperience(user.getId(), levelId, totalExperience);  
220 - } 221 + // 3. 更新会员表上的等级编号、经验值
  222 + memberUserService.updateUserLevel(user.getId(), updateReqVO.getLevelId(),
  223 + levelRecord.getUserExperience());
221 224
222 - // 记录会员经验变动  
223 - memberExperienceLogService.createAdjustLog(user.getId(), experience, totalExperience); 225 + // 4. 给会员发送等级变动消息
  226 + notifyMemberLevelChange(user.getId(), memberLevel);
224 } 227 }
225 228
226 - // TODO @疯狂：方法名，建议改成 increase 或者 add 经验，和项目更统一一些  
227 - // TODO @疯狂：bizType 改成具体数值，主要是枚举在 api 不好传递，rpc 情况下  
228 @Override 229 @Override
229 @Transactional(rollbackFor = Exception.class) 230 @Transactional(rollbackFor = Exception.class)
230 - public void plusExperience(Long userId, Integer experience, MemberExperienceBizTypeEnum bizType, String bizId) { 231 + public void addExperience(Long userId, Integer experience, MemberExperienceBizTypeEnum bizType, String bizId) {
231 if (experience == 0) { 232 if (experience == 0) {
232 return; 233 return;
233 } 234 }
234 -  
235 - MemberUserDO user = memberUserMapper.selectById(userId);  
236 - // TODO @疯狂：默认给 Experience 搞个 0 哈。这里就不做兜底逻辑啦  
237 - if (user.getExperience() == null) {  
238 - user.setExperience(0); 235 + if (!bizType.isAdd() && experience > 0) {
  236 + experience = -experience;
239 } 237 }
240 238
241 - // 防止扣出负数  
242 - // TODO @疯狂：如果经验出现负数，是不是抛出异常会更合理；按道理不应该出现的；  
243 - int userExperience = NumberUtil.max(user.getExperience() + experience, 0);  
244 - // 创建经验记录  
245 - memberExperienceLogService.createBizLog(userId, experience, userExperience, bizType, bizId);  
246 -  
247 - // 计算会员等级  
248 - Long levelId = calcLevel(user, userExperience);  
249 - // 更新会员表上的等级编号、经验值  
250 - updateUserLevelIdAndExperience(user.getId(), levelId, userExperience);  
251 - } 239 + // 1. 创建经验记录
  240 + MemberUserDO user = memberUserService.getUser(userId);
  241 + int userExperience = NumberUtil.max(user.getExperience() + experience, 0); // 防止扣出负数
  242 + MemberLevelRecordDO levelRecord = new MemberLevelRecordDO()
  243 + .setUserId(user.getId())
  244 + .setExperience(experience)
  245 + .setUserExperience(userExperience);
  246 + memberExperienceRecordService.createExperienceRecord(userId, experience, userExperience,
  247 + bizType, bizId);
  248 +
  249 + // 2.1 保存等级变更记录
  250 + MemberLevelDO newLevel = calculateNewLevel(user, userExperience);
  251 + if (newLevel != null) {
  252 + MemberLevelRecordConvert.INSTANCE.copyTo(newLevel, levelRecord);
  253 + memberLevelRecordService.createLevelRecord(levelRecord);
  254 +
  255 + // 2.2 给会员发送等级变动消息
  256 + notifyMemberLevelChange(userId, newLevel);
  257 + }
252 258
253 - // TODO @疯狂：让 memberUserService 那开个方法；每个模块，不直接操作对方的 mapper；  
254 - private void updateUserLevelIdAndExperience(Long userId, Long levelId, Integer experience) {  
255 - memberUserMapper.updateById(new MemberUserDO()  
256 - .setId(userId)  
257 - .setLevelId(levelId).setExperience(experience)  
258 - ); 259 + // 3. 更新会员表上的等级编号、经验值
  260 + memberUserService.updateUserLevel(user.getId(), levelRecord.getLevelId(), userExperience);
259 } 261 }
260 262
261 /** 263 /**
@@ -263,11 +265,9 @@ public class MemberLevelServiceImpl implements MemberLevelService { @@ -263,11 +265,9 @@ public class MemberLevelServiceImpl implements MemberLevelService {
263 * 265 *
264 * @param user 会员 266 * @param user 会员
265 * @param userExperience 会员当前的经验值 267 * @param userExperience 会员当前的经验值
266 - * @return 会员等级编号，null表示无变化 268 + * @return 会员新的等级，null表示无变化
267 */ 269 */
268 - // calc  
269 - // TODO @疯狂：calc 改成完整的拼写哈。是不是改成 calculateNewLevel  
270 - private Long calcLevel(MemberUserDO user, int userExperience) { 270 + private MemberLevelDO calculateNewLevel(MemberUserDO user, int userExperience) {
271 List<MemberLevelDO> list = getEnableLevelList(); 271 List<MemberLevelDO> list = getEnableLevelList();
272 if (CollUtil.isEmpty(list)) { 272 if (CollUtil.isEmpty(list)) {
273 log.warn("计算会员等级失败：会员等级配置不存在"); 273 log.warn("计算会员等级失败：会员等级配置不存在");
@@ -288,9 +288,11 @@ public class MemberLevelServiceImpl implements MemberLevelService { @@ -288,9 +288,11 @@ public class MemberLevelServiceImpl implements MemberLevelService {
288 return null; 288 return null;
289 } 289 }
290 290
291 - // TODO @疯狂：这个方法，应该只做 level 的计算，不做登记的变更。  
292 - // 保存等级变更记录  
293 - memberLevelLogService.createAutoUpgradeLog(user, matchLevel);  
294 - return matchLevel.getId(); 291 + return matchLevel;
295 } 292 }
  293 +
  294 + private void notifyMemberLevelChange(Long userId, MemberLevelDO level) {
  295 + //todo: 给会员发消息
  296 + }
  297 +
296 } 298 }
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/point/MemberPointRecordService.java
  View file @498edff
@@ -4,6 +4,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageParam; @@ -4,6 +4,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageParam;
4 import cn.iocoder.yudao.framework.common.pojo.PageResult; 4 import cn.iocoder.yudao.framework.common.pojo.PageResult;
5 import cn.iocoder.yudao.module.member.controller.admin.point.vo.recrod.MemberPointRecordPageReqVO; 5 import cn.iocoder.yudao.module.member.controller.admin.point.vo.recrod.MemberPointRecordPageReqVO;
6 import cn.iocoder.yudao.module.member.dal.dataobject.point.MemberPointRecordDO; 6 import cn.iocoder.yudao.module.member.dal.dataobject.point.MemberPointRecordDO;
  7 +import cn.iocoder.yudao.module.member.enums.point.MemberPointBizTypeEnum;
7 8
8 /** 9 /**
9 * 用户积分记录 Service 接口 10 * 用户积分记录 Service 接口
@@ -29,4 +30,13 @@ public interface MemberPointRecordService { @@ -29,4 +30,13 @@ public interface MemberPointRecordService {
29 */ 30 */
30 PageResult<MemberPointRecordDO> getPointRecordPage(Long userId, PageParam pageVO); 31 PageResult<MemberPointRecordDO> getPointRecordPage(Long userId, PageParam pageVO);
31 32
  33 + /**
  34 + * 创建用户积分记录
  35 + *
  36 + * @param userId 用户ID
  37 + * @param point 变动积分
  38 + * @param bizType 业务类型
  39 + * @param bizId 业务编号
  40 + */
  41 + void createPointRecord(Long userId, Integer point, MemberPointBizTypeEnum bizType, String bizId);
32 } 42 }
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/point/MemberPointRecordServiceImpl.java
  View file @498edff
1 package cn.iocoder.yudao.module.member.service.point; 1 package cn.iocoder.yudao.module.member.service.point;
2 2
  3 +import cn.hutool.core.util.ObjectUtil;
  4 +import cn.hutool.core.util.StrUtil;
3 import cn.iocoder.yudao.framework.common.pojo.PageParam; 5 import cn.iocoder.yudao.framework.common.pojo.PageParam;
4 import cn.iocoder.yudao.framework.common.pojo.PageResult; 6 import cn.iocoder.yudao.framework.common.pojo.PageResult;
5 -import cn.iocoder.yudao.module.member.api.user.MemberUserApi;  
6 -import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;  
7 import cn.iocoder.yudao.module.member.controller.admin.point.vo.recrod.MemberPointRecordPageReqVO; 7 import cn.iocoder.yudao.module.member.controller.admin.point.vo.recrod.MemberPointRecordPageReqVO;
  8 +import cn.iocoder.yudao.module.member.dal.dataobject.point.MemberPointConfigDO;
8 import cn.iocoder.yudao.module.member.dal.dataobject.point.MemberPointRecordDO; 9 import cn.iocoder.yudao.module.member.dal.dataobject.point.MemberPointRecordDO;
  10 +import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO;
9 import cn.iocoder.yudao.module.member.dal.mysql.point.MemberPointRecordMapper; 11 import cn.iocoder.yudao.module.member.dal.mysql.point.MemberPointRecordMapper;
  12 +import cn.iocoder.yudao.module.member.enums.point.MemberPointBizTypeEnum;
  13 +import cn.iocoder.yudao.module.member.service.user.MemberUserService;
  14 +import lombok.extern.slf4j.Slf4j;
10 import org.apache.commons.lang3.StringUtils; 15 import org.apache.commons.lang3.StringUtils;
11 import org.springframework.stereotype.Service; 16 import org.springframework.stereotype.Service;
12 import org.springframework.util.CollectionUtils; 17 import org.springframework.util.CollectionUtils;
@@ -24,27 +29,30 @@ import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils. @@ -24,27 +29,30 @@ import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.
24 * 29 *
25 * @author QingX 30 * @author QingX
26 */ 31 */
  32 +@Slf4j
27 @Service 33 @Service
28 @Validated 34 @Validated
29 public class MemberPointRecordServiceImpl implements MemberPointRecordService { 35 public class MemberPointRecordServiceImpl implements MemberPointRecordService {
30 36
31 @Resource 37 @Resource
32 private MemberPointRecordMapper recordMapper; 38 private MemberPointRecordMapper recordMapper;
  39 + @Resource
  40 + private MemberPointConfigService memberPointConfigService;
33 41
34 @Resource 42 @Resource
35 - private MemberUserApi memberUserApi; 43 + private MemberUserService memberUserService;
36 44
37 @Override 45 @Override
38 public PageResult<MemberPointRecordDO> getPointRecordPage(MemberPointRecordPageReqVO pageReqVO) { 46 public PageResult<MemberPointRecordDO> getPointRecordPage(MemberPointRecordPageReqVO pageReqVO) {
39 // 根据用户昵称查询出用户 ids 47 // 根据用户昵称查询出用户 ids
40 Set<Long> userIds = null; 48 Set<Long> userIds = null;
41 if (StringUtils.isNotBlank(pageReqVO.getNickname())) { 49 if (StringUtils.isNotBlank(pageReqVO.getNickname())) {
42 - List<MemberUserRespDTO> users = memberUserApi.getUserListByNickname(pageReqVO.getNickname()); 50 + List<MemberUserDO> users = memberUserService.getUserListByNickname(pageReqVO.getNickname());
43 // 如果查询用户结果为空直接返回无需继续查询 51 // 如果查询用户结果为空直接返回无需继续查询
44 if (CollectionUtils.isEmpty(users)) { 52 if (CollectionUtils.isEmpty(users)) {
45 return PageResult.empty(); 53 return PageResult.empty();
46 } 54 }
47 - userIds = convertSet(users, MemberUserRespDTO::getId); 55 + userIds = convertSet(users, MemberUserDO::getId);
48 } 56 }
49 // 执行查询 57 // 执行查询
50 return recordMapper.selectPage(pageReqVO, userIds); 58 return recordMapper.selectPage(pageReqVO, userIds);
@@ -55,4 +63,33 @@ public class MemberPointRecordServiceImpl implements MemberPointRecordService { @@ -55,4 +63,33 @@ public class MemberPointRecordServiceImpl implements MemberPointRecordService {
55 return recordMapper.selectPage(userId, pageVO); 63 return recordMapper.selectPage(userId, pageVO);
56 } 64 }
57 65
  66 + @Override
  67 + public void createPointRecord(Long userId, Integer point, MemberPointBizTypeEnum bizType, String bizId) {
  68 + MemberPointConfigDO pointConfig = memberPointConfigService.getPointConfig();
  69 + if (pointConfig == null || pointConfig.getTradeGivePoint() == null) {
  70 + log.error("[createPointRecord][增加积分失败：tradeGivePoint 未配置，userId({}) point({}) bizType({}) bizId({})]",
  71 + userId, point, bizType.getType(), bizId);
  72 + return;
  73 + }
  74 +
  75 + // 1. 根据配置的比例，换算实际的积分
  76 + point = point * pointConfig.getTradeGivePoint();
  77 + if (!bizType.isAdd() && point > 0) {
  78 + point = -point;
  79 + }
  80 +
  81 + // 2. 增加积分记录
  82 + MemberUserDO user = memberUserService.getUser(userId);
  83 + Integer userPoint = ObjectUtil.defaultIfNull(user.getPoint(), 0);
  84 + Integer totalPoint = userPoint + point; // 用户变动后的积分
  85 + MemberPointRecordDO record = new MemberPointRecordDO()
  86 + .setUserId(userId).setBizId(bizId).setBizType(bizType.getType())
  87 + .setTitle(bizType.getName()).setDescription(StrUtil.format(bizType.getDescription(), point))
  88 + .setPoint(point).setTotalPoint(totalPoint);
  89 + recordMapper.insert(record);
  90 +
  91 + // 3. 更新用户积分
  92 + memberUserService.updateUserPoint(userId, totalPoint);
  93 + }
  94 +
58 } 95 }
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/tag/MemberTagServiceImpl.java
  View file @498edff
@@ -10,7 +10,7 @@ import cn.iocoder.yudao.module.member.controller.admin.tag.vo.MemberTagUpdateReq @@ -10,7 +10,7 @@ import cn.iocoder.yudao.module.member.controller.admin.tag.vo.MemberTagUpdateReq
10 import cn.iocoder.yudao.module.member.convert.tag.MemberTagConvert; 10 import cn.iocoder.yudao.module.member.convert.tag.MemberTagConvert;
11 import cn.iocoder.yudao.module.member.dal.dataobject.tag.MemberTagDO; 11 import cn.iocoder.yudao.module.member.dal.dataobject.tag.MemberTagDO;
12 import cn.iocoder.yudao.module.member.dal.mysql.tag.MemberTagMapper; 12 import cn.iocoder.yudao.module.member.dal.mysql.tag.MemberTagMapper;
13 -import cn.iocoder.yudao.module.member.dal.mysql.user.MemberUserMapper; 13 +import cn.iocoder.yudao.module.member.service.user.MemberUserService;
14 import org.springframework.stereotype.Service; 14 import org.springframework.stereotype.Service;
15 import org.springframework.validation.annotation.Validated; 15 import org.springframework.validation.annotation.Validated;
16 16
@@ -33,7 +33,7 @@ public class MemberTagServiceImpl implements MemberTagService { @@ -33,7 +33,7 @@ public class MemberTagServiceImpl implements MemberTagService {
33 @Resource 33 @Resource
34 private MemberTagMapper tagMapper; 34 private MemberTagMapper tagMapper;
35 @Resource 35 @Resource
36 - private MemberUserMapper memberUserMapper; 36 + private MemberUserService memberUserService;
37 37
38 @Override 38 @Override
39 public Long createTag(MemberTagCreateReqVO createReqVO) { 39 public Long createTag(MemberTagCreateReqVO createReqVO) {
@@ -92,7 +92,7 @@ public class MemberTagServiceImpl implements MemberTagService { @@ -92,7 +92,7 @@ public class MemberTagServiceImpl implements MemberTagService {
92 } 92 }
93 93
94 void validateTagHasUser(Long id) { 94 void validateTagHasUser(Long id) {
95 - Long count = memberUserMapper.selectCountByTagId(id); 95 + Long count = memberUserService.getUserCountByTagId(id);
96 if (count > 0) { 96 if (count > 0) {
97 throw exception(TAG_HAS_USER); 97 throw exception(TAG_HAS_USER);
98 } 98 }
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserService.java
  View file @498edff
@@ -5,9 +5,9 @@ import cn.iocoder.yudao.framework.common.validation.Mobile; @@ -5,9 +5,9 @@ import cn.iocoder.yudao.framework.common.validation.Mobile;
5 import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserPageReqVO; 5 import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserPageReqVO;
6 import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserUpdateReqVO; 6 import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserUpdateReqVO;
7 import cn.iocoder.yudao.module.member.controller.app.user.vo.AppMemberUserResetPasswordReqVO; 7 import cn.iocoder.yudao.module.member.controller.app.user.vo.AppMemberUserResetPasswordReqVO;
  8 +import cn.iocoder.yudao.module.member.controller.app.user.vo.AppMemberUserUpdateMobileReqVO;
8 import cn.iocoder.yudao.module.member.controller.app.user.vo.AppMemberUserUpdatePasswordReqVO; 9 import cn.iocoder.yudao.module.member.controller.app.user.vo.AppMemberUserUpdatePasswordReqVO;
9 import cn.iocoder.yudao.module.member.controller.app.user.vo.AppMemberUserUpdateReqVO; 10 import cn.iocoder.yudao.module.member.controller.app.user.vo.AppMemberUserUpdateReqVO;
10 -import cn.iocoder.yudao.module.member.controller.app.user.vo.AppMemberUserUpdateMobileReqVO;  
11 import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO; 11 import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO;
12 12
13 import javax.validation.Valid; 13 import javax.validation.Valid;
@@ -41,7 +41,7 @@ public interface MemberUserService { @@ -41,7 +41,7 @@ public interface MemberUserService {
41 * 基于手机号创建用户。 41 * 基于手机号创建用户。
42 * 如果用户已经存在，则直接进行返回 42 * 如果用户已经存在，则直接进行返回
43 * 43 *
44 - * @param mobile 手机号 44 + * @param mobile 手机号
45 * @param registerIp 注册 IP 45 * @param registerIp 注册 IP
46 * @return 用户对象 46 * @return 用户对象
47 */ 47 */
@@ -50,7 +50,7 @@ public interface MemberUserService { @@ -50,7 +50,7 @@ public interface MemberUserService {
50 /** 50 /**
51 * 更新用户的最后登陆信息 51 * 更新用户的最后登陆信息
52 * 52 *
53 - * @param id 用户编号 53 + * @param id 用户编号
54 * @param loginIp 登陆 IP 54 * @param loginIp 登陆 IP
55 */ 55 */
56 void updateUserLogin(Long id, String loginIp); 56 void updateUserLogin(Long id, String loginIp);
@@ -75,7 +75,7 @@ public interface MemberUserService { @@ -75,7 +75,7 @@ public interface MemberUserService {
75 * 【会员】修改基本信息 75 * 【会员】修改基本信息
76 * 76 *
77 * @param userId 用户编号 77 * @param userId 用户编号
78 - * @param reqVO 基本信息 78 + * @param reqVO 基本信息
79 */ 79 */
80 void updateUser(Long userId, AppMemberUserUpdateReqVO reqVO); 80 void updateUser(Long userId, AppMemberUserUpdateReqVO reqVO);
81 81
@@ -83,7 +83,7 @@ public interface MemberUserService { @@ -83,7 +83,7 @@ public interface MemberUserService {
83 * 【会员】修改手机 83 * 【会员】修改手机
84 * 84 *
85 * @param userId 用户编号 85 * @param userId 用户编号
86 - * @param reqVO 请求信息 86 + * @param reqVO 请求信息
87 */ 87 */
88 void updateUserMobile(Long userId, AppMemberUserUpdateMobileReqVO reqVO); 88 void updateUserMobile(Long userId, AppMemberUserUpdateMobileReqVO reqVO);
89 89
@@ -91,7 +91,7 @@ public interface MemberUserService { @@ -91,7 +91,7 @@ public interface MemberUserService {
91 * 【会员】修改密码 91 * 【会员】修改密码
92 * 92 *
93 * @param userId 用户编号 93 * @param userId 用户编号
94 - * @param reqVO 请求信息 94 + * @param reqVO 请求信息
95 */ 95 */
96 void updateUserPassword(Long userId, AppMemberUserUpdatePasswordReqVO reqVO); 96 void updateUserPassword(Long userId, AppMemberUserUpdatePasswordReqVO reqVO);
97 97
@@ -105,7 +105,7 @@ public interface MemberUserService { @@ -105,7 +105,7 @@ public interface MemberUserService {
105 /** 105 /**
106 * 判断密码是否匹配 106 * 判断密码是否匹配
107 * 107 *
108 - * @param rawPassword 未加密的密码 108 + * @param rawPassword 未加密的密码
109 * @param encodedPassword 加密后的密码 109 * @param encodedPassword 加密后的密码
110 * @return 是否匹配 110 * @return 是否匹配
111 */ 111 */
@@ -126,4 +126,44 @@ public interface MemberUserService { @@ -126,4 +126,44 @@ public interface MemberUserService {
126 */ 126 */
127 PageResult<MemberUserDO> getUserPage(MemberUserPageReqVO pageReqVO); 127 PageResult<MemberUserDO> getUserPage(MemberUserPageReqVO pageReqVO);
128 128
  129 + /**
  130 + * 更新用户的等级和经验
  131 + *
  132 + * @param id 用户编号
  133 + * @param levelId 用户等级
  134 + * @param experience 用户经验
  135 + */
  136 + void updateUserLevel(Long id, Long levelId, Integer experience);
  137 +
  138 + /**
  139 + * 获得指定用户分组下的用户数量
  140 + *
  141 + * @param groupId 用户分组编号
  142 + * @return 用户数量
  143 + */
  144 + Long getUserCountByGroupId(Long groupId);
  145 +
  146 + /**
  147 + * 获得指定用户等级下的用户数量
  148 + *
  149 + * @param levelId 用户等级编号
  150 + * @return 用户数量
  151 + */
  152 + Long getUserCountByLevelId(Long levelId);
  153 +
  154 + /**
  155 + * 获得指定会员标签下的用户数量
  156 + *
  157 + * @param tagId 用户标签编号
  158 + * @return 用户数量
  159 + */
  160 + Long getUserCountByTagId(Long tagId);
  161 +
  162 + /**
  163 + * 更新用户的积分
  164 + *
  165 + * @param userId 用户编号
  166 + * @param point 积分数量
  167 + */
  168 + void updateUserPoint(Long userId, Integer point);
129 } 169 }
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java
  View file @498edff
1 package cn.iocoder.yudao.module.member.service.user; 1 package cn.iocoder.yudao.module.member.service.user;
2 2
3 import cn.hutool.core.util.IdUtil; 3 import cn.hutool.core.util.IdUtil;
  4 +import cn.hutool.core.util.ObjectUtil;
4 import cn.hutool.core.util.StrUtil; 5 import cn.hutool.core.util.StrUtil;
5 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; 6 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
6 import cn.iocoder.yudao.framework.common.pojo.PageResult; 7 import cn.iocoder.yudao.framework.common.pojo.PageResult;
@@ -15,7 +16,6 @@ import cn.iocoder.yudao.module.member.convert.auth.AuthConvert; @@ -15,7 +16,6 @@ import cn.iocoder.yudao.module.member.convert.auth.AuthConvert;
15 import cn.iocoder.yudao.module.member.convert.user.MemberUserConvert; 16 import cn.iocoder.yudao.module.member.convert.user.MemberUserConvert;
16 import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO; 17 import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO;
17 import cn.iocoder.yudao.module.member.dal.mysql.user.MemberUserMapper; 18 import cn.iocoder.yudao.module.member.dal.mysql.user.MemberUserMapper;
18 -import cn.iocoder.yudao.module.member.service.level.MemberLevelService;  
19 import cn.iocoder.yudao.module.system.api.sms.SmsCodeApi; 19 import cn.iocoder.yudao.module.system.api.sms.SmsCodeApi;
20 import cn.iocoder.yudao.module.system.api.sms.dto.code.SmsCodeUseReqDTO; 20 import cn.iocoder.yudao.module.system.api.sms.dto.code.SmsCodeUseReqDTO;
21 import cn.iocoder.yudao.module.system.enums.sms.SmsSceneEnum; 21 import cn.iocoder.yudao.module.system.enums.sms.SmsSceneEnum;
@@ -56,9 +56,6 @@ public class MemberUserServiceImpl implements MemberUserService { @@ -56,9 +56,6 @@ public class MemberUserServiceImpl implements MemberUserService {
56 @Resource 56 @Resource
57 private PasswordEncoder passwordEncoder; 57 private PasswordEncoder passwordEncoder;
58 58
59 - @Resource  
60 - private MemberLevelService memberLevelService;  
61 -  
62 @Override 59 @Override
63 public MemberUserDO getUserByMobile(String mobile) { 60 public MemberUserDO getUserByMobile(String mobile) {
64 return memberUserMapper.selectByMobile(mobile); 61 return memberUserMapper.selectByMobile(mobile);
@@ -195,10 +192,6 @@ public class MemberUserServiceImpl implements MemberUserService { @@ -195,10 +192,6 @@ public class MemberUserServiceImpl implements MemberUserService {
195 // 更新 192 // 更新
196 MemberUserDO updateObj = MemberUserConvert.INSTANCE.convert(updateReqVO); 193 MemberUserDO updateObj = MemberUserConvert.INSTANCE.convert(updateReqVO);
197 memberUserMapper.updateById(updateObj); 194 memberUserMapper.updateById(updateObj);
198 -  
199 - // 会员级别修改  
200 - // TODO @疯狂：修改用户等级，要不要单独一个前端操作 + 接口；因为它是个相对严肃独立的动作  
201 - memberLevelService.updateUserLevel(user, updateReqVO.getLevelId(), updateReqVO.getLevelReason());  
202 } 195 }
203 196
204 @VisibleForTesting 197 @VisibleForTesting
@@ -236,4 +229,34 @@ public class MemberUserServiceImpl implements MemberUserService { @@ -236,4 +229,34 @@ public class MemberUserServiceImpl implements MemberUserService {
236 return memberUserMapper.selectPage(pageReqVO); 229 return memberUserMapper.selectPage(pageReqVO);
237 } 230 }
238 231
  232 + @Override
  233 + public void updateUserLevel(Long id, Long levelId, Integer experience) {
  234 + // 0 代表无等级：防止UpdateById时，会被过滤掉的问题
  235 + levelId = ObjectUtil.defaultIfNull(levelId, 0L);
  236 + memberUserMapper.updateById(new MemberUserDO()
  237 + .setId(id)
  238 + .setLevelId(levelId).setExperience(experience)
  239 + );
  240 + }
  241 +
  242 + @Override
  243 + public Long getUserCountByGroupId(Long groupId) {
  244 + return memberUserMapper.selectCountByGroupId(groupId);
  245 + }
  246 +
  247 + @Override
  248 + public Long getUserCountByLevelId(Long levelId) {
  249 + return memberUserMapper.selectCountByLevelId(levelId);
  250 + }
  251 +
  252 + @Override
  253 + public Long getUserCountByTagId(Long tagId) {
  254 + return memberUserMapper.selectCountByTagId(tagId);
  255 + }
  256 +
  257 + @Override
  258 + public void updateUserPoint(Long userId, Integer point) {
  259 + memberUserMapper.updateById(new MemberUserDO().setId(userId).setPoint(point));
  260 + }
  261 +
239 } 262 }
yudao-module-member/yudao-module-member-biz/src/test/java/cn/iocoder/yudao/module/member/service/level/MemberLevelServiceImplTest.java
  View file @498edff
@@ -5,7 +5,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult; @@ -5,7 +5,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
5 import cn.iocoder.yudao.framework.common.util.collection.ArrayUtils; 5 import cn.iocoder.yudao.framework.common.util.collection.ArrayUtils;
6 import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; 6 import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
7 import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelCreateReqVO; 7 import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelCreateReqVO;
8 -import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelPageReqVO; 8 +import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelListReqVO;
9 import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelUpdateReqVO; 9 import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelUpdateReqVO;
10 import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO; 10 import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO;
11 import cn.iocoder.yudao.module.member.dal.mysql.level.MemberLevelMapper; 11 import cn.iocoder.yudao.module.member.dal.mysql.level.MemberLevelMapper;
@@ -41,9 +41,9 @@ public class MemberLevelServiceImplTest extends BaseDbUnitTest { @@ -41,9 +41,9 @@ public class MemberLevelServiceImplTest extends BaseDbUnitTest {
41 private MemberLevelMapper levelMapper; 41 private MemberLevelMapper levelMapper;
42 42
43 @MockBean 43 @MockBean
44 - private MemberLevelLogService memberLevelLogService; 44 + private MemberLevelRecordService memberLevelRecordService;
45 @MockBean 45 @MockBean
46 - private MemberExperienceLogService memberExperienceLogService; 46 + private MemberExperienceRecordService memberExperienceRecordService;
47 47
48 @Test 48 @Test
49 public void testCreateLevel_success() { 49 public void testCreateLevel_success() {
@@ -121,7 +121,7 @@ public class MemberLevelServiceImplTest extends BaseDbUnitTest { @@ -121,7 +121,7 @@ public class MemberLevelServiceImplTest extends BaseDbUnitTest {
121 } 121 }
122 122
123 @Test 123 @Test
124 - public void testGetLevelPage() { 124 + public void testGetLevelList() {
125 // mock 数据 125 // mock 数据
126 MemberLevelDO dbLevel = randomPojo(MemberLevelDO.class, o -> { // 等会查询到 126 MemberLevelDO dbLevel = randomPojo(MemberLevelDO.class, o -> { // 等会查询到
127 o.setName("黄金会员"); 127 o.setName("黄金会员");
@@ -133,16 +133,15 @@ public class MemberLevelServiceImplTest extends BaseDbUnitTest { @@ -133,16 +133,15 @@ public class MemberLevelServiceImplTest extends BaseDbUnitTest {
133 // 测试 status 不匹配 133 // 测试 status 不匹配
134 levelMapper.insert(cloneIgnoreId(dbLevel, o -> o.setStatus(0))); 134 levelMapper.insert(cloneIgnoreId(dbLevel, o -> o.setStatus(0)));
135 // 准备参数 135 // 准备参数
136 - MemberLevelPageReqVO reqVO = new MemberLevelPageReqVO(); 136 + MemberLevelListReqVO reqVO = new MemberLevelListReqVO();
137 reqVO.setName("黄金会员"); 137 reqVO.setName("黄金会员");
138 reqVO.setStatus(1); 138 reqVO.setStatus(1);
139 139
140 // 调用 140 // 调用
141 - PageResult<MemberLevelDO> pageResult = levelService.getLevelPage(reqVO); 141 + List<MemberLevelDO> list = levelService.getLevelList(reqVO);
142 // 断言 142 // 断言
143 - assertEquals(1, pageResult.getTotal());  
144 - assertEquals(1, pageResult.getList().size());  
145 - assertPojoEquals(dbLevel, pageResult.getList().get(0)); 143 + assertEquals(1, list.size());
  144 + assertPojoEquals(dbLevel, list.get(0));
146 } 145 }
147 146
148 @Test 147 @Test
yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/ErrorCodeConstants.java
  View file @498edff
@@ -41,6 +41,9 @@ public interface ErrorCodeConstants { @@ -41,6 +41,9 @@ public interface ErrorCodeConstants {
41 ErrorCode REFUND_NOT_FOUND = new ErrorCode(1007006004, "支付退款单不存在"); 41 ErrorCode REFUND_NOT_FOUND = new ErrorCode(1007006004, "支付退款单不存在");
42 ErrorCode REFUND_STATUS_IS_NOT_WAITING = new ErrorCode(1007006005, "支付退款单不处于待退款"); 42 ErrorCode REFUND_STATUS_IS_NOT_WAITING = new ErrorCode(1007006005, "支付退款单不处于待退款");
43 43
  44 + // ========== 钱包模块(退款) 1007007000 ==========
  45 + ErrorCode WALLET_NOT_FOUND = new ErrorCode(1007007000, "用户钱包不存在");
  46 +
44 // ========== 示例订单 1007900000 ========== 47 // ========== 示例订单 1007900000 ==========
45 ErrorCode DEMO_ORDER_NOT_FOUND = new ErrorCode(1007900000, "示例订单不存在"); 48 ErrorCode DEMO_ORDER_NOT_FOUND = new ErrorCode(1007900000, "示例订单不存在");
46 ErrorCode DEMO_ORDER_UPDATE_PAID_STATUS_NOT_UNPAID = new ErrorCode(1007900001, "示例订单更新支付状态失败，订单不是【未支付】状态"); 49 ErrorCode DEMO_ORDER_UPDATE_PAID_STATUS_NOT_UNPAID = new ErrorCode(1007900001, "示例订单更新支付状态失败，订单不是【未支付】状态");
yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/member/WalletTransactionGategoryEnum.java renamed to yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/member/WalletBizTypeEnum.java
  View file @498edff
@@ -4,20 +4,21 @@ import lombok.AllArgsConstructor; @@ -4,20 +4,21 @@ import lombok.AllArgsConstructor;
4 import lombok.Getter; 4 import lombok.Getter;
5 5
6 /** 6 /**
7 - * 钱包交易大类枚举 7 + * 钱包交易业务分类
8 * 8 *
9 * @author jason 9 * @author jason
10 */ 10 */
11 @AllArgsConstructor 11 @AllArgsConstructor
12 @Getter 12 @Getter
13 -public enum WalletTransactionGategoryEnum {  
14 - TOP_UP(1, "充值"),  
15 - SPENDING(2, "支出"); 13 +public enum WalletBizTypeEnum {
  14 + RECHARGE(1, "充值"),
  15 + RECHARGE_REFUND(2, "充值退款");
16 16
  17 + // TODO 后续增加
17 /** 18 /**
18 - * 分类 19 + * 业务分类
19 */ 20 */
20 - private final Integer category; 21 + private final Integer bizType;
21 22
22 /** 23 /**
23 * 说明 24 * 说明
yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/member/WalletOperateTypeEnum.java renamed to yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/member/WalletTransactionQueryTypeEnum.java
  View file @498edff
1 package cn.iocoder.yudao.module.pay.enums.member; 1 package cn.iocoder.yudao.module.pay.enums.member;
2 2
  3 +import cn.hutool.core.util.ArrayUtil;
  4 +import cn.iocoder.yudao.framework.common.core.IntArrayValuable;
3 import lombok.AllArgsConstructor; 5 import lombok.AllArgsConstructor;
4 import lombok.Getter; 6 import lombok.Getter;
5 7
  8 +import java.util.Arrays;
  9 +
6 /** 10 /**
7 - * 钱包操作类型枚举 11 + * 钱包明细查询类型
8 * 12 *
9 * @author jason 13 * @author jason
10 */ 14 */
11 @AllArgsConstructor 15 @AllArgsConstructor
12 @Getter 16 @Getter
13 -public enum WalletOperateTypeEnum {  
14 - TOP_UP_INC(1, "充值增加"),  
15 - ORDER_DEC(2, "订单消费扣除");  
16 - // TODO 其它类型 17 +public enum WalletTransactionQueryTypeEnum implements IntArrayValuable {
  18 + RECHARGE(1, "充值"),
  19 + EXPENSE(2, "消费");
17 20
18 private final Integer type; 21 private final Integer type;
19 22
20 private final String desc; 23 private final String desc;
  24 +
  25 + public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(WalletTransactionQueryTypeEnum::getType).toArray();
  26 +
  27 + @Override
  28 + public int[] array() {
  29 + return ARRAYS;
  30 + }
  31 +
  32 + public static WalletTransactionQueryTypeEnum valueOf(Integer type) {
  33 + return ArrayUtil.firstMatch(o -> o.getType().equals(type), values());
  34 + }
21 } 35 }
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/wallet/AppPayWalletController.java 0 → 100644
  View file @498edff
  1 +package cn.iocoder.yudao.module.pay.controller.app.wallet;
  2 +
  3 +import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
  4 +import cn.iocoder.yudao.framework.common.pojo.CommonResult;
  5 +import cn.iocoder.yudao.module.pay.controller.app.wallet.vo.AppPayWalletRespVO;
  6 +import cn.iocoder.yudao.module.pay.convert.wallet.PayWalletConvert;
  7 +import cn.iocoder.yudao.module.pay.dal.dataobject.wallet.PayWalletDO;
  8 +import cn.iocoder.yudao.module.pay.service.wallet.PayWalletService;
  9 +import io.swagger.v3.oas.annotations.Operation;
  10 +import io.swagger.v3.oas.annotations.tags.Tag;
  11 +import lombok.extern.slf4j.Slf4j;
  12 +import org.springframework.validation.annotation.Validated;
  13 +import org.springframework.web.bind.annotation.GetMapping;
  14 +import org.springframework.web.bind.annotation.RequestMapping;
  15 +import org.springframework.web.bind.annotation.RestController;
  16 +
  17 +import javax.annotation.Resource;
  18 +
  19 +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
  20 +import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
  21 +
  22 +/**
  23 + * @author jason
  24 + */
  25 +@Tag(name = "用户 APP - 钱包")
  26 +@RestController
  27 +@RequestMapping("/pay/wallet")
  28 +@Validated
  29 +@Slf4j
  30 +public class AppPayWalletController {
  31 +
  32 + @Resource
  33 + private PayWalletService payWalletService;
  34 +
  35 + @GetMapping("/get")
  36 + @Operation(summary = "获取钱包")
  37 + public CommonResult<AppPayWalletRespVO> getPayWallet() {
  38 + PayWalletDO payWallet = payWalletService.getPayWallet(getLoginUserId(), UserTypeEnum.MEMBER.getValue());
  39 + return success(PayWalletConvert.INSTANCE.convert(payWallet));
  40 + }
  41 +}
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/wallet/AppPayWalletTransactionController.java 0 → 100644
  View file @498edff
  1 +package cn.iocoder.yudao.module.pay.controller.app.wallet;
  2 +
  3 +import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
  4 +import cn.iocoder.yudao.framework.common.pojo.CommonResult;
  5 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  6 +import cn.iocoder.yudao.module.pay.controller.app.wallet.vo.AppPayWalletTransactionPageReqVO;
  7 +import cn.iocoder.yudao.module.pay.controller.app.wallet.vo.AppPayWalletTransactionRespVO;
  8 +import cn.iocoder.yudao.module.pay.convert.wallet.PayWalletTransactionConvert;
  9 +import cn.iocoder.yudao.module.pay.dal.dataobject.wallet.PayWalletTransactionDO;
  10 +import cn.iocoder.yudao.module.pay.service.wallet.PayWalletTransactionService;
  11 +import io.swagger.v3.oas.annotations.Operation;
  12 +import io.swagger.v3.oas.annotations.tags.Tag;
  13 +import lombok.extern.slf4j.Slf4j;
  14 +import org.springframework.validation.annotation.Validated;
  15 +import org.springframework.web.bind.annotation.GetMapping;
  16 +import org.springframework.web.bind.annotation.RequestMapping;
  17 +import org.springframework.web.bind.annotation.RestController;
  18 +
  19 +import javax.annotation.Resource;
  20 +import javax.validation.Valid;
  21 +
  22 +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
  23 +import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
  24 +
  25 +@Tag(name = "用户 APP - 钱包余额明细")
  26 +@RestController
  27 +@RequestMapping("/pay/wallet-transaction")
  28 +@Validated
  29 +@Slf4j
  30 +public class AppPayWalletTransactionController {
  31 +
  32 + @Resource
  33 + private PayWalletTransactionService payWalletTransactionService;
  34 +
  35 + @GetMapping("/page")
  36 + @Operation(summary = "获得钱包余额明细分页")
  37 + public CommonResult<PageResult<AppPayWalletTransactionRespVO>> pageWalletTransaction(
  38 + @Valid AppPayWalletTransactionPageReqVO pageVO) {
  39 + PageResult<PayWalletTransactionDO> result = payWalletTransactionService.getWalletTransactionPage(getLoginUserId(),
  40 + UserTypeEnum.MEMBER.getValue(), pageVO);
  41 + return success(PayWalletTransactionConvert.INSTANCE.convertPage(result));
  42 + }
  43 +}
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/wallet/vo/AppPayWalletRespVO.java 0 → 100644
  View file @498edff
  1 +package cn.iocoder.yudao.module.pay.controller.app.wallet.vo;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +
  6 +/**
  7 + * @author jason
  8 + */
  9 +@Schema(description = "用户 APP - 获取用户钱包 Response VO")
  10 +@Data
  11 +public class AppPayWalletRespVO {
  12 +
  13 + @Schema(description = "钱包余额,单位分", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
  14 + private Integer balance;
  15 +
  16 + @Schema(description = "累计支出, 单位分", requiredMode = Schema.RequiredMode.REQUIRED, example = "1000")
  17 + private Long totalExpense;
  18 +
  19 + @Schema(description = "累计充值, 单位分", requiredMode = Schema.RequiredMode.REQUIRED, example = "1000")
  20 + private Long totalRecharge;
  21 +}
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/wallet/vo/AppPayWalletTransactionPageReqVO.java 0 → 100644
  View file @498edff
  1 +package cn.iocoder.yudao.module.pay.controller.app.wallet.vo;
  2 +
  3 +import cn.iocoder.yudao.framework.common.pojo.PageParam;
  4 +import cn.iocoder.yudao.framework.common.validation.InEnum;
  5 +import cn.iocoder.yudao.module.pay.enums.member.WalletTransactionQueryTypeEnum;
  6 +import io.swagger.v3.oas.annotations.media.Schema;
  7 +import lombok.Data;
  8 +
  9 +@Schema(description = "用户 APP - 钱包余额明细分页 Request VO")
  10 +@Data
  11 +public class AppPayWalletTransactionPageReqVO extends PageParam {
  12 +
  13 + @Schema(description = "余额明细查询分类", example = "1")
  14 + @InEnum(value = WalletTransactionQueryTypeEnum.class, message = "查询类型必须是 {value}")
  15 + private Integer type;
  16 +}
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/wallet/vo/AppPayWalletTransactionRespVO.java 0 → 100644
  View file @498edff
  1 +package cn.iocoder.yudao.module.pay.controller.app.wallet.vo;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +
  6 +import java.time.LocalDateTime;
  7 +
  8 +@Schema(description = "用户 APP - 钱包余额明细分页 Response VO")
  9 +@Data
  10 +public class AppPayWalletTransactionRespVO {
  11 + @Schema(description = "交易金额, 单位分", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
  12 + private Integer amount;
  13 +
  14 + @Schema(description = "业务分类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
  15 + private Integer bizType;
  16 +
  17 + @Schema(description = "交易时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
  18 + private LocalDateTime transactionTime;
  19 +}
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/convert/wallet/PayWalletConvert.java 0 → 100644
  View file @498edff
  1 +package cn.iocoder.yudao.module.pay.convert.wallet;
  2 +
  3 +import cn.iocoder.yudao.module.pay.controller.app.wallet.vo.AppPayWalletRespVO;
  4 +import cn.iocoder.yudao.module.pay.dal.dataobject.wallet.PayWalletDO;
  5 +import org.mapstruct.Mapper;
  6 +import org.mapstruct.factory.Mappers;
  7 +
  8 +@Mapper
  9 +public interface PayWalletConvert {
  10 +
  11 + PayWalletConvert INSTANCE = Mappers.getMapper(PayWalletConvert.class);
  12 +
  13 + AppPayWalletRespVO convert(PayWalletDO bean);
  14 +}
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/convert/wallet/PayWalletTransactionConvert.java 0 → 100644
  View file @498edff
  1 +package cn.iocoder.yudao.module.pay.convert.wallet;
  2 +
  3 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  4 +import cn.iocoder.yudao.module.pay.controller.app.wallet.vo.AppPayWalletTransactionRespVO;
  5 +import cn.iocoder.yudao.module.pay.dal.dataobject.wallet.PayWalletTransactionDO;
  6 +import org.mapstruct.Mapper;
  7 +import org.mapstruct.factory.Mappers;
  8 +
  9 +@Mapper
  10 +public interface PayWalletTransactionConvert {
  11 +
  12 + PayWalletTransactionConvert INSTANCE = Mappers.getMapper(PayWalletTransactionConvert.class);
  13 +
  14 + PageResult<AppPayWalletTransactionRespVO> convertPage(PageResult<PayWalletTransactionDO> page);
  15 +}
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/dal/dataobject/member/MemberWalletDO.java renamed to yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/dal/dataobject/wallet/PayWalletDO.java
  View file @498edff
1 -package cn.iocoder.yudao.module.pay.dal.dataobject.member; 1 +package cn.iocoder.yudao.module.pay.dal.dataobject.wallet;
2 2
  3 +import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
3 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; 4 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
4 import com.baomidou.mybatisplus.annotation.KeySequence; 5 import com.baomidou.mybatisplus.annotation.KeySequence;
5 import com.baomidou.mybatisplus.annotation.TableId; 6 import com.baomidou.mybatisplus.annotation.TableId;
6 import com.baomidou.mybatisplus.annotation.TableName; 7 import com.baomidou.mybatisplus.annotation.TableName;
7 import lombok.Data; 8 import lombok.Data;
8 9
9 -// TODO @jason：修改 MemberWalletDO 为 PayWalletDO  
10 /** 10 /**
11 * 支付 - 会员钱包 DO 11 * 支付 - 会员钱包 DO
12 * 12 *
13 * @author jason 13 * @author jason
14 */ 14 */
15 -@TableName(value ="pay_member_wallet")  
16 -@KeySequence("pay_member_wallet_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 15 +@TableName(value ="pay_wallet")
  16 +@KeySequence("pay_wallet_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
17 @Data 17 @Data
18 -public class MemberWalletDO extends BaseDO { 18 +public class PayWalletDO extends BaseDO {
19 19
20 /** 20 /**
21 * 编号 21 * 编号
@@ -23,7 +23,6 @@ public class MemberWalletDO extends BaseDO { @@ -23,7 +23,6 @@ public class MemberWalletDO extends BaseDO {
23 @TableId 23 @TableId
24 private Long id; 24 private Long id;
25 25
26 - // TODO @jaosn：增加 userType 字段；  
27 /** 26 /**
28 * 用户 id 27 * 用户 id
29 * 28 *
@@ -33,6 +32,13 @@ public class MemberWalletDO extends BaseDO { @@ -33,6 +32,13 @@ public class MemberWalletDO extends BaseDO {
33 private Long userId; 32 private Long userId;
34 33
35 /** 34 /**
  35 + * 用户类型, 预留 多商户转帐可能需要用到
  36 + *
  37 + * 关联 {@link UserTypeEnum}
  38 + */
  39 + private Integer userType;
  40 +
  41 + /**
36 * 余额, 单位分 42 * 余额, 单位分
37 */ 43 */
38 private Integer balance; 44 private Integer balance;
@@ -40,10 +46,10 @@ public class MemberWalletDO extends BaseDO { @@ -40,10 +46,10 @@ public class MemberWalletDO extends BaseDO {
40 /** 46 /**
41 * 累计支出, 单位分 47 * 累计支出, 单位分
42 */ 48 */
43 - private Integer totalSpending; 49 + private Long totalExpense;
44 50
45 /** 51 /**
46 * 累计充值, 单位分 52 * 累计充值, 单位分
47 */ 53 */
48 - private Integer totalTopUp; 54 + private Long totalRecharge;
49 } 55 }
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/dal/dataobject/member/MemberWalletTransactionDO.java renamed to yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/dal/dataobject/wallet/PayWalletTransactionDO.java
  View file @498edff
1 -package cn.iocoder.yudao.module.pay.dal.dataobject.member; 1 +package cn.iocoder.yudao.module.pay.dal.dataobject.wallet;
2 2
3 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; 3 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
4 -import cn.iocoder.yudao.module.pay.enums.member.WalletOperateTypeEnum;  
5 -import cn.iocoder.yudao.module.pay.enums.member.WalletTransactionGategoryEnum; 4 +import cn.iocoder.yudao.module.pay.enums.member.WalletBizTypeEnum;
6 import com.baomidou.mybatisplus.annotation.KeySequence; 5 import com.baomidou.mybatisplus.annotation.KeySequence;
7 import com.baomidou.mybatisplus.annotation.TableId; 6 import com.baomidou.mybatisplus.annotation.TableId;
8 import com.baomidou.mybatisplus.annotation.TableName; 7 import com.baomidou.mybatisplus.annotation.TableName;
@@ -15,10 +14,10 @@ import java.time.LocalDateTime; @@ -15,10 +14,10 @@ import java.time.LocalDateTime;
15 * 14 *
16 * @author jason 15 * @author jason
17 */ 16 */
18 -@TableName(value ="pay_member_wallet_transaction")  
19 -@KeySequence("pay_member_wallet_transaction_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 17 +@TableName(value ="pay_wallet_transaction")
  18 +@KeySequence("pay_wallet_transaction_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
20 @Data 19 @Data
21 -public class MemberWalletTransactionDO extends BaseDO { 20 +public class PayWalletTransactionDO extends BaseDO {
22 21
23 /** 22 /**
24 * 编号 23 * 编号
@@ -28,58 +27,43 @@ public class MemberWalletTransactionDO extends BaseDO { @@ -28,58 +27,43 @@ public class MemberWalletTransactionDO extends BaseDO {
28 27
29 /** 28 /**
30 * 会员钱包 id 29 * 会员钱包 id
31 - *  
32 - * 关联 {@link MemberWalletDO#getId()} 30 + * 关联 {@link PayWalletDO#getId()}
33 */ 31 */
34 private Long walletId; 32 private Long walletId;
35 33
36 /** 34 /**
37 - * 用户 id  
38 - *  
39 - * 关联 MemberUserDO 的 id 编号 35 + * 钱包交易业务分类
  36 + * 关联枚举 {@link WalletBizTypeEnum#getBizType()}
40 */ 37 */
41 - private Long userId; 38 + private Integer bizType;
42 39
43 /** 40 /**
44 - * 交易单号 @芋艿 这里是关联交易单号, 还是订单号 , 退款单号! ?? 41 + * 关联业务编号
45 */ 42 */
46 - private String tradeNo; 43 + private Long bizId;
47 44
48 /** 45 /**
49 - * 交易分类  
50 - *  
51 - * 枚举 {@link WalletTransactionGategoryEnum#getCategory()} 46 + * 流水号
52 */ 47 */
53 - private Integer category; 48 + private String no;
54 49
55 /** 50 /**
56 - * 操作分类  
57 - *  
58 - * 枚举 {@link WalletOperateTypeEnum#getType()} 51 + * 附加说明
59 */ 52 */
60 - private Integer operateType;  
61 -  
62 - /**  
63 - * 操作详情  
64 - */  
65 - private String operateDesc; 53 + private String description;
66 54
67 /** 55 /**
68 * 交易金额, 单位分 56 * 交易金额, 单位分
  57 + * 正值表示余额增加,负值表示余额减少
69 */ 58 */
70 - private Integer price; 59 + private Integer amount;
71 60
72 /** 61 /**
73 - * 余额, 单位分 62 + * 交易后余额,单位分
74 */ 63 */
75 private Integer balance; 64 private Integer balance;
76 65
77 /** 66 /**
78 - * 备注  
79 - */  
80 - private String mark;  
81 -  
82 - /**  
83 * 交易时间 67 * 交易时间
84 */ 68 */
85 private LocalDateTime transactionTime; 69 private LocalDateTime transactionTime;
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/dal/mysql/member/MemberWalletMapper.java deleted
View file @655eefc
1 -package cn.iocoder.yudao.module.pay.dal.mysql.member;  
2 -  
3 -  
4 -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;  
5 -import cn.iocoder.yudao.module.pay.dal.dataobject.member.MemberWalletDO;  
6 -import org.apache.ibatis.annotations.Mapper;  
7 -  
8 -@Mapper  
9 -public interface MemberWalletMapper extends BaseMapperX<MemberWalletDO> {  
10 -  
11 -}  
12 -  
13 -  
14 -  
15 -  
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/dal/mysql/member/MemberWalletTransactionMapper.java deleted
View file @655eefc
1 -package cn.iocoder.yudao.module.pay.dal.mysql.member;  
2 -  
3 -  
4 -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;  
5 -import cn.iocoder.yudao.module.pay.dal.dataobject.member.MemberWalletTransactionDO;  
6 -import org.apache.ibatis.annotations.Mapper;  
7 -  
8 -@Mapper  
9 -public interface MemberWalletTransactionMapper extends BaseMapperX<MemberWalletTransactionDO> {  
10 -  
11 -}  
12 -  
13 -  
14 -  
15 -  
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/dal/mysql/wallet/PayWalletMapper.java 0 → 100644
  View file @498edff
  1 +package cn.iocoder.yudao.module.pay.dal.mysql.wallet;
  2 +
  3 +
  4 +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
  5 +import cn.iocoder.yudao.module.pay.dal.dataobject.wallet.PayWalletDO;
  6 +import org.apache.ibatis.annotations.Mapper;
  7 +
  8 +@Mapper
  9 +public interface PayWalletMapper extends BaseMapperX<PayWalletDO> {
  10 +
  11 + default PayWalletDO selectByUserIdAndType(Long userId, Integer userType) {
  12 + return selectOne(PayWalletDO::getUserId, userId, PayWalletDO::getUserType, userType);
  13 + }
  14 +}
  15 +
  16 +
  17 +
  18 +
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/dal/mysql/wallet/PayWalletTransactionMapper.java 0 → 100644
  View file @498edff
  1 +package cn.iocoder.yudao.module.pay.dal.mysql.wallet;
  2 +
  3 +
  4 +import cn.iocoder.yudao.framework.common.pojo.PageParam;
  5 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  6 +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
  7 +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
  8 +import cn.iocoder.yudao.module.pay.dal.dataobject.wallet.PayWalletTransactionDO;
  9 +import cn.iocoder.yudao.module.pay.enums.member.WalletTransactionQueryTypeEnum;
  10 +import org.apache.ibatis.annotations.Mapper;
  11 +
  12 +@Mapper
  13 +public interface PayWalletTransactionMapper extends BaseMapperX<PayWalletTransactionDO> {
  14 +
  15 + default PageResult<PayWalletTransactionDO> selectPageByWalletIdAndQueryType(Long walletId,
  16 + WalletTransactionQueryTypeEnum queryType,
  17 + PageParam pageParam) {
  18 + LambdaQueryWrapperX<PayWalletTransactionDO> query = new LambdaQueryWrapperX<PayWalletTransactionDO>()
  19 + .eq(PayWalletTransactionDO::getWalletId, walletId);
  20 + if (WalletTransactionQueryTypeEnum.RECHARGE == queryType ) {
  21 + query.ge(PayWalletTransactionDO::getAmount, 0);
  22 + }
  23 + if (WalletTransactionQueryTypeEnum.EXPENSE == queryType ) {
  24 + query.lt(PayWalletTransactionDO::getAmount, 0);
  25 + }
  26 + query.orderByDesc(PayWalletTransactionDO::getTransactionTime);
  27 + return selectPage(pageParam, query);
  28 + }
  29 +}
  30 +
  31 +
  32 +
  33 +
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletService.java 0 → 100644
  View file @498edff
  1 +package cn.iocoder.yudao.module.pay.service.wallet;
  2 +
  3 +import cn.iocoder.yudao.module.pay.dal.dataobject.wallet.PayWalletDO;
  4 +
  5 +/**
  6 + * 钱包 Service 接口
  7 + *
  8 + * @author jason
  9 + */
  10 +public interface PayWalletService {
  11 +
  12 + /**
  13 + * 获取钱包信息
  14 + * @param userId 用户 id
  15 + * @param userType 用户类型
  16 + */
  17 + PayWalletDO getPayWallet(Long userId, Integer userType);
  18 +}
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletServiceImpl.java 0 → 100644
  View file @498edff
  1 +package cn.iocoder.yudao.module.pay.service.wallet;
  2 +
  3 +import cn.iocoder.yudao.module.pay.dal.dataobject.wallet.PayWalletDO;
  4 +import cn.iocoder.yudao.module.pay.dal.mysql.wallet.PayWalletMapper;
  5 +import org.springframework.stereotype.Service;
  6 +
  7 +import javax.annotation.Resource;
  8 +
  9 +/**
  10 + * 钱包 Service 实现类
  11 + *
  12 + * @author jason
  13 + */
  14 +@Service
  15 +public class PayWalletServiceImpl implements PayWalletService {
  16 +
  17 + @Resource
  18 + private PayWalletMapper payWalletMapper;
  19 +
  20 + @Override
  21 + public PayWalletDO getPayWallet(Long userId, Integer userType) {
  22 + return payWalletMapper.selectByUserIdAndType(userId, userType);
  23 + }
  24 +}
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletTransactionService.java 0 → 100644
  View file @498edff
  1 +package cn.iocoder.yudao.module.pay.service.wallet;
  2 +
  3 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  4 +import cn.iocoder.yudao.module.pay.controller.app.wallet.vo.AppPayWalletTransactionPageReqVO;
  5 +import cn.iocoder.yudao.module.pay.dal.dataobject.wallet.PayWalletTransactionDO;
  6 +
  7 +/**
  8 + * 钱包余额明细 Service 接口
  9 + *
  10 + * @author jason
  11 + */
  12 +public interface PayWalletTransactionService {
  13 +
  14 + /**
  15 + * 查询钱包余额明细, 分页
  16 + *
  17 + * @param userId 用户 id
  18 + * @param userType 用户类型
  19 + * @param pageVO 分页查询参数
  20 + */
  21 + PageResult<PayWalletTransactionDO> getWalletTransactionPage(Long userId, Integer userType,
  22 + AppPayWalletTransactionPageReqVO pageVO);
  23 +}
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletTransactionServiceImpl.java 0 → 100644
  View file @498edff
  1 +package cn.iocoder.yudao.module.pay.service.wallet;
  2 +
  3 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  4 +import cn.iocoder.yudao.module.pay.controller.app.wallet.vo.AppPayWalletTransactionPageReqVO;
  5 +import cn.iocoder.yudao.module.pay.dal.dataobject.wallet.PayWalletDO;
  6 +import cn.iocoder.yudao.module.pay.dal.dataobject.wallet.PayWalletTransactionDO;
  7 +import cn.iocoder.yudao.module.pay.dal.mysql.wallet.PayWalletTransactionMapper;
  8 +import cn.iocoder.yudao.module.pay.enums.member.WalletTransactionQueryTypeEnum;
  9 +import lombok.extern.slf4j.Slf4j;
  10 +import org.springframework.stereotype.Service;
  11 +
  12 +import javax.annotation.Resource;
  13 +
  14 +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
  15 +import static cn.iocoder.yudao.module.pay.enums.ErrorCodeConstants.WALLET_NOT_FOUND;
  16 +
  17 +/**
  18 + * 钱包余额明细 Service 实现类
  19 + *
  20 + * @author jason
  21 + */
  22 +@Service
  23 +@Slf4j
  24 +public class PayWalletTransactionServiceImpl implements PayWalletTransactionService{
  25 + @Resource
  26 + private PayWalletService payWalletService;
  27 + @Resource
  28 + private PayWalletTransactionMapper payWalletTransactionMapper;
  29 +
  30 + @Override
  31 + public PageResult<PayWalletTransactionDO> getWalletTransactionPage(Long userId, Integer userType,
  32 + AppPayWalletTransactionPageReqVO pageVO) {
  33 + PayWalletDO payWallet = payWalletService.getPayWallet(userId, userType);
  34 + if (payWallet == null) {
  35 + log.error("[pageWalletTransaction] 用户 {} 钱包不存在", userId);
  36 + throw exception(WALLET_NOT_FOUND);
  37 + }
  38 + return payWalletTransactionMapper.selectPageByWalletIdAndQueryType(payWallet.getId(),
  39 + WalletTransactionQueryTypeEnum.valueOf(pageVO.getType()), pageVO);
  40 + }
  41 +}