BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 8b98d13d8bac263ea2f3627e759a972c47b28f9b

Authored by YunaiV
2 parents 02bc9d28 1baa7f4a

Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro

Inline Side-by-side
Showing 175 changed files with 4991 additions and 1094 deletions
@@ -16,11 +16,11 @@ @@ -16,11 +16,11 @@
16 <module>yudao-module-member</module> 16 <module>yudao-module-member</module>
17 <module>yudao-module-system</module> 17 <module>yudao-module-system</module>
18 <module>yudao-module-infra</module> 18 <module>yudao-module-infra</module>
19 -<!-- <module>yudao-module-pay</module>-->  
20 -<!-- <module>yudao-module-bpm</module>-->  
21 -<!-- <module>yudao-module-report</module>-->  
22 -<!-- <module>yudao-module-mp</module>-->  
23 -<!-- <module>yudao-module-mall</module>--> 19 + <module>yudao-module-pay</module>
  20 + <module>yudao-module-bpm</module>
  21 + <module>yudao-module-report</module>
  22 + <module>yudao-module-mp</module>
  23 + <module>yudao-module-mall</module>
24 <!-- 示例项目 --> 24 <!-- 示例项目 -->
25 <module>yudao-example</module> 25 <module>yudao-example</module>
26 </modules> 26 </modules>
sql/mysql/pay_wallet.sql 0 → 100644
  View file @8b98d13
  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 @8b98d13
@@ -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 @8b98d13
@@ -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 0 → 100644
  View file @8b98d13
  1 +package cn.iocoder.yudao.framework.pay.core.client.impl.alipay;
  2 +
  3 +import cn.hutool.core.date.LocalDateTimeUtil;
  4 +import cn.hutool.core.util.RandomUtil;
  5 +import cn.iocoder.yudao.framework.common.exception.ServiceException;
  6 +import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants;
  7 +import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
  8 +import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderUnifiedReqDTO;
  9 +import cn.iocoder.yudao.framework.pay.core.client.dto.refund.PayRefundRespDTO;
  10 +import cn.iocoder.yudao.framework.pay.core.client.dto.refund.PayRefundUnifiedReqDTO;
  11 +import cn.iocoder.yudao.framework.pay.core.client.exception.PayException;
  12 +import cn.iocoder.yudao.framework.pay.core.enums.refund.PayRefundStatusRespEnum;
  13 +import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest;
  14 +import com.alipay.api.AlipayApiException;
  15 +import com.alipay.api.DefaultAlipayClient;
  16 +import com.alipay.api.DefaultSigner;
  17 +import com.alipay.api.domain.AlipayTradeRefundModel;
  18 +import com.alipay.api.request.AlipayTradeRefundRequest;
  19 +import com.alipay.api.response.AlipayTradeRefundResponse;
  20 +import lombok.Setter;
  21 +import org.junit.jupiter.api.BeforeEach;
  22 +import org.junit.jupiter.api.DisplayName;
  23 +import org.junit.jupiter.api.Test;
  24 +import org.mockito.ArgumentMatcher;
  25 +import org.mockito.Mock;
  26 +
  27 +import javax.validation.ConstraintViolationException;
  28 +import java.util.Date;
  29 +
  30 +import static cn.iocoder.yudao.framework.pay.core.client.impl.alipay.AlipayPayClientConfig.MODE_PUBLIC_KEY;
  31 +import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
  32 +import static org.junit.jupiter.api.Assertions.*;
  33 +import static org.mockito.ArgumentMatchers.argThat;
  34 +import static org.mockito.Mockito.when;
  35 +
  36 +/**
  37 + * 支付宝 Client 的测试基类
  38 + *
  39 + * @author jason
  40 + */
  41 +public abstract class AbstractAlipayClientTest extends BaseMockitoUnitTest {
  42 +
  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 + });
  52 +
  53 + @Mock
  54 + protected DefaultAlipayClient defaultAlipayClient;
  55 +
  56 + @Setter
  57 + private AbstractAlipayPayClient client;
  58 +
  59 + /**
  60 + * 子类需要实现该方法. 设置 client 的具体实现
  61 + */
  62 + @BeforeEach
  63 + public abstract void setUp();
  64 +
  65 + @Test
  66 + @DisplayName("支付宝 Client 初始化")
  67 + public void testDoInit() {
  68 + // 调用
  69 + client.doInit();
  70 + // 断言
  71 + DefaultAlipayClient realClient = client.getClient();
  72 + assertNotSame(defaultAlipayClient, realClient);
  73 + assertInstanceOf(DefaultSigner.class, realClient.getSigner());
  74 + assertEquals(config.getPrivateKey(), ((DefaultSigner) realClient.getSigner()).getPrivateKey());
  75 + }
  76 +
  77 + @Test
  78 + @DisplayName("支付宝 Client 统一退款：成功")
  79 + public void testUnifiedRefund_success() throws AlipayApiException {
  80 + // mock 方法
  81 + String notifyUrl = randomURL();
  82 + Date refundTime = randomDate();
  83 + String outRefundNo = randomString();
  84 + String outTradeNo = randomString();
  85 + Integer refundAmount = randomInteger();
  86 + AlipayTradeRefundResponse response = randomPojo(AlipayTradeRefundResponse.class, o -> {
  87 + o.setSubCode("");
  88 + o.setGmtRefundPay(refundTime);
  89 + });
  90 + when(defaultAlipayClient.execute(argThat((ArgumentMatcher<AlipayTradeRefundRequest>) request -> {
  91 + assertInstanceOf(AlipayTradeRefundModel.class, request.getBizModel());
  92 + AlipayTradeRefundModel bizModel = (AlipayTradeRefundModel) request.getBizModel();
  93 + assertEquals(outRefundNo, bizModel.getOutRequestNo());
  94 + assertEquals(outTradeNo, bizModel.getOutTradeNo());
  95 + assertEquals(String.valueOf(refundAmount / 100.0), bizModel.getRefundAmount());
  96 + return true;
  97 + }))).thenReturn(response);
  98 + // 准备请求参数
  99 + PayRefundUnifiedReqDTO refundReqDTO = randomPojo(PayRefundUnifiedReqDTO.class, o -> {
  100 + o.setOutRefundNo(outRefundNo);
  101 + o.setOutTradeNo(outTradeNo);
  102 + o.setNotifyUrl(notifyUrl);
  103 + o.setRefundPrice(refundAmount);
  104 + });
  105 +
  106 + // 调用
  107 + PayRefundRespDTO resp = client.unifiedRefund(refundReqDTO);
  108 + // 断言
  109 + assertEquals(PayRefundStatusRespEnum.SUCCESS.getStatus(), resp.getStatus());
  110 + assertEquals(outRefundNo, resp.getOutRefundNo());
  111 + assertNull(resp.getChannelRefundNo());
  112 + assertEquals(LocalDateTimeUtil.of(refundTime), resp.getSuccessTime());
  113 + assertSame(response, resp.getRawData());
  114 + assertNull(resp.getChannelErrorCode());
  115 + assertNull(resp.getChannelErrorMsg());
  116 + }
  117 +
  118 + @Test
  119 + @DisplayName("支付宝 Client 统一退款：渠道返回失败")
  120 + public void test_unified_refund_channel_failed() throws AlipayApiException {
  121 + // mock 方法
  122 + String notifyUrl = randomURL();
  123 + String subCode = randomString();
  124 + String subMsg = randomString();
  125 + AlipayTradeRefundResponse response = randomPojo(AlipayTradeRefundResponse.class, o -> {
  126 + o.setSubCode(subCode);
  127 + o.setSubMsg(subMsg);
  128 + });
  129 + when(defaultAlipayClient.execute(argThat((ArgumentMatcher<AlipayTradeRefundRequest>) request -> {
  130 + assertInstanceOf(AlipayTradeRefundModel.class, request.getBizModel());
  131 + return true;
  132 + }))).thenReturn(response);
  133 + // 准备请求参数
  134 + String outRefundNo = randomString();
  135 + String outTradeNo = randomString();
  136 + PayRefundUnifiedReqDTO refundReqDTO = randomPojo(PayRefundUnifiedReqDTO.class, o -> {
  137 + o.setOutRefundNo(outRefundNo);
  138 + o.setOutTradeNo(outTradeNo);
  139 + o.setNotifyUrl(notifyUrl);
  140 + });
  141 +
  142 + // 调用
  143 + PayRefundRespDTO resp = client.unifiedRefund(refundReqDTO);
  144 + // 断言
  145 + assertEquals(PayRefundStatusRespEnum.FAILURE.getStatus(), resp.getStatus());
  146 + assertEquals(outRefundNo, resp.getOutRefundNo());
  147 + assertNull(resp.getChannelRefundNo());
  148 + assertNull(resp.getSuccessTime());
  149 + assertSame(response, resp.getRawData());
  150 + assertEquals(subCode, resp.getChannelErrorCode());
  151 + assertEquals(subMsg, resp.getChannelErrorMsg());
  152 + }
  153 +
  154 + @Test
  155 + @DisplayName("支付宝 Client 统一退款：参数校验不通过")
  156 + public void testUnifiedRefund_paramInvalidate() {
  157 + // 准备请求参数
  158 + String notifyUrl = randomURL();
  159 + PayRefundUnifiedReqDTO refundReqDTO = randomPojo(PayRefundUnifiedReqDTO.class, o -> {
  160 + o.setOutTradeNo("");
  161 + o.setNotifyUrl(notifyUrl);
  162 + });
  163 +
  164 + // 调用，并断言
  165 + assertThrows(ConstraintViolationException.class, () -> client.unifiedRefund(refundReqDTO));
  166 + }
  167 +
  168 + @Test
  169 + @DisplayName("支付宝 Client 统一退款：抛出业务异常")
  170 + public void testUnifiedRefund_throwServiceException() throws AlipayApiException {
  171 + // mock
  172 + when(defaultAlipayClient.execute(argThat((ArgumentMatcher<AlipayTradeRefundRequest>) request -> true)))
  173 + .thenThrow(ServiceExceptionUtil.exception(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR));
  174 + // 准备请求参数
  175 + String notifyUrl = randomURL();
  176 + PayRefundUnifiedReqDTO refundReqDTO = randomPojo(PayRefundUnifiedReqDTO.class, o -> o.setNotifyUrl(notifyUrl));
  177 +
  178 + // 调用，并断言
  179 + assertThrows(ServiceException.class, () -> client.unifiedRefund(refundReqDTO));
  180 + }
  181 +
  182 + @Test
  183 + @DisplayName("支付宝 Client 统一退款：抛出系统异常")
  184 + public void testUnifiedRefund_throwPayException() throws AlipayApiException {
  185 + // mock
  186 + when(defaultAlipayClient.execute(argThat((ArgumentMatcher<AlipayTradeRefundRequest>) request -> true)))
  187 + .thenThrow(new RuntimeException("系统异常"));
  188 + // 准备请求参数
  189 + String notifyUrl = randomURL();
  190 + PayRefundUnifiedReqDTO refundReqDTO = randomPojo(PayRefundUnifiedReqDTO.class, o -> o.setNotifyUrl(notifyUrl));
  191 +
  192 + // 调用，并断言
  193 + assertThrows(PayException.class, () -> client.unifiedRefund(refundReqDTO));
  194 + }
  195 +
  196 + @Test
  197 + @DisplayName("支付宝 Client 统一下单：参数校验不通过")
  198 + public void testUnifiedOrder_paramInvalidate() {
  199 + // 准备请求参数
  200 + String outTradeNo = randomString();
  201 + String notifyUrl = randomURL();
  202 + PayOrderUnifiedReqDTO reqDTO = randomPojo(PayOrderUnifiedReqDTO.class, o -> {
  203 + o.setOutTradeNo(outTradeNo);
  204 + o.setNotifyUrl(notifyUrl);
  205 + });
  206 +
  207 + // 调用，并断言
  208 + assertThrows(ConstraintViolationException.class, () -> client.unifiedOrder(reqDTO));
  209 + }
  210 +
  211 + protected PayOrderUnifiedReqDTO buildOrderUnifiedReqDTO(String notifyUrl, String outTradeNo, Integer price) {
  212 + return randomPojo(PayOrderUnifiedReqDTO.class, o -> {
  213 + o.setOutTradeNo(outTradeNo);
  214 + o.setNotifyUrl(notifyUrl);
  215 + o.setPrice(price);
  216 + o.setSubject(RandomUtil.randomString(32));
  217 + o.setBody(RandomUtil.randomString(32));
  218 + });
  219 + }
  220 +
  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 @8b98d13
  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 0 → 100644
  View file @8b98d13
  1 +package cn.iocoder.yudao.framework.pay.core.client.impl.alipay;
  2 +
  3 +import cn.hutool.http.Method;
  4 +import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderRespDTO;
  5 +import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderUnifiedReqDTO;
  6 +import cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderDisplayModeEnum;
  7 +import com.alipay.api.AlipayApiException;
  8 +import com.alipay.api.request.AlipayTradePagePayRequest;
  9 +import com.alipay.api.response.AlipayTradePagePayResponse;
  10 +import org.junit.jupiter.api.BeforeEach;
  11 +import org.junit.jupiter.api.DisplayName;
  12 +import org.junit.jupiter.api.Test;
  13 +import org.mockito.ArgumentMatcher;
  14 +import org.mockito.InjectMocks;
  15 +
  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;
  18 +import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
  19 +import static org.junit.jupiter.api.Assertions.*;
  20 +import static org.junit.jupiter.api.Assertions.assertNull;
  21 +import static org.mockito.ArgumentMatchers.argThat;
  22 +import static org.mockito.ArgumentMatchers.eq;
  23 +import static org.mockito.Mockito.when;
  24 +
  25 +/**
  26 + * {@link AlipayPcPayClient} 单元测试
  27 + *
  28 + * @author jason
  29 + */
  30 +public class AlipayPcPayClientTest extends AbstractAlipayClientTest {
  31 +
  32 + @InjectMocks
  33 + private AlipayPcPayClient client = new AlipayPcPayClient(randomLongId(), config);
  34 +
  35 + @Override
  36 + @BeforeEach
  37 + public void setUp() {
  38 + setClient(client);
  39 + }
  40 +
  41 + @Test
  42 + @DisplayName("支付宝 PC 网站支付：URL Display Mode 下单成功")
  43 + public void testUnifiedOrder_urlSuccess() throws AlipayApiException {
  44 + // mock 方法
  45 + String notifyUrl = randomURL();
  46 + AlipayTradePagePayResponse response = randomPojo(AlipayTradePagePayResponse.class, o -> o.setSubCode(""));
  47 + when(defaultAlipayClient.pageExecute(argThat((ArgumentMatcher<AlipayTradePagePayRequest>) request -> true),
  48 + eq(Method.GET.name()))).thenReturn(response);
  49 + // 准备请求参数
  50 + String outTradeNo = randomString();
  51 + Integer price = randomInteger();
  52 + PayOrderUnifiedReqDTO reqDTO = buildOrderUnifiedReqDTO(notifyUrl, outTradeNo, price);
  53 + reqDTO.setDisplayMode(null);
  54 +
  55 + // 调用
  56 + PayOrderRespDTO resp = client.unifiedOrder(reqDTO);
  57 + // 断言
  58 + assertEquals(WAITING.getStatus(), resp.getStatus());
  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());
  65 + assertSame(response, resp.getRawData());
  66 + assertNull(resp.getChannelErrorCode());
  67 + assertNull(resp.getChannelErrorMsg());
  68 + }
  69 +
  70 + @Test
  71 + @DisplayName("支付宝 PC 网站支付：Form Display Mode 下单成功")
  72 + public void testUnifiedOrder_formSuccess() throws AlipayApiException {
  73 + // mock
  74 + String notifyUrl = randomURL();
  75 + AlipayTradePagePayResponse response = randomPojo(AlipayTradePagePayResponse.class, o -> o.setSubCode(""));
  76 + when(defaultAlipayClient.pageExecute(argThat((ArgumentMatcher<AlipayTradePagePayRequest>) request -> true),
  77 + eq(Method.POST.name()))).thenReturn(response);
  78 + // 准备请求参数
  79 + String outTradeNo = randomString();
  80 + Integer price = randomInteger();
  81 + PayOrderUnifiedReqDTO reqDTO = buildOrderUnifiedReqDTO(notifyUrl, outTradeNo, price);
  82 + reqDTO.setDisplayMode(PayOrderDisplayModeEnum.FORM.getMode());
  83 +
  84 + // 调用
  85 + PayOrderRespDTO resp = client.unifiedOrder(reqDTO);
  86 + // 断言
  87 + assertEquals(WAITING.getStatus(), resp.getStatus());
  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());
  94 + assertSame(response, resp.getRawData());
  95 + assertNull(resp.getChannelErrorCode());
  96 + assertNull(resp.getChannelErrorMsg());
  97 + }
  98 +
  99 + @Test
  100 + @DisplayName("支付宝 PC 网站支付：渠道返回失败")
  101 + public void testUnifiedOrder_channelFailed() throws AlipayApiException {
  102 + // mock
  103 + String subCode = randomString();
  104 + String subMsg = randomString();
  105 + AlipayTradePagePayResponse response = randomPojo(AlipayTradePagePayResponse.class, o -> {
  106 + o.setSubCode(subCode);
  107 + o.setSubMsg(subMsg);
  108 + });
  109 + when(defaultAlipayClient.pageExecute(argThat((ArgumentMatcher<AlipayTradePagePayRequest>) request -> true),
  110 + eq(Method.GET.name()))).thenReturn(response);
  111 + // 准备请求参数
  112 + String outTradeNo = randomString();
  113 + PayOrderUnifiedReqDTO reqDTO = buildOrderUnifiedReqDTO(randomURL(), outTradeNo, randomInteger());
  114 + reqDTO.setDisplayMode(PayOrderDisplayModeEnum.URL.getMode());
  115 +
  116 + // 调用
  117 + PayOrderRespDTO resp = client.unifiedOrder(reqDTO);
  118 + // 断言
  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());
  127 + assertEquals(subCode, resp.getChannelErrorCode());
  128 + assertEquals(subMsg, resp.getChannelErrorMsg());
  129 + }
  130 +
  131 +}
yudao-framework/yudao-spring-boot-starter-biz-pay/src/test/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AlipayQrPayClientTest.java
  View file @8b98d13
1 package cn.iocoder.yudao.framework.pay.core.client.impl.alipay; 1 package cn.iocoder.yudao.framework.pay.core.client.impl.alipay;
2 2
3 -import cn.hutool.core.date.LocalDateTimeUtil;  
4 -import cn.hutool.core.util.RandomUtil;  
5 -import cn.hutool.core.util.ReflectUtil;  
6 import cn.iocoder.yudao.framework.common.exception.ServiceException; 3 import cn.iocoder.yudao.framework.common.exception.ServiceException;
7 import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants; 4 import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants;
8 import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil; 5 import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
9 import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderRespDTO; 6 import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderRespDTO;
10 import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderUnifiedReqDTO; 7 import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderUnifiedReqDTO;
11 -import cn.iocoder.yudao.framework.pay.core.client.dto.refund.PayRefundRespDTO;  
12 -import cn.iocoder.yudao.framework.pay.core.client.dto.refund.PayRefundUnifiedReqDTO;  
13 import cn.iocoder.yudao.framework.pay.core.client.exception.PayException; 8 import cn.iocoder.yudao.framework.pay.core.client.exception.PayException;
14 import cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderDisplayModeEnum; 9 import cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderDisplayModeEnum;
15 -import cn.iocoder.yudao.framework.pay.core.enums.refund.PayRefundStatusRespEnum;  
16 -import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest;  
17 import com.alipay.api.AlipayApiException; 10 import com.alipay.api.AlipayApiException;
18 -import com.alipay.api.DefaultAlipayClient;  
19 -import com.alipay.api.domain.AlipayTradeRefundModel;  
20 import com.alipay.api.request.AlipayTradePrecreateRequest; 11 import com.alipay.api.request.AlipayTradePrecreateRequest;
21 -import com.alipay.api.request.AlipayTradeRefundRequest;  
22 import com.alipay.api.response.AlipayTradePrecreateResponse; 12 import com.alipay.api.response.AlipayTradePrecreateResponse;
23 -import com.alipay.api.response.AlipayTradeRefundResponse; 13 +import org.junit.jupiter.api.BeforeEach;
24 import org.junit.jupiter.api.DisplayName; 14 import org.junit.jupiter.api.DisplayName;
25 import org.junit.jupiter.api.Test; 15 import org.junit.jupiter.api.Test;
26 import org.mockito.ArgumentMatcher; 16 import org.mockito.ArgumentMatcher;
27 import org.mockito.InjectMocks; 17 import org.mockito.InjectMocks;
28 -import org.mockito.Mock;  
29 18
30 -import javax.validation.ConstraintViolationException;  
31 -import java.util.Date;  
32 -  
33 -import static cn.iocoder.yudao.framework.pay.core.client.impl.alipay.AlipayPayClientConfig.MODE_PUBLIC_KEY;  
34 import static cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderStatusRespEnum.CLOSED; 19 import static cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderStatusRespEnum.CLOSED;
35 import static cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderStatusRespEnum.WAITING; 20 import static cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderStatusRespEnum.WAITING;
36 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*; 21 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
37 import static org.junit.jupiter.api.Assertions.*; 22 import static org.junit.jupiter.api.Assertions.*;
38 import static org.mockito.ArgumentMatchers.argThat; 23 import static org.mockito.ArgumentMatchers.argThat;
39 import static org.mockito.Mockito.when; 24 import static org.mockito.Mockito.when;
  25 +
40 /** 26 /**
41 * {@link AlipayQrPayClient} 单元测试 27 * {@link AlipayQrPayClient} 单元测试
42 * 28 *
43 * @author jason 29 * @author jason
44 */ 30 */
45 -public class AlipayQrPayClientTest extends BaseMockitoUnitTest {  
46 -  
47 - private final AlipayPayClientConfig config = randomPojo(AlipayPayClientConfig.class, t -> {  
48 - t.setServerUrl(randomURL());  
49 - t.setMode(MODE_PUBLIC_KEY);  
50 - t.setSignType(AlipayPayClientConfig.SIGN_TYPE_DEFAULT);  
51 - t.setAppCertContent("");  
52 - t.setAlipayPublicCertContent("");  
53 - t.setRootCertContent("");  
54 - }); 31 +public class AlipayQrPayClientTest extends AbstractAlipayClientTest {
55 32
56 @InjectMocks 33 @InjectMocks
57 - AlipayQrPayClient client = new AlipayQrPayClient(randomLongId(), config); 34 + private AlipayQrPayClient client = new AlipayQrPayClient(randomLongId(), config);
58 35
59 - @Mock  
60 - private DefaultAlipayClient defaultAlipayClient;  
61 -  
62 - @Test  
63 - public void test_do_init() {  
64 - client.doInit();  
65 - assertNotSame(defaultAlipayClient, ReflectUtil.getFieldValue(client, "defaultAlipayClient")); 36 + @BeforeEach
  37 + public void setUp() {
  38 + setClient(client);
66 } 39 }
67 40
68 @Test 41 @Test
69 - @DisplayName("支付包扫描支付下单成功") 42 + @DisplayName("支付宝扫描支付下单成功")
70 public void test_unified_order_success() throws AlipayApiException { 43 public void test_unified_order_success() throws AlipayApiException {
71 // 准备返回对象 44 // 准备返回对象
72 String notifyUrl = randomURL(); 45 String notifyUrl = randomURL();
73 String qrCode = randomString(); 46 String qrCode = randomString();
  47 + Integer price = randomInteger();
74 AlipayTradePrecreateResponse response = randomPojo(AlipayTradePrecreateResponse.class, o -> { 48 AlipayTradePrecreateResponse response = randomPojo(AlipayTradePrecreateResponse.class, o -> {
75 o.setQrCode(qrCode); 49 o.setQrCode(qrCode);
76 o.setSubCode(""); 50 o.setSubCode("");
@@ -82,7 +56,7 @@ public class AlipayQrPayClientTest extends BaseMockitoUnitTest { @@ -82,7 +56,7 @@ public class AlipayQrPayClientTest extends BaseMockitoUnitTest {
82 }))).thenReturn(response); 56 }))).thenReturn(response);
83 // 准备请求参数 57 // 准备请求参数
84 String outTradeNo = randomString(); 58 String outTradeNo = randomString();
85 - PayOrderUnifiedReqDTO reqDTO = buildOrderUnifiedReqDTO(notifyUrl, outTradeNo); 59 + PayOrderUnifiedReqDTO reqDTO = buildOrderUnifiedReqDTO(notifyUrl, outTradeNo, price);
86 60
87 PayOrderRespDTO resp = client.unifiedOrder(reqDTO); 61 PayOrderRespDTO resp = client.unifiedOrder(reqDTO);
88 // 断言 62 // 断言
@@ -94,11 +68,12 @@ public class AlipayQrPayClientTest extends BaseMockitoUnitTest { @@ -94,11 +68,12 @@ public class AlipayQrPayClientTest extends BaseMockitoUnitTest {
94 } 68 }
95 69
96 @Test 70 @Test
97 - @DisplayName("支付包扫描支付,渠道返回失败") 71 + @DisplayName("支付宝扫描支付,渠道返回失败")
98 public void test_unified_order_channel_failed() throws AlipayApiException { 72 public void test_unified_order_channel_failed() throws AlipayApiException {
99 String notifyUrl = randomURL(); 73 String notifyUrl = randomURL();
100 String subCode = randomString(); 74 String subCode = randomString();
101 String subMsg = randomString(); 75 String subMsg = randomString();
  76 + Integer price = randomInteger();
102 AlipayTradePrecreateResponse response = randomPojo(AlipayTradePrecreateResponse.class, o -> { 77 AlipayTradePrecreateResponse response = randomPojo(AlipayTradePrecreateResponse.class, o -> {
103 o.setSubCode(subCode); 78 o.setSubCode(subCode);
104 o.setSubMsg(subMsg); 79 o.setSubMsg(subMsg);
@@ -110,7 +85,7 @@ public class AlipayQrPayClientTest extends BaseMockitoUnitTest { @@ -110,7 +85,7 @@ public class AlipayQrPayClientTest extends BaseMockitoUnitTest {
110 }))).thenReturn(response); 85 }))).thenReturn(response);
111 // 准备请求参数 86 // 准备请求参数
112 String outTradeNo = randomString(); 87 String outTradeNo = randomString();
113 - PayOrderUnifiedReqDTO reqDTO = buildOrderUnifiedReqDTO(notifyUrl, outTradeNo); 88 + PayOrderUnifiedReqDTO reqDTO = buildOrderUnifiedReqDTO(notifyUrl, outTradeNo, price);
114 89
115 PayOrderRespDTO resp = client.unifiedOrder(reqDTO); 90 PayOrderRespDTO resp = client.unifiedOrder(reqDTO);
116 // 断言 91 // 断言
@@ -121,174 +96,38 @@ public class AlipayQrPayClientTest extends BaseMockitoUnitTest { @@ -121,174 +96,38 @@ public class AlipayQrPayClientTest extends BaseMockitoUnitTest {
121 } 96 }
122 97
123 @Test 98 @Test
124 - @DisplayName("支付包扫描支付,抛出系统异常") 99 + @DisplayName("支付宝扫描支付, 抛出系统异常")
125 public void test_unified_order_throw_pay_exception() throws AlipayApiException { 100 public void test_unified_order_throw_pay_exception() throws AlipayApiException {
126 // 准备请求参数 101 // 准备请求参数
127 String outTradeNo = randomString(); 102 String outTradeNo = randomString();
128 String notifyUrl = randomURL(); 103 String notifyUrl = randomURL();
  104 + Integer price = randomInteger();
129 // mock 105 // mock
130 when(defaultAlipayClient.execute(argThat((ArgumentMatcher<AlipayTradePrecreateRequest>) request -> { 106 when(defaultAlipayClient.execute(argThat((ArgumentMatcher<AlipayTradePrecreateRequest>) request -> {
131 assertEquals(notifyUrl, request.getNotifyUrl()); 107 assertEquals(notifyUrl, request.getNotifyUrl());
132 return true; 108 return true;
133 }))).thenThrow(new RuntimeException("系统异常")); 109 }))).thenThrow(new RuntimeException("系统异常"));
134 // 准备请求参数 110 // 准备请求参数
135 - PayOrderUnifiedReqDTO reqDTO = buildOrderUnifiedReqDTO(notifyUrl, outTradeNo); 111 + PayOrderUnifiedReqDTO reqDTO = buildOrderUnifiedReqDTO(notifyUrl, outTradeNo,price);
136 // 断言 112 // 断言
137 assertThrows(PayException.class, () -> client.unifiedOrder(reqDTO)); 113 assertThrows(PayException.class, () -> client.unifiedOrder(reqDTO));
138 } 114 }
139 115
140 @Test 116 @Test
141 - @DisplayName("支付包扫描支付,抛出业务异常") 117 + @DisplayName("支付宝 Client 统一下单,抛出业务异常")
142 public void test_unified_order_throw_service_exception() throws AlipayApiException { 118 public void test_unified_order_throw_service_exception() throws AlipayApiException {
143 // 准备请求参数 119 // 准备请求参数
144 String outTradeNo = randomString(); 120 String outTradeNo = randomString();
145 String notifyUrl = randomURL(); 121 String notifyUrl = randomURL();
  122 + Integer price = randomInteger();
146 // mock 123 // mock
147 when(defaultAlipayClient.execute(argThat((ArgumentMatcher<AlipayTradePrecreateRequest>) request -> { 124 when(defaultAlipayClient.execute(argThat((ArgumentMatcher<AlipayTradePrecreateRequest>) request -> {
148 assertEquals(notifyUrl, request.getNotifyUrl()); 125 assertEquals(notifyUrl, request.getNotifyUrl());
149 return true; 126 return true;
150 }))).thenThrow(ServiceExceptionUtil.exception(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR)); 127 }))).thenThrow(ServiceExceptionUtil.exception(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR));
151 // 准备请求参数 128 // 准备请求参数
152 - PayOrderUnifiedReqDTO reqDTO = buildOrderUnifiedReqDTO(notifyUrl, outTradeNo); 129 + PayOrderUnifiedReqDTO reqDTO = buildOrderUnifiedReqDTO(notifyUrl, outTradeNo, price);
153 // 断言 130 // 断言
154 assertThrows(ServiceException.class, () -> client.unifiedOrder(reqDTO)); 131 assertThrows(ServiceException.class, () -> client.unifiedOrder(reqDTO));
155 } 132 }
156 -  
157 - @Test  
158 - @DisplayName("支付包扫描支付,参数校验不通过")  
159 - public void test_unified_order_param_validate() {  
160 - // 准备请求参数  
161 - String outTradeNo = randomString();  
162 - String notifyUrl = randomURL();  
163 - PayOrderUnifiedReqDTO reqDTO = randomPojo(PayOrderUnifiedReqDTO.class, o -> {  
164 - o.setOutTradeNo(outTradeNo);  
165 - o.setNotifyUrl(notifyUrl);  
166 - });  
167 - // 断言  
168 - assertThrows(ConstraintViolationException.class, () -> client.unifiedOrder(reqDTO));  
169 - }  
170 -  
171 - private PayOrderUnifiedReqDTO buildOrderUnifiedReqDTO(String notifyUrl, String outTradeNo) {  
172 - return randomPojo(PayOrderUnifiedReqDTO.class, o -> {  
173 - o.setOutTradeNo(outTradeNo);  
174 - o.setNotifyUrl(notifyUrl);  
175 - o.setSubject(RandomUtil.randomString(32));  
176 - o.setBody(RandomUtil.randomString(32));  
177 - });  
178 - }  
179 -  
180 - @Test  
181 - @DisplayName("支付包扫描退款成功")  
182 - public void test_unified_refund_success() throws AlipayApiException {  
183 - // 准备返回对象  
184 - String notifyUrl = randomURL();  
185 - Date refundTime = randomDate();  
186 - String outRefundNo = randomString();  
187 - String outTradeNo = randomString();  
188 - Integer refundAmount = randomInteger();  
189 - AlipayTradeRefundResponse response = randomPojo(AlipayTradeRefundResponse.class, o -> {  
190 - o.setSubCode("");  
191 - o.setGmtRefundPay(refundTime);  
192 - });  
193 - // mock  
194 - when(defaultAlipayClient.execute(argThat((ArgumentMatcher<AlipayTradeRefundRequest>) request -> {  
195 - assertInstanceOf(AlipayTradeRefundModel.class, request.getBizModel());  
196 - AlipayTradeRefundModel bizModel = (AlipayTradeRefundModel) request.getBizModel();  
197 - assertEquals(outRefundNo, bizModel.getOutRequestNo());  
198 - assertEquals(outTradeNo, bizModel.getOutTradeNo());  
199 - assertEquals(String.valueOf(refundAmount / 100.0), bizModel.getRefundAmount());  
200 - return true;  
201 - }))).thenReturn(response);  
202 - // 准备请求参数  
203 - PayRefundUnifiedReqDTO refundReqDTO = randomPojo(PayRefundUnifiedReqDTO.class, o -> {  
204 - o.setOutRefundNo(outRefundNo);  
205 - o.setOutTradeNo(outTradeNo);  
206 - o.setNotifyUrl(notifyUrl);  
207 - o.setRefundPrice(refundAmount);  
208 - });  
209 - PayRefundRespDTO resp = client.unifiedRefund(refundReqDTO);  
210 - // 断言  
211 - assertEquals(PayRefundStatusRespEnum.SUCCESS.getStatus(), resp.getStatus());  
212 - assertNull(resp.getChannelRefundNo());  
213 - assertEquals(LocalDateTimeUtil.of(refundTime), resp.getSuccessTime());  
214 - assertEquals(outRefundNo, resp.getOutRefundNo());  
215 - assertSame(response, resp.getRawData());  
216 - }  
217 -  
218 - @Test  
219 - @DisplayName("支付包扫描退款,渠道返回失败")  
220 - public void test_unified_refund_channel_failed() throws AlipayApiException {  
221 - // 准备返回对象  
222 - String notifyUrl = randomURL();  
223 - String subCode = randomString();  
224 - String subMsg = randomString();  
225 - AlipayTradeRefundResponse response = randomPojo(AlipayTradeRefundResponse.class, o -> {  
226 - o.setSubCode(subCode);  
227 - o.setSubMsg(subMsg);  
228 - });  
229 - // mock  
230 - when(defaultAlipayClient.execute(argThat((ArgumentMatcher<AlipayTradeRefundRequest>) request -> {  
231 - assertInstanceOf(AlipayTradeRefundModel.class, request.getBizModel());  
232 - return true;  
233 - }))).thenReturn(response);  
234 - // 准备请求参数  
235 - String outRefundNo = randomString();  
236 - String outTradeNo = randomString();  
237 - PayRefundUnifiedReqDTO refundReqDTO = randomPojo(PayRefundUnifiedReqDTO.class, o -> {  
238 - o.setOutRefundNo(outRefundNo);  
239 - o.setOutTradeNo(outTradeNo);  
240 - o.setNotifyUrl(notifyUrl);  
241 - });  
242 - PayRefundRespDTO resp = client.unifiedRefund(refundReqDTO);  
243 - // 断言  
244 - assertEquals(PayRefundStatusRespEnum.FAILURE.getStatus(), resp.getStatus());  
245 - assertNull(resp.getChannelRefundNo());  
246 - assertEquals(subCode, resp.getChannelErrorCode());  
247 - assertEquals(subMsg, resp.getChannelErrorMsg());  
248 - assertNull(resp.getSuccessTime());  
249 - assertEquals(outRefundNo, resp.getOutRefundNo());  
250 - assertSame(response, resp.getRawData());  
251 - }  
252 -  
253 - @Test  
254 - @DisplayName("支付包扫描退款,参数校验不通过")  
255 - public void test_unified_refund_param_validate() {  
256 - // 准备请求参数  
257 - String notifyUrl = randomURL();  
258 - PayRefundUnifiedReqDTO refundReqDTO = randomPojo(PayRefundUnifiedReqDTO.class, o -> {  
259 - o.setOutTradeNo("");  
260 - o.setNotifyUrl(notifyUrl);  
261 - });  
262 - // 断言  
263 - assertThrows(ConstraintViolationException.class, () -> client.unifiedRefund(refundReqDTO));  
264 - }  
265 -  
266 - @Test  
267 - @DisplayName("支付包扫描退款,抛出业务异常")  
268 - public void test_unified_refund_throw_service_exception() throws AlipayApiException {  
269 - // mock  
270 - when(defaultAlipayClient.execute(argThat((ArgumentMatcher<AlipayTradeRefundRequest>) request -> true)))  
271 - .thenThrow(ServiceExceptionUtil.exception(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR));  
272 - // 准备请求参数  
273 - String notifyUrl = randomURL();  
274 - PayRefundUnifiedReqDTO refundReqDTO = randomPojo(PayRefundUnifiedReqDTO.class, o -> {  
275 - o.setNotifyUrl(notifyUrl);  
276 - });  
277 - // 断言  
278 - assertThrows(ServiceException.class, () -> client.unifiedRefund(refundReqDTO));  
279 - }  
280 - @Test  
281 - @DisplayName("支付包扫描退款,抛出系统异常")  
282 - public void test_unified_refund_throw_pay_exception() throws AlipayApiException {  
283 - // mock  
284 - when(defaultAlipayClient.execute(argThat((ArgumentMatcher<AlipayTradeRefundRequest>) request -> true)))  
285 - .thenThrow(new RuntimeException("系统异常"));  
286 - // 准备请求参数  
287 - String notifyUrl = randomURL();  
288 - PayRefundUnifiedReqDTO refundReqDTO = randomPojo(PayRefundUnifiedReqDTO.class, o -> {  
289 - o.setNotifyUrl(notifyUrl);  
290 - });  
291 - // 断言  
292 - assertThrows(PayException.class, () -> client.unifiedRefund(refundReqDTO));  
293 - }  
294 } 133 }
yudao-framework/yudao-spring-boot-starter-biz-pay/src/test/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AlipayWapPayClientTest.java 0 → 100644
  View file @8b98d13
  1 +package cn.iocoder.yudao.framework.pay.core.client.impl.alipay;
  2 +
  3 +import cn.hutool.http.Method;
  4 +import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderRespDTO;
  5 +import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderUnifiedReqDTO;
  6 +import cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderDisplayModeEnum;
  7 +import com.alipay.api.AlipayApiException;
  8 +import com.alipay.api.domain.AlipayTradeWapPayModel;
  9 +import com.alipay.api.request.AlipayTradeWapPayRequest;
  10 +import com.alipay.api.response.AlipayTradeWapPayResponse;
  11 +import org.junit.jupiter.api.BeforeEach;
  12 +import org.junit.jupiter.api.DisplayName;
  13 +import org.junit.jupiter.api.Test;
  14 +import org.mockito.ArgumentMatcher;
  15 +import org.mockito.InjectMocks;
  16 +
  17 +import static cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderStatusRespEnum.CLOSED;
  18 +import static cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderStatusRespEnum.WAITING;
  19 +import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
  20 +import static org.junit.jupiter.api.Assertions.*;
  21 +import static org.junit.jupiter.api.Assertions.assertEquals;
  22 +import static org.mockito.ArgumentMatchers.argThat;
  23 +import static org.mockito.ArgumentMatchers.eq;
  24 +import static org.mockito.Mockito.when;
  25 +
  26 +/**
  27 + * {@link AlipayWapPayClient} 单元测试
  28 + *
  29 + * @author jason
  30 + */
  31 +public class AlipayWapPayClientTest extends AbstractAlipayClientTest {
  32 +
  33 + /**
  34 + * 支付宝 H5 支付 Client
  35 + */
  36 + @InjectMocks
  37 + private AlipayWapPayClient client = new AlipayWapPayClient(randomLongId(), config);
  38 +
  39 + @BeforeEach
  40 + public void setUp() {
  41 + setClient(client);
  42 + }
  43 +
  44 + @Test
  45 + @DisplayName("支付宝 H5 支付下单成功")
  46 + public void test_unified_order_success() throws AlipayApiException {
  47 + // 准备响应对象
  48 + String h5Body = randomString();
  49 + Integer price = randomInteger();
  50 + AlipayTradeWapPayResponse response = randomPojo(AlipayTradeWapPayResponse.class, o -> {
  51 + o.setSubCode("");
  52 + o.setBody(h5Body);
  53 + });
  54 + String notifyUrl = randomURL();
  55 + // mock
  56 + when(defaultAlipayClient.pageExecute(argThat((ArgumentMatcher<AlipayTradeWapPayRequest>) request -> {
  57 + assertInstanceOf(AlipayTradeWapPayModel.class, request.getBizModel());
  58 + AlipayTradeWapPayModel bizModel = (AlipayTradeWapPayModel) request.getBizModel();
  59 + assertEquals(String.valueOf(price / 100.0), bizModel.getTotalAmount());
  60 + assertEquals(notifyUrl, request.getNotifyUrl());
  61 + return true;
  62 + }), eq(Method.GET.name()))).thenReturn(response);
  63 +
  64 + String outTradeNo = randomString();
  65 + PayOrderUnifiedReqDTO reqDTO = buildOrderUnifiedReqDTO(notifyUrl, outTradeNo, price);
  66 + PayOrderRespDTO resp = client.unifiedOrder(reqDTO);
  67 + assertEquals(WAITING.getStatus(), resp.getStatus());
  68 + assertEquals(PayOrderDisplayModeEnum.URL.getMode(), resp.getDisplayMode());
  69 + assertEquals(outTradeNo, resp.getOutTradeNo());
  70 + assertEquals(h5Body, resp.getDisplayContent());
  71 + assertSame(response, resp.getRawData());
  72 + }
  73 +
  74 + @Test
  75 + @DisplayName("支付宝 H5 支付,渠道返回失败")
  76 + public void test_unified_order_channel_failed() throws AlipayApiException {
  77 + // 准备响应对象
  78 + String subCode = randomString();
  79 + String subMsg = randomString();
  80 + AlipayTradeWapPayResponse response = randomPojo(AlipayTradeWapPayResponse.class, o -> {
  81 + o.setSubCode(subCode);
  82 + o.setSubMsg(subMsg);
  83 + });
  84 + // mock
  85 + when(defaultAlipayClient.pageExecute(argThat((ArgumentMatcher<AlipayTradeWapPayRequest>) request -> true),
  86 + eq(Method.GET.name()))).thenReturn(response);
  87 + PayOrderUnifiedReqDTO reqDTO = buildOrderUnifiedReqDTO(randomURL(), randomString(), randomInteger());
  88 +
  89 + PayOrderRespDTO resp = client.unifiedOrder(reqDTO);
  90 + // 断言
  91 + assertEquals(CLOSED.getStatus(), resp.getStatus());
  92 + assertEquals(subCode, resp.getChannelErrorCode());
  93 + assertEquals(subMsg, resp.getChannelErrorMsg());
  94 + assertSame(response, resp.getRawData());
  95 + }
  96 +}
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/comment/ProductCommentController.java
  View file @8b98d13
@@ -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 @8b98d13
@@ -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 @8b98d13
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 @8b98d13
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 @02bc9d2
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 @8b98d13
@@ -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 @8b98d13
@@ -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 @8b98d13
@@ -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 @8b98d13
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 @8b98d13
@@ -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 @8b98d13
@@ -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 @8b98d13
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-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/bargain/vo/BargainActivityBaseVO.java
  View file @8b98d13
@@ -18,7 +18,7 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_ @@ -18,7 +18,7 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
18 @Data 18 @Data
19 public class BargainActivityBaseVO { 19 public class BargainActivityBaseVO {
20 20
21 - @Schema(description = "砍价活动名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "越拼越省钱") 21 + @Schema(description = "砍价活动名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "砍得越多省得越多，是兄弟就来砍我")
22 @NotNull(message = "砍价名称不能为空") 22 @NotNull(message = "砍价名称不能为空")
23 private String name; 23 private String name;
24 24
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/DeliveryExpressController.java
  View file @8b98d13
1 package cn.iocoder.yudao.module.trade.controller.admin.delivery; 1 package cn.iocoder.yudao.module.trade.controller.admin.delivery;
2 2
  3 +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
3 import cn.iocoder.yudao.framework.common.pojo.CommonResult; 4 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
4 import cn.iocoder.yudao.framework.common.pojo.PageResult; 5 import cn.iocoder.yudao.framework.common.pojo.PageResult;
5 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; 6 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
6 import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; 7 import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
7 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.express.*; 8 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.express.*;
8 -import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.express.DeliveryExpressUpdateReqVO;  
9 import cn.iocoder.yudao.module.trade.convert.delivery.DeliveryExpressConvert; 9 import cn.iocoder.yudao.module.trade.convert.delivery.DeliveryExpressConvert;
10 import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryExpressDO; 10 import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryExpressDO;
11 import cn.iocoder.yudao.module.trade.service.delivery.DeliveryExpressService; 11 import cn.iocoder.yudao.module.trade.service.delivery.DeliveryExpressService;
@@ -67,6 +67,13 @@ public class DeliveryExpressController { @@ -67,6 +67,13 @@ public class DeliveryExpressController {
67 return success(DeliveryExpressConvert.INSTANCE.convert(deliveryExpress)); 67 return success(DeliveryExpressConvert.INSTANCE.convert(deliveryExpress));
68 } 68 }
69 69
  70 + @GetMapping("/list-all-simple")
  71 + @Operation(summary = "获取快递公司精简信息列表", description = "主要用于前端的下拉选项")
  72 + public CommonResult<List<DeliveryExpressSimpleRespVO>> getSimpleDeliveryExpressList() {
  73 + List<DeliveryExpressDO> list = deliveryExpressService.getDeliveryExpressListByStatus(CommonStatusEnum.ENABLE.getStatus());
  74 + return success(DeliveryExpressConvert.INSTANCE.convertList1(list));
  75 + }
  76 +
70 @GetMapping("/page") 77 @GetMapping("/page")
71 @Operation(summary = "获得快递公司分页") 78 @Operation(summary = "获得快递公司分页")
72 @PreAuthorize("@ss.hasPermission('trade:delivery:express:query')") 79 @PreAuthorize("@ss.hasPermission('trade:delivery:express:query')")
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/DeliveryPickUpStoreController.java
  View file @8b98d13
1 package cn.iocoder.yudao.module.trade.controller.admin.delivery; 1 package cn.iocoder.yudao.module.trade.controller.admin.delivery;
2 2
  3 +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
3 import cn.iocoder.yudao.framework.common.pojo.CommonResult; 4 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
4 import cn.iocoder.yudao.framework.common.pojo.PageResult; 5 import cn.iocoder.yudao.framework.common.pojo.PageResult;
5 -import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;  
6 -import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;  
7 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.*; 6 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.*;
8 import cn.iocoder.yudao.module.trade.convert.delivery.DeliveryPickUpStoreConvert; 7 import cn.iocoder.yudao.module.trade.convert.delivery.DeliveryPickUpStoreConvert;
9 import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryPickUpStoreDO; 8 import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryPickUpStoreDO;
@@ -16,14 +15,11 @@ import org.springframework.validation.annotation.Validated; @@ -16,14 +15,11 @@ import org.springframework.validation.annotation.Validated;
16 import org.springframework.web.bind.annotation.*; 15 import org.springframework.web.bind.annotation.*;
17 16
18 import javax.annotation.Resource; 17 import javax.annotation.Resource;
19 -import javax.servlet.http.HttpServletResponse;  
20 import javax.validation.Valid; 18 import javax.validation.Valid;
21 -import java.io.IOException;  
22 import java.util.Collection; 19 import java.util.Collection;
23 import java.util.List; 20 import java.util.List;
24 21
25 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; 22 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
26 -import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;  
27 23
28 @Tag(name = "管理后台 - 自提门店") 24 @Tag(name = "管理后台 - 自提门店")
29 @RestController 25 @RestController
@@ -67,6 +63,13 @@ public class DeliveryPickUpStoreController { @@ -67,6 +63,13 @@ public class DeliveryPickUpStoreController {
67 return success(DeliveryPickUpStoreConvert.INSTANCE.convert(deliveryPickUpStore)); 63 return success(DeliveryPickUpStoreConvert.INSTANCE.convert(deliveryPickUpStore));
68 } 64 }
69 65
  66 + @GetMapping("/list-all-simple")
  67 + @Operation(summary = "获取快递公司精简信息列表")
  68 + public CommonResult<List<DeliveryPickUpStoreSimpleRespVO>> getSimpleDeliveryPickUpStoreList() {
  69 + List<DeliveryPickUpStoreDO> list = deliveryPickUpStoreService.getDeliveryPickUpStoreListByStatus(CommonStatusEnum.ENABLE.getStatus());
  70 + return success(DeliveryPickUpStoreConvert.INSTANCE.convertList1(list));
  71 + }
  72 +
70 @GetMapping("/list") 73 @GetMapping("/list")
71 @Operation(summary = "获得自提门店列表") 74 @Operation(summary = "获得自提门店列表")
72 @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") 75 @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
@@ -84,16 +87,4 @@ public class DeliveryPickUpStoreController { @@ -84,16 +87,4 @@ public class DeliveryPickUpStoreController {
84 return success(DeliveryPickUpStoreConvert.INSTANCE.convertPage(pageResult)); 87 return success(DeliveryPickUpStoreConvert.INSTANCE.convertPage(pageResult));
85 } 88 }
86 89
87 - // TODO @jason：导出去掉好列；简化下，一般用不到哈。  
88 - @GetMapping("/export-excel")  
89 - @Operation(summary = "导出自提门店 Excel")  
90 - @PreAuthorize("@ss.hasPermission('trade:delivery:pick-up-store:export')")  
91 - @OperateLog(type = EXPORT)  
92 - public void exportDeliveryPickUpStoreExcel(@Valid DeliveryPickUpStoreExportReqVO exportReqVO,  
93 - HttpServletResponse response) throws IOException {  
94 - List<DeliveryPickUpStoreDO> list = deliveryPickUpStoreService.getDeliveryPickUpStoreList(exportReqVO);  
95 - // 导出 Excel  
96 - List<DeliveryPickUpStoreExcelVO> datas = DeliveryPickUpStoreConvert.INSTANCE.convertList02(list);  
97 - ExcelUtils.write(response, "自提门店.xls", "数据", DeliveryPickUpStoreExcelVO.class, datas);  
98 - }  
99 } 90 }
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/vo/express/DeliveryExpressSimpleRespVO.java 0 → 100644
  View file @8b98d13
  1 +package cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.express;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.AllArgsConstructor;
  5 +import lombok.Data;
  6 +import lombok.NoArgsConstructor;
  7 +
  8 +import javax.validation.constraints.NotNull;
  9 +
  10 +@Schema(description = "管理后台 - 快递公司精简信息 Response VO")
  11 +@Data
  12 +@NoArgsConstructor
  13 +@AllArgsConstructor
  14 +public class DeliveryExpressSimpleRespVO {
  15 +
  16 + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "6592")
  17 + @NotNull(message = "编号不能为空")
  18 + private Long id;
  19 +
  20 + @Schema(description = "快递公司名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "顺丰速运")
  21 + @NotNull(message = "快递公司名称不能为空")
  22 + private String name;
  23 +
  24 +}
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/vo/pickup/DeliveryPickUpStoreExcelVO.java deleted
View file @02bc9d2
1 -package cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup;  
2 -  
3 -import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;  
4 -import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;  
5 -import cn.iocoder.yudao.module.system.enums.DictTypeConstants;  
6 -import com.alibaba.excel.annotation.ExcelProperty;  
7 -import lombok.Data;  
8 -  
9 -import java.time.LocalDateTime;  
10 -  
11 -@Data  
12 -public class DeliveryPickUpStoreExcelVO {  
13 -  
14 - @ExcelProperty("编号")  
15 - private Long id;  
16 -  
17 - @ExcelProperty("门店名称")  
18 - private String name;  
19 -  
20 - @ExcelProperty("门店简介")  
21 - private String introduction;  
22 -  
23 - @ExcelProperty("门店手机")  
24 - private String phone;  
25 -  
26 - @ExcelProperty("门店所在区域")  
27 - private String areaName;  
28 -  
29 - @ExcelProperty("门店详细地址")  
30 - private String detailAddress;  
31 -  
32 - @ExcelProperty("门店logo")  
33 - private String logo;  
34 -  
35 - // TODO @jason：是不是可以加个 convert？  
36 - /**  
37 - * easy-excel 好像暂时不支持 LocalTime. 转成string  
38 - */  
39 - @ExcelProperty("营业开始时间")  
40 - private String openingTime;  
41 -  
42 - @ExcelProperty("营业结束时间")  
43 - private String closingTime;  
44 -  
45 - @ExcelProperty("纬度")  
46 - private String latitude;  
47 -  
48 - @ExcelProperty("经度")  
49 - private String longitude;  
50 -  
51 - @ExcelProperty(value = "状态", converter = DictConvert.class)  
52 - @DictFormat(DictTypeConstants.COMMON_STATUS)  
53 - private Integer status;  
54 -  
55 - @ExcelProperty("创建时间")  
56 - private LocalDateTime createTime;  
57 -  
58 -}  
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/vo/pickup/DeliveryPickUpStoreSimpleRespVO.java 0 → 100644
  View file @8b98d13
  1 +package cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.AllArgsConstructor;
  5 +import lombok.Data;
  6 +import lombok.NoArgsConstructor;
  7 +
  8 +@Schema(description = "管理后台 - 自提门店精简信息 Response VO")
  9 +@Data
  10 +@NoArgsConstructor
  11 +@AllArgsConstructor
  12 +public class DeliveryPickUpStoreSimpleRespVO {
  13 +
  14 + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "23128")
  15 + private Long id;
  16 +
  17 + @Schema(description = "门店名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四")
  18 + private String name;
  19 +
  20 + @Schema(description = "门店手机", requiredMode = Schema.RequiredMode.REQUIRED, example = "15601892312")
  21 + private String phone;
  22 +
  23 + @Schema(description = "区域编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "18733")
  24 + private Integer areaId;
  25 +
  26 + // TODO @puhui999：要把 areaName 也返回哈
  27 +
  28 + @Schema(description = "门店详细地址", requiredMode = Schema.RequiredMode.REQUIRED, example = "复旦大学路 188 号")
  29 + private String detailAddress;
  30 +
  31 +}
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/TradeOrderController.java
  View file @8b98d13
@@ -5,10 +5,7 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult; @@ -5,10 +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.api.user.MemberUserApi; 6 import cn.iocoder.yudao.module.member.api.user.MemberUserApi;
7 import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO; 7 import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
8 -import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderDeliveryReqVO;  
9 -import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderDetailRespVO;  
10 -import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderPageItemRespVO;  
11 -import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderPageReqVO; 8 +import cn.iocoder.yudao.module.trade.controller.admin.order.vo.*;
12 import cn.iocoder.yudao.module.trade.convert.order.TradeOrderConvert; 9 import cn.iocoder.yudao.module.trade.convert.order.TradeOrderConvert;
13 import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderDO; 10 import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderDO;
14 import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderItemDO; 11 import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderItemDO;
@@ -79,12 +76,56 @@ public class TradeOrderController { @@ -79,12 +76,56 @@ public class TradeOrderController {
79 return success(TradeOrderConvert.INSTANCE.convert(order, orderItems, user)); 76 return success(TradeOrderConvert.INSTANCE.convert(order, orderItems, user));
80 } 77 }
81 78
  79 + @GetMapping("/get-express-track-list")
  80 + @Operation(summary = "获得交易订单的物流轨迹")
  81 + @Parameter(name = "id", description = "交易订单编号")
  82 + @PreAuthorize("@ss.hasPermission('trade:order:query')")
  83 + public CommonResult<List<?>> getOrderExpressTrackList(@RequestParam("id") Long id) {
  84 + return success(TradeOrderConvert.INSTANCE.convertList02(
  85 + tradeOrderQueryService.getExpressTrackList(id, getLoginUserId())));
  86 + }
  87 +
  88 + // TODO @puhui999：put 请求哈
82 @PostMapping("/delivery") 89 @PostMapping("/delivery")
83 - @Operation(summary = "发货订单")  
84 - @PreAuthorize("@ss.hasPermission('trade:order:delivery')") 90 + @Operation(summary = "订单发货")
  91 + @PreAuthorize("@ss.hasPermission('trade:order:update')")
85 public CommonResult<Boolean> deliveryOrder(@RequestBody TradeOrderDeliveryReqVO deliveryReqVO) { 92 public CommonResult<Boolean> deliveryOrder(@RequestBody TradeOrderDeliveryReqVO deliveryReqVO) {
86 - tradeOrderUpdateService.deliveryOrder(getLoginUserId(), deliveryReqVO); 93 + tradeOrderUpdateService.deliveryOrder(deliveryReqVO);
87 return success(true); 94 return success(true);
88 } 95 }
89 96
  97 + // TODO @puhui999：put 请求哈，update-remark；
  98 + @PostMapping("/remark")
  99 + @Operation(summary = "订单备注")
  100 + @PreAuthorize("@ss.hasPermission('trade:order:update')")
  101 + public CommonResult<Boolean> updateOrderRemark(@RequestBody TradeOrderRemarkReqVO reqVO) {
  102 + tradeOrderUpdateService.updateOrderRemark(reqVO);
  103 + return success(true);
  104 + }
  105 +
  106 + // TODO @puhui999：put 请求哈，update-price；
  107 + @PostMapping("/adjust-price")
  108 + @Operation(summary = "订单调价")
  109 + @PreAuthorize("@ss.hasPermission('trade:order:update')")
  110 + public CommonResult<Boolean> updateOrderPrice(@RequestBody TradeOrderUpdatePriceReqVO reqVO) {
  111 + tradeOrderUpdateService.updateOrderPrice(reqVO);
  112 + return success(true);
  113 + }
  114 +
  115 + // TODO @puhui999：put 请求哈，update-address；
  116 + @PostMapping("/adjust-address")
  117 + @Operation(summary = "修改订单收货地址")
  118 + @PreAuthorize("@ss.hasPermission('trade:order:update')")
  119 + public CommonResult<Boolean> updateOrderAddress(@RequestBody TradeOrderUpdateAddressReqVO reqVO) {
  120 + tradeOrderUpdateService.updateOrderAddress(reqVO);
  121 + return success(true);
  122 + }
  123 +
  124 + // TODO @puhui999 订单物流详情
  125 + // TODO @puhui999 【前台】订单取消
  126 + // TODO @puhui999 【后台】订单取消
  127 + // TODO @puhui999 【前台】订单核销
  128 + // TODO @puhui999 【前台】订单删除
  129 + // TODO @puhui999 【后台】订单统计
  130 +
90 } 131 }
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderBaseVO.java
  View file @8b98d13
@@ -6,9 +6,9 @@ import lombok.Data; @@ -6,9 +6,9 @@ import lombok.Data;
6 import java.time.LocalDateTime; 6 import java.time.LocalDateTime;
7 7
8 /** 8 /**
9 -* 交易订单 Base VO，提供给添加、修改、详细的子 VO 使用  
10 -* 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成  
11 -*/ 9 + * 交易订单 Base VO，提供给添加、修改、详细的子 VO 使用
  10 + * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
  11 + */
12 @Data 12 @Data
13 public class TradeOrderBaseVO { 13 public class TradeOrderBaseVO {
14 14
@@ -87,6 +87,12 @@ public class TradeOrderBaseVO { @@ -87,6 +87,12 @@ public class TradeOrderBaseVO {
87 87
88 // ========== 收件 + 物流基本信息 ========== 88 // ========== 收件 + 物流基本信息 ==========
89 89
  90 + @Schema(description = "配送方式", example = "10")
  91 + private Integer deliveryType;
  92 +
  93 + @Schema(description = "自提门店", example = "10")
  94 + private Long pickUpStoreId;
  95 +
90 @Schema(description = "配送模板编号", example = "1024") 96 @Schema(description = "配送模板编号", example = "1024")
91 private Long deliveryTemplateId; 97 private Long deliveryTemplateId;
92 98
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderDeliveryReqVO.java
  View file @8b98d13
1 package cn.iocoder.yudao.module.trade.controller.admin.order.vo; 1 package cn.iocoder.yudao.module.trade.controller.admin.order.vo;
2 2
3 -import cn.iocoder.yudao.framework.common.validation.InEnum;  
4 -import cn.iocoder.yudao.module.trade.enums.delivery.DeliveryTypeEnum;  
5 import io.swagger.v3.oas.annotations.media.Schema; 3 import io.swagger.v3.oas.annotations.media.Schema;
6 import lombok.Data; 4 import lombok.Data;
7 5
8 -import javax.validation.constraints.NotEmpty;  
9 import javax.validation.constraints.NotNull; 6 import javax.validation.constraints.NotNull;
10 7
11 @Schema(description = "管理后台 - 订单发货 Request VO") 8 @Schema(description = "管理后台 - 订单发货 Request VO")
@@ -16,18 +13,11 @@ public class TradeOrderDeliveryReqVO { @@ -16,18 +13,11 @@ public class TradeOrderDeliveryReqVO {
16 @NotNull(message = "订单编号不能为空") 13 @NotNull(message = "订单编号不能为空")
17 private Long id; 14 private Long id;
18 15
19 - // TODO @puhui999：可以去掉 type；如果无需发货，则 logisticsId 传递 0；logisticsNo 传递空串  
20 - @Schema(description = "发货类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")  
21 - @InEnum(DeliveryTypeEnum.class)  
22 - @NotNull(message = "发货类型不能为空")  
23 - private Integer type;  
24 -  
25 @Schema(description = "发货物流公司编号", example = "1") 16 @Schema(description = "发货物流公司编号", example = "1")
26 @NotNull(message = "发货物流公司不能为空") 17 @NotNull(message = "发货物流公司不能为空")
27 private Long logisticsId; 18 private Long logisticsId;
28 19
29 @Schema(description = "发货物流单号", example = "SF123456789") 20 @Schema(description = "发货物流单号", example = "SF123456789")
30 - @NotEmpty(message = "发货物流单号不能为空")  
31 private String logisticsNo; 21 private String logisticsNo;
32 22
33 } 23 }
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderPageReqVO.java
  View file @8b98d13
@@ -10,6 +10,7 @@ import lombok.Data; @@ -10,6 +10,7 @@ import lombok.Data;
10 import org.springframework.format.annotation.DateTimeFormat; 10 import org.springframework.format.annotation.DateTimeFormat;
11 11
12 import java.time.LocalDateTime; 12 import java.time.LocalDateTime;
  13 +import java.util.List;
13 14
14 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; 15 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
15 16
@@ -30,6 +31,12 @@ public class TradeOrderPageReqVO extends PageParam { @@ -30,6 +31,12 @@ public class TradeOrderPageReqVO extends PageParam {
30 @Mobile 31 @Mobile
31 private String userMobile; 32 private String userMobile;
32 33
  34 + @Schema(description = "发货物流公司编号", example = "1")
  35 + private Long logisticsId;
  36 +
  37 + @Schema(description = "自提门店编号", example = "[1,2]")
  38 + private List<Long> pickUpStoreIds;
  39 +
33 @Schema(description = "收件人名称", example = "小红") 40 @Schema(description = "收件人名称", example = "小红")
34 private String receiverName; 41 private String receiverName;
35 42
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderRemarkReqVO.java 0 → 100644
  View file @8b98d13
  1 +package cn.iocoder.yudao.module.trade.controller.admin.order.vo;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +
  6 +import javax.validation.constraints.NotEmpty;
  7 +import javax.validation.constraints.NotNull;
  8 +
  9 +@Schema(description = "管理后台 - 订单备注 Request VO")
  10 +@Data
  11 +public class TradeOrderRemarkReqVO {
  12 +
  13 + @Schema(description = "订单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
  14 + @NotNull(message = "订单编号不能为空")
  15 + private Long id;
  16 +
  17 + @Schema(description = "商家备注", example = "你猜一下")
  18 + @NotEmpty(message = "订单备注不能为空")
  19 + private String remark;
  20 +
  21 +}
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderUpdateAddressReqVO.java 0 → 100644
  View file @8b98d13
  1 +package cn.iocoder.yudao.module.trade.controller.admin.order.vo;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +
  6 +import javax.validation.constraints.NotEmpty;
  7 +import javax.validation.constraints.NotNull;
  8 +
  9 +@Schema(description = "管理后台 - 订单修改地址 Request VO")
  10 +@Data
  11 +public class TradeOrderUpdateAddressReqVO {
  12 +
  13 + @Schema(description = "订单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
  14 + @NotNull(message = "订单编号不能为空")
  15 + private Long id;
  16 +
  17 + @Schema(description = "收件人名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "z张三")
  18 + @NotEmpty(message = "收件人名称不能为空")
  19 + private String receiverName;
  20 +
  21 + @Schema(description = "收件人手机", requiredMode = Schema.RequiredMode.REQUIRED, example = "19988188888")
  22 + @NotEmpty(message = "收件人手机不能为空")
  23 + private String receiverMobile;
  24 +
  25 + @Schema(description = "收件人地区编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "7310")
  26 + @NotNull(message = "收件人地区编号不能为空")
  27 + private Integer receiverAreaId;
  28 +
  29 + @Schema(description = "收件人详细地址", requiredMode = Schema.RequiredMode.REQUIRED, example = "昆明市五华区xxx小区xxx")
  30 + @NotEmpty(message = "收件人详细地址不能为空")
  31 + private String receiverDetailAddress;
  32 +
  33 +}
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderUpdatePriceReqVO.java 0 → 100644
  View file @8b98d13
  1 +package cn.iocoder.yudao.module.trade.controller.admin.order.vo;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +
  6 +import javax.validation.constraints.NotNull;
  7 +
  8 +@Schema(description = "管理后台 - 订单改价 Request VO")
  9 +@Data
  10 +public class TradeOrderUpdatePriceReqVO {
  11 +
  12 + @Schema(description = "订单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
  13 + @NotNull(message = "订单编号不能为空")
  14 + private Long id;
  15 +
  16 + @Schema(description = "订单调价，单位：分。正数，加价；负数，减价", requiredMode = Schema.RequiredMode.REQUIRED, example = "-100")
  17 + @NotNull(message = "订单调价价格不能为空")
  18 + private Integer adjustPrice;
  19 +
  20 +}
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/delivery/AppDeliverExpressController.java
  View file @8b98d13
@@ -31,7 +31,7 @@ public class AppDeliverExpressController { @@ -31,7 +31,7 @@ public class AppDeliverExpressController {
31 @GetMapping("/list") 31 @GetMapping("/list")
32 @Operation(summary = "获得快递公司列表") 32 @Operation(summary = "获得快递公司列表")
33 public CommonResult<List<AppDeliveryExpressRespVO>> getDeliveryExpressList() { 33 public CommonResult<List<AppDeliveryExpressRespVO>> getDeliveryExpressList() {
34 - List<DeliveryExpressDO> list = deliveryExpressService.getDeliveryExpressList(CommonStatusEnum.ENABLE.getStatus()); 34 + List<DeliveryExpressDO> list = deliveryExpressService.getDeliveryExpressListByStatus(CommonStatusEnum.ENABLE.getStatus());
35 list.sort(Comparator.comparing(DeliveryExpressDO::getSort)); 35 list.sort(Comparator.comparing(DeliveryExpressDO::getSort));
36 return success(DeliveryExpressConvert.INSTANCE.convertList03(list)); 36 return success(DeliveryExpressConvert.INSTANCE.convertList03(list));
37 } 37 }
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/delivery/DeliveryExpressConvert.java
  View file @8b98d13
1 package cn.iocoder.yudao.module.trade.convert.delivery; 1 package cn.iocoder.yudao.module.trade.convert.delivery;
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.trade.controller.admin.delivery.vo.express.*;
4 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.express.DeliveryExpressCreateReqVO; 5 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.express.DeliveryExpressCreateReqVO;
5 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.express.DeliveryExpressExcelVO; 6 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.express.DeliveryExpressExcelVO;
6 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.express.DeliveryExpressRespVO; 7 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.express.DeliveryExpressRespVO;
@@ -29,6 +30,8 @@ public interface DeliveryExpressConvert { @@ -29,6 +30,8 @@ public interface DeliveryExpressConvert {
29 30
30 List<DeliveryExpressExcelVO> convertList02(List<DeliveryExpressDO> list); 31 List<DeliveryExpressExcelVO> convertList02(List<DeliveryExpressDO> list);
31 32
  33 + List<DeliveryExpressSimpleRespVO> convertList1(List<DeliveryExpressDO> list);
  34 +
32 List<AppDeliveryExpressRespVO> convertList03(List<DeliveryExpressDO> list); 35 List<AppDeliveryExpressRespVO> convertList03(List<DeliveryExpressDO> list);
33 36
34 } 37 }
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/delivery/DeliveryPickUpStoreConvert.java
  View file @8b98d13
1 package cn.iocoder.yudao.module.trade.convert.delivery; 1 package cn.iocoder.yudao.module.trade.convert.delivery;
2 2
3 -import java.util.*;  
4 -  
5 import cn.iocoder.yudao.framework.common.pojo.PageResult; 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
6 -  
7 import cn.iocoder.yudao.framework.ip.core.utils.AreaUtils; 4 import cn.iocoder.yudao.framework.ip.core.utils.AreaUtils;
8 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreCreateReqVO; 5 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreCreateReqVO;
9 -import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreExcelVO;  
10 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreRespVO; 6 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreRespVO;
  7 +import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreSimpleRespVO;
11 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreUpdateReqVO; 8 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreUpdateReqVO;
12 import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryPickUpStoreDO; 9 import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryPickUpStoreDO;
13 import org.mapstruct.Mapper; 10 import org.mapstruct.Mapper;
14 -import org.mapstruct.Mapping;  
15 import org.mapstruct.Named; 11 import org.mapstruct.Named;
16 import org.mapstruct.factory.Mappers; 12 import org.mapstruct.factory.Mappers;
17 13
  14 +import java.util.List;
  15 +
18 @Mapper 16 @Mapper
19 public interface DeliveryPickUpStoreConvert { 17 public interface DeliveryPickUpStoreConvert {
20 18
@@ -30,14 +28,10 @@ public interface DeliveryPickUpStoreConvert { @@ -30,14 +28,10 @@ public interface DeliveryPickUpStoreConvert {
30 28
31 PageResult<DeliveryPickUpStoreRespVO> convertPage(PageResult<DeliveryPickUpStoreDO> page); 29 PageResult<DeliveryPickUpStoreRespVO> convertPage(PageResult<DeliveryPickUpStoreDO> page);
32 30
33 - List<DeliveryPickUpStoreExcelVO> convertList02(List<DeliveryPickUpStoreDO> list);  
34 -  
35 - @Mapping(source = "areaId", target = "areaName", qualifiedByName = "convertAreaIdToName")  
36 - DeliveryPickUpStoreExcelVO convert2(DeliveryPickUpStoreDO bean);  
37 -  
38 @Named("convertAreaIdToName") 31 @Named("convertAreaIdToName")
39 default String convertAreaIdToName(Integer areaId) { 32 default String convertAreaIdToName(Integer areaId) {
40 return AreaUtils.format(areaId); 33 return AreaUtils.format(areaId);
41 } 34 }
42 35
  36 + List<DeliveryPickUpStoreSimpleRespVO> convertList1(List<DeliveryPickUpStoreDO> list);
43 } 37 }
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java
  View file @8b98d13
@@ -17,8 +17,7 @@ import cn.iocoder.yudao.module.promotion.api.combination.dto.CombinationRecordCr @@ -17,8 +17,7 @@ import cn.iocoder.yudao.module.promotion.api.combination.dto.CombinationRecordCr
17 import cn.iocoder.yudao.module.trade.api.order.dto.TradeOrderRespDTO; 17 import cn.iocoder.yudao.module.trade.api.order.dto.TradeOrderRespDTO;
18 import cn.iocoder.yudao.module.trade.controller.admin.base.member.user.MemberUserRespVO; 18 import cn.iocoder.yudao.module.trade.controller.admin.base.member.user.MemberUserRespVO;
19 import cn.iocoder.yudao.module.trade.controller.admin.base.product.property.ProductPropertyValueDetailRespVO; 19 import cn.iocoder.yudao.module.trade.controller.admin.base.product.property.ProductPropertyValueDetailRespVO;
20 -import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderDetailRespVO;  
21 -import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderPageItemRespVO; 20 +import cn.iocoder.yudao.module.trade.controller.admin.order.vo.*;
22 import cn.iocoder.yudao.module.trade.controller.app.base.property.AppProductPropertyValueDetailRespVO; 21 import cn.iocoder.yudao.module.trade.controller.app.base.property.AppProductPropertyValueDetailRespVO;
23 import cn.iocoder.yudao.module.trade.controller.app.order.vo.*; 22 import cn.iocoder.yudao.module.trade.controller.app.order.vo.*;
24 import cn.iocoder.yudao.module.trade.controller.app.order.vo.item.AppTradeOrderItemCommentCreateReqVO; 23 import cn.iocoder.yudao.module.trade.controller.app.order.vo.item.AppTradeOrderItemCommentCreateReqVO;
@@ -278,4 +277,10 @@ public interface TradeOrderConvert { @@ -278,4 +277,10 @@ public interface TradeOrderConvert {
278 277
279 List<AppOrderExpressTrackRespDTO> convertList02(List<ExpressTrackRespDTO> list); 278 List<AppOrderExpressTrackRespDTO> convertList02(List<ExpressTrackRespDTO> list);
280 279
  280 + TradeOrderDO convert(TradeOrderUpdateAddressReqVO reqVO);
  281 +
  282 + TradeOrderDO convert(TradeOrderUpdatePriceReqVO reqVO);
  283 +
  284 + TradeOrderDO convert(TradeOrderRemarkReqVO reqVO);
  285 +
281 } 286 }
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/delivery/DeliveryPickUpStoreMapper.java
  View file @8b98d13
@@ -3,7 +3,6 @@ package cn.iocoder.yudao.module.trade.dal.mysql.delivery; @@ -3,7 +3,6 @@ package cn.iocoder.yudao.module.trade.dal.mysql.delivery;
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.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreExportReqVO;  
7 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStorePageReqVO; 6 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStorePageReqVO;
8 import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryPickUpStoreDO; 7 import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryPickUpStoreDO;
9 import org.apache.ibatis.annotations.Mapper; 8 import org.apache.ibatis.annotations.Mapper;
@@ -23,15 +22,10 @@ public interface DeliveryPickUpStoreMapper extends BaseMapperX&lt;DeliveryPickUpSto @@ -23,15 +22,10 @@ public interface DeliveryPickUpStoreMapper extends BaseMapperX&lt;DeliveryPickUpSto
23 .orderByDesc(DeliveryPickUpStoreDO::getId)); 22 .orderByDesc(DeliveryPickUpStoreDO::getId));
24 } 23 }
25 24
26 - default List<DeliveryPickUpStoreDO> selectList(DeliveryPickUpStoreExportReqVO reqVO) {  
27 - return selectList(new LambdaQueryWrapperX<DeliveryPickUpStoreDO>()  
28 - .likeIfPresent(DeliveryPickUpStoreDO::getName, reqVO.getName())  
29 - .eqIfPresent(DeliveryPickUpStoreDO::getPhone, reqVO.getPhone())  
30 - .eqIfPresent(DeliveryPickUpStoreDO::getAreaId, reqVO.getAreaId())  
31 - .eqIfPresent(DeliveryPickUpStoreDO::getStatus, reqVO.getStatus())  
32 - .betweenIfPresent(DeliveryPickUpStoreDO::getCreateTime, reqVO.getCreateTime())  
33 - .orderByDesc(DeliveryPickUpStoreDO::getId)); 25 + default List<DeliveryPickUpStoreDO> selectListByStatus(Integer status) {
  26 + return selectList(DeliveryPickUpStoreDO::getStatus, status);
34 } 27 }
  28 +
35 } 29 }
36 30
37 31
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/order/TradeOrderMapper.java
  View file @8b98d13
@@ -34,6 +34,8 @@ public interface TradeOrderMapper extends BaseMapperX&lt;TradeOrderDO&gt; { @@ -34,6 +34,8 @@ public interface TradeOrderMapper extends BaseMapperX&lt;TradeOrderDO&gt; {
34 .eqIfPresent(TradeOrderDO::getStatus, reqVO.getStatus()) 34 .eqIfPresent(TradeOrderDO::getStatus, reqVO.getStatus())
35 .eqIfPresent(TradeOrderDO::getPayChannelCode, reqVO.getPayChannelCode()) 35 .eqIfPresent(TradeOrderDO::getPayChannelCode, reqVO.getPayChannelCode())
36 .eqIfPresent(TradeOrderDO::getTerminal,reqVO.getTerminal()) 36 .eqIfPresent(TradeOrderDO::getTerminal,reqVO.getTerminal())
  37 + .eqIfPresent(TradeOrderDO::getLogisticsId, reqVO.getLogisticsId())
  38 + .inIfPresent(TradeOrderDO::getPickUpStoreId, reqVO.getPickUpStoreIds())
37 .betweenIfPresent(TradeOrderDO::getCreateTime, reqVO.getCreateTime())); 39 .betweenIfPresent(TradeOrderDO::getCreateTime, reqVO.getCreateTime()));
38 } 40 }
39 41
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/delivery/DeliveryExpressService.java
  View file @8b98d13
@@ -64,11 +64,10 @@ public interface DeliveryExpressService { @@ -64,11 +64,10 @@ public interface DeliveryExpressService {
64 List<DeliveryExpressDO> getDeliveryExpressList(DeliveryExpressExportReqVO exportReqVO); 64 List<DeliveryExpressDO> getDeliveryExpressList(DeliveryExpressExportReqVO exportReqVO);
65 65
66 /** 66 /**
67 - * 获得快递公司列表 67 + * 获取指定状态的快递公司列表
68 * 68 *
69 * @param status 状态 69 * @param status 状态
70 * @return 快递公司列表 70 * @return 快递公司列表
71 */ 71 */
72 - List<DeliveryExpressDO> getDeliveryExpressList(Integer status);  
73 - 72 + List<DeliveryExpressDO> getDeliveryExpressListByStatus(Integer status);
74 } 73 }
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/delivery/DeliveryExpressServiceImpl.java
  View file @8b98d13
@@ -12,6 +12,7 @@ import org.springframework.stereotype.Service; @@ -12,6 +12,7 @@ import org.springframework.stereotype.Service;
12 import org.springframework.validation.annotation.Validated; 12 import org.springframework.validation.annotation.Validated;
13 13
14 import javax.annotation.Resource; 14 import javax.annotation.Resource;
  15 +import java.util.Collection;
15 import java.util.List; 16 import java.util.List;
16 17
17 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; 18 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -95,7 +96,7 @@ public class DeliveryExpressServiceImpl implements DeliveryExpressService { @@ -95,7 +96,7 @@ public class DeliveryExpressServiceImpl implements DeliveryExpressService {
95 } 96 }
96 97
97 @Override 98 @Override
98 - public List<DeliveryExpressDO> getDeliveryExpressList(Integer status) { 99 + public List<DeliveryExpressDO> getDeliveryExpressListByStatus(Integer status) {
99 return deliveryExpressMapper.selectListByStatus(status); 100 return deliveryExpressMapper.selectListByStatus(status);
100 } 101 }
101 102
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/delivery/DeliveryPickUpStoreService.java
  View file @8b98d13
1 package cn.iocoder.yudao.module.trade.service.delivery; 1 package cn.iocoder.yudao.module.trade.service.delivery;
2 2
3 -import java.util.*;  
4 -import javax.validation.*;  
5 import cn.iocoder.yudao.framework.common.pojo.PageResult; 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
6 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreCreateReqVO; 4 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreCreateReqVO;
7 -import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreExportReqVO;  
8 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStorePageReqVO; 5 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStorePageReqVO;
9 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreUpdateReqVO; 6 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreUpdateReqVO;
10 import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryPickUpStoreDO; 7 import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryPickUpStoreDO;
11 8
  9 +import javax.validation.Valid;
  10 +import java.util.Collection;
  11 +import java.util.List;
  12 +
12 /** 13 /**
13 * 自提门店 Service 接口 14 * 自提门店 Service 接口
14 * 15 *
@@ -63,10 +64,10 @@ public interface DeliveryPickUpStoreService { @@ -63,10 +64,10 @@ public interface DeliveryPickUpStoreService {
63 PageResult<DeliveryPickUpStoreDO> getDeliveryPickUpStorePage(DeliveryPickUpStorePageReqVO pageReqVO); 64 PageResult<DeliveryPickUpStoreDO> getDeliveryPickUpStorePage(DeliveryPickUpStorePageReqVO pageReqVO);
64 65
65 /** 66 /**
66 - * 获得自提门店列表, 用于 Excel 导出 67 + * 获得指定状态的自提门店列表
67 * 68 *
68 - * @param exportReqVO 查询条件 69 + * @param status 状态
69 * @return 自提门店列表 70 * @return 自提门店列表
70 */ 71 */
71 - List<DeliveryPickUpStoreDO> getDeliveryPickUpStoreList(DeliveryPickUpStoreExportReqVO exportReqVO); 72 + List<DeliveryPickUpStoreDO> getDeliveryPickUpStoreListByStatus(Integer status);
72 } 73 }
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/delivery/DeliveryPickUpStoreServiceImpl.java
  View file @8b98d13
@@ -2,21 +2,20 @@ package cn.iocoder.yudao.module.trade.service.delivery; @@ -2,21 +2,20 @@ package cn.iocoder.yudao.module.trade.service.delivery;
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.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreCreateReqVO; 4 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreCreateReqVO;
5 -import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreExportReqVO;  
6 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStorePageReqVO; 5 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStorePageReqVO;
7 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreUpdateReqVO; 6 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreUpdateReqVO;
8 import cn.iocoder.yudao.module.trade.convert.delivery.DeliveryPickUpStoreConvert; 7 import cn.iocoder.yudao.module.trade.convert.delivery.DeliveryPickUpStoreConvert;
9 import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryPickUpStoreDO; 8 import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryPickUpStoreDO;
10 import cn.iocoder.yudao.module.trade.dal.mysql.delivery.DeliveryPickUpStoreMapper; 9 import cn.iocoder.yudao.module.trade.dal.mysql.delivery.DeliveryPickUpStoreMapper;
11 import org.springframework.stereotype.Service; 10 import org.springframework.stereotype.Service;
12 -import javax.annotation.Resource;  
13 import org.springframework.validation.annotation.Validated; 11 import org.springframework.validation.annotation.Validated;
14 12
15 -import java.util.*;  
16 - 13 +import javax.annotation.Resource;
  14 +import java.util.Collection;
  15 +import java.util.List;
17 16
18 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; 17 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
19 -import static cn.iocoder.yudao.module.trade.enums.ErrorCodeConstants.*; 18 +import static cn.iocoder.yudao.module.trade.enums.ErrorCodeConstants.PICK_UP_STORE_NOT_EXISTS;
20 19
21 /** 20 /**
22 * 自提门店 Service 实现类 21 * 自提门店 Service 实现类
@@ -78,7 +77,8 @@ public class DeliveryPickUpStoreServiceImpl implements DeliveryPickUpStoreServic @@ -78,7 +77,8 @@ public class DeliveryPickUpStoreServiceImpl implements DeliveryPickUpStoreServic
78 } 77 }
79 78
80 @Override 79 @Override
81 - public List<DeliveryPickUpStoreDO> getDeliveryPickUpStoreList(DeliveryPickUpStoreExportReqVO exportReqVO) {  
82 - return deliveryPickUpStoreMapper.selectList(exportReqVO); 80 + public List<DeliveryPickUpStoreDO> getDeliveryPickUpStoreListByStatus(Integer status) {
  81 + return deliveryPickUpStoreMapper.selectListByStatus(status);
83 } 82 }
  83 +
84 } 84 }
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateService.java
  View file @8b98d13
1 package cn.iocoder.yudao.module.trade.service.order; 1 package cn.iocoder.yudao.module.trade.service.order;
2 2
  3 +import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderUpdateAddressReqVO;
  4 +import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderUpdatePriceReqVO;
3 import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderDeliveryReqVO; 5 import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderDeliveryReqVO;
  6 +import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderRemarkReqVO;
4 import cn.iocoder.yudao.module.trade.controller.app.order.vo.AppTradeOrderCreateReqVO; 7 import cn.iocoder.yudao.module.trade.controller.app.order.vo.AppTradeOrderCreateReqVO;
5 import cn.iocoder.yudao.module.trade.controller.app.order.vo.AppTradeOrderSettlementReqVO; 8 import cn.iocoder.yudao.module.trade.controller.app.order.vo.AppTradeOrderSettlementReqVO;
6 import cn.iocoder.yudao.module.trade.controller.app.order.vo.AppTradeOrderSettlementRespVO; 9 import cn.iocoder.yudao.module.trade.controller.app.order.vo.AppTradeOrderSettlementRespVO;
@@ -20,7 +23,7 @@ public interface TradeOrderUpdateService { @@ -20,7 +23,7 @@ public interface TradeOrderUpdateService {
20 /** 23 /**
21 * 获得订单结算信息 24 * 获得订单结算信息
22 * 25 *
23 - * @param userId 登录用户 26 + * @param userId 登录用户
24 * @param settlementReqVO 订单结算请求 27 * @param settlementReqVO 订单结算请求
25 * @return 订单结算结果 28 * @return 订单结算结果
26 */ 29 */
@@ -29,8 +32,8 @@ public interface TradeOrderUpdateService { @@ -29,8 +32,8 @@ public interface TradeOrderUpdateService {
29 /** 32 /**
30 * 【会员】创建交易订单 33 * 【会员】创建交易订单
31 * 34 *
32 - * @param userId 登录用户  
33 - * @param userIp 用户 IP 地址 35 + * @param userId 登录用户
  36 + * @param userIp 用户 IP 地址
34 * @param createReqVO 创建交易订单请求模型 37 * @param createReqVO 创建交易订单请求模型
35 * @return 交易订单的 38 * @return 交易订单的
36 */ 39 */
@@ -39,7 +42,7 @@ public interface TradeOrderUpdateService { @@ -39,7 +42,7 @@ public interface TradeOrderUpdateService {
39 /** 42 /**
40 * 更新交易订单已支付 43 * 更新交易订单已支付
41 * 44 *
42 - * @param id 交易订单编号 45 + * @param id 交易订单编号
43 * @param payOrderId 支付订单编号 46 * @param payOrderId 支付订单编号
44 */ 47 */
45 void updateOrderPaid(Long id, Long payOrderId); 48 void updateOrderPaid(Long id, Long payOrderId);
@@ -47,10 +50,9 @@ public interface TradeOrderUpdateService { @@ -47,10 +50,9 @@ public interface TradeOrderUpdateService {
47 /** 50 /**
48 * 【管理员】发货交易订单 51 * 【管理员】发货交易订单
49 * 52 *
50 - * @param userId 管理员编号  
51 * @param deliveryReqVO 发货请求 53 * @param deliveryReqVO 发货请求
52 */ 54 */
53 - void deliveryOrder(Long userId, TradeOrderDeliveryReqVO deliveryReqVO); 55 + void deliveryOrder(TradeOrderDeliveryReqVO deliveryReqVO);
54 56
55 /** 57 /**
56 * 【会员】收货交易订单 58 * 【会员】收货交易订单
@@ -60,12 +62,33 @@ public interface TradeOrderUpdateService { @@ -60,12 +62,33 @@ public interface TradeOrderUpdateService {
60 */ 62 */
61 void receiveOrder(Long userId, Long id); 63 void receiveOrder(Long userId, Long id);
62 64
  65 + /**
  66 + * 【管理员】交易订单备注
  67 + *
  68 + * @param reqVO 请求
  69 + */
  70 + void updateOrderRemark(TradeOrderRemarkReqVO reqVO);
  71 +
  72 + /**
  73 + * 【管理员】调整价格
  74 + *
  75 + * @param reqVO 请求
  76 + */
  77 + void updateOrderPrice(TradeOrderUpdatePriceReqVO reqVO);
  78 +
  79 + /**
  80 + * 【管理员】调整地址
  81 + *
  82 + * @param reqVO 请求
  83 + */
  84 + void updateOrderAddress(TradeOrderUpdateAddressReqVO reqVO);
  85 +
63 // =================== Order Item =================== 86 // =================== Order Item ===================
64 87
65 /** 88 /**
66 * 更新交易订单项的售后状态 89 * 更新交易订单项的售后状态
67 * 90 *
68 - * @param id 交易订单项编号 91 + * @param id 交易订单项编号
69 * @param oldAfterSaleStatus 当前售后状态；如果不符，更新后会抛出异常 92 * @param oldAfterSaleStatus 当前售后状态；如果不符，更新后会抛出异常
70 * @param newAfterSaleStatus 目标售后状态 93 * @param newAfterSaleStatus 目标售后状态
71 */ 94 */
@@ -76,11 +99,11 @@ public interface TradeOrderUpdateService { @@ -76,11 +99,11 @@ public interface TradeOrderUpdateService {
76 /** 99 /**
77 * 更新交易订单项的售后状态 100 * 更新交易订单项的售后状态
78 * 101 *
79 - * @param id 交易订单项编号 102 + * @param id 交易订单项编号
80 * @param oldAfterSaleStatus 当前售后状态；如果不符，更新后会抛出异常 103 * @param oldAfterSaleStatus 当前售后状态；如果不符，更新后会抛出异常
81 * @param newAfterSaleStatus 目标售后状态 104 * @param newAfterSaleStatus 目标售后状态
82 - * @param afterSaleId 售后单编号；当订单项发起售后时，必须传递该字段  
83 - * @param refundPrice 退款金额；当订单项退款成功时，必须传递该值 105 + * @param afterSaleId 售后单编号；当订单项发起售后时，必须传递该字段
  106 + * @param refundPrice 退款金额；当订单项退款成功时，必须传递该值
84 */ 107 */
85 void updateOrderItemAfterSaleStatus(Long id, Integer oldAfterSaleStatus, Integer newAfterSaleStatus, 108 void updateOrderItemAfterSaleStatus(Long id, Integer oldAfterSaleStatus, Integer newAfterSaleStatus,
86 Long afterSaleId, Integer refundPrice); 109 Long afterSaleId, Integer refundPrice);
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java
  View file @8b98d13
@@ -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;
@@ -30,6 +35,9 @@ import cn.iocoder.yudao.module.promotion.api.coupon.CouponApi; @@ -30,6 +35,9 @@ import cn.iocoder.yudao.module.promotion.api.coupon.CouponApi;
30 import cn.iocoder.yudao.module.promotion.api.coupon.dto.CouponUseReqDTO; 35 import cn.iocoder.yudao.module.promotion.api.coupon.dto.CouponUseReqDTO;
31 import cn.iocoder.yudao.module.promotion.enums.combination.CombinationRecordStatusEnum; 36 import cn.iocoder.yudao.module.promotion.enums.combination.CombinationRecordStatusEnum;
32 import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderDeliveryReqVO; 37 import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderDeliveryReqVO;
  38 +import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderRemarkReqVO;
  39 +import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderUpdateAddressReqVO;
  40 +import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderUpdatePriceReqVO;
33 import cn.iocoder.yudao.module.trade.controller.app.order.vo.AppTradeOrderCreateReqVO; 41 import cn.iocoder.yudao.module.trade.controller.app.order.vo.AppTradeOrderCreateReqVO;
34 import cn.iocoder.yudao.module.trade.controller.app.order.vo.AppTradeOrderSettlementReqVO; 42 import cn.iocoder.yudao.module.trade.controller.app.order.vo.AppTradeOrderSettlementReqVO;
35 import cn.iocoder.yudao.module.trade.controller.app.order.vo.AppTradeOrderSettlementRespVO; 43 import cn.iocoder.yudao.module.trade.controller.app.order.vo.AppTradeOrderSettlementRespVO;
@@ -53,6 +61,8 @@ import cn.iocoder.yudao.module.trade.service.price.TradePriceService; @@ -53,6 +61,8 @@ import cn.iocoder.yudao.module.trade.service.price.TradePriceService;
53 import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateReqBO; 61 import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateReqBO;
54 import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateRespBO; 62 import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateRespBO;
55 import lombok.extern.slf4j.Slf4j; 63 import lombok.extern.slf4j.Slf4j;
  64 +import org.jetbrains.annotations.NotNull;
  65 +import org.springframework.scheduling.annotation.Async;
56 import org.springframework.stereotype.Service; 66 import org.springframework.stereotype.Service;
57 import org.springframework.transaction.annotation.Transactional; 67 import org.springframework.transaction.annotation.Transactional;
58 68
@@ -64,6 +74,7 @@ import java.util.Objects; @@ -64,6 +74,7 @@ import java.util.Objects;
64 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; 74 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
65 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*; 75 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
66 import static cn.iocoder.yudao.module.pay.enums.ErrorCodeConstants.ORDER_NOT_FOUND; 76 import static cn.iocoder.yudao.module.pay.enums.ErrorCodeConstants.ORDER_NOT_FOUND;
  77 +import static cn.iocoder.yudao.module.pay.enums.ErrorCodeConstants.ORDER_UPDATE_PRICE_FAIL_PAID;
67 import static cn.iocoder.yudao.module.trade.enums.ErrorCodeConstants.*; 78 import static cn.iocoder.yudao.module.trade.enums.ErrorCodeConstants.*;
68 79
69 /** 80 /**
@@ -96,9 +107,15 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService { @@ -96,9 +107,15 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
96 private AddressApi addressApi; 107 private AddressApi addressApi;
97 @Resource 108 @Resource
98 private CouponApi couponApi; 109 private CouponApi couponApi;
  110 +
99 @Resource 111 @Resource
100 private MemberUserApi memberUserApi; 112 private MemberUserApi memberUserApi;
101 @Resource 113 @Resource
  114 + private MemberLevelApi memberLevelApi;
  115 + @Resource
  116 + private MemberPointApi memberPointApi;
  117 +
  118 + @Resource
102 private ProductCommentApi productCommentApi; 119 private ProductCommentApi productCommentApi;
103 @Resource 120 @Resource
104 private TradeMessageService tradeMessageService; 121 private TradeMessageService tradeMessageService;
@@ -331,6 +348,11 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService { @@ -331,6 +348,11 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
331 // TODO 芋艿：发送站内信 348 // TODO 芋艿：发送站内信
332 349
333 // 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());
334 } 356 }
335 357
336 /** 358 /**
@@ -345,10 +367,7 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService { @@ -345,10 +367,7 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
345 */ 367 */
346 private KeyValue<TradeOrderDO, PayOrderRespDTO> validateOrderPayable(Long id, Long payOrderId) { 368 private KeyValue<TradeOrderDO, PayOrderRespDTO> validateOrderPayable(Long id, Long payOrderId) {
347 // 校验订单是否存在 369 // 校验订单是否存在
348 - TradeOrderDO order = tradeOrderMapper.selectById(id);  
349 - if (order == null) {  
350 - throw exception(ORDER_NOT_FOUND);  
351 - } 370 + TradeOrderDO order = validateOrderExists(id);
352 // 校验订单未支付 371 // 校验订单未支付
353 if (!TradeOrderStatusEnum.isUnpaid(order.getStatus()) || order.getPayStatus()) { 372 if (!TradeOrderStatusEnum.isUnpaid(order.getStatus()) || order.getPayStatus()) {
354 log.error("[validateOrderPaid][order({}) 不处于待支付状态，请进行处理！order 数据是：{}]", 373 log.error("[validateOrderPaid][order({}) 不处于待支付状态，请进行处理！order 数据是：{}]",
@@ -391,14 +410,16 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService { @@ -391,14 +410,16 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
391 410
392 @Override 411 @Override
393 @Transactional(rollbackFor = Exception.class) 412 @Transactional(rollbackFor = Exception.class)
394 - public void deliveryOrder(Long userId, TradeOrderDeliveryReqVO deliveryReqVO) { 413 + public void deliveryOrder(TradeOrderDeliveryReqVO deliveryReqVO) {
395 // TODO @puhui999：只有选择快递的，才可以发货 414 // TODO @puhui999：只有选择快递的，才可以发货
396 // 1.1 校验并获得交易订单（可发货） 415 // 1.1 校验并获得交易订单（可发货）
397 TradeOrderDO order = validateOrderDeliverable(deliveryReqVO.getId()); 416 TradeOrderDO order = validateOrderDeliverable(deliveryReqVO.getId());
398 - TradeOrderDO updateOrderObj = new TradeOrderDO(); 417 +
  418 + // TODO @puhui999：下面不修改 deliveryType，直接校验 deliveryType 是否为快递，是快递才可以发货；先做严格的方式哈。
399 // 判断发货类型 419 // 判断发货类型
  420 + TradeOrderDO updateOrderObj = new TradeOrderDO();
400 // 2.1 快递发货 421 // 2.1 快递发货
401 - if (Objects.equals(deliveryReqVO.getType(), DeliveryTypeEnum.EXPRESS.getMode())) { 422 + if (ObjectUtil.notEqual(deliveryReqVO.getLogisticsId(), 0L)) {
402 // 校验快递公司 423 // 校验快递公司
403 DeliveryExpressDO deliveryExpress = deliveryExpressService.getDeliveryExpress(deliveryReqVO.getLogisticsId()); 424 DeliveryExpressDO deliveryExpress = deliveryExpressService.getDeliveryExpress(deliveryReqVO.getLogisticsId());
404 if (deliveryExpress == null) { 425 if (deliveryExpress == null) {
@@ -408,27 +429,24 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService { @@ -408,27 +429,24 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
408 throw exception(EXPRESS_STATUS_NOT_ENABLE); 429 throw exception(EXPRESS_STATUS_NOT_ENABLE);
409 } 430 }
410 updateOrderObj.setLogisticsId(deliveryReqVO.getLogisticsId()).setLogisticsNo(deliveryReqVO.getLogisticsNo()).setDeliveryType(DeliveryTypeEnum.EXPRESS.getMode()); 431 updateOrderObj.setLogisticsId(deliveryReqVO.getLogisticsId()).setLogisticsNo(deliveryReqVO.getLogisticsNo()).setDeliveryType(DeliveryTypeEnum.EXPRESS.getMode());
  432 + } else {
  433 + // 2.2 无需发货
  434 + updateOrderObj.setLogisticsId(0L).setLogisticsNo("").setDeliveryType(DeliveryTypeEnum.NULL.getMode());
411 } 435 }
412 - // TODO @puhui999：无需发货时，更新 logisticsId 为 0；  
413 - // 2.2 无需发货  
414 - if (Objects.equals(deliveryReqVO.getType(), DeliveryTypeEnum.NULL.getMode())) {  
415 - updateOrderObj.setLogisticsId(null).setLogisticsNo("").setDeliveryType(DeliveryTypeEnum.NULL.getMode());  
416 - }  
417 -  
418 // 更新 TradeOrderDO 状态为已发货，等待收货 436 // 更新 TradeOrderDO 状态为已发货，等待收货
419 updateOrderObj.setStatus(TradeOrderStatusEnum.DELIVERED.getStatus()).setDeliveryTime(LocalDateTime.now()); 437 updateOrderObj.setStatus(TradeOrderStatusEnum.DELIVERED.getStatus()).setDeliveryTime(LocalDateTime.now());
420 int updateCount = tradeOrderMapper.updateByIdAndStatus(order.getId(), order.getStatus(), updateOrderObj); 438 int updateCount = tradeOrderMapper.updateByIdAndStatus(order.getId(), order.getStatus(), updateOrderObj);
421 if (updateCount == 0) { 439 if (updateCount == 0) {
422 throw exception(ORDER_DELIVERY_FAIL_STATUS_NOT_UNDELIVERED); 440 throw exception(ORDER_DELIVERY_FAIL_STATUS_NOT_UNDELIVERED);
423 } 441 }
  442 +
424 // TODO 芋艿：发送订单变化的消息 443 // TODO 芋艿：发送订单变化的消息
425 444
426 // 发送站内信 445 // 发送站内信
427 tradeMessageService.sendMessageWhenDeliveryOrder(new TradeOrderMessageWhenDeliveryOrderReqBO().setOrderId(order.getId()) 446 tradeMessageService.sendMessageWhenDeliveryOrder(new TradeOrderMessageWhenDeliveryOrderReqBO().setOrderId(order.getId())
428 - .setUserId(userId).setMessage(null)); 447 + .setUserId(order.getUserId()).setMessage(null));
429 448
430 // TODO 芋艿：OrderLog 449 // TODO 芋艿：OrderLog
431 - // TODO 设计：lili：是不是发货后，才支持售后？  
432 } 450 }
433 451
434 /** 452 /**
@@ -440,12 +458,9 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService { @@ -440,12 +458,9 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
440 * @return 交易订单 458 * @return 交易订单
441 */ 459 */
442 private TradeOrderDO validateOrderDeliverable(Long id) { 460 private TradeOrderDO validateOrderDeliverable(Long id) {
443 - // 校验订单是否存在  
444 - TradeOrderDO order = tradeOrderMapper.selectById(id);  
445 - if (order == null) {  
446 - throw exception(ORDER_NOT_FOUND);  
447 - } 461 + TradeOrderDO order = validateOrderExists(id);
448 // 校验订单是否是待发货状态 462 // 校验订单是否是待发货状态
  463 + // TODO @puhui999：已经发货，可以重新发货，修改信息；
449 if (!TradeOrderStatusEnum.isUndelivered(order.getStatus())) { 464 if (!TradeOrderStatusEnum.isUndelivered(order.getStatus())) {
450 throw exception(ORDER_DELIVERY_FAIL_STATUS_NOT_UNDELIVERED); 465 throw exception(ORDER_DELIVERY_FAIL_STATUS_NOT_UNDELIVERED);
451 } 466 }
@@ -456,6 +471,7 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService { @@ -456,6 +471,7 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
456 // 订单类型：拼团 471 // 订单类型：拼团
457 if (Objects.equals(TradeOrderTypeEnum.COMBINATION.getType(), order.getType())) { 472 if (Objects.equals(TradeOrderTypeEnum.COMBINATION.getType(), order.getType())) {
458 // 校验订单拼团是否成功 473 // 校验订单拼团是否成功
  474 + // TODO @puhui999：是不是取反？
459 if (combinationRecordApi.isCombinationRecordSuccess(order.getUserId(), order.getId())) { 475 if (combinationRecordApi.isCombinationRecordSuccess(order.getUserId(), order.getId())) {
460 throw exception(ORDER_DELIVERY_FAIL_COMBINATION_RECORD_STATUS_NOT_SUCCESS); 476 throw exception(ORDER_DELIVERY_FAIL_COMBINATION_RECORD_STATUS_NOT_SUCCESS);
461 } 477 }
@@ -463,6 +479,7 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService { @@ -463,6 +479,7 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
463 // 订单类类型：砍价 479 // 订单类类型：砍价
464 if (Objects.equals(TradeOrderTypeEnum.BARGAIN.getType(), order.getType())) { 480 if (Objects.equals(TradeOrderTypeEnum.BARGAIN.getType(), order.getType())) {
465 // 校验订单砍价是否成功 481 // 校验订单砍价是否成功
  482 + // TODO @puhui999：是不是取反？
466 if (bargainRecordApi.isBargainRecordSuccess(order.getUserId(), order.getId())) { 483 if (bargainRecordApi.isBargainRecordSuccess(order.getUserId(), order.getId())) {
467 throw exception(ORDER_DELIVERY_FAIL_BARGAIN_RECORD_STATUS_NOT_SUCCESS); 484 throw exception(ORDER_DELIVERY_FAIL_BARGAIN_RECORD_STATUS_NOT_SUCCESS);
468 } 485 }
@@ -470,6 +487,16 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService { @@ -470,6 +487,16 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
470 return order; 487 return order;
471 } 488 }
472 489
  490 + @NotNull
  491 + private TradeOrderDO validateOrderExists(Long id) {
  492 + // 校验订单是否存在
  493 + TradeOrderDO order = tradeOrderMapper.selectById(id);
  494 + if (order == null) {
  495 + throw exception(ORDER_NOT_FOUND);
  496 + }
  497 + return order;
  498 + }
  499 +
473 @Override 500 @Override
474 @Transactional(rollbackFor = Exception.class) 501 @Transactional(rollbackFor = Exception.class)
475 public void receiveOrder(Long userId, Long id) { 502 public void receiveOrder(Long userId, Long id) {
@@ -489,6 +516,43 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService { @@ -489,6 +516,43 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
489 // TODO 芋艿：lili 发送商品被购买完成的数据 516 // TODO 芋艿：lili 发送商品被购买完成的数据
490 } 517 }
491 518
  519 + @Override
  520 + public void updateOrderRemark(TradeOrderRemarkReqVO reqVO) {
  521 + // 校验并获得交易订单
  522 + validateOrderExists(reqVO.getId());
  523 +
  524 + // 更新
  525 + TradeOrderDO order = TradeOrderConvert.INSTANCE.convert(reqVO);
  526 + tradeOrderMapper.updateById(order);
  527 + }
  528 +
  529 + @Override
  530 + public void updateOrderPrice(TradeOrderUpdatePriceReqVO reqVO) {
  531 + // 校验交易订单
  532 + TradeOrderDO order = validateOrderExists(reqVO.getId());
  533 + if (order.getPayStatus()) {
  534 + throw exception(ORDER_UPDATE_PRICE_FAIL_PAID);
  535 + }
  536 +
  537 + // 更新
  538 + // TODO @puhui999：TradeOrderItemDO 需要做 adjustPrice 的分摊；另外，支付订单那的价格，需要 update 下；
  539 + TradeOrderDO update = TradeOrderConvert.INSTANCE.convert(reqVO);
  540 + update.setPayPrice(update.getPayPrice() + update.getAdjustPrice());
  541 + tradeOrderMapper.updateById(update);
  542 + }
  543 +
  544 + @Override
  545 + public void updateOrderAddress(TradeOrderUpdateAddressReqVO reqVO) {
  546 + // 校验交易订单
  547 + validateOrderExists(reqVO.getId());
  548 + // TODO 是否需要校验订单是否发货
  549 + // TODO 发货后是否支持修改收货地址
  550 +
  551 + // 更新
  552 + TradeOrderDO update = TradeOrderConvert.INSTANCE.convert(reqVO);
  553 + tradeOrderMapper.updateById(update);
  554 + }
  555 +
492 /** 556 /**
493 * 校验交易订单满足可售货的条件 557 * 校验交易订单满足可售货的条件
494 * 558 *
@@ -555,6 +619,11 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService { @@ -555,6 +619,11 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
555 } 619 }
556 620
557 // TODO 芋艿：未来如果有分佣，需要更新相关分佣订单为已失效 621 // TODO 芋艿：未来如果有分佣，需要更新相关分佣订单为已失效
  622 +
  623 + // 扣减用户积分
  624 + getSelf().reduceUserPointAsync(order.getUserId(), orderRefundPrice, afterSaleId);
  625 + // 扣减用户经验
  626 + getSelf().reduceUserExperienceAsync(order.getUserId(), orderRefundPrice, afterSaleId);
558 } 627 }
559 628
560 @Override 629 @Override
@@ -602,4 +671,37 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService { @@ -602,4 +671,37 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
602 TradeOrderItemAfterSaleStatusEnum.SUCCESS.getStatus())); 671 TradeOrderItemAfterSaleStatusEnum.SUCCESS.getStatus()));
603 } 672 }
604 673
  674 + @Async
  675 + protected void addUserExperienceAsync(Long userId, Integer payPrice, Long orderId) {
  676 + int bizType = MemberExperienceBizTypeEnum.ORDER.getType();
  677 + memberLevelApi.addExperience(userId, payPrice, bizType, String.valueOf(orderId));
  678 + }
  679 +
  680 + @Async
  681 + protected void reduceUserExperienceAsync(Long userId, Integer refundPrice, Long afterSaleId) {
  682 + int bizType = MemberExperienceBizTypeEnum.REFUND.getType();
  683 + memberLevelApi.addExperience(userId, -refundPrice, bizType, String.valueOf(afterSaleId));
  684 + }
  685 +
  686 + @Async
  687 + protected void addUserPointAsync(Long userId, Integer payPrice, Long orderId) {
  688 + int bizType = MemberPointBizTypeEnum.ORDER_BUY.getType();
  689 + memberPointApi.addPoint(userId, payPrice, bizType, String.valueOf(orderId));
  690 + }
  691 +
  692 + @Async
  693 + protected void reduceUserPointAsync(Long userId, Integer refundPrice, Long afterSaleId) {
  694 + int bizType = MemberPointBizTypeEnum.ORDER_CANCEL.getType();
  695 + memberPointApi.addPoint(userId, -refundPrice, bizType, String.valueOf(afterSaleId));
  696 + }
  697 +
  698 + /**
  699 + * 获得自身的代理对象，解决 AOP 生效问题
  700 + *
  701 + * @return 自己
  702 + */
  703 + private TradeOrderUpdateServiceImpl getSelf() {
  704 + return SpringUtil.getBean(getClass());
  705 + }
  706 +
605 } 707 }
yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/aftersale/TradeAfterSaleServiceTest.java
  View file @8b98d13
@@ -56,6 +56,7 @@ public class TradeAfterSaleServiceTest extends BaseDbUnitTest { @@ -56,6 +56,7 @@ public class TradeAfterSaleServiceTest extends BaseDbUnitTest {
56 private TradeOrderUpdateService tradeOrderUpdateService; 56 private TradeOrderUpdateService tradeOrderUpdateService;
57 @Resource 57 @Resource
58 private TradeOrderQueryService tradeOrderQueryService; 58 private TradeOrderQueryService tradeOrderQueryService;
  59 +
59 @MockBean 60 @MockBean
60 private PayRefundApi payRefundApi; 61 private PayRefundApi payRefundApi;
61 62
yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceTest.java
  View file @8b98d13
@@ -23,7 +23,10 @@ import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderDO; @@ -23,7 +23,10 @@ import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderDO;
23 import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderItemDO; 23 import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderItemDO;
24 import cn.iocoder.yudao.module.trade.dal.mysql.order.TradeOrderItemMapper; 24 import cn.iocoder.yudao.module.trade.dal.mysql.order.TradeOrderItemMapper;
25 import cn.iocoder.yudao.module.trade.dal.mysql.order.TradeOrderMapper; 25 import cn.iocoder.yudao.module.trade.dal.mysql.order.TradeOrderMapper;
26 -import cn.iocoder.yudao.module.trade.enums.order.*; 26 +import cn.iocoder.yudao.module.trade.enums.order.TradeOrderItemAfterSaleStatusEnum;
  27 +import cn.iocoder.yudao.module.trade.enums.order.TradeOrderRefundStatusEnum;
  28 +import cn.iocoder.yudao.module.trade.enums.order.TradeOrderStatusEnum;
  29 +import cn.iocoder.yudao.module.trade.enums.order.TradeOrderTypeEnum;
27 import cn.iocoder.yudao.module.trade.framework.order.config.TradeOrderConfig; 30 import cn.iocoder.yudao.module.trade.framework.order.config.TradeOrderConfig;
28 import cn.iocoder.yudao.module.trade.framework.order.config.TradeOrderProperties; 31 import cn.iocoder.yudao.module.trade.framework.order.config.TradeOrderProperties;
29 import org.junit.jupiter.api.BeforeEach; 32 import org.junit.jupiter.api.BeforeEach;
@@ -38,7 +41,6 @@ import java.util.List; @@ -38,7 +41,6 @@ import java.util.List;
38 41
39 import static cn.iocoder.yudao.framework.common.util.collection.SetUtils.asSet; 42 import static cn.iocoder.yudao.framework.common.util.collection.SetUtils.asSet;
40 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals; 43 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
41 -import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomLongId;  
42 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo; 44 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;
43 import static java.util.Collections.singletonList; 45 import static java.util.Collections.singletonList;
44 import static org.junit.jupiter.api.Assertions.*; 46 import static org.junit.jupiter.api.Assertions.*;
@@ -282,7 +284,7 @@ public class TradeOrderUpdateServiceTest extends BaseDbUnitTest { @@ -282,7 +284,7 @@ public class TradeOrderUpdateServiceTest extends BaseDbUnitTest {
282 // mock 方法（支付单） 284 // mock 方法（支付单）
283 285
284 // 调用 286 // 调用
285 - tradeOrderUpdateService.deliveryOrder(randomLongId(), deliveryReqVO); 287 + tradeOrderUpdateService.deliveryOrder(deliveryReqVO);
286 // 断言 288 // 断言
287 TradeOrderDO dbOrder = tradeOrderMapper.selectById(1L); 289 TradeOrderDO dbOrder = tradeOrderMapper.selectById(1L);
288 assertEquals(dbOrder.getStatus(), TradeOrderStatusEnum.DELIVERED.getStatus()); 290 assertEquals(dbOrder.getStatus(), TradeOrderStatusEnum.DELIVERED.getStatus());
yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/level/MemberLevelApi.java 0 → 100644
  View file @8b98d13
  1 +package cn.iocoder.yudao.module.member.api.level;
  2 +
  3 +import cn.iocoder.yudao.module.member.enums.MemberExperienceBizTypeEnum;
  4 +
  5 +/**
  6 + * 会员等级 API 接口
  7 + *
  8 + * @author owen
  9 + */
  10 +public interface MemberLevelApi {
  11 +
  12 + /**
  13 + * 增加会员经验
  14 + *
  15 + * @param userId 会员ID
  16 + * @param experience 经验
  17 + * @param bizType 业务类型 {@link MemberExperienceBizTypeEnum}
  18 + * @param bizId 业务编号
  19 + */
  20 + void addExperience(Long userId, Integer experience, Integer bizType, String bizId);
  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 @8b98d13
  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 @8b98d13
@@ -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/DictTypeConstants.java 0 → 100644
  View file @8b98d13
  1 +package cn.iocoder.yudao.module.member.enums;
  2 +
  3 +/**
  4 + * Member 字典类型的枚举类
  5 + *
  6 + * @author owen
  7 + */
  8 +public interface DictTypeConstants {
  9 +
  10 + /**
  11 + * 会员经验记录 - 业务类型
  12 + */
  13 + String MEMBER_EXPERIENCE_BIZ_TYPE = "member_experience_biz_type";
  14 +
  15 +}
yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
  View file @8b98d13
@@ -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 {
@@ -24,13 +24,15 @@ public interface ErrorCodeConstants { @@ -24,13 +24,15 @@ public interface ErrorCodeConstants {
24 // ========== 用户收件地址 1004004000 ========== 24 // ========== 用户收件地址 1004004000 ==========
25 ErrorCode ADDRESS_NOT_EXISTS = new ErrorCode(1004004000, "用户收件地址不存在"); 25 ErrorCode ADDRESS_NOT_EXISTS = new ErrorCode(1004004000, "用户收件地址不存在");
26 26
27 - //========== 会员标签 1004006000 ==========  
28 - ErrorCode TAG_NOT_EXISTS = new ErrorCode(1004006000, "会员标签不存在");  
29 - ErrorCode TAG_NAME_EXISTS = new ErrorCode(1004006001, "会员标签已经存在"); 27 + //========== 用户标签 1004006000 ==========
  28 + ErrorCode TAG_NOT_EXISTS = new ErrorCode(1004006000, "用户标签不存在");
  29 + ErrorCode TAG_NAME_EXISTS = new ErrorCode(1004006001, "用户标签已经存在");
  30 + ErrorCode TAG_HAS_USER = new ErrorCode(1004006002, "用户标签下存在用户，无法删除");
30 31
31 //========== 积分配置 1004007000 ========== 32 //========== 积分配置 1004007000 ==========
32 33
33 //========== 积分记录 1004008000 ========== 34 //========== 积分记录 1004008000 ==========
  35 + ErrorCode POINT_RECORD_BIZ_NOT_SUPPORT = new ErrorCode(1004008000, "用户积分记录业务类型不支持");
34 36
35 //========== 签到配置 1004009000 ========== 37 //========== 签到配置 1004009000 ==========
36 ErrorCode SIGN_IN_CONFIG_NOT_EXISTS = new ErrorCode(1004009000, "签到天数规则不存在"); 38 ErrorCode SIGN_IN_CONFIG_NOT_EXISTS = new ErrorCode(1004009000, "签到天数规则不存在");
@@ -38,4 +40,19 @@ public interface ErrorCodeConstants { @@ -38,4 +40,19 @@ public interface ErrorCodeConstants {
38 40
39 //========== 签到配置 1004010000 ========== 41 //========== 签到配置 1004010000 ==========
40 42
  43 +
  44 + //========== 用户等级 1004011000 ==========
  45 + ErrorCode LEVEL_NOT_EXISTS = new ErrorCode(1004011000, "用户等级不存在");
  46 + ErrorCode LEVEL_NAME_EXISTS = new ErrorCode(1004011001, "用户等级名称[{}]已被使用");
  47 + ErrorCode LEVEL_VALUE_EXISTS = new ErrorCode(1004011002, "用户等级值[{}]已被[{}]使用");
  48 + ErrorCode LEVEL_EXPERIENCE_MIN = new ErrorCode(1004011003, "升级经验必须大于上一个等级[{}]设置的升级经验[{}]");
  49 + ErrorCode LEVEL_EXPERIENCE_MAX = new ErrorCode(1004011004, "升级经验必须小于下一个等级[{}]设置的升级经验[{}]");
  50 + ErrorCode LEVEL_HAS_USER = new ErrorCode(1004011005, "用户等级下存在用户，无法删除");
  51 +
  52 + ErrorCode EXPERIENCE_BIZ_NOT_SUPPORT = new ErrorCode(1004011201, "用户经验业务类型不支持");
  53 +
  54 + //========== 用户分组 1004012000 ==========
  55 + ErrorCode GROUP_NOT_EXISTS = new ErrorCode(1004012000, "用户分组不存在");
  56 + ErrorCode GROUP_HAS_USER = new ErrorCode(1004012001, "用户分组下存在用户，无法删除");
  57 +
41 } 58 }
yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/MemberExperienceBizTypeEnum.java 0 → 100644
  View file @8b98d13
  1 +package cn.iocoder.yudao.module.member.enums;
  2 +
  3 +import cn.hutool.core.util.EnumUtil;
  4 +import lombok.AllArgsConstructor;
  5 +import lombok.Getter;
  6 +
  7 +import java.util.Objects;
  8 +
  9 +/**
  10 + * 会员经验 - 业务类型
  11 + *
  12 + * @author owen
  13 + */
  14 +@Getter
  15 +@AllArgsConstructor
  16 +public enum MemberExperienceBizTypeEnum {
  17 +
  18 + /**
  19 + * 管理员调整、邀请新用户、下单、退单、签到、抽奖
  20 + */
  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),
  27 + ;
  28 +
  29 + /**
  30 + * 业务类型
  31 + */
  32 + private final int type;
  33 + /**
  34 + * 标题
  35 + */
  36 + private final String title;
  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 + }
  50 +}
yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/point/MemberPointBizTypeEnum.java
  View file @8b98d13
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 0 → 100644
  View file @8b98d13
  1 +package cn.iocoder.yudao.module.member.api.level;
  2 +
  3 +import cn.iocoder.yudao.module.member.enums.MemberExperienceBizTypeEnum;
  4 +import cn.iocoder.yudao.module.member.service.level.MemberLevelService;
  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.EXPERIENCE_BIZ_NOT_SUPPORT;
  12 +
  13 +/**
  14 + * 会员等级 API 实现类
  15 + *
  16 + * @author owen
  17 + */
  18 +@Service
  19 +@Validated
  20 +public class MemberLevelApiImpl implements MemberLevelApi {
  21 +
  22 + @Resource
  23 + private MemberLevelService memberLevelService;
  24 +
  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);
  32 + }
  33 +
  34 +}
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/point/MemberPointApiImpl.java 0 → 100644
  View file @8b98d13
  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
  View file @8b98d13
1 package cn.iocoder.yudao.module.member.controller.admin.address; 1 package cn.iocoder.yudao.module.member.controller.admin.address;
2 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;
3 import cn.iocoder.yudao.module.member.dal.dataobject.address.MemberAddressDO; 6 import cn.iocoder.yudao.module.member.dal.dataobject.address.MemberAddressDO;
4 -import org.springframework.web.bind.annotation.*;  
5 -import javax.annotation.Resource;  
6 -import org.springframework.validation.annotation.Validated;  
7 -import org.springframework.security.access.prepost.PreAuthorize;  
8 -import io.swagger.v3.oas.annotations.tags.Tag;  
9 -import io.swagger.v3.oas.annotations.Parameter; 7 +import cn.iocoder.yudao.module.member.service.address.AddressService;
10 import io.swagger.v3.oas.annotations.Operation; 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;
11 17
12 -import javax.validation.constraints.*;  
13 -import javax.validation.*;  
14 -import javax.servlet.http.*;  
15 -import java.util.*;  
16 -import java.io.IOException; 18 +import javax.annotation.Resource;
  19 +import java.util.List;
17 20
18 -import cn.iocoder.yudao.framework.common.pojo.PageResult;  
19 -import cn.iocoder.yudao.framework.common.pojo.CommonResult;  
20 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; 21 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
21 22
22 -import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;  
23 -  
24 -import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;  
25 -import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.*;  
26 -  
27 -import cn.iocoder.yudao.module.member.controller.admin.address.vo.*;  
28 -import cn.iocoder.yudao.module.member.convert.address.AddressConvert;  
29 -import cn.iocoder.yudao.module.member.service.address.AddressService;  
30 -  
31 @Tag(name = "管理后台 - 用户收件地址") 23 @Tag(name = "管理后台 - 用户收件地址")
32 @RestController 24 @RestController
33 @RequestMapping("/member/address") 25 @RequestMapping("/member/address")
@@ -37,66 +29,13 @@ public class AddressController { @@ -37,66 +29,13 @@ public class AddressController {
37 @Resource 29 @Resource
38 private AddressService addressService; 30 private AddressService addressService;
39 31
40 - @PostMapping("/create")  
41 - @Operation(summary = "创建用户收件地址")  
42 - @PreAuthorize("@ss.hasPermission('member:address:create')")  
43 - public CommonResult<Long> createAddress(@Valid @RequestBody AddressCreateReqVO createReqVO) {  
44 - return success(addressService.createAddress(createReqVO));  
45 - }  
46 -  
47 - @PutMapping("/update")  
48 - @Operation(summary = "更新用户收件地址")  
49 - @PreAuthorize("@ss.hasPermission('member:address:update')")  
50 - public CommonResult<Boolean> updateAddress(@Valid @RequestBody AddressUpdateReqVO updateReqVO) {  
51 - addressService.updateAddress(updateReqVO);  
52 - return success(true);  
53 - }  
54 -  
55 - @DeleteMapping("/delete")  
56 - @Operation(summary = "删除用户收件地址")  
57 - @Parameter(name = "id", description = "编号", required = true)  
58 - @PreAuthorize("@ss.hasPermission('member:address:delete')")  
59 - public CommonResult<Boolean> deleteAddress(@RequestParam("id") Long id) {  
60 - addressService.deleteAddress(id);  
61 - return success(true);  
62 - }  
63 -  
64 - @GetMapping("/get")  
65 - @Operation(summary = "获得用户收件地址")  
66 - @Parameter(name = "id", description = "编号", required = true, example = "1024")  
67 - @PreAuthorize("@ss.hasPermission('member:address:query')")  
68 - public CommonResult<AddressRespVO> getAddress(@RequestParam("id") Long id) {  
69 - MemberAddressDO address = addressService.getAddress(id);  
70 - return success(AddressConvert.INSTANCE.convert2(address));  
71 - }  
72 -  
73 @GetMapping("/list") 32 @GetMapping("/list")
74 @Operation(summary = "获得用户收件地址列表") 33 @Operation(summary = "获得用户收件地址列表")
75 - @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")  
76 - @PreAuthorize("@ss.hasPermission('member:address:query')")  
77 - public CommonResult<List<AddressRespVO>> getAddressList(@RequestParam("ids") Collection<Long> ids) {  
78 - List<MemberAddressDO> list = addressService.getAddressList(ids); 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);
79 return success(AddressConvert.INSTANCE.convertList2(list)); 38 return success(AddressConvert.INSTANCE.convertList2(list));
80 } 39 }
81 40
82 - @GetMapping("/page")  
83 - @Operation(summary = "获得用户收件地址分页")  
84 - @PreAuthorize("@ss.hasPermission('member:address:query')")  
85 - public CommonResult<PageResult<AddressRespVO>> getAddressPage(@Valid AddressPageReqVO pageVO) {  
86 - PageResult<MemberAddressDO> pageResult = addressService.getAddressPage(pageVO);  
87 - return success(AddressConvert.INSTANCE.convertPage(pageResult));  
88 - }  
89 -  
90 - @GetMapping("/export-excel")  
91 - @Operation(summary = "导出用户收件地址 Excel")  
92 - @PreAuthorize("@ss.hasPermission('member:address:export')")  
93 - @OperateLog(type = EXPORT)  
94 - public void exportAddressExcel(@Valid AddressExportReqVO exportReqVO,  
95 - HttpServletResponse response) throws IOException {  
96 - List<MemberAddressDO> list = addressService.getAddressList(exportReqVO);  
97 - // 导出 Excel  
98 - List<AddressExcelVO> datas = AddressConvert.INSTANCE.convertList02(list);  
99 - ExcelUtils.write(response, "用户收件地址.xls", "数据", AddressExcelVO.class, datas);  
100 - }  
101 -  
102 } 41 }
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/address/vo/AddressCreateReqVO.java deleted
View file @02bc9d2
1 -package cn.iocoder.yudao.module.member.controller.admin.address.vo;  
2 -  
3 -import lombok.*;  
4 -import java.util.*;  
5 -import io.swagger.v3.oas.annotations.media.Schema;  
6 -import javax.validation.constraints.*;  
7 -  
8 -@Schema(description = "管理后台 - 用户收件地址创建 Request VO")  
9 -@Data  
10 -@EqualsAndHashCode(callSuper = true)  
11 -@ToString(callSuper = true)  
12 -public class AddressCreateReqVO extends AddressBaseVO {  
13 -  
14 -}  
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/address/vo/AddressExcelVO.java deleted
View file @02bc9d2
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.util.*;  
6 -import java.time.LocalDateTime;  
7 -import java.time.LocalDateTime;  
8 -  
9 -import com.alibaba.excel.annotation.ExcelProperty;  
10 -  
11 -/**  
12 - * 用户收件地址 Excel VO  
13 - *  
14 - * @author 绮梦  
15 - */  
16 -@Data  
17 -public class AddressExcelVO {  
18 -  
19 - @ExcelProperty("收件地址编号")  
20 - private Long id;  
21 -  
22 - @ExcelProperty("收件人名称")  
23 - private String name;  
24 -  
25 - @ExcelProperty("手机号")  
26 - private String mobile;  
27 -  
28 - @ExcelProperty("地区编码")  
29 - private Long areaId;  
30 -  
31 - @ExcelProperty("收件详细地址")  
32 - private String detailAddress;  
33 -  
34 - @ExcelProperty("是否默认")  
35 - private Boolean defaultStatus;  
36 -  
37 - @ExcelProperty("创建时间")  
38 - private LocalDateTime createTime;  
39 -  
40 -}  
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/address/vo/AddressExportReqVO.java deleted
View file @02bc9d2
1 -package cn.iocoder.yudao.module.member.controller.admin.address.vo;  
2 -  
3 -import lombok.*;  
4 -import java.util.*;  
5 -import io.swagger.v3.oas.annotations.media.Schema;  
6 -import cn.iocoder.yudao.framework.common.pojo.PageParam;  
7 -import java.time.LocalDateTime;  
8 -import org.springframework.format.annotation.DateTimeFormat;  
9 -  
10 -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;  
11 -  
12 -@Schema(description = "管理后台 - 用户收件地址 Excel 导出 Request VO，参数和 AddressPageReqVO 是一致的")  
13 -@Data  
14 -public class AddressExportReqVO {  
15 -  
16 - @Schema(description = "用户编号", example = "20369")  
17 - private Long userId;  
18 -  
19 - @Schema(description = "收件人名称", example = "张三")  
20 - private String name;  
21 -  
22 - @Schema(description = "手机号")  
23 - private String mobile;  
24 -  
25 - @Schema(description = "地区编码", example = "15716")  
26 - private Long areaId;  
27 -  
28 - @Schema(description = "收件详细地址")  
29 - private String detailAddress;  
30 -  
31 - @Schema(description = "是否默认", example = "2")  
32 - private Boolean defaultStatus;  
33 -  
34 - @Schema(description = "创建时间")  
35 - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)  
36 - private LocalDateTime[] createTime;  
37 -  
38 -}  
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/address/vo/AddressUpdateReqVO.java deleted
View file @02bc9d2
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.util.*;  
6 -import javax.validation.constraints.*;  
7 -  
8 -@Schema(description = "管理后台 - 用户收件地址更新 Request VO")  
9 -@Data  
10 -@EqualsAndHashCode(callSuper = true)  
11 -@ToString(callSuper = true)  
12 -public class AddressUpdateReqVO extends AddressBaseVO {  
13 -  
14 - @Schema(description = "收件地址编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "7380")  
15 - @NotNull(message = "收件地址编号不能为空")  
16 - private Long id;  
17 -  
18 -}  
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/group/MemberGroupController.java 0 → 100644
  View file @8b98d13
  1 +package cn.iocoder.yudao.module.member.controller.admin.group;
  2 +
  3 +import cn.iocoder.yudao.framework.common.pojo.CommonResult;
  4 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  5 +import cn.iocoder.yudao.module.member.controller.admin.group.vo.*;
  6 +import cn.iocoder.yudao.module.member.convert.group.MemberGroupConvert;
  7 +import cn.iocoder.yudao.module.member.dal.dataobject.group.MemberGroupDO;
  8 +import cn.iocoder.yudao.module.member.service.group.MemberGroupService;
  9 +import io.swagger.v3.oas.annotations.Operation;
  10 +import io.swagger.v3.oas.annotations.Parameter;
  11 +import io.swagger.v3.oas.annotations.tags.Tag;
  12 +import org.springframework.security.access.prepost.PreAuthorize;
  13 +import org.springframework.validation.annotation.Validated;
  14 +import org.springframework.web.bind.annotation.*;
  15 +
  16 +import javax.annotation.Resource;
  17 +import javax.validation.Valid;
  18 +import java.util.List;
  19 +
  20 +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
  21 +
  22 +
  23 +@Tag(name = "管理后台 - 用户分组")
  24 +@RestController
  25 +@RequestMapping("/member/group")
  26 +@Validated
  27 +public class MemberGroupController {
  28 +
  29 + @Resource
  30 + private MemberGroupService groupService;
  31 +
  32 + @PostMapping("/create")
  33 + @Operation(summary = "创建用户分组")
  34 + @PreAuthorize("@ss.hasPermission('member:group:create')")
  35 + public CommonResult<Long> createGroup(@Valid @RequestBody MemberGroupCreateReqVO createReqVO) {
  36 + return success(groupService.createGroup(createReqVO));
  37 + }
  38 +
  39 + @PutMapping("/update")
  40 + @Operation(summary = "更新用户分组")
  41 + @PreAuthorize("@ss.hasPermission('member:group:update')")
  42 + public CommonResult<Boolean> updateGroup(@Valid @RequestBody MemberGroupUpdateReqVO updateReqVO) {
  43 + groupService.updateGroup(updateReqVO);
  44 + return success(true);
  45 + }
  46 +
  47 + @DeleteMapping("/delete")
  48 + @Operation(summary = "删除用户分组")
  49 + @Parameter(name = "id", description = "编号", required = true)
  50 + @PreAuthorize("@ss.hasPermission('member:group:delete')")
  51 + public CommonResult<Boolean> deleteGroup(@RequestParam("id") Long id) {
  52 + groupService.deleteGroup(id);
  53 + return success(true);
  54 + }
  55 +
  56 + @GetMapping("/get")
  57 + @Operation(summary = "获得用户分组")
  58 + @Parameter(name = "id", description = "编号", required = true, example = "1024")
  59 + @PreAuthorize("@ss.hasPermission('member:group:query')")
  60 + public CommonResult<MemberGroupRespVO> getGroup(@RequestParam("id") Long id) {
  61 + MemberGroupDO group = groupService.getGroup(id);
  62 + return success(MemberGroupConvert.INSTANCE.convert(group));
  63 + }
  64 +
  65 + @GetMapping("/list-all-simple")
  66 + @Operation(summary = "获取会员分组精简信息列表", description = "只包含被开启的会员分组，主要用于前端的下拉选项")
  67 + public CommonResult<List<MemberGroupSimpleRespVO>> getSimpleGroupList() {
  68 + // 获用户列表，只要开启状态的
  69 + List<MemberGroupDO> list = groupService.getEnableGroupList();
  70 + return success(MemberGroupConvert.INSTANCE.convertSimpleList(list));
  71 + }
  72 +
  73 + @GetMapping("/page")
  74 + @Operation(summary = "获得用户分组分页")
  75 + @PreAuthorize("@ss.hasPermission('member:group:query')")
  76 + public CommonResult<PageResult<MemberGroupRespVO>> getGroupPage(@Valid MemberGroupPageReqVO pageVO) {
  77 + PageResult<MemberGroupDO> pageResult = groupService.getGroupPage(pageVO);
  78 + return success(MemberGroupConvert.INSTANCE.convertPage(pageResult));
  79 + }
  80 +
  81 +}
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/group/vo/MemberGroupBaseVO.java 0 → 100644
  View file @8b98d13
  1 +package cn.iocoder.yudao.module.member.controller.admin.group.vo;
  2 +
  3 +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
  4 +import cn.iocoder.yudao.framework.common.validation.InEnum;
  5 +import io.swagger.v3.oas.annotations.media.Schema;
  6 +import lombok.Data;
  7 +
  8 +import javax.validation.constraints.NotNull;
  9 +
  10 +/**
  11 + * 用户分组 Base VO，提供给添加、修改、详细的子 VO 使用
  12 + * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
  13 + */
  14 +@Data
  15 +public class MemberGroupBaseVO {
  16 +
  17 + @Schema(description = "名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "购物达人")
  18 + @NotNull(message = "名称不能为空")
  19 + private String name;
  20 +
  21 + @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "你猜")
  22 + private String remark;
  23 +
  24 + @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
  25 + @NotNull(message = "状态不能为空")
  26 + @InEnum(CommonStatusEnum.class)
  27 + private Integer status;
  28 +
  29 +}
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/group/vo/MemberGroupCreateReqVO.java 0 → 100644
  View file @8b98d13
  1 +package cn.iocoder.yudao.module.member.controller.admin.group.vo;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +import lombok.EqualsAndHashCode;
  6 +import lombok.ToString;
  7 +
  8 +@Schema(description = "管理后台 - 用户分组创建 Request VO")
  9 +@Data
  10 +@EqualsAndHashCode(callSuper = true)
  11 +@ToString(callSuper = true)
  12 +public class MemberGroupCreateReqVO extends MemberGroupBaseVO {
  13 +
  14 +}
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/vo/pickup/DeliveryPickUpStoreExportReqVO.java renamed to yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/group/vo/MemberGroupPageReqVO.java
  View file @8b98d13
1 -package cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup; 1 +package cn.iocoder.yudao.module.member.controller.admin.group.vo;
2 2
3 -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;  
4 -import cn.iocoder.yudao.framework.common.validation.InEnum; 3 +import cn.iocoder.yudao.framework.common.pojo.PageParam;
5 import io.swagger.v3.oas.annotations.media.Schema; 4 import io.swagger.v3.oas.annotations.media.Schema;
6 import lombok.Data; 5 import lombok.Data;
  6 +import lombok.EqualsAndHashCode;
  7 +import lombok.ToString;
7 import org.springframework.format.annotation.DateTimeFormat; 8 import org.springframework.format.annotation.DateTimeFormat;
8 9
9 import java.time.LocalDateTime; 10 import java.time.LocalDateTime;
10 11
11 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; 12 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
12 13
13 -@Schema(description = "管理后台 - 自提门店 Excel 导出 Request VO，参数和 DeliveryPickUpStorePageReqVO 是一致的") 14 +@Schema(description = "管理后台 - 用户分组分页 Request VO")
14 @Data 15 @Data
15 -public class DeliveryPickUpStoreExportReqVO { 16 +@EqualsAndHashCode(callSuper = true)
  17 +@ToString(callSuper = true)
  18 +public class MemberGroupPageReqVO extends PageParam {
16 19
17 - @Schema(description = "门店名称", example = "李四") 20 + @Schema(description = "名称", example = "购物达人")
18 private String name; 21 private String name;
19 22
20 - @Schema(description = "门店手机")  
21 - private String phone;  
22 -  
23 - @Schema(description = "区域id", example = "18733")  
24 - private Integer areaId;  
25 -  
26 - @Schema(description = "门店状态", example = "1")  
27 - @InEnum(CommonStatusEnum.class) 23 + @Schema(description = "状态", example = "1")
28 private Integer status; 24 private Integer status;
29 25
30 @Schema(description = "创建时间") 26 @Schema(description = "创建时间")
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/group/vo/MemberGroupRespVO.java 0 → 100644
  View file @8b98d13
  1 +package cn.iocoder.yudao.module.member.controller.admin.group.vo;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +import lombok.EqualsAndHashCode;
  6 +import lombok.ToString;
  7 +
  8 +import java.time.LocalDateTime;
  9 +
  10 +@Schema(description = "管理后台 - 用户分组 Response VO")
  11 +@Data
  12 +@EqualsAndHashCode(callSuper = true)
  13 +@ToString(callSuper = true)
  14 +public class MemberGroupRespVO extends MemberGroupBaseVO {
  15 +
  16 + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "20357")
  17 + private Long id;
  18 +
  19 + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
  20 + private LocalDateTime createTime;
  21 +
  22 +}
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/group/vo/MemberGroupSimpleRespVO.java 0 → 100644
  View file @8b98d13
  1 +package cn.iocoder.yudao.module.member.controller.admin.group.vo;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +import lombok.ToString;
  6 +
  7 +@Schema(description = "管理后台 - 用户分组 Response VO")
  8 +@Data
  9 +@ToString(callSuper = true)
  10 +public class MemberGroupSimpleRespVO {
  11 +
  12 + @Schema(description = "编号", example = "6103")
  13 + private Long id;
  14 +
  15 + @Schema(description = "等级名称", example = "芋艿")
  16 + private String name;
  17 +
  18 +}
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/group/vo/MemberGroupUpdateReqVO.java 0 → 100644
  View file @8b98d13
  1 +package cn.iocoder.yudao.module.member.controller.admin.group.vo;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +import lombok.EqualsAndHashCode;
  6 +import lombok.ToString;
  7 +
  8 +import javax.validation.constraints.NotNull;
  9 +
  10 +@Schema(description = "管理后台 - 用户分组更新 Request VO")
  11 +@Data
  12 +@EqualsAndHashCode(callSuper = true)
  13 +@ToString(callSuper = true)
  14 +public class MemberGroupUpdateReqVO extends MemberGroupBaseVO {
  15 +
  16 + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "20357")
  17 + @NotNull(message = "编号不能为空")
  18 + private Long id;
  19 +
  20 +}
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/MemberExperienceRecordController.java 0 → 100644
  View file @8b98d13
  1 +package cn.iocoder.yudao.module.member.controller.admin.level;
  2 +
  3 +import cn.iocoder.yudao.framework.common.pojo.CommonResult;
  4 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  5 +import cn.iocoder.yudao.module.member.controller.admin.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;
  11 +import io.swagger.v3.oas.annotations.Parameter;
  12 +import io.swagger.v3.oas.annotations.tags.Tag;
  13 +import org.springframework.security.access.prepost.PreAuthorize;
  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.RequestParam;
  18 +import org.springframework.web.bind.annotation.RestController;
  19 +
  20 +import javax.annotation.Resource;
  21 +import javax.validation.Valid;
  22 +
  23 +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
  24 +
  25 +@Tag(name = "管理后台 - 会员经验记录")
  26 +@RestController
  27 +@RequestMapping("/member/experience-record")
  28 +@Validated
  29 +public class MemberExperienceRecordController {
  30 +
  31 + @Resource
  32 + private MemberExperienceRecordService experienceLogService;
  33 +
  34 + @GetMapping("/get")
  35 + @Operation(summary = "获得会员经验记录")
  36 + @Parameter(name = "id", description = "编号", required = true, example = "1024")
  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));
  41 + }
  42 +
  43 + @GetMapping("/page")
  44 + @Operation(summary = "获得会员经验记录分页")
  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 + }
  51 +
  52 +}
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/MemberLevelController.java 0 → 100644
  View file @8b98d13
  1 +package cn.iocoder.yudao.module.member.controller.admin.level;
  2 +
  3 +import cn.iocoder.yudao.framework.common.pojo.CommonResult;
  4 +import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.*;
  5 +import cn.iocoder.yudao.module.member.convert.level.MemberLevelConvert;
  6 +import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO;
  7 +import cn.iocoder.yudao.module.member.service.level.MemberLevelService;
  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.*;
  14 +
  15 +import javax.annotation.Resource;
  16 +import javax.validation.Valid;
  17 +import java.util.List;
  18 +
  19 +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
  20 +
  21 +@Tag(name = "管理后台 - 会员等级")
  22 +@RestController
  23 +@RequestMapping("/member/level")
  24 +@Validated
  25 +public class MemberLevelController {
  26 +
  27 + @Resource
  28 + private MemberLevelService levelService;
  29 +
  30 + @PostMapping("/create")
  31 + @Operation(summary = "创建会员等级")
  32 + @PreAuthorize("@ss.hasPermission('member:level:create')")
  33 + public CommonResult<Long> createLevel(@Valid @RequestBody MemberLevelCreateReqVO createReqVO) {
  34 + return success(levelService.createLevel(createReqVO));
  35 + }
  36 +
  37 + @PutMapping("/update")
  38 + @Operation(summary = "更新会员等级")
  39 + @PreAuthorize("@ss.hasPermission('member:level:update')")
  40 + public CommonResult<Boolean> updateLevel(@Valid @RequestBody MemberLevelUpdateReqVO updateReqVO) {
  41 + levelService.updateLevel(updateReqVO);
  42 + return success(true);
  43 + }
  44 +
  45 + @DeleteMapping("/delete")
  46 + @Operation(summary = "删除会员等级")
  47 + @Parameter(name = "id", description = "编号", required = true)
  48 + @PreAuthorize("@ss.hasPermission('member:level:delete')")
  49 + public CommonResult<Boolean> deleteLevel(@RequestParam("id") Long id) {
  50 + levelService.deleteLevel(id);
  51 + return success(true);
  52 + }
  53 +
  54 + @GetMapping("/get")
  55 + @Operation(summary = "获得会员等级")
  56 + @Parameter(name = "id", description = "编号", required = true, example = "1024")
  57 + @PreAuthorize("@ss.hasPermission('member:level:query')")
  58 + public CommonResult<MemberLevelRespVO> getLevel(@RequestParam("id") Long id) {
  59 + MemberLevelDO level = levelService.getLevel(id);
  60 + return success(MemberLevelConvert.INSTANCE.convert(level));
  61 + }
  62 +
  63 + @GetMapping("/list-all-simple")
  64 + @Operation(summary = "获取会员等级精简信息列表", description = "只包含被开启的会员等级，主要用于前端的下拉选项")
  65 + public CommonResult<List<MemberLevelSimpleRespVO>> getSimpleLevelList() {
  66 + // 获用户列表，只要开启状态的
  67 + List<MemberLevelDO> list = levelService.getEnableLevelList();
  68 + // 排序后，返回给前端
  69 + return success(MemberLevelConvert.INSTANCE.convertSimpleList(list));
  70 + }
  71 +
  72 + @GetMapping("/list")
  73 + @Operation(summary = "获得会员等级列表")
  74 + @PreAuthorize("@ss.hasPermission('member:level:query')")
  75 + public CommonResult<List<MemberLevelRespVO>> getLevelList(@Valid MemberLevelListReqVO pageVO) {
  76 + List<MemberLevelDO> result = levelService.getLevelList(pageVO);
  77 + return success(MemberLevelConvert.INSTANCE.convertList(result));
  78 + }
  79 +
  80 +}
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/MemberLevelRecordController.java 0 → 100644
  View file @8b98d13
  1 +package cn.iocoder.yudao.module.member.controller.admin.level;
  2 +
  3 +import cn.iocoder.yudao.framework.common.pojo.CommonResult;
  4 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  5 +import cn.iocoder.yudao.module.member.controller.admin.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;
  11 +import io.swagger.v3.oas.annotations.Parameter;
  12 +import io.swagger.v3.oas.annotations.tags.Tag;
  13 +import org.springframework.security.access.prepost.PreAuthorize;
  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.RequestParam;
  18 +import org.springframework.web.bind.annotation.RestController;
  19 +
  20 +import javax.annotation.Resource;
  21 +import javax.validation.Valid;
  22 +
  23 +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
  24 +
  25 +@Tag(name = "管理后台 - 会员等级记录")
  26 +@RestController
  27 +@RequestMapping("/member/level-record")
  28 +@Validated
  29 +public class MemberLevelRecordController {
  30 +
  31 + @Resource
  32 + private MemberLevelRecordService levelLogService;
  33 +
  34 + @GetMapping("/get")
  35 + @Operation(summary = "获得会员等级记录")
  36 + @Parameter(name = "id", description = "编号", required = true, example = "1024")
  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));
  41 + }
  42 +
  43 + @GetMapping("/page")
  44 + @Operation(summary = "获得会员等级记录分页")
  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 + }
  51 +
  52 +}
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/experience/MemberExperienceRecordBaseVO.java 0 → 100644
  View file @8b98d13
  1 +package cn.iocoder.yudao.module.member.controller.admin.level.vo.experience;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +
  6 +import javax.validation.constraints.NotNull;
  7 +
  8 +/**
  9 + * 会员经验记录 Base VO，提供给添加、修改、详细的子 VO 使用
  10 + * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
  11 + */
  12 +@Data
  13 +public class MemberExperienceRecordBaseVO {
  14 +
  15 + @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "3638")
  16 + @NotNull(message = "用户编号不能为空")
  17 + private Long userId;
  18 +
  19 + @Schema(description = "业务编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "12164")
  20 + @NotNull(message = "业务编号不能为空")
  21 + private String bizId;
  22 +
  23 + @Schema(description = "业务类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
  24 + @NotNull(message = "业务类型不能为空")
  25 + private Integer bizType;
  26 +
  27 + @Schema(description = "标题", requiredMode = Schema.RequiredMode.REQUIRED, example = "增加经验")
  28 + @NotNull(message = "标题不能为空")
  29 + private String title;
  30 +
  31 + @Schema(description = "经验", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
  32 + @NotNull(message = "经验不能为空")
  33 + private Integer experience;
  34 +
  35 + @Schema(description = "变更后的经验", requiredMode = Schema.RequiredMode.REQUIRED, example = "200")
  36 + @NotNull(message = "变更后的经验不能为空")
  37 + private Integer totalExperience;
  38 +
  39 + @Schema(description = "描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "下单增加 100 经验")
  40 + @NotNull(message = "描述不能为空")
  41 + private String description;
  42 +
  43 +}
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/experience/MemberExperienceRecordPageReqVO.java 0 → 100644
  View file @8b98d13
  1 +package cn.iocoder.yudao.module.member.controller.admin.level.vo.experience;
  2 +
  3 +import cn.iocoder.yudao.framework.common.pojo.PageParam;
  4 +import io.swagger.v3.oas.annotations.media.Schema;
  5 +import lombok.Data;
  6 +import lombok.EqualsAndHashCode;
  7 +import lombok.ToString;
  8 +import org.springframework.format.annotation.DateTimeFormat;
  9 +
  10 +import java.time.LocalDateTime;
  11 +
  12 +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
  13 +
  14 +@Schema(description = "管理后台 - 会员经验记录分页 Request VO")
  15 +@Data
  16 +@EqualsAndHashCode(callSuper = true)
  17 +@ToString(callSuper = true)
  18 +public class MemberExperienceRecordPageReqVO extends PageParam {
  19 +
  20 + @Schema(description = "用户编号", example = "3638")
  21 + private Long userId;
  22 +
  23 + @Schema(description = "业务编号", example = "12164")
  24 + private String bizId;
  25 +
  26 + @Schema(description = "业务类型", example = "1")
  27 + private Integer bizType;
  28 +
  29 + @Schema(description = "标题", example = "增加经验")
  30 + private String title;
  31 +
  32 + @Schema(description = "创建时间")
  33 + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
  34 + private LocalDateTime[] createTime;
  35 +
  36 +}
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/experience/MemberExperienceRecordRespVO.java 0 → 100644
  View file @8b98d13
  1 +package cn.iocoder.yudao.module.member.controller.admin.level.vo.experience;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +import lombok.EqualsAndHashCode;
  6 +import lombok.ToString;
  7 +
  8 +import java.time.LocalDateTime;
  9 +
  10 +@Schema(description = "管理后台 - 会员经验记录 Response VO")
  11 +@Data
  12 +@EqualsAndHashCode(callSuper = true)
  13 +@ToString(callSuper = true)
  14 +public class MemberExperienceRecordRespVO extends MemberExperienceRecordBaseVO {
  15 +
  16 + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "19610")
  17 + private Long id;
  18 +
  19 + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
  20 + private LocalDateTime createTime;
  21 +
  22 +}
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/level/MemberLevelBaseVO.java 0 → 100644
  View file @8b98d13
  1 +package cn.iocoder.yudao.module.member.controller.admin.level.vo.level;
  2 +
  3 +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
  4 +import cn.iocoder.yudao.framework.common.validation.InEnum;
  5 +import io.swagger.v3.oas.annotations.media.Schema;
  6 +import lombok.Data;
  7 +import org.hibernate.validator.constraints.Range;
  8 +import org.hibernate.validator.constraints.URL;
  9 +
  10 +import javax.validation.constraints.NotBlank;
  11 +import javax.validation.constraints.NotNull;
  12 +import javax.validation.constraints.Positive;
  13 +
  14 +/**
  15 + * 会员等级 Base VO，提供给添加、修改、详细的子 VO 使用
  16 + * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
  17 + */
  18 +@Data
  19 +public class MemberLevelBaseVO {
  20 +
  21 + @Schema(description = "等级名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
  22 + @NotBlank(message = "等级名称不能为空")
  23 + private String name;
  24 +
  25 + @Schema(description = "升级经验", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
  26 + @NotNull(message = "升级经验不能为空")
  27 + @Positive(message = "升级经验必须大于 0")
  28 + private Integer experience;
  29 +
  30 + @Schema(description = "等级", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
  31 + @NotNull(message = "等级不能为空")
  32 + @Positive(message = "等级必须大于 0")
  33 + private Integer level;
  34 +
  35 + @Schema(description = "享受折扣", requiredMode = Schema.RequiredMode.REQUIRED, example = "98")
  36 + @NotNull(message = "享受折扣不能为空")
  37 + @Range(min = 0, max = 100, message = "享受折扣的范围为 0-100")
  38 + private Integer discountPercent;
  39 +
  40 + @Schema(description = "等级图标", example = "https://www.iocoder.cn/yudao.jpg")
  41 + @URL(message = "等级图标必须是 URL 格式")
  42 + private String icon;
  43 +
  44 + @Schema(description = "等级背景图", example = "https://www.iocoder.cn/yudao.jpg")
  45 + @URL(message = "等级背景图必须是 URL 格式")
  46 + private String backgroundUrl;
  47 +
  48 + @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
  49 + @NotNull(message = "状态不能为空")
  50 + @InEnum(CommonStatusEnum.class)
  51 + private Integer status;
  52 +
  53 +}
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/level/MemberLevelCreateReqVO.java 0 → 100644
  View file @8b98d13
  1 +package cn.iocoder.yudao.module.member.controller.admin.level.vo.level;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +import lombok.EqualsAndHashCode;
  6 +import lombok.ToString;
  7 +
  8 +@Schema(description = "管理后台 - 会员等级创建 Request VO")
  9 +@Data
  10 +@EqualsAndHashCode(callSuper = true)
  11 +@ToString(callSuper = true)
  12 +public class MemberLevelCreateReqVO extends MemberLevelBaseVO {
  13 +
  14 +}
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/level/MemberLevelListReqVO.java 0 → 100644
  View file @8b98d13
  1 +package cn.iocoder.yudao.module.member.controller.admin.level.vo.level;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +import lombok.ToString;
  6 +
  7 +@Schema(description = "管理后台 - 会员等级列表筛选 Request VO")
  8 +@Data
  9 +@ToString(callSuper = true)
  10 +public class MemberLevelListReqVO {
  11 +
  12 + @Schema(description = "等级名称", example = "芋艿")
  13 + private String name;
  14 +
  15 + @Schema(description = "状态", example = "1")
  16 + private Integer status;
  17 +
  18 +}
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/level/MemberLevelRespVO.java 0 → 100644
  View file @8b98d13
  1 +package cn.iocoder.yudao.module.member.controller.admin.level.vo.level;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +import lombok.EqualsAndHashCode;
  6 +import lombok.ToString;
  7 +
  8 +import java.time.LocalDateTime;
  9 +
  10 +@Schema(description = "管理后台 - 会员等级 Response VO")
  11 +@Data
  12 +@EqualsAndHashCode(callSuper = true)
  13 +@ToString(callSuper = true)
  14 +public class MemberLevelRespVO extends MemberLevelBaseVO {
  15 +
  16 + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "6103")
  17 + private Long id;
  18 +
  19 + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
  20 + private LocalDateTime createTime;
  21 +
  22 +}
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/level/MemberLevelSimpleRespVO.java 0 → 100644
  View file @8b98d13
  1 +package cn.iocoder.yudao.module.member.controller.admin.level.vo.level;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +import lombok.ToString;
  6 +
  7 +@Schema(description = "管理后台 - 会员等级 Response VO")
  8 +@Data
  9 +@ToString(callSuper = true)
  10 +public class MemberLevelSimpleRespVO {
  11 +
  12 + @Schema(description = "编号", example = "6103")
  13 + private Long id;
  14 +
  15 + @Schema(description = "等级名称", example = "芋艿")
  16 + private String name;
  17 +
  18 + @Schema(description = "等级图标", example = "https://www.iocoder.cn/yudao.jpg")
  19 + private String icon;
  20 +
  21 +}
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/level/MemberLevelUpdateReqVO.java 0 → 100644
  View file @8b98d13
  1 +package cn.iocoder.yudao.module.member.controller.admin.level.vo.level;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +import lombok.EqualsAndHashCode;
  6 +import lombok.ToString;
  7 +
  8 +import javax.validation.constraints.NotNull;
  9 +
  10 +@Schema(description = "管理后台 - 会员等级更新 Request VO")
  11 +@Data
  12 +@EqualsAndHashCode(callSuper = true)
  13 +@ToString(callSuper = true)
  14 +public class MemberLevelUpdateReqVO extends MemberLevelBaseVO {
  15 +
  16 + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "6103")
  17 + @NotNull(message = "编号不能为空")
  18 + private Long id;
  19 +
  20 +}
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/log/MemberLevelRecordBaseVO.java 0 → 100644
  View file @8b98d13
  1 +package cn.iocoder.yudao.module.member.controller.admin.level.vo.log;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +
  6 +import javax.validation.constraints.NotNull;
  7 +
  8 +/**
  9 + * 会员等级记录 Base VO，提供给添加、修改、详细的子 VO 使用
  10 + * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
  11 + */
  12 +@Data
  13 +public class MemberLevelRecordBaseVO {
  14 +
  15 + @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "25923")
  16 + @NotNull(message = "用户编号不能为空")
  17 + private Long userId;
  18 +
  19 + @Schema(description = "等级编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "25985")
  20 + @NotNull(message = "等级编号不能为空")
  21 + private Long levelId;
  22 +
  23 + @Schema(description = "会员等级", requiredMode = Schema.RequiredMode.REQUIRED)
  24 + @NotNull(message = "会员等级不能为空")
  25 + private Integer level;
  26 +
  27 + @Schema(description = "享受折扣", requiredMode = Schema.RequiredMode.REQUIRED, example = "13319")
  28 + @NotNull(message = "享受折扣不能为空")
  29 + private Integer discountPercent;
  30 +
  31 + @Schema(description = "升级经验", requiredMode = Schema.RequiredMode.REQUIRED, example = "13319")
  32 + @NotNull(message = "升级经验不能为空")
  33 + private Integer experience;
  34 +
  35 + @Schema(description = "会员此时的经验", requiredMode = Schema.RequiredMode.REQUIRED, example = "13319")
  36 + @NotNull(message = "会员此时的经验不能为空")
  37 + private Integer userExperience;
  38 +
  39 + @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "推广需要")
  40 + @NotNull(message = "备注不能为空")
  41 + private String remark;
  42 +
  43 + @Schema(description = "描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "升级为金牌会员")
  44 + @NotNull(message = "描述不能为空")
  45 + private String description;
  46 +
  47 +}
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/address/vo/AddressPageReqVO.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 @8b98d13
1 -package cn.iocoder.yudao.module.member.controller.admin.address.vo; 1 +package cn.iocoder.yudao.module.member.controller.admin.level.vo.log;
2 2
3 -import lombok.*;  
4 -import java.util.*;  
5 -import io.swagger.v3.oas.annotations.media.Schema;  
6 import cn.iocoder.yudao.framework.common.pojo.PageParam; 3 import cn.iocoder.yudao.framework.common.pojo.PageParam;
  4 +import io.swagger.v3.oas.annotations.media.Schema;
  5 +import lombok.Data;
  6 +import lombok.EqualsAndHashCode;
  7 +import lombok.ToString;
7 import org.springframework.format.annotation.DateTimeFormat; 8 import org.springframework.format.annotation.DateTimeFormat;
  9 +
8 import java.time.LocalDateTime; 10 import java.time.LocalDateTime;
9 11
10 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; 12 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
11 13
12 -@Schema(description = "管理后台 - 用户收件地址分页 Request VO") 14 +@Schema(description = "管理后台 - 会员等级记录分页 Request VO")
13 @Data 15 @Data
14 @EqualsAndHashCode(callSuper = true) 16 @EqualsAndHashCode(callSuper = true)
15 @ToString(callSuper = true) 17 @ToString(callSuper = true)
16 -public class AddressPageReqVO extends PageParam { 18 +public class MemberLevelRecordPageReqVO extends PageParam {
17 19
18 - @Schema(description = "用户编号", example = "20369") 20 + @Schema(description = "用户编号", example = "25923")
19 private Long userId; 21 private Long userId;
20 22
21 - @Schema(description = "收件人名称", example = "张三")  
22 - private String name;  
23 -  
24 - @Schema(description = "手机号")  
25 - private String mobile;  
26 -  
27 - @Schema(description = "地区编码", example = "15716")  
28 - private Long areaId;  
29 -  
30 - @Schema(description = "收件详细地址")  
31 - private String detailAddress;  
32 -  
33 - @Schema(description = "是否默认", example = "2")  
34 - private Boolean defaultStatus; 23 + @Schema(description = "等级编号", example = "25985")
  24 + private Long levelId;
35 25
36 @Schema(description = "创建时间") 26 @Schema(description = "创建时间")
37 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) 27 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/log/MemberLevelRecordRespVO.java 0 → 100644
  View file @8b98d13
  1 +package cn.iocoder.yudao.module.member.controller.admin.level.vo.log;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +import lombok.EqualsAndHashCode;
  6 +import lombok.ToString;
  7 +
  8 +import java.time.LocalDateTime;
  9 +
  10 +@Schema(description = "管理后台 - 会员等级记录 Response VO")
  11 +@Data
  12 +@EqualsAndHashCode(callSuper = true)
  13 +@ToString(callSuper = true)
  14 +public class MemberLevelRecordRespVO extends MemberLevelRecordBaseVO {
  15 +
  16 + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "8741")
  17 + private Long id;
  18 +
  19 + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
  20 + private LocalDateTime createTime;
  21 +
  22 +}
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/point/MemberPointConfigController.java
  View file @8b98d13
@@ -29,16 +29,16 @@ public class MemberPointConfigController { @@ -29,16 +29,16 @@ public class MemberPointConfigController {
29 @PutMapping("/save") 29 @PutMapping("/save")
30 @Operation(summary = "保存会员积分配置") 30 @Operation(summary = "保存会员积分配置")
31 @PreAuthorize("@ss.hasPermission('point:config:save')") 31 @PreAuthorize("@ss.hasPermission('point:config:save')")
32 - public CommonResult<Boolean> updateConfig(@Valid @RequestBody MemberPointConfigSaveReqVO saveReqVO) {  
33 - memberPointConfigService.saveConfig(saveReqVO); 32 + public CommonResult<Boolean> savePointConfig(@Valid @RequestBody MemberPointConfigSaveReqVO saveReqVO) {
  33 + memberPointConfigService.savePointConfig(saveReqVO);
34 return success(true); 34 return success(true);
35 } 35 }
36 36
37 @GetMapping("/get") 37 @GetMapping("/get")
38 @Operation(summary = "获得会员积分配置") 38 @Operation(summary = "获得会员积分配置")
39 @PreAuthorize("@ss.hasPermission('point:config:query')") 39 @PreAuthorize("@ss.hasPermission('point:config:query')")
40 - public CommonResult<MemberPointConfigRespVO> getConfig() {  
41 - MemberPointConfigDO config = memberPointConfigService.getConfig(); 40 + public CommonResult<MemberPointConfigRespVO> getPointConfig() {
  41 + MemberPointConfigDO config = memberPointConfigService.getPointConfig();
42 return success(MemberPointConfigConvert.INSTANCE.convert(config)); 42 return success(MemberPointConfigConvert.INSTANCE.convert(config));
43 } 43 }
44 44
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/point/MemberPointRecordController.java
  View file @8b98d13
@@ -25,6 +25,7 @@ import java.util.List; @@ -25,6 +25,7 @@ import java.util.List;
25 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; 25 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
26 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet; 26 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
27 27
  28 +@Tag(name = "管理后台 - 签到记录")
28 @RestController 29 @RestController
29 @RequestMapping("/member/point/record") 30 @RequestMapping("/member/point/record")
30 @Validated 31 @Validated
@@ -39,9 +40,9 @@ public class MemberPointRecordController { @@ -39,9 +40,9 @@ public class MemberPointRecordController {
39 @GetMapping("/page") 40 @GetMapping("/page")
40 @Operation(summary = "获得用户积分记录分页") 41 @Operation(summary = "获得用户积分记录分页")
41 @PreAuthorize("@ss.hasPermission('point:record:query')") 42 @PreAuthorize("@ss.hasPermission('point:record:query')")
42 - public CommonResult<PageResult<MemberPointRecordRespVO>> getRecordPage(@Valid MemberPointRecordPageReqVO pageVO) { 43 + public CommonResult<PageResult<MemberPointRecordRespVO>> getPointRecordPage(@Valid MemberPointRecordPageReqVO pageVO) {
43 // 执行分页查询 44 // 执行分页查询
44 - PageResult<MemberPointRecordDO> pageResult = pointRecordService.getRecordPage(pageVO); 45 + PageResult<MemberPointRecordDO> pageResult = pointRecordService.getPointRecordPage(pageVO);
45 if (CollectionUtils.isEmpty(pageResult.getList())) { 46 if (CollectionUtils.isEmpty(pageResult.getList())) {
46 return success(PageResult.empty(pageResult.getTotal())); 47 return success(PageResult.empty(pageResult.getTotal()));
47 } 48 }
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/point/vo/recrod/MemberPointRecordPageReqVO.java
  View file @8b98d13
@@ -15,7 +15,7 @@ public class MemberPointRecordPageReqVO extends PageParam { @@ -15,7 +15,7 @@ public class MemberPointRecordPageReqVO extends PageParam {
15 @Schema(description = "用户昵称", example = "张三") 15 @Schema(description = "用户昵称", example = "张三")
16 private String nickname; 16 private String nickname;
17 17
18 - @Schema(description = "用户ID", example = "123") 18 + @Schema(description = "用户编号", example = "123")
19 private Long userId; 19 private Long userId;
20 20
21 @Schema(description = "业务类型", example = "1") 21 @Schema(description = "业务类型", example = "1")
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/signin/MemberSignInConfigController.java
  View file @8b98d13
@@ -20,9 +20,10 @@ import java.util.List; @@ -20,9 +20,10 @@ import java.util.List;
20 20
21 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; 21 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
22 22
  23 +// TODO 芋艿：url
23 @Tag(name = "管理后台 - 签到规则") 24 @Tag(name = "管理后台 - 签到规则")
24 @RestController 25 @RestController
25 -@RequestMapping("/member/point/sign-in-config") 26 +@RequestMapping("/member/sign-in/config")
26 @Validated 27 @Validated
27 public class MemberSignInConfigController { 28 public class MemberSignInConfigController {
28 29
@@ -66,8 +67,8 @@ public class MemberSignInConfigController { @@ -66,8 +67,8 @@ public class MemberSignInConfigController {
66 @Operation(summary = "获得签到规则列表") 67 @Operation(summary = "获得签到规则列表")
67 @PreAuthorize("@ss.hasPermission('point:sign-in-config:query')") 68 @PreAuthorize("@ss.hasPermission('point:sign-in-config:query')")
68 public CommonResult<List<MemberSignInConfigRespVO>> getSignInConfigList() { 69 public CommonResult<List<MemberSignInConfigRespVO>> getSignInConfigList() {
69 - List<MemberSignInConfigDO> pageResult = signInConfigService.getSignInConfigList();  
70 - return success(MemberSignInConfigConvert.INSTANCE.convertList(pageResult)); 70 + List<MemberSignInConfigDO> list = signInConfigService.getSignInConfigList();
  71 + return success(MemberSignInConfigConvert.INSTANCE.convertList(list));
71 } 72 }
72 73
73 } 74 }
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/signin/MemberSignInRecordController.java
  View file @8b98d13
@@ -27,7 +27,7 @@ import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils. @@ -27,7 +27,7 @@ import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.
27 27
28 @Tag(name = "管理后台 - 签到记录") 28 @Tag(name = "管理后台 - 签到记录")
29 @RestController 29 @RestController
30 -@RequestMapping("/member/point/sign-in-record") 30 +@RequestMapping("/member/sign-in/record")
31 @Validated 31 @Validated
32 public class MemberSignInRecordController { 32 public class MemberSignInRecordController {
33 33
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/signin/vo/record/MemberSignInRecordPageReqVO.java
  View file @8b98d13
@@ -23,7 +23,7 @@ public class MemberSignInRecordPageReqVO extends PageParam { @@ -23,7 +23,7 @@ public class MemberSignInRecordPageReqVO extends PageParam {
23 @Schema(description = "第几天签到", example = "10") 23 @Schema(description = "第几天签到", example = "10")
24 private Integer day; 24 private Integer day;
25 25
26 - @Schema(description = "用户ID", example = "123") 26 + @Schema(description = "用户编号", example = "123")
27 private Long userId; 27 private Long userId;
28 28
29 @Schema(description = "签到时间") 29 @Schema(description = "签到时间")
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/tag/MemberTagController.java
  View file @8b98d13
@@ -65,6 +65,15 @@ public class MemberTagController { @@ -65,6 +65,15 @@ public class MemberTagController {
65 return success(MemberTagConvert.INSTANCE.convert(tag)); 65 return success(MemberTagConvert.INSTANCE.convert(tag));
66 } 66 }
67 67
  68 + @GetMapping("/list-all-simple")
  69 + @Operation(summary = "获取会员标签精简信息列表", description = "只包含被开启的会员标签，主要用于前端的下拉选项")
  70 + public CommonResult<List<MemberTagRespVO>> getSimpleTagList() {
  71 + // 获用户列表，只要开启状态的
  72 + List<MemberTagDO> list = tagService.getTagList();
  73 + // 排序后，返回给前端
  74 + return success(MemberTagConvert.INSTANCE.convertList(list));
  75 + }
  76 +
68 @GetMapping("/list") 77 @GetMapping("/list")
69 @Operation(summary = "获得会员标签列表") 78 @Operation(summary = "获得会员标签列表")
70 @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") 79 @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/MemberUserController.java
  View file @8b98d13
@@ -5,10 +5,15 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult; @@ -5,10 +5,15 @@ 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;
  11 +import cn.iocoder.yudao.module.member.dal.dataobject.group.MemberGroupDO;
  12 +import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO;
10 import cn.iocoder.yudao.module.member.dal.dataobject.tag.MemberTagDO; 13 import cn.iocoder.yudao.module.member.dal.dataobject.tag.MemberTagDO;
11 import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO; 14 import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO;
  15 +import cn.iocoder.yudao.module.member.service.group.MemberGroupService;
  16 +import cn.iocoder.yudao.module.member.service.level.MemberLevelService;
12 import cn.iocoder.yudao.module.member.service.tag.MemberTagService; 17 import cn.iocoder.yudao.module.member.service.tag.MemberTagService;
13 import cn.iocoder.yudao.module.member.service.user.MemberUserService; 18 import cn.iocoder.yudao.module.member.service.user.MemberUserService;
14 import io.swagger.v3.oas.annotations.Operation; 19 import io.swagger.v3.oas.annotations.Operation;
@@ -27,6 +32,7 @@ import java.util.Set; @@ -27,6 +32,7 @@ import java.util.Set;
27 import java.util.stream.Collectors; 32 import java.util.stream.Collectors;
28 33
29 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;
30 36
31 @Tag(name = "管理后台 - 会员用户") 37 @Tag(name = "管理后台 - 会员用户")
32 @RestController 38 @RestController
@@ -38,6 +44,10 @@ public class MemberUserController { @@ -38,6 +44,10 @@ public class MemberUserController {
38 private MemberUserService memberUserService; 44 private MemberUserService memberUserService;
39 @Resource 45 @Resource
40 private MemberTagService memberTagService; 46 private MemberTagService memberTagService;
  47 + @Resource
  48 + private MemberLevelService memberLevelService;
  49 + @Resource
  50 + private MemberGroupService memberGroupService;
41 51
42 @PutMapping("/update") 52 @PutMapping("/update")
43 @Operation(summary = "更新会员用户") 53 @Operation(summary = "更新会员用户")
@@ -47,6 +57,14 @@ public class MemberUserController { @@ -47,6 +57,14 @@ public class MemberUserController {
47 return success(true); 57 return success(true);
48 } 58 }
49 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 +
50 @GetMapping("/get") 68 @GetMapping("/get")
51 @Operation(summary = "获得会员用户") 69 @Operation(summary = "获得会员用户")
52 @Parameter(name = "id", description = "编号", required = true, example = "1024") 70 @Parameter(name = "id", description = "编号", required = true, example = "1024")
@@ -65,14 +83,20 @@ public class MemberUserController { @@ -65,14 +83,20 @@ public class MemberUserController {
65 return success(PageResult.empty()); 83 return success(PageResult.empty());
66 } 84 }
67 85
68 - // 处理会员标签返显 86 + // 处理用户标签返显
69 Set<Long> tagIds = pageResult.getList().stream() 87 Set<Long> tagIds = pageResult.getList().stream()
70 .map(MemberUserDO::getTagIds) 88 .map(MemberUserDO::getTagIds)
71 .filter(Objects::nonNull) 89 .filter(Objects::nonNull)
72 .flatMap(Collection::stream) 90 .flatMap(Collection::stream)
73 .collect(Collectors.toSet()); 91 .collect(Collectors.toSet());
74 List<MemberTagDO> tags = memberTagService.getTagList(tagIds); 92 List<MemberTagDO> tags = memberTagService.getTagList(tagIds);
75 - return success(MemberUserConvert.INSTANCE.convertPage(pageResult, tags)); 93 + // 处理用户级别返显
  94 + List<MemberLevelDO> levels = memberLevelService.getLevelList(
  95 + convertSet(pageResult.getList(), MemberUserDO::getLevelId));
  96 + // 处理用户分组返显
  97 + List<MemberGroupDO> groups = memberGroupService.getGroupList(
  98 + convertSet(pageResult.getList(), MemberUserDO::getGroupId));
  99 + return success(MemberUserConvert.INSTANCE.convertPage(pageResult, tags, levels, groups));
76 } 100 }
77 101
78 } 102 }
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserBaseVO.java
  View file @8b98d13
@@ -40,10 +40,10 @@ public class MemberUserBaseVO { @@ -40,10 +40,10 @@ 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 = "4371") 46 + @Schema(description = "所在地全程", example = "上海上海市普陀区")
47 private String areaName; 47 private String areaName;
48 48
49 @Schema(description = "出生日期", example = "2023-03-12") 49 @Schema(description = "出生日期", example = "2023-03-12")
@@ -56,4 +56,10 @@ public class MemberUserBaseVO { @@ -56,4 +56,10 @@ public class MemberUserBaseVO {
56 @Schema(description = "会员标签", example = "[1, 2]") 56 @Schema(description = "会员标签", example = "[1, 2]")
57 private List<Long> tagIds; 57 private List<Long> tagIds;
58 58
  59 + @Schema(description = "会员等级编号", example = "1")
  60 + private Long levelId;
  61 +
  62 + @Schema(description = "用户分组编号", example = "1")
  63 + private Long groupId;
  64 +
59 } 65 }
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserPageReqVO.java
  View file @8b98d13
@@ -32,7 +32,13 @@ public class MemberUserPageReqVO extends PageParam { @@ -32,7 +32,13 @@ public class MemberUserPageReqVO extends PageParam {
32 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) 32 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
33 private LocalDateTime[] createTime; 33 private LocalDateTime[] createTime;
34 34
35 - @Schema(description = "会员标签", example = "[1, 2]") 35 + @Schema(description = "会员标签编号列表", example = "[1, 2]")
36 private List<Long> tagIds; 36 private List<Long> tagIds;
37 37
  38 + @Schema(description = "会员等级编号", example = "1")
  39 + private Long levelId;
  40 +
  41 + @Schema(description = "用户分组编号", example = "1")
  42 + private Long groupId;
  43 +
38 } 44 }
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserRespVO.java
  View file @8b98d13
@@ -29,10 +29,24 @@ public class MemberUserRespVO extends MemberUserBaseVO { @@ -29,10 +29,24 @@ public class MemberUserRespVO extends MemberUserBaseVO {
29 @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) 29 @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
30 private LocalDateTime createTime; 30 private LocalDateTime createTime;
31 31
32 -  
33 // ========== 其它信息 ========== 32 // ========== 其它信息 ==========
34 33
  34 + @Schema(description = "积分", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
  35 + private Integer point;
  36 +
  37 + @Schema(description = "总积分", requiredMode = Schema.RequiredMode.REQUIRED, example = "2000")
  38 + private Integer totalPoint;
  39 +
35 @Schema(description = "会员标签", example = "[红色, 快乐]") 40 @Schema(description = "会员标签", example = "[红色, 快乐]")
36 private List<String> tagNames; 41 private List<String> tagNames;
37 42
  43 + @Schema(description = "会员等级", example = "黄金会员")
  44 + private String levelName;
  45 +
  46 + @Schema(description = "用户分组", example = "购物达人")
  47 + private String groupName;
  48 +
  49 + @Schema(description = "用户经验值", requiredMode = Schema.RequiredMode.REQUIRED, example = "200")
  50 + private Integer experience;
  51 +
38 } 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 @8b98d13
  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/app/point/AppMemberPointRecordController.java 0 → 100644
  View file @8b98d13
  1 +package cn.iocoder.yudao.module.member.controller.app.point;
  2 +
  3 +import cn.iocoder.yudao.framework.common.pojo.CommonResult;
  4 +import cn.iocoder.yudao.framework.common.pojo.PageParam;
  5 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  6 +import cn.iocoder.yudao.module.member.controller.app.point.vo.AppMemberPointRecordRespVO;
  7 +import cn.iocoder.yudao.module.member.convert.point.MemberPointRecordConvert;
  8 +import cn.iocoder.yudao.module.member.dal.dataobject.point.MemberPointRecordDO;
  9 +import cn.iocoder.yudao.module.member.service.point.MemberPointRecordService;
  10 +import io.swagger.v3.oas.annotations.Operation;
  11 +import io.swagger.v3.oas.annotations.tags.Tag;
  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 +import javax.validation.Valid;
  19 +
  20 +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
  21 +import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
  22 +
  23 +@Tag(name = "用户 App - 签到记录")
  24 +@RestController
  25 +@RequestMapping("/member/point/record")
  26 +@Validated
  27 +public class AppMemberPointRecordController {
  28 +
  29 + @Resource
  30 + private MemberPointRecordService pointRecordService;
  31 +
  32 + @GetMapping("/page")
  33 + @Operation(summary = "获得用户积分记录分页")
  34 + public CommonResult<PageResult<AppMemberPointRecordRespVO>> getPointRecordPage(@Valid PageParam pageVO) {
  35 + PageResult<MemberPointRecordDO> pageResult = pointRecordService.getPointRecordPage(getLoginUserId(), pageVO);
  36 + return success(MemberPointRecordConvert.INSTANCE.convertPage02(pageResult));
  37 + }
  38 +
  39 +}
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/point/vo/AppMemberPointRecordRespVO.java 0 → 100644
  View file @8b98d13
  1 +package cn.iocoder.yudao.module.member.controller.app.point.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 AppMemberPointRecordRespVO {
  11 +
  12 + @Schema(description = "自增主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "31457")
  13 + private Long id;;
  14 +
  15 + @Schema(description = "积分标题", requiredMode = Schema.RequiredMode.REQUIRED, example = "你猜")
  16 + private String title;
  17 +
  18 + @Schema(description = "积分描述", example = "你猜")
  19 + private String description;
  20 +
  21 + @Schema(description = "积分", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
  22 + private Integer point;
  23 +
  24 + @Schema(description = "发生时间", requiredMode = Schema.RequiredMode.REQUIRED)
  25 + private LocalDateTime createTime;
  26 +
  27 +}
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/signin/AppMemberSignInConfigController.java 0 → 100644
  View file @8b98d13
  1 +package cn.iocoder.yudao.module.member.controller.app.signin;
  2 +
  3 +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
  4 +import cn.iocoder.yudao.framework.common.pojo.CommonResult;
  5 +import cn.iocoder.yudao.module.member.controller.app.signin.vo.config.AppMemberSignInConfigRespVO;
  6 +import cn.iocoder.yudao.module.member.convert.signin.MemberSignInConfigConvert;
  7 +import cn.iocoder.yudao.module.member.dal.dataobject.signin.MemberSignInConfigDO;
  8 +import cn.iocoder.yudao.module.member.service.signin.MemberSignInConfigService;
  9 +import io.swagger.v3.oas.annotations.Operation;
  10 +import io.swagger.v3.oas.annotations.tags.Tag;
  11 +import org.springframework.validation.annotation.Validated;
  12 +import org.springframework.web.bind.annotation.GetMapping;
  13 +import org.springframework.web.bind.annotation.RequestMapping;
  14 +import org.springframework.web.bind.annotation.RestController;
  15 +
  16 +import javax.annotation.Resource;
  17 +import java.util.List;
  18 +
  19 +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
  20 +
  21 +@Tag(name = "用户 App - 签到规则")
  22 +@RestController
  23 +@RequestMapping("/member/sign-in/config")
  24 +@Validated
  25 +public class AppMemberSignInConfigController {
  26 +
  27 + @Resource
  28 + private MemberSignInConfigService signInConfigService;
  29 +
  30 + @GetMapping("/list")
  31 + @Operation(summary = "获得签到规则列表")
  32 + public CommonResult<List<AppMemberSignInConfigRespVO>> getSignInConfigList() {
  33 + List<MemberSignInConfigDO> pageResult = signInConfigService.getSignInConfigList(CommonStatusEnum.ENABLE.getStatus());
  34 + return success(MemberSignInConfigConvert.INSTANCE.convertList02(pageResult));
  35 + }
  36 +
  37 +}
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/signin/AppMemberSignInRecordController.java 0 → 100644
  View file @8b98d13
  1 +package cn.iocoder.yudao.module.member.controller.app.signin;
  2 +
  3 +import cn.iocoder.yudao.framework.common.pojo.CommonResult;
  4 +import cn.iocoder.yudao.framework.common.pojo.PageParam;
  5 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  6 +import cn.iocoder.yudao.module.member.controller.app.signin.vo.record.AppMemberSignInRecordRespVO;
  7 +import cn.iocoder.yudao.module.member.controller.app.signin.vo.record.AppMemberSignInRecordSummaryRespVO;
  8 +import cn.iocoder.yudao.module.member.convert.signin.MemberSignInRecordConvert;
  9 +import cn.iocoder.yudao.module.member.dal.dataobject.signin.MemberSignInRecordDO;
  10 +import cn.iocoder.yudao.module.member.service.signin.MemberSignInRecordService;
  11 +import io.swagger.v3.oas.annotations.Operation;
  12 +import io.swagger.v3.oas.annotations.tags.Tag;
  13 +import org.springframework.validation.annotation.Validated;
  14 +import org.springframework.web.bind.annotation.GetMapping;
  15 +import org.springframework.web.bind.annotation.PostMapping;
  16 +import org.springframework.web.bind.annotation.RequestMapping;
  17 +import org.springframework.web.bind.annotation.RestController;
  18 +
  19 +import javax.annotation.Resource;
  20 +import java.time.LocalDateTime;
  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 = "管理后台 - 签到记录")
  26 +@RestController
  27 +@RequestMapping("/member/sign-in/record")
  28 +@Validated
  29 +public class AppMemberSignInRecordController {
  30 +
  31 + @Resource
  32 + private MemberSignInRecordService signInRecordService;
  33 +
  34 + // TODO 芋艿：临时 mock => UserSignController.getUserInfo
  35 + @GetMapping("/get-summary")
  36 + @Operation(summary = "获得个人签到统计")
  37 + public CommonResult<AppMemberSignInRecordSummaryRespVO> getSignInRecordSummary() {
  38 + AppMemberSignInRecordSummaryRespVO respVO = new AppMemberSignInRecordSummaryRespVO();
  39 + if (false) {
  40 + respVO.setTotalDay(100);
  41 + respVO.setContinuousDay(5);
  42 + respVO.setTodaySignIn(true);
  43 + } else {
  44 + respVO.setTotalDay(100);
  45 + respVO.setContinuousDay(10);
  46 + respVO.setTodaySignIn(false);
  47 + }
  48 + return success(respVO);
  49 + }
  50 +
  51 + // TODO 芋艿：临时 mock => UserSignController.info
  52 + @PostMapping("/create")
  53 + @Operation(summary = "签到")
  54 + public CommonResult<AppMemberSignInRecordRespVO> createSignInRecord() {
  55 + AppMemberSignInRecordRespVO respVO = new AppMemberSignInRecordRespVO()
  56 + .setPoint(10)
  57 + .setDay(10)
  58 + .setCreateTime(LocalDateTime.now());
  59 + return success(respVO);
  60 + }
  61 +
  62 + @GetMapping("/page")
  63 + @Operation(summary = "获得签到记录分页")
  64 + public CommonResult<PageResult<AppMemberSignInRecordRespVO>> getSignRecordPage(PageParam pageParam) {
  65 + PageResult<MemberSignInRecordDO> pageResult = signInRecordService.getSignRecordPage(getLoginUserId(), pageParam);
  66 + return success(MemberSignInRecordConvert.INSTANCE.convertPage02(pageResult));
  67 + }
  68 +
  69 +}
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/signin/vo/config/AppMemberSignInConfigRespVO.java 0 → 100644
  View file @8b98d13
  1 +package cn.iocoder.yudao.module.member.controller.app.signin.vo.config;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +
  6 +@Schema(description = "用户 App - 签到规则 Response VO")
  7 +@Data
  8 +public class AppMemberSignInConfigRespVO {
  9 +
  10 + @Schema(description = "签到第 x 天", requiredMode = Schema.RequiredMode.REQUIRED, example = "7")
  11 + private Integer day;
  12 +
  13 + @Schema(description = "奖励积分", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
  14 + private Integer point;
  15 +
  16 +}
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/signin/vo/record/AppMemberSignInRecordRespVO.java 0 → 100644
  View file @8b98d13
  1 +package cn.iocoder.yudao.module.member.controller.app.signin.vo.record;
  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 AppMemberSignInRecordRespVO {
  11 +
  12 + @Schema(description = "第几天签到", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
  13 + private Integer day;
  14 +
  15 + @Schema(description = "签到的分数", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
  16 + private Integer point;
  17 +
  18 + @Schema(description = "签到时间", requiredMode = Schema.RequiredMode.REQUIRED)
  19 + private LocalDateTime createTime;
  20 +
  21 +}
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/signin/vo/record/AppMemberSignInRecordSummaryRespVO.java 0 → 100644
  View file @8b98d13
  1 +package cn.iocoder.yudao.module.member.controller.app.signin.vo.record;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +
  6 +@Schema(description = "用户 App - 个人签到统计 Response VO")
  7 +@Data
  8 +public class AppMemberSignInRecordSummaryRespVO {
  9 +
  10 + @Schema(description = "总签到天数", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
  11 + private Integer totalDay;
  12 +
  13 + @Schema(description = "连续签到第 x 天", requiredMode = Schema.RequiredMode.REQUIRED, example = "3")
  14 + private Integer continuousDay;
  15 +
  16 + @Schema(description = "今天是否已签到", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
  17 + private Boolean todaySignIn;
  18 +
  19 +}
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/address/AddressConvert.java
  View file @8b98d13
1 package cn.iocoder.yudao.module.member.convert.address; 1 package cn.iocoder.yudao.module.member.convert.address;
2 2
3 -import cn.iocoder.yudao.framework.common.pojo.PageResult;  
4 import cn.iocoder.yudao.framework.ip.core.utils.AreaUtils; 3 import cn.iocoder.yudao.framework.ip.core.utils.AreaUtils;
5 import cn.iocoder.yudao.module.member.api.address.dto.AddressRespDTO; 4 import cn.iocoder.yudao.module.member.api.address.dto.AddressRespDTO;
6 -import cn.iocoder.yudao.module.member.controller.admin.address.vo.AddressCreateReqVO;  
7 -import cn.iocoder.yudao.module.member.controller.admin.address.vo.AddressExcelVO;  
8 import cn.iocoder.yudao.module.member.controller.admin.address.vo.AddressRespVO; 5 import cn.iocoder.yudao.module.member.controller.admin.address.vo.AddressRespVO;
9 -import cn.iocoder.yudao.module.member.controller.admin.address.vo.AddressUpdateReqVO;  
10 import cn.iocoder.yudao.module.member.controller.app.address.vo.AppAddressCreateReqVO; 6 import cn.iocoder.yudao.module.member.controller.app.address.vo.AppAddressCreateReqVO;
11 import cn.iocoder.yudao.module.member.controller.app.address.vo.AppAddressRespVO; 7 import cn.iocoder.yudao.module.member.controller.app.address.vo.AppAddressRespVO;
12 import cn.iocoder.yudao.module.member.controller.app.address.vo.AppAddressUpdateReqVO; 8 import cn.iocoder.yudao.module.member.controller.app.address.vo.AppAddressUpdateReqVO;
@@ -44,15 +40,6 @@ public interface AddressConvert { @@ -44,15 +40,6 @@ public interface AddressConvert {
44 return AreaUtils.format(areaId); 40 return AreaUtils.format(areaId);
45 } 41 }
46 42
47 - MemberAddressDO convert(AddressCreateReqVO bean);  
48 -  
49 - MemberAddressDO convert(AddressUpdateReqVO bean);  
50 -  
51 - AddressRespVO convert2(MemberAddressDO bean);  
52 -  
53 List<AddressRespVO> convertList2(List<MemberAddressDO> list); 43 List<AddressRespVO> convertList2(List<MemberAddressDO> list);
54 44
55 - PageResult<AddressRespVO> convertPage(PageResult<MemberAddressDO> page);  
56 -  
57 - List<AddressExcelVO> convertList02(List<MemberAddressDO> list);  
58 } 45 }
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/group/MemberGroupConvert.java 0 → 100644
  View file @8b98d13
  1 +package cn.iocoder.yudao.module.member.convert.group;
  2 +
  3 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  4 +import cn.iocoder.yudao.module.member.controller.admin.group.vo.MemberGroupCreateReqVO;
  5 +import cn.iocoder.yudao.module.member.controller.admin.group.vo.MemberGroupRespVO;
  6 +import cn.iocoder.yudao.module.member.controller.admin.group.vo.MemberGroupSimpleRespVO;
  7 +import cn.iocoder.yudao.module.member.controller.admin.group.vo.MemberGroupUpdateReqVO;
  8 +import cn.iocoder.yudao.module.member.dal.dataobject.group.MemberGroupDO;
  9 +import org.mapstruct.Mapper;
  10 +import org.mapstruct.factory.Mappers;
  11 +
  12 +import java.util.List;
  13 +
  14 +/**
  15 + * 用户分组 Convert
  16 + *
  17 + * @author owen
  18 + */
  19 +@Mapper
  20 +public interface MemberGroupConvert {
  21 +
  22 + MemberGroupConvert INSTANCE = Mappers.getMapper(MemberGroupConvert.class);
  23 +
  24 + MemberGroupDO convert(MemberGroupCreateReqVO bean);
  25 +
  26 + MemberGroupDO convert(MemberGroupUpdateReqVO bean);
  27 +
  28 + MemberGroupRespVO convert(MemberGroupDO bean);
  29 +
  30 + List<MemberGroupRespVO> convertList(List<MemberGroupDO> list);
  31 +
  32 + PageResult<MemberGroupRespVO> convertPage(PageResult<MemberGroupDO> page);
  33 +
  34 + List<MemberGroupSimpleRespVO> convertSimpleList(List<MemberGroupDO> list);
  35 +}
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/level/MemberExperienceRecordConvert.java 0 → 100644
  View file @8b98d13
  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.experience.MemberExperienceRecordRespVO;
  5 +import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberExperienceRecordDO;
  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 MemberExperienceRecordConvert {
  18 +
  19 + MemberExperienceRecordConvert INSTANCE = Mappers.getMapper(MemberExperienceRecordConvert.class);
  20 +
  21 + MemberExperienceRecordRespVO convert(MemberExperienceRecordDO bean);
  22 +
  23 + List<MemberExperienceRecordRespVO> convertList(List<MemberExperienceRecordDO> list);
  24 +
  25 + PageResult<MemberExperienceRecordRespVO> convertPage(PageResult<MemberExperienceRecordDO> page);
  26 +
  27 + MemberExperienceRecordDO convert(Long userId, Integer experience, Integer totalExperience,
  28 + String bizId, Integer bizType,
  29 + String title, String description);
  30 +}
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/level/MemberLevelConvert.java 0 → 100644
  View file @8b98d13
  1 +package cn.iocoder.yudao.module.member.convert.level;
  2 +
  3 +import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelCreateReqVO;
  4 +import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelRespVO;
  5 +import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelSimpleRespVO;
  6 +import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelUpdateReqVO;
  7 +import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO;
  8 +import org.mapstruct.Mapper;
  9 +import org.mapstruct.factory.Mappers;
  10 +
  11 +import java.util.List;
  12 +
  13 +/**
  14 + * 会员等级 Convert
  15 + *
  16 + * @author owen
  17 + */
  18 +@Mapper
  19 +public interface MemberLevelConvert {
  20 +
  21 + MemberLevelConvert INSTANCE = Mappers.getMapper(MemberLevelConvert.class);
  22 +
  23 + MemberLevelDO convert(MemberLevelCreateReqVO bean);
  24 +
  25 + MemberLevelDO convert(MemberLevelUpdateReqVO bean);
  26 +
  27 + MemberLevelRespVO convert(MemberLevelDO bean);
  28 +
  29 + List<MemberLevelRespVO> convertList(List<MemberLevelDO> list);
  30 +
  31 + List<MemberLevelSimpleRespVO> convertSimpleList(List<MemberLevelDO> list);
  32 +}
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/level/MemberLevelRecordConvert.java 0 → 100644
  View file @8b98d13
  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/point/MemberPointRecordConvert.java
  View file @8b98d13
@@ -4,6 +4,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult; @@ -4,6 +4,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
4 import cn.iocoder.yudao.framework.common.util.collection.MapUtils; 4 import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
5 import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO; 5 import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
6 import cn.iocoder.yudao.module.member.controller.admin.point.vo.recrod.MemberPointRecordRespVO; 6 import cn.iocoder.yudao.module.member.controller.admin.point.vo.recrod.MemberPointRecordRespVO;
  7 +import cn.iocoder.yudao.module.member.controller.app.point.vo.AppMemberPointRecordRespVO;
7 import cn.iocoder.yudao.module.member.dal.dataobject.point.MemberPointRecordDO; 8 import cn.iocoder.yudao.module.member.dal.dataobject.point.MemberPointRecordDO;
8 import org.mapstruct.Mapper; 9 import org.mapstruct.Mapper;
9 import org.mapstruct.factory.Mappers; 10 import org.mapstruct.factory.Mappers;
@@ -33,4 +34,6 @@ public interface MemberPointRecordConvert { @@ -33,4 +34,6 @@ public interface MemberPointRecordConvert {
33 } 34 }
34 PageResult<MemberPointRecordRespVO> convertPage(PageResult<MemberPointRecordDO> pageResult); 35 PageResult<MemberPointRecordRespVO> convertPage(PageResult<MemberPointRecordDO> pageResult);
35 36
  37 + PageResult<AppMemberPointRecordRespVO> convertPage02(PageResult<MemberPointRecordDO> pageResult);
  38 +
36 } 39 }
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/signin/MemberSignInConfigConvert.java
  View file @8b98d13
@@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.member.convert.signin; @@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.member.convert.signin;
3 import cn.iocoder.yudao.module.member.controller.admin.signin.vo.config.MemberSignInConfigCreateReqVO; 3 import cn.iocoder.yudao.module.member.controller.admin.signin.vo.config.MemberSignInConfigCreateReqVO;
4 import cn.iocoder.yudao.module.member.controller.admin.signin.vo.config.MemberSignInConfigRespVO; 4 import cn.iocoder.yudao.module.member.controller.admin.signin.vo.config.MemberSignInConfigRespVO;
5 import cn.iocoder.yudao.module.member.controller.admin.signin.vo.config.MemberSignInConfigUpdateReqVO; 5 import cn.iocoder.yudao.module.member.controller.admin.signin.vo.config.MemberSignInConfigUpdateReqVO;
  6 +import cn.iocoder.yudao.module.member.controller.app.signin.vo.config.AppMemberSignInConfigRespVO;
6 import cn.iocoder.yudao.module.member.dal.dataobject.signin.MemberSignInConfigDO; 7 import cn.iocoder.yudao.module.member.dal.dataobject.signin.MemberSignInConfigDO;
7 import org.mapstruct.Mapper; 8 import org.mapstruct.Mapper;
8 import org.mapstruct.factory.Mappers; 9 import org.mapstruct.factory.Mappers;
@@ -27,4 +28,6 @@ public interface MemberSignInConfigConvert { @@ -27,4 +28,6 @@ public interface MemberSignInConfigConvert {
27 28
28 List<MemberSignInConfigRespVO> convertList(List<MemberSignInConfigDO> list); 29 List<MemberSignInConfigRespVO> convertList(List<MemberSignInConfigDO> list);
29 30
  31 + List<AppMemberSignInConfigRespVO> convertList02(List<MemberSignInConfigDO> list);
  32 +
30 } 33 }
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/signin/MemberSignInRecordConvert.java
  View file @8b98d13
@@ -4,6 +4,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult; @@ -4,6 +4,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
4 import cn.iocoder.yudao.framework.common.util.collection.MapUtils; 4 import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
5 import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO; 5 import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
6 import cn.iocoder.yudao.module.member.controller.admin.signin.vo.record.MemberSignInRecordRespVO; 6 import cn.iocoder.yudao.module.member.controller.admin.signin.vo.record.MemberSignInRecordRespVO;
  7 +import cn.iocoder.yudao.module.member.controller.app.signin.vo.record.AppMemberSignInRecordRespVO;
7 import cn.iocoder.yudao.module.member.dal.dataobject.signin.MemberSignInRecordDO; 8 import cn.iocoder.yudao.module.member.dal.dataobject.signin.MemberSignInRecordDO;
8 import org.mapstruct.Mapper; 9 import org.mapstruct.Mapper;
9 import org.mapstruct.factory.Mappers; 10 import org.mapstruct.factory.Mappers;
@@ -33,4 +34,6 @@ public interface MemberSignInRecordConvert { @@ -33,4 +34,6 @@ public interface MemberSignInRecordConvert {
33 } 34 }
34 PageResult<MemberSignInRecordRespVO> convertPage(PageResult<MemberSignInRecordDO> pageResult); 35 PageResult<MemberSignInRecordRespVO> convertPage(PageResult<MemberSignInRecordDO> pageResult);
35 36
  37 + PageResult<AppMemberSignInRecordRespVO> convertPage02(PageResult<MemberSignInRecordDO> pageResult);
  38 +
36 } 39 }
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/user/MemberUserConvert.java
  View file @8b98d13
@@ -6,6 +6,8 @@ import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserRespVO; @@ -6,6 +6,8 @@ import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserRespVO;
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.AppMemberUserInfoRespVO; 7 import cn.iocoder.yudao.module.member.controller.app.user.vo.AppMemberUserInfoRespVO;
8 import cn.iocoder.yudao.module.member.convert.address.AddressConvert; 8 import cn.iocoder.yudao.module.member.convert.address.AddressConvert;
  9 +import cn.iocoder.yudao.module.member.dal.dataobject.group.MemberGroupDO;
  10 +import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO;
9 import cn.iocoder.yudao.module.member.dal.dataobject.tag.MemberTagDO; 11 import cn.iocoder.yudao.module.member.dal.dataobject.tag.MemberTagDO;
10 import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO; 12 import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO;
11 import org.mapstruct.Mapper; 13 import org.mapstruct.Mapper;
@@ -33,16 +35,25 @@ public interface MemberUserConvert { @@ -33,16 +35,25 @@ public interface MemberUserConvert {
33 35
34 PageResult<MemberUserRespVO> convertPage(PageResult<MemberUserDO> page); 36 PageResult<MemberUserRespVO> convertPage(PageResult<MemberUserDO> page);
35 37
36 - @Mapping(source = "areaId", target = "areaName", qualifiedByName = "convertAreaIdToAreaName") 38 + @Mapping(source = "areaId", target = "areaName", qualifiedByName = "convertAreaIdToAreaName")
37 MemberUserRespVO convert03(MemberUserDO bean); 39 MemberUserRespVO convert03(MemberUserDO bean);
38 40
39 default PageResult<MemberUserRespVO> convertPage(PageResult<MemberUserDO> pageResult, 41 default PageResult<MemberUserRespVO> convertPage(PageResult<MemberUserDO> pageResult,
40 - List<MemberTagDO> tags) { 42 + List<MemberTagDO> tags,
  43 + List<MemberLevelDO> levels,
  44 + List<MemberGroupDO> groups) {
41 PageResult<MemberUserRespVO> result = convertPage(pageResult); 45 PageResult<MemberUserRespVO> result = convertPage(pageResult);
  46 + // 处理关联数据
42 Map<Long, String> tagMap = convertMap(tags, MemberTagDO::getId, MemberTagDO::getName); 47 Map<Long, String> tagMap = convertMap(tags, MemberTagDO::getId, MemberTagDO::getName);
43 - for (MemberUserRespVO vo : result.getList()) {  
44 - vo.setTagNames(convertList(vo.getTagIds(), tagMap::get));  
45 - } 48 + Map<Long, String> levelMap = convertMap(levels, MemberLevelDO::getId, MemberLevelDO::getName);
  49 + Map<Long, String> groupMap = convertMap(groups, MemberGroupDO::getId, MemberGroupDO::getName);
  50 + // 填充关联数据
  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 + });
46 return result; 56 return result;
47 } 57 }
  58 +
48 } 59 }
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/group/MemberGroupDO.java 0 → 100644
  View file @8b98d13
  1 +package cn.iocoder.yudao.module.member.dal.dataobject.group;
  2 +
  3 +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
  4 +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
  5 +import com.baomidou.mybatisplus.annotation.KeySequence;
  6 +import com.baomidou.mybatisplus.annotation.TableId;
  7 +import com.baomidou.mybatisplus.annotation.TableName;
  8 +import lombok.*;
  9 +
  10 +/**
  11 + * 用户分组 DO
  12 + *
  13 + * @author owen
  14 + */
  15 +@TableName("member_group")
  16 +@KeySequence("member_group_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
  17 +@Data
  18 +@EqualsAndHashCode(callSuper = true)
  19 +@ToString(callSuper = true)
  20 +@Builder
  21 +@NoArgsConstructor
  22 +@AllArgsConstructor
  23 +public class MemberGroupDO extends BaseDO {
  24 +
  25 + /**
  26 + * 编号
  27 + */
  28 + @TableId
  29 + private Long id;
  30 + /**
  31 + * 名称
  32 + */
  33 + private String name;
  34 + /**
  35 + * 备注
  36 + */
  37 + private String remark;
  38 + /**
  39 + * 状态
  40 + * <p>
  41 + * 枚举 {@link CommonStatusEnum}
  42 + */
  43 + private Integer status;
  44 +
  45 +}
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/level/MemberExperienceRecordDO.java 0 → 100644
  View file @8b98d13
  1 +package cn.iocoder.yudao.module.member.dal.dataobject.level;
  2 +
  3 +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
  4 +import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO;
  5 +import cn.iocoder.yudao.module.member.enums.MemberExperienceBizTypeEnum;
  6 +import com.baomidou.mybatisplus.annotation.KeySequence;
  7 +import com.baomidou.mybatisplus.annotation.TableId;
  8 +import com.baomidou.mybatisplus.annotation.TableName;
  9 +import lombok.*;
  10 +
  11 +/**
  12 + * 会员经验记录 DO
  13 + *
  14 + * @author owen
  15 + */
  16 +@TableName("member_experience_record")
  17 +@KeySequence("member_experience_record_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
  18 +@Data
  19 +@EqualsAndHashCode(callSuper = true)
  20 +@ToString(callSuper = true)
  21 +@Builder
  22 +@NoArgsConstructor
  23 +@AllArgsConstructor
  24 +public class MemberExperienceRecordDO extends BaseDO {
  25 +
  26 + /**
  27 + * 编号
  28 + */
  29 + @TableId
  30 + private Long id;
  31 + /**
  32 + * 用户编号
  33 + *
  34 + * 关联 {@link MemberUserDO#getId()} 字段
  35 + */
  36 + private Long userId;
  37 + /**
  38 + * 业务类型
  39 + * <p>
  40 + * 枚举 {@link MemberExperienceBizTypeEnum}
  41 + */
  42 + private Integer bizType;
  43 + /**
  44 + * 业务编号
  45 + */
  46 + private String bizId;
  47 + /**
  48 + * 标题
  49 + */
  50 + private String title;
  51 + /**
  52 + * 描述
  53 + */
  54 + private String description;
  55 + /**
  56 + * 经验
  57 + */
  58 + private Integer experience;
  59 + /**
  60 + * 变更后的经验
  61 + */
  62 + private Integer totalExperience;
  63 +
  64 +}
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/level/MemberLevelDO.java 0 → 100644
  View file @8b98d13
  1 +package cn.iocoder.yudao.module.member.dal.dataobject.level;
  2 +
  3 +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
  4 +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
  5 +import com.baomidou.mybatisplus.annotation.KeySequence;
  6 +import com.baomidou.mybatisplus.annotation.TableId;
  7 +import com.baomidou.mybatisplus.annotation.TableName;
  8 +import lombok.*;
  9 +
  10 +/**
  11 + * 会员等级 DO
  12 + *
  13 + * 配置每个等级需要的积分
  14 + *
  15 + * @author owen
  16 + */
  17 +@TableName("member_level")
  18 +@KeySequence("member_level_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
  19 +@Data
  20 +@EqualsAndHashCode(callSuper = true)
  21 +@ToString(callSuper = true)
  22 +@Builder
  23 +@NoArgsConstructor
  24 +@AllArgsConstructor
  25 +public class MemberLevelDO extends BaseDO {
  26 +
  27 + /**
  28 + * 编号
  29 + */
  30 + @TableId
  31 + private Long id;
  32 + /**
  33 + * 等级名称
  34 + */
  35 + private String name;
  36 + /**
  37 + * 等级
  38 + */
  39 + private Integer level;
  40 + /**
  41 + * 升级经验
  42 + */
  43 + private Integer experience;
  44 + /**
  45 + * 享受折扣
  46 + */
  47 + private Integer discountPercent;
  48 +
  49 + /**
  50 + * 等级图标
  51 + */
  52 + private String icon;
  53 + /**
  54 + * 等级背景图
  55 + */
  56 + private String backgroundUrl;
  57 + /**
  58 + * 状态
  59 + * <p>
  60 + * 枚举 {@link CommonStatusEnum}
  61 + */
  62 + private Integer status;
  63 +
  64 +}
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/level/MemberLevelRecordDO.java 0 → 100644
  View file @8b98d13
  1 +package cn.iocoder.yudao.module.member.dal.dataobject.level;
  2 +
  3 +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
  4 +import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO;
  5 +import com.baomidou.mybatisplus.annotation.KeySequence;
  6 +import com.baomidou.mybatisplus.annotation.TableId;
  7 +import com.baomidou.mybatisplus.annotation.TableName;
  8 +import lombok.*;
  9 +
  10 +/**
  11 + * 会员等级记录 DO
  12 + *
  13 + * 用户每次等级发生变更时，记录一条日志
  14 + *
  15 + * @author owen
  16 + */
  17 +@TableName("member_level_record")
  18 +@KeySequence("member_level_record_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
  19 +@Data
  20 +@EqualsAndHashCode(callSuper = true)
  21 +@ToString(callSuper = true)
  22 +@Builder
  23 +@NoArgsConstructor
  24 +@AllArgsConstructor
  25 +public class MemberLevelRecordDO extends BaseDO {
  26 +
  27 + /**
  28 + * 编号
  29 + */
  30 + @TableId
  31 + private Long id;
  32 + /**
  33 + * 用户编号
  34 + *
  35 + * 关联 {@link MemberUserDO#getId()} 字段
  36 + */
  37 + private Long userId;
  38 + /**
  39 + * 等级编号
  40 + *
  41 + * 关联 {@link MemberLevelDO#getId()} 字段
  42 + */
  43 + private Long levelId;
  44 + /**
  45 + * 会员等级
  46 + *
  47 + * 冗余 {@link MemberLevelDO#getLevel()} 字段
  48 + */
  49 + private Integer level;
  50 + /**
  51 + * 享受折扣
  52 + */
  53 + private Integer discountPercent;
  54 + /**
  55 + * 升级经验
  56 + */
  57 + private Integer experience;
  58 + /**
  59 + * 会员此时的经验
  60 + */
  61 + private Integer userExperience;
  62 + /**
  63 + * 备注
  64 + */
  65 + private String remark;
  66 + /**
  67 + * 描述
  68 + */
  69 + private String description;
  70 +
  71 +}
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/signin/MemberSignInRecordDO.java
  View file @8b98d13
@@ -22,7 +22,7 @@ import lombok.*; @@ -22,7 +22,7 @@ import lombok.*;
22 public class MemberSignInRecordDO extends BaseDO { 22 public class MemberSignInRecordDO extends BaseDO {
23 23
24 /** 24 /**
25 - * 签到自增id 25 + * 编号
26 */ 26 */
27 @TableId 27 @TableId
28 private Long id; 28 private Long id;
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/user/MemberUserDO.java
  View file @8b98d13
@@ -4,6 +4,8 @@ import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; @@ -4,6 +4,8 @@ import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
4 import cn.iocoder.yudao.framework.ip.core.Area; 4 import cn.iocoder.yudao.framework.ip.core.Area;
5 import cn.iocoder.yudao.framework.mybatis.core.type.LongListTypeHandler; 5 import cn.iocoder.yudao.framework.mybatis.core.type.LongListTypeHandler;
6 import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO; 6 import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO;
  7 +import cn.iocoder.yudao.module.member.dal.dataobject.group.MemberGroupDO;
  8 +import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO;
7 import cn.iocoder.yudao.module.system.enums.common.SexEnum; 9 import cn.iocoder.yudao.module.system.enums.common.SexEnum;
8 import com.baomidou.mybatisplus.annotation.KeySequence; 10 import com.baomidou.mybatisplus.annotation.KeySequence;
9 import com.baomidou.mybatisplus.annotation.TableField; 11 import com.baomidou.mybatisplus.annotation.TableField;
@@ -109,6 +111,7 @@ public class MemberUserDO extends TenantBaseDO { @@ -109,6 +111,7 @@ public class MemberUserDO extends TenantBaseDO {
109 * 积分 111 * 积分
110 */ 112 */
111 private Integer point; 113 private Integer point;
  114 + // TODO 芋艿：增加一个 totalPoint；个人信息接口要返回
112 115
113 /** 116 /**
114 * 会员标签列表，以逗号分隔 117 * 会员标签列表，以逗号分隔
@@ -116,5 +119,21 @@ public class MemberUserDO extends TenantBaseDO { @@ -116,5 +119,21 @@ public class MemberUserDO extends TenantBaseDO {
116 @TableField(typeHandler = LongListTypeHandler.class) 119 @TableField(typeHandler = LongListTypeHandler.class)
117 private List<Long> tagIds; 120 private List<Long> tagIds;
118 121
119 - // TODO 成长值、会员等级等等 122 + /**
  123 + * 会员级别编号
  124 + *
  125 + * 关联 {@link MemberLevelDO#getId()} 字段
  126 + */
  127 + private Long levelId;
  128 + /**
  129 + * 会员经验
  130 + */
  131 + private Integer experience;
  132 + /**
  133 + * 用户分组编号
  134 + *
  135 + * 关联 {@link MemberGroupDO#getId()} 字段
  136 + */
  137 + private Long groupId;
  138 +
120 } 139 }
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/address/AddressMapper.java
  View file @8b98d13
1 package cn.iocoder.yudao.module.member.dal.mysql.address; 1 package cn.iocoder.yudao.module.member.dal.mysql.address;
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.address.vo.AddressExportReqVO;  
7 -import cn.iocoder.yudao.module.member.controller.admin.address.vo.AddressPageReqVO;  
8 import cn.iocoder.yudao.module.member.dal.dataobject.address.MemberAddressDO; 5 import cn.iocoder.yudao.module.member.dal.dataobject.address.MemberAddressDO;
9 import org.apache.ibatis.annotations.Mapper; 6 import org.apache.ibatis.annotations.Mapper;
10 7
@@ -21,28 +18,5 @@ public interface AddressMapper extends BaseMapperX&lt;MemberAddressDO&gt; { @@ -21,28 +18,5 @@ public interface AddressMapper extends BaseMapperX&lt;MemberAddressDO&gt; {
21 return selectList(new LambdaQueryWrapperX<MemberAddressDO>().eq(MemberAddressDO::getUserId, userId) 18 return selectList(new LambdaQueryWrapperX<MemberAddressDO>().eq(MemberAddressDO::getUserId, userId)
22 .eqIfPresent(MemberAddressDO::getDefaultStatus, defaulted)); 19 .eqIfPresent(MemberAddressDO::getDefaultStatus, defaulted));
23 } 20 }
24 - default PageResult<MemberAddressDO> selectPage(AddressPageReqVO reqVO) {  
25 - return selectPage(reqVO, new LambdaQueryWrapperX<MemberAddressDO>()  
26 - .eqIfPresent(MemberAddressDO::getUserId, reqVO.getUserId())  
27 - .likeIfPresent(MemberAddressDO::getName, reqVO.getName())  
28 - .eqIfPresent(MemberAddressDO::getMobile, reqVO.getMobile())  
29 - .eqIfPresent(MemberAddressDO::getAreaId, reqVO.getAreaId())  
30 - .eqIfPresent(MemberAddressDO::getDetailAddress, reqVO.getDetailAddress())  
31 - .eqIfPresent(MemberAddressDO::getDefaultStatus, reqVO.getDefaultStatus())  
32 - .betweenIfPresent(MemberAddressDO::getCreateTime, reqVO.getCreateTime())  
33 - .orderByDesc(MemberAddressDO::getId));  
34 - }  
35 -  
36 - default List<MemberAddressDO> selectList(AddressExportReqVO reqVO) {  
37 - return selectList(new LambdaQueryWrapperX<MemberAddressDO>()  
38 - .eqIfPresent(MemberAddressDO::getUserId, reqVO.getUserId())  
39 - .likeIfPresent(MemberAddressDO::getName, reqVO.getName())  
40 - .eqIfPresent(MemberAddressDO::getMobile, reqVO.getMobile())  
41 - .eqIfPresent(MemberAddressDO::getAreaId, reqVO.getAreaId())  
42 - .eqIfPresent(MemberAddressDO::getDetailAddress, reqVO.getDetailAddress())  
43 - .eqIfPresent(MemberAddressDO::getDefaultStatus, reqVO.getDefaultStatus())  
44 - .betweenIfPresent(MemberAddressDO::getCreateTime, reqVO.getCreateTime())  
45 - .orderByDesc(MemberAddressDO::getId));  
46 - }  
47 21
48 } 22 }
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/group/MemberGroupMapper.java 0 → 100644
  View file @8b98d13
  1 +package cn.iocoder.yudao.module.member.dal.mysql.group;
  2 +
  3 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  4 +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
  5 +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
  6 +import cn.iocoder.yudao.module.member.controller.admin.group.vo.MemberGroupPageReqVO;
  7 +import cn.iocoder.yudao.module.member.dal.dataobject.group.MemberGroupDO;
  8 +import org.apache.ibatis.annotations.Mapper;
  9 +
  10 +import java.util.List;
  11 +
  12 +/**
  13 + * 用户分组 Mapper
  14 + *
  15 + * @author owen
  16 + */
  17 +@Mapper
  18 +public interface MemberGroupMapper extends BaseMapperX<MemberGroupDO> {
  19 +
  20 + default PageResult<MemberGroupDO> selectPage(MemberGroupPageReqVO reqVO) {
  21 + return selectPage(reqVO, new LambdaQueryWrapperX<MemberGroupDO>()
  22 + .likeIfPresent(MemberGroupDO::getName, reqVO.getName())
  23 + .eqIfPresent(MemberGroupDO::getStatus, reqVO.getStatus())
  24 + .betweenIfPresent(MemberGroupDO::getCreateTime, reqVO.getCreateTime())
  25 + .orderByDesc(MemberGroupDO::getId));
  26 + }
  27 +
  28 + default List<MemberGroupDO> selectListByStatus(Integer status) {
  29 + return selectList(MemberGroupDO::getStatus, status);
  30 + }
  31 +}
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/level/MemberExperienceRecordMapper.java 0 → 100644
  View file @8b98d13
  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 0 → 100644
  View file @8b98d13
  1 +package cn.iocoder.yudao.module.member.dal.mysql.level;
  2 +
  3 +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
  4 +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
  5 +import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelListReqVO;
  6 +import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO;
  7 +import org.apache.ibatis.annotations.Mapper;
  8 +
  9 +import java.util.List;
  10 +
  11 +/**
  12 + * 会员等级 Mapper
  13 + *
  14 + * @author owen
  15 + */
  16 +@Mapper
  17 +public interface MemberLevelMapper extends BaseMapperX<MemberLevelDO> {
  18 +
  19 + default List<MemberLevelDO> selectList(MemberLevelListReqVO reqVO) {
  20 + return selectList(new LambdaQueryWrapperX<MemberLevelDO>()
  21 + .likeIfPresent(MemberLevelDO::getName, reqVO.getName())
  22 + .eqIfPresent(MemberLevelDO::getStatus, reqVO.getStatus())
  23 + .orderByAsc(MemberLevelDO::getLevel));
  24 + }
  25 +
  26 +
  27 + default List<MemberLevelDO> selectListByStatus(Integer status) {
  28 + return selectList(new LambdaQueryWrapperX<MemberLevelDO>()
  29 + .eq(MemberLevelDO::getStatus, status)
  30 + .orderByAsc(MemberLevelDO::getLevel));
  31 + }
  32 +}
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/level/MemberLevelRecordMapper.java 0 → 100644
  View file @8b98d13
  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.log.MemberLevelRecordPageReqVO;
  7 +import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelRecordDO;
  8 +import org.apache.ibatis.annotations.Mapper;
  9 +
  10 +/**
  11 + * 会员等级记录 Mapper
  12 + *
  13 + * @author owen
  14 + */
  15 +@Mapper
  16 +public interface MemberLevelRecordMapper extends BaseMapperX<MemberLevelRecordDO> {
  17 +
  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 + }
  25 +
  26 +}
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/point/MemberPointRecordMapper.java
  View file @8b98d13
1 package cn.iocoder.yudao.module.member.dal.mysql.point; 1 package cn.iocoder.yudao.module.member.dal.mysql.point;
2 2
  3 +import cn.iocoder.yudao.framework.common.pojo.PageParam;
3 import cn.iocoder.yudao.framework.common.pojo.PageResult; 4 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.mapper.BaseMapperX;
5 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; 6 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
@@ -20,9 +21,16 @@ public interface MemberPointRecordMapper extends BaseMapperX&lt;MemberPointRecordDO @@ -20,9 +21,16 @@ public interface MemberPointRecordMapper extends BaseMapperX&lt;MemberPointRecordDO
20 default PageResult<MemberPointRecordDO> selectPage(MemberPointRecordPageReqVO reqVO, Set<Long> userIds) { 21 default PageResult<MemberPointRecordDO> selectPage(MemberPointRecordPageReqVO reqVO, Set<Long> userIds) {
21 return selectPage(reqVO, new LambdaQueryWrapperX<MemberPointRecordDO>() 22 return selectPage(reqVO, new LambdaQueryWrapperX<MemberPointRecordDO>()
22 .inIfPresent(MemberPointRecordDO::getUserId, userIds) 23 .inIfPresent(MemberPointRecordDO::getUserId, userIds)
  24 + .eqIfPresent(MemberPointRecordDO::getUserId, reqVO.getUserId())
23 .eqIfPresent(MemberPointRecordDO::getBizType, reqVO.getBizType()) 25 .eqIfPresent(MemberPointRecordDO::getBizType, reqVO.getBizType())
24 .likeIfPresent(MemberPointRecordDO::getTitle, reqVO.getTitle()) 26 .likeIfPresent(MemberPointRecordDO::getTitle, reqVO.getTitle())
25 .orderByDesc(MemberPointRecordDO::getId)); 27 .orderByDesc(MemberPointRecordDO::getId));
26 } 28 }
27 29
  30 + default PageResult<MemberPointRecordDO> selectPage(Long userId, PageParam pageVO) {
  31 + return selectPage(pageVO, new LambdaQueryWrapperX<MemberPointRecordDO>()
  32 + .eq(MemberPointRecordDO::getUserId, userId)
  33 + .orderByDesc(MemberPointRecordDO::getId));
  34 + }
  35 +
28 } 36 }
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/signin/MemberSignInConfigMapper.java
  View file @8b98d13
@@ -4,6 +4,8 @@ import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; @@ -4,6 +4,8 @@ import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
4 import cn.iocoder.yudao.module.member.dal.dataobject.signin.MemberSignInConfigDO; 4 import cn.iocoder.yudao.module.member.dal.dataobject.signin.MemberSignInConfigDO;
5 import org.apache.ibatis.annotations.Mapper; 5 import org.apache.ibatis.annotations.Mapper;
6 6
  7 +import java.util.List;
  8 +
7 /** 9 /**
8 * 签到规则 Mapper 10 * 签到规则 Mapper
9 * 11 *
@@ -16,4 +18,7 @@ public interface MemberSignInConfigMapper extends BaseMapperX&lt;MemberSignInConfig @@ -16,4 +18,7 @@ public interface MemberSignInConfigMapper extends BaseMapperX&lt;MemberSignInConfig
16 return selectOne(MemberSignInConfigDO::getDay, day); 18 return selectOne(MemberSignInConfigDO::getDay, day);
17 } 19 }
18 20
  21 + default List<MemberSignInConfigDO> selectListByStatus(Integer status) {
  22 + return selectList(MemberSignInConfigDO::getStatus, status);
  23 + }
19 } 24 }
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/signin/MemberSignInRecordMapper.java
  View file @8b98d13
1 package cn.iocoder.yudao.module.member.dal.mysql.signin; 1 package cn.iocoder.yudao.module.member.dal.mysql.signin;
2 2
  3 +import cn.iocoder.yudao.framework.common.pojo.PageParam;
3 import cn.iocoder.yudao.framework.common.pojo.PageResult; 4 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.mapper.BaseMapperX;
5 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; 6 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
@@ -20,9 +21,16 @@ public interface MemberSignInRecordMapper extends BaseMapperX&lt;MemberSignInRecord @@ -20,9 +21,16 @@ public interface MemberSignInRecordMapper extends BaseMapperX&lt;MemberSignInRecord
20 default PageResult<MemberSignInRecordDO> selectPage(MemberSignInRecordPageReqVO reqVO, Set<Long> userIds) { 21 default PageResult<MemberSignInRecordDO> selectPage(MemberSignInRecordPageReqVO reqVO, Set<Long> userIds) {
21 return selectPage(reqVO, new LambdaQueryWrapperX<MemberSignInRecordDO>() 22 return selectPage(reqVO, new LambdaQueryWrapperX<MemberSignInRecordDO>()
22 .inIfPresent(MemberSignInRecordDO::getUserId, userIds) 23 .inIfPresent(MemberSignInRecordDO::getUserId, userIds)
  24 + .eqIfPresent(MemberSignInRecordDO::getUserId, reqVO.getUserId())
23 .eqIfPresent(MemberSignInRecordDO::getDay, reqVO.getDay()) 25 .eqIfPresent(MemberSignInRecordDO::getDay, reqVO.getDay())
24 .betweenIfPresent(MemberSignInRecordDO::getCreateTime, reqVO.getCreateTime()) 26 .betweenIfPresent(MemberSignInRecordDO::getCreateTime, reqVO.getCreateTime())
25 .orderByDesc(MemberSignInRecordDO::getId)); 27 .orderByDesc(MemberSignInRecordDO::getId));
26 } 28 }
27 29
  30 + default PageResult<MemberSignInRecordDO> selectPage(Long userId, PageParam pageParam) {
  31 + return selectPage(pageParam, new LambdaQueryWrapperX<MemberSignInRecordDO>()
  32 + .eq(MemberSignInRecordDO::getUserId, userId)
  33 + .orderByDesc(MemberSignInRecordDO::getId));
  34 + }
  35 +
28 } 36 }
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/tag/MemberTagMapper.java
  View file @8b98d13
@@ -22,9 +22,7 @@ public interface MemberTagMapper extends BaseMapperX&lt;MemberTagDO&gt; { @@ -22,9 +22,7 @@ public interface MemberTagMapper extends BaseMapperX&lt;MemberTagDO&gt; {
22 .orderByDesc(MemberTagDO::getId)); 22 .orderByDesc(MemberTagDO::getId));
23 } 23 }
24 24
25 - default boolean exists(Long id, String name) {  
26 - return exists(new LambdaQueryWrapperX<MemberTagDO>()  
27 - .neIfPresent(MemberTagDO::getId, id)  
28 - .eq(MemberTagDO::getName, name)); 25 + default MemberTagDO selelctByName(String name) {
  26 + return selectOne(MemberTagDO::getName, name);
29 } 27 }
30 } 28 }
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/user/MemberUserMapper.java
  View file @8b98d13
@@ -43,8 +43,23 @@ public interface MemberUserMapper extends BaseMapperX&lt;MemberUserDO&gt; { @@ -43,8 +43,23 @@ public interface MemberUserMapper extends BaseMapperX&lt;MemberUserDO&gt; {
43 .betweenIfPresent(MemberUserDO::getLoginDate, reqVO.getLoginDate()) 43 .betweenIfPresent(MemberUserDO::getLoginDate, reqVO.getLoginDate())
44 .likeIfPresent(MemberUserDO::getNickname, reqVO.getNickname()) 44 .likeIfPresent(MemberUserDO::getNickname, reqVO.getNickname())
45 .betweenIfPresent(MemberUserDO::getCreateTime, reqVO.getCreateTime()) 45 .betweenIfPresent(MemberUserDO::getCreateTime, reqVO.getCreateTime())
  46 + .eqIfPresent(MemberUserDO::getLevelId, reqVO.getLevelId())
  47 + .eqIfPresent(MemberUserDO::getGroupId, reqVO.getGroupId())
46 .apply(StrUtil.isNotEmpty(tagIdSql), tagIdSql) 48 .apply(StrUtil.isNotEmpty(tagIdSql), tagIdSql)
47 .orderByDesc(MemberUserDO::getId)); 49 .orderByDesc(MemberUserDO::getId));
48 } 50 }
49 51
  52 + default Long selectCountByGroupId(Long groupId) {
  53 + return selectCount(MemberUserDO::getGroupId, groupId);
  54 + }
  55 +
  56 + default Long selectCountByLevelId(Long levelId) {
  57 + return selectCount(MemberUserDO::getLevelId, levelId);
  58 + }
  59 +
  60 + default Long selectCountByTagId(Long tagId) {
  61 + return selectCount(new LambdaQueryWrapperX<MemberUserDO>()
  62 + .apply("FIND_IN_SET({0}, tag_ids)", tagId));
  63 + }
  64 +
50 } 65 }
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/address/AddressService.java
  View file @8b98d13
1 package cn.iocoder.yudao.module.member.service.address; 1 package cn.iocoder.yudao.module.member.service.address;
2 2
3 -import cn.iocoder.yudao.framework.common.pojo.PageResult;  
4 -import cn.iocoder.yudao.module.member.controller.admin.address.vo.AddressCreateReqVO;  
5 -import cn.iocoder.yudao.module.member.controller.admin.address.vo.AddressExportReqVO;  
6 -import cn.iocoder.yudao.module.member.controller.admin.address.vo.AddressPageReqVO;  
7 -import cn.iocoder.yudao.module.member.controller.admin.address.vo.AddressUpdateReqVO;  
8 import cn.iocoder.yudao.module.member.controller.app.address.vo.AppAddressCreateReqVO; 3 import cn.iocoder.yudao.module.member.controller.app.address.vo.AppAddressCreateReqVO;
9 import cn.iocoder.yudao.module.member.controller.app.address.vo.AppAddressUpdateReqVO; 4 import cn.iocoder.yudao.module.member.controller.app.address.vo.AppAddressUpdateReqVO;
10 import cn.iocoder.yudao.module.member.dal.dataobject.address.MemberAddressDO; 5 import cn.iocoder.yudao.module.member.dal.dataobject.address.MemberAddressDO;
11 6
12 import javax.validation.Valid; 7 import javax.validation.Valid;
13 -import java.util.Collection;  
14 import java.util.List; 8 import java.util.List;
15 9
16 /** 10 /**
@@ -70,57 +64,4 @@ public interface AddressService { @@ -70,57 +64,4 @@ public interface AddressService {
70 */ 64 */
71 MemberAddressDO getDefaultUserAddress(Long userId); 65 MemberAddressDO getDefaultUserAddress(Long userId);
72 66
73 - /**  
74 - * 创建用户收件地址  
75 - *  
76 - * @param createReqVO 创建信息  
77 - * @return 编号  
78 - */  
79 - Long createAddress(@Valid AddressCreateReqVO createReqVO);  
80 -  
81 - /**  
82 - * 更新用户收件地址  
83 - *  
84 - * @param updateReqVO 更新信息  
85 - */  
86 - void updateAddress(@Valid AddressUpdateReqVO updateReqVO);  
87 -  
88 - /**  
89 - * 删除用户收件地址  
90 - *  
91 - * @param id 编号  
92 - */  
93 - void deleteAddress(Long id);  
94 -  
95 - /**  
96 - * 获得用户收件地址  
97 - *  
98 - * @param id 编号  
99 - * @return 用户收件地址  
100 - */  
101 - MemberAddressDO getAddress(Long id);  
102 -  
103 - /**  
104 - * 获得用户收件地址列表  
105 - *  
106 - * @param ids 编号  
107 - * @return 用户收件地址列表  
108 - */  
109 - List<MemberAddressDO> getAddressList(Collection<Long> ids);  
110 -  
111 - /**  
112 - * 获得用户收件地址分页  
113 - *  
114 - * @param pageReqVO 分页查询  
115 - * @return 用户收件地址分页  
116 - */  
117 - PageResult<MemberAddressDO> getAddressPage(AddressPageReqVO pageReqVO);  
118 -  
119 - /**  
120 - * 获得用户收件地址列表, 用于 Excel 导出  
121 - *  
122 - * @param exportReqVO 查询条件  
123 - * @return 用户收件地址列表  
124 - */  
125 - List<MemberAddressDO> getAddressList(AddressExportReqVO exportReqVO);  
126 } 67 }
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/address/AddressServiceImpl.java
  View file @8b98d13
1 package cn.iocoder.yudao.module.member.service.address; 1 package cn.iocoder.yudao.module.member.service.address;
2 2
3 import cn.hutool.core.collection.CollUtil; 3 import cn.hutool.core.collection.CollUtil;
4 -import cn.iocoder.yudao.framework.common.pojo.PageResult;  
5 -import cn.iocoder.yudao.module.member.controller.admin.address.vo.AddressCreateReqVO;  
6 -import cn.iocoder.yudao.module.member.controller.admin.address.vo.AddressExportReqVO;  
7 -import cn.iocoder.yudao.module.member.controller.admin.address.vo.AddressPageReqVO;  
8 -import cn.iocoder.yudao.module.member.controller.admin.address.vo.AddressUpdateReqVO;  
9 import cn.iocoder.yudao.module.member.controller.app.address.vo.AppAddressCreateReqVO; 4 import cn.iocoder.yudao.module.member.controller.app.address.vo.AppAddressCreateReqVO;
10 import cn.iocoder.yudao.module.member.controller.app.address.vo.AppAddressUpdateReqVO; 5 import cn.iocoder.yudao.module.member.controller.app.address.vo.AppAddressUpdateReqVO;
11 import cn.iocoder.yudao.module.member.convert.address.AddressConvert; 6 import cn.iocoder.yudao.module.member.convert.address.AddressConvert;
@@ -16,7 +11,6 @@ import org.springframework.transaction.annotation.Transactional; @@ -16,7 +11,6 @@ import org.springframework.transaction.annotation.Transactional;
16 import org.springframework.validation.annotation.Validated; 11 import org.springframework.validation.annotation.Validated;
17 12
18 import javax.annotation.Resource; 13 import javax.annotation.Resource;
19 -import java.util.Collection;  
20 import java.util.List; 14 import java.util.List;
21 15
22 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; 16 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -100,56 +94,4 @@ public class AddressServiceImpl implements AddressService { @@ -100,56 +94,4 @@ public class AddressServiceImpl implements AddressService {
100 return CollUtil.getFirst(addresses); 94 return CollUtil.getFirst(addresses);
101 } 95 }
102 96
103 - @Override  
104 - public Long createAddress(AddressCreateReqVO createReqVO) {  
105 - // 插入  
106 - MemberAddressDO address = AddressConvert.INSTANCE.convert(createReqVO);  
107 - addressMapper.insert(address);  
108 - // 返回  
109 - return address.getId();  
110 - }  
111 -  
112 - @Override  
113 - public void updateAddress(AddressUpdateReqVO updateReqVO) {  
114 - // 校验存在  
115 - validateAddressExists(updateReqVO.getId());  
116 - // 更新  
117 - MemberAddressDO updateObj = AddressConvert.INSTANCE.convert(updateReqVO);  
118 - addressMapper.updateById(updateObj);  
119 - }  
120 -  
121 - @Override  
122 - public void deleteAddress(Long id) {  
123 - // 校验存在  
124 - validateAddressExists(id);  
125 - // 删除  
126 - addressMapper.deleteById(id);  
127 - }  
128 -  
129 - private void validateAddressExists(Long id) {  
130 - if (addressMapper.selectById(id) == null) {  
131 - throw exception(ADDRESS_NOT_EXISTS);  
132 - }  
133 - }  
134 -  
135 - @Override  
136 - public MemberAddressDO getAddress(Long id) {  
137 - return addressMapper.selectById(id);  
138 - }  
139 -  
140 - @Override  
141 - public List<MemberAddressDO> getAddressList(Collection<Long> ids) {  
142 - return addressMapper.selectBatchIds(ids);  
143 - }  
144 -  
145 - @Override  
146 - public PageResult<MemberAddressDO> getAddressPage(AddressPageReqVO pageReqVO) {  
147 - return addressMapper.selectPage(pageReqVO);  
148 - }  
149 -  
150 - @Override  
151 - public List<MemberAddressDO> getAddressList(AddressExportReqVO exportReqVO) {  
152 - return addressMapper.selectList(exportReqVO);  
153 - }  
154 -  
155 } 97 }
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/group/MemberGroupService.java 0 → 100644
  View file @8b98d13
  1 +package cn.iocoder.yudao.module.member.service.group;
  2 +
  3 +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
  4 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  5 +import cn.iocoder.yudao.module.member.controller.admin.group.vo.MemberGroupCreateReqVO;
  6 +import cn.iocoder.yudao.module.member.controller.admin.group.vo.MemberGroupPageReqVO;
  7 +import cn.iocoder.yudao.module.member.controller.admin.group.vo.MemberGroupUpdateReqVO;
  8 +import cn.iocoder.yudao.module.member.dal.dataobject.group.MemberGroupDO;
  9 +
  10 +import javax.validation.Valid;
  11 +import java.util.Collection;
  12 +import java.util.List;
  13 +
  14 +/**
  15 + * 用户分组 Service 接口
  16 + *
  17 + * @author owen
  18 + */
  19 +public interface MemberGroupService {
  20 +
  21 + /**
  22 + * 创建用户分组
  23 + *
  24 + * @param createReqVO 创建信息
  25 + * @return 编号
  26 + */
  27 + Long createGroup(@Valid MemberGroupCreateReqVO createReqVO);
  28 +
  29 + /**
  30 + * 更新用户分组
  31 + *
  32 + * @param updateReqVO 更新信息
  33 + */
  34 + void updateGroup(@Valid MemberGroupUpdateReqVO updateReqVO);
  35 +
  36 + /**
  37 + * 删除用户分组
  38 + *
  39 + * @param id 编号
  40 + */
  41 + void deleteGroup(Long id);
  42 +
  43 + /**
  44 + * 获得用户分组
  45 + *
  46 + * @param id 编号
  47 + * @return 用户分组
  48 + */
  49 + MemberGroupDO getGroup(Long id);
  50 +
  51 + /**
  52 + * 获得用户分组列表
  53 + *
  54 + * @param ids 编号
  55 + * @return 用户分组列表
  56 + */
  57 + List<MemberGroupDO> getGroupList(Collection<Long> ids);
  58 +
  59 + /**
  60 + * 获得用户分组分页
  61 + *
  62 + * @param pageReqVO 分页查询
  63 + * @return 用户分组分页
  64 + */
  65 + PageResult<MemberGroupDO> getGroupPage(MemberGroupPageReqVO pageReqVO);
  66 +
  67 +
  68 + /**
  69 + * 获得指定状态的用户分组列表
  70 + *
  71 + * @param status 状态
  72 + * @return 用户分组列表
  73 + */
  74 + List<MemberGroupDO> getGroupListByStatus(Integer status);
  75 +
  76 +
  77 + /**
  78 + * 获得开启状态的用户分组列表
  79 + *
  80 + * @return 用户分组列表
  81 + */
  82 + default List<MemberGroupDO> getEnableGroupList() {
  83 + return getGroupListByStatus(CommonStatusEnum.ENABLE.getStatus());
  84 + }
  85 +
  86 +}
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/group/MemberGroupServiceImpl.java 0 → 100644
  View file @8b98d13
  1 +package cn.iocoder.yudao.module.member.service.group;
  2 +
  3 +import cn.hutool.core.collection.CollUtil;
  4 +import cn.hutool.core.collection.ListUtil;
  5 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  6 +import cn.iocoder.yudao.module.member.controller.admin.group.vo.MemberGroupCreateReqVO;
  7 +import cn.iocoder.yudao.module.member.controller.admin.group.vo.MemberGroupPageReqVO;
  8 +import cn.iocoder.yudao.module.member.controller.admin.group.vo.MemberGroupUpdateReqVO;
  9 +import cn.iocoder.yudao.module.member.convert.group.MemberGroupConvert;
  10 +import cn.iocoder.yudao.module.member.dal.dataobject.group.MemberGroupDO;
  11 +import cn.iocoder.yudao.module.member.dal.mysql.group.MemberGroupMapper;
  12 +import cn.iocoder.yudao.module.member.service.user.MemberUserService;
  13 +import org.springframework.stereotype.Service;
  14 +import org.springframework.validation.annotation.Validated;
  15 +
  16 +import javax.annotation.Resource;
  17 +import java.util.Collection;
  18 +import java.util.List;
  19 +
  20 +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
  21 +import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.GROUP_HAS_USER;
  22 +import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.GROUP_NOT_EXISTS;
  23 +
  24 +/**
  25 + * 用户分组 Service 实现类
  26 + *
  27 + * @author owen
  28 + */
  29 +@Service
  30 +@Validated
  31 +public class MemberGroupServiceImpl implements MemberGroupService {
  32 +
  33 + @Resource
  34 + private MemberGroupMapper groupMapper;
  35 + @Resource
  36 + private MemberUserService memberUserService;
  37 +
  38 + @Override
  39 + public Long createGroup(MemberGroupCreateReqVO createReqVO) {
  40 + // 插入
  41 + MemberGroupDO group = MemberGroupConvert.INSTANCE.convert(createReqVO);
  42 + groupMapper.insert(group);
  43 + // 返回
  44 + return group.getId();
  45 + }
  46 +
  47 + @Override
  48 + public void updateGroup(MemberGroupUpdateReqVO updateReqVO) {
  49 + // 校验存在
  50 + validateGroupExists(updateReqVO.getId());
  51 + // 更新
  52 + MemberGroupDO updateObj = MemberGroupConvert.INSTANCE.convert(updateReqVO);
  53 + groupMapper.updateById(updateObj);
  54 + }
  55 +
  56 + @Override
  57 + public void deleteGroup(Long id) {
  58 + // 校验存在
  59 + validateGroupExists(id);
  60 + // 校验分组下是否有用户
  61 + validateGroupHasUser(id);
  62 + // 删除
  63 + groupMapper.deleteById(id);
  64 + }
  65 +
  66 + void validateGroupExists(Long id) {
  67 + if (groupMapper.selectById(id) == null) {
  68 + throw exception(GROUP_NOT_EXISTS);
  69 + }
  70 + }
  71 +
  72 + void validateGroupHasUser(Long id) {
  73 + Long count = memberUserService.getUserCountByGroupId(id);
  74 + if (count > 0) {
  75 + throw exception(GROUP_HAS_USER);
  76 + }
  77 + }
  78 +
  79 + @Override
  80 + public MemberGroupDO getGroup(Long id) {
  81 + return groupMapper.selectById(id);
  82 + }
  83 +
  84 + @Override
  85 + public List<MemberGroupDO> getGroupList(Collection<Long> ids) {
  86 + if (CollUtil.isEmpty(ids)) {
  87 + return ListUtil.empty();
  88 + }
  89 + return groupMapper.selectBatchIds(ids);
  90 + }
  91 +
  92 + @Override
  93 + public PageResult<MemberGroupDO> getGroupPage(MemberGroupPageReqVO pageReqVO) {
  94 + return groupMapper.selectPage(pageReqVO);
  95 + }
  96 +
  97 + @Override
  98 + public List<MemberGroupDO> getGroupListByStatus(Integer status) {
  99 + return groupMapper.selectListByStatus(status);
  100 + }
  101 +
  102 +}
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberExperienceRecordService.java 0 → 100644
  View file @8b98d13
  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.experience.MemberExperienceRecordPageReqVO;
  5 +import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberExperienceRecordDO;
  6 +import cn.iocoder.yudao.module.member.enums.MemberExperienceBizTypeEnum;
  7 +
  8 +import java.util.Collection;
  9 +import java.util.List;
  10 +
  11 +/**
  12 + * 会员经验记录 Service 接口
  13 + *
  14 + * @author owen
  15 + */
  16 +public interface MemberExperienceRecordService {
  17 +
  18 + /**
  19 + * 获得会员经验记录
  20 + *
  21 + * @param id 编号
  22 + * @return 会员经验记录
  23 + */
  24 + MemberExperienceRecordDO getExperienceRecord(Long id);
  25 +
  26 + /**
  27 + * 获得会员经验记录列表
  28 + *
  29 + * @param ids 编号
  30 + * @return 会员经验记录列表
  31 + */
  32 + List<MemberExperienceRecordDO> getExperienceRecordList(Collection<Long> ids);
  33 +
  34 + /**
  35 + * 获得会员经验记录分页
  36 + *
  37 + * @param pageReqVO 分页查询
  38 + * @return 会员经验记录分页
  39 + */
  40 + PageResult<MemberExperienceRecordDO> getExperienceRecordPage(MemberExperienceRecordPageReqVO pageReqVO);
  41 +
  42 + /**
  43 + * 根据业务类型, 创建 经验变动记录
  44 + *
  45 + * @param userId 会员编号
  46 + * @param experience 变动经验值
  47 + * @param totalExperience 会员当前的经验
  48 + * @param bizType 业务类型
  49 + * @param bizId 业务ID
  50 + */
  51 + void createExperienceRecord(Long userId, Integer experience, Integer totalExperience,
  52 + MemberExperienceBizTypeEnum bizType, String bizId);
  53 +}
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberExperienceRecordServiceImpl.java 0 → 100644
  View file @8b98d13
  1 +package cn.iocoder.yudao.module.member.service.level;
  2 +
  3 +import cn.hutool.core.util.StrUtil;
  4 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  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;
  9 +import cn.iocoder.yudao.module.member.enums.MemberExperienceBizTypeEnum;
  10 +import org.springframework.stereotype.Service;
  11 +import org.springframework.validation.annotation.Validated;
  12 +
  13 +import javax.annotation.Resource;
  14 +import java.util.Collection;
  15 +import java.util.List;
  16 +
  17 +/**
  18 + * 会员经验记录 Service 实现类
  19 + *
  20 + * @author owen
  21 + */
  22 +@Service
  23 +@Validated
  24 +public class MemberExperienceRecordServiceImpl implements MemberExperienceRecordService {
  25 +
  26 + @Resource
  27 + private MemberExperienceRecordMapper experienceLogMapper;
  28 +
  29 + @Override
  30 + public MemberExperienceRecordDO getExperienceRecord(Long id) {
  31 + return experienceLogMapper.selectById(id);
  32 + }
  33 +
  34 + @Override
  35 + public List<MemberExperienceRecordDO> getExperienceRecordList(Collection<Long> ids) {
  36 + return experienceLogMapper.selectBatchIds(ids);
  37 + }
  38 +
  39 + @Override
  40 + public PageResult<MemberExperienceRecordDO> getExperienceRecordPage(MemberExperienceRecordPageReqVO pageReqVO) {
  41 + return experienceLogMapper.selectPage(pageReqVO);
  42 + }
  43 +
  44 + @Override
  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);
  52 + }
  53 +
  54 +}
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelRecordService.java 0 → 100644
  View file @8b98d13
  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 @8b98d13
  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 0 → 100644
  View file @8b98d13
  1 +package cn.iocoder.yudao.module.member.service.level;
  2 +
  3 +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
  4 +import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelCreateReqVO;
  5 +import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelListReqVO;
  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;
  9 +import cn.iocoder.yudao.module.member.enums.MemberExperienceBizTypeEnum;
  10 +
  11 +import javax.validation.Valid;
  12 +import java.util.Collection;
  13 +import java.util.List;
  14 +
  15 +/**
  16 + * 会员等级 Service 接口
  17 + *
  18 + * @author owen
  19 + */
  20 +public interface MemberLevelService {
  21 +
  22 + /**
  23 + * 创建会员等级
  24 + *
  25 + * @param createReqVO 创建信息
  26 + * @return 编号
  27 + */
  28 + Long createLevel(@Valid MemberLevelCreateReqVO createReqVO);
  29 +
  30 + /**
  31 + * 更新会员等级
  32 + *
  33 + * @param updateReqVO 更新信息
  34 + */
  35 + void updateLevel(@Valid MemberLevelUpdateReqVO updateReqVO);
  36 +
  37 + /**
  38 + * 删除会员等级
  39 + *
  40 + * @param id 编号
  41 + */
  42 + void deleteLevel(Long id);
  43 +
  44 + /**
  45 + * 获得会员等级
  46 + *
  47 + * @param id 编号
  48 + * @return 会员等级
  49 + */
  50 + MemberLevelDO getLevel(Long id);
  51 +
  52 + /**
  53 + * 获得会员等级列表
  54 + *
  55 + * @param ids 编号
  56 + * @return 会员等级列表
  57 + */
  58 + List<MemberLevelDO> getLevelList(Collection<Long> ids);
  59 +
  60 + /**
  61 + * 获得会员等级列表
  62 + *
  63 + * @param listReqVO 查询参数
  64 + * @return 会员等级列表
  65 + */
  66 + List<MemberLevelDO> getLevelList(MemberLevelListReqVO listReqVO);
  67 +
  68 + /**
  69 + * 获得指定状态的会员等级列表
  70 + *
  71 + * @param status 状态
  72 + * @return 会员等级列表
  73 + */
  74 + List<MemberLevelDO> getLevelListByStatus(Integer status);
  75 +
  76 + /**
  77 + * 获得开启状态的会员等级列表
  78 + *
  79 + * @return 会员等级列表
  80 + */
  81 + default List<MemberLevelDO> getEnableLevelList() {
  82 + return getLevelListByStatus(CommonStatusEnum.ENABLE.getStatus());
  83 + }
  84 +
  85 + /**
  86 + * 修改会员的等级
  87 + *
  88 + * @param updateReqVO 修改参数
  89 + */
  90 + void updateUserLevel(MemberUserUpdateLevelReqVO updateReqVO);
  91 +
  92 + /**
  93 + * 增加会员经验
  94 + *
  95 + * @param userId 会员ID
  96 + * @param experience 经验
  97 + * @param bizType 业务类型
  98 + * @param bizId 业务编号
  99 + */
  100 + void addExperience(Long userId, Integer experience, MemberExperienceBizTypeEnum bizType, String bizId);
  101 +
  102 +}
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelServiceImpl.java 0 → 100644
  View file @8b98d13
  1 +package cn.iocoder.yudao.module.member.service.level;
  2 +
  3 +import cn.hutool.core.collection.CollUtil;
  4 +import cn.hutool.core.util.NumberUtil;
  5 +import cn.hutool.core.util.ObjUtil;
  6 +import cn.hutool.core.util.ObjectUtil;
  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.MemberLevelListReqVO;
  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;
  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;
  14 +import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelRecordDO;
  15 +import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO;
  16 +import cn.iocoder.yudao.module.member.dal.mysql.level.MemberLevelMapper;
  17 +import cn.iocoder.yudao.module.member.enums.MemberExperienceBizTypeEnum;
  18 +import cn.iocoder.yudao.module.member.service.user.MemberUserService;
  19 +import com.google.common.annotations.VisibleForTesting;
  20 +import lombok.extern.slf4j.Slf4j;
  21 +import org.springframework.stereotype.Service;
  22 +import org.springframework.transaction.annotation.Transactional;
  23 +import org.springframework.validation.annotation.Validated;
  24 +
  25 +import javax.annotation.Resource;
  26 +import java.util.Collection;
  27 +import java.util.Collections;
  28 +import java.util.Comparator;
  29 +import java.util.List;
  30 +
  31 +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
  32 +import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.*;
  33 +
  34 +/**
  35 + * 会员等级 Service 实现类
  36 + *
  37 + * @author owen
  38 + */
  39 +@Slf4j
  40 +@Service
  41 +@Validated
  42 +public class MemberLevelServiceImpl implements MemberLevelService {
  43 +
  44 + @Resource
  45 + private MemberLevelMapper levelMapper;
  46 + @Resource
  47 + private MemberLevelRecordService memberLevelRecordService;
  48 + @Resource
  49 + private MemberExperienceRecordService memberExperienceRecordService;
  50 + @Resource
  51 + private MemberUserService memberUserService;
  52 +
  53 + @Override
  54 + public Long createLevel(MemberLevelCreateReqVO createReqVO) {
  55 + // 校验配置是否有效
  56 + validateConfigValid(null, createReqVO.getName(), createReqVO.getLevel(), createReqVO.getExperience());
  57 +
  58 + // 插入
  59 + MemberLevelDO level = MemberLevelConvert.INSTANCE.convert(createReqVO);
  60 + levelMapper.insert(level);
  61 + // 返回
  62 + return level.getId();
  63 + }
  64 +
  65 + @Override
  66 + public void updateLevel(MemberLevelUpdateReqVO updateReqVO) {
  67 + // 校验存在
  68 + validateLevelExists(updateReqVO.getId());
  69 + // 校验配置是否有效
  70 + validateConfigValid(updateReqVO.getId(), updateReqVO.getName(), updateReqVO.getLevel(), updateReqVO.getExperience());
  71 +
  72 + // 更新
  73 + MemberLevelDO updateObj = MemberLevelConvert.INSTANCE.convert(updateReqVO);
  74 + levelMapper.updateById(updateObj);
  75 + }
  76 +
  77 + @Override
  78 + public void deleteLevel(Long id) {
  79 + // 校验存在
  80 + validateLevelExists(id);
  81 + // 校验分组下是否有用户
  82 + validateLevelHasUser(id);
  83 + // 删除
  84 + levelMapper.deleteById(id);
  85 + }
  86 +
  87 + @VisibleForTesting
  88 + MemberLevelDO validateLevelExists(Long id) {
  89 + MemberLevelDO levelDO = levelMapper.selectById(id);
  90 + if (levelDO == null) {
  91 + throw exception(LEVEL_NOT_EXISTS);
  92 + }
  93 + return levelDO;
  94 + }
  95 +
  96 + @VisibleForTesting
  97 + void validateNameUnique(List<MemberLevelDO> list, Long id, String name) {
  98 + for (MemberLevelDO levelDO : list) {
  99 + if (ObjUtil.notEqual(levelDO.getName(), name)) {
  100 + continue;
  101 + }
  102 + if (id == null || !id.equals(levelDO.getId())) {
  103 + throw exception(LEVEL_NAME_EXISTS, levelDO.getName());
  104 + }
  105 + }
  106 + }
  107 +
  108 + @VisibleForTesting
  109 + void validateLevelUnique(List<MemberLevelDO> list, Long id, Integer level) {
  110 + for (MemberLevelDO levelDO : list) {
  111 + if (ObjUtil.notEqual(levelDO.getLevel(), level)) {
  112 + continue;
  113 + }
  114 +
  115 + if (id == null || !id.equals(levelDO.getId())) {
  116 + throw exception(LEVEL_VALUE_EXISTS, levelDO.getLevel(), levelDO.getName());
  117 + }
  118 + }
  119 + }
  120 +
  121 + @VisibleForTesting
  122 + void validateExperienceOutRange(List<MemberLevelDO> list, Long id, Integer level, Integer experience) {
  123 + for (MemberLevelDO levelDO : list) {
  124 + if (levelDO.getId().equals(id)) {
  125 + continue;
  126 + }
  127 +
  128 + if (levelDO.getLevel() < level) {
  129 + // 经验大于前一个等级
  130 + if (experience <= levelDO.getExperience()) {
  131 + throw exception(LEVEL_EXPERIENCE_MIN, levelDO.getName(), levelDO.getExperience());
  132 + }
  133 + } else if (levelDO.getLevel() > level) {
  134 + //小于下一个级别
  135 + if (experience >= levelDO.getExperience()) {
  136 + throw exception(LEVEL_EXPERIENCE_MAX, levelDO.getName(), levelDO.getExperience());
  137 + }
  138 + }
  139 + }
  140 + }
  141 +
  142 + @VisibleForTesting
  143 + void validateConfigValid(Long id, String name, Integer level, Integer experience) {
  144 + List<MemberLevelDO> list = levelMapper.selectList();
  145 + // 校验名称唯一
  146 + validateNameUnique(list, id, name);
  147 + // 校验等级唯一
  148 + validateLevelUnique(list, id, level);
  149 + // 校验升级所需经验是否有效: 大于前一个等级，小于下一个级别
  150 + validateExperienceOutRange(list, id, level, experience);
  151 + }
  152 +
  153 + @VisibleForTesting
  154 + void validateLevelHasUser(Long id) {
  155 + Long count = memberUserService.getUserCountByLevelId(id);
  156 + if (count > 0) {
  157 + throw exception(LEVEL_HAS_USER);
  158 + }
  159 + }
  160 +
  161 + @Override
  162 + public MemberLevelDO getLevel(Long id) {
  163 + return levelMapper.selectById(id);
  164 + }
  165 +
  166 + @Override
  167 + public List<MemberLevelDO> getLevelList(Collection<Long> ids) {
  168 + if (CollUtil.isEmpty(ids)) {
  169 + return Collections.emptyList();
  170 + }
  171 + return levelMapper.selectBatchIds(ids);
  172 + }
  173 +
  174 + @Override
  175 + public List<MemberLevelDO> getLevelList(MemberLevelListReqVO listReqVO) {
  176 + return levelMapper.selectList(listReqVO);
  177 + }
  178 +
  179 + @Override
  180 + public List<MemberLevelDO> getLevelListByStatus(Integer status) {
  181 + return levelMapper.selectListByStatus(status);
  182 + }
  183 +
  184 + @Override
  185 + @Transactional(rollbackFor = Exception.class)
  186 + public void updateUserLevel(MemberUserUpdateLevelReqVO updateReqVO) {
  187 + MemberUserDO user = memberUserService.getUser(updateReqVO.getId());
  188 + if (user == null) {
  189 + throw exception(USER_NOT_EXISTS);
  190 + }
  191 + // 等级未发生变化
  192 + if (ObjUtil.equal(user.getLevelId(), updateReqVO.getLevelId())) {
  193 + return;
  194 + }
  195 +
  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("管理员取消了等级");
  205 + } else {
  206 + // 复制等级配置
  207 + memberLevel = validateLevelExists(updateReqVO.getLevelId());
  208 + MemberLevelRecordConvert.INSTANCE.copyTo(memberLevel, levelRecord);
  209 + // 变动经验值 = 等级的升级经验 - 会员当前的经验；正数为增加经验，负数为扣减经验
  210 + levelRecord.setExperience(memberLevel.getExperience() - user.getExperience());
  211 + levelRecord.setUserExperience(memberLevel.getExperience()); // 会员当前的经验 = 等级的升级经验
  212 + levelRecord.setDescription("管理员调整为：" + memberLevel.getName());
  213 + }
  214 + memberLevelRecordService.createLevelRecord(levelRecord);
  215 +
  216 + // 2. 记录会员经验变动
  217 + memberExperienceRecordService.createExperienceRecord(user.getId(),
  218 + levelRecord.getExperience(), levelRecord.getUserExperience(),
  219 + MemberExperienceBizTypeEnum.ADMIN, String.valueOf(MemberExperienceBizTypeEnum.ADMIN.getType()));
  220 +
  221 + // 3. 更新会员表上的等级编号、经验值
  222 + memberUserService.updateUserLevel(user.getId(), updateReqVO.getLevelId(),
  223 + levelRecord.getUserExperience());
  224 +
  225 + // 4. 给会员发送等级变动消息
  226 + notifyMemberLevelChange(user.getId(), memberLevel);
  227 + }
  228 +
  229 + @Override
  230 + @Transactional(rollbackFor = Exception.class)
  231 + public void addExperience(Long userId, Integer experience, MemberExperienceBizTypeEnum bizType, String bizId) {
  232 + if (experience == 0) {
  233 + return;
  234 + }
  235 + if (!bizType.isAdd() && experience > 0) {
  236 + experience = -experience;
  237 + }
  238 +
  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 + }
  258 +
  259 + // 3. 更新会员表上的等级编号、经验值
  260 + memberUserService.updateUserLevel(user.getId(), levelRecord.getLevelId(), userExperience);
  261 + }
  262 +
  263 + /**
  264 + * 计算会员等级
  265 + *
  266 + * @param user 会员
  267 + * @param userExperience 会员当前的经验值
  268 + * @return 会员新的等级，null表示无变化
  269 + */
  270 + private MemberLevelDO calculateNewLevel(MemberUserDO user, int userExperience) {
  271 + List<MemberLevelDO> list = getEnableLevelList();
  272 + if (CollUtil.isEmpty(list)) {
  273 + log.warn("计算会员等级失败：会员等级配置不存在");
  274 + return null;
  275 + }
  276 +
  277 + MemberLevelDO matchLevel = list.stream()
  278 + .filter(level -> userExperience >= level.getExperience())
  279 + .max(Comparator.nullsFirst(Comparator.comparing(MemberLevelDO::getLevel)))
  280 + .orElse(null);
  281 + if (matchLevel == null) {
  282 + log.warn("计算会员等级失败：未找到会员{}经验{}对应的等级配置", user.getId(), userExperience);
  283 + return null;
  284 + }
  285 +
  286 + // 等级没有变化
  287 + if (ObjectUtil.equal(matchLevel.getId(), user.getLevelId())) {
  288 + return null;
  289 + }
  290 +
  291 + return matchLevel;
  292 + }
  293 +
  294 + private void notifyMemberLevelChange(Long userId, MemberLevelDO level) {
  295 + //todo: 给会员发消息
  296 + }
  297 +
  298 +}
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/point/MemberPointConfigService.java
  View file @8b98d13
@@ -17,13 +17,13 @@ public interface MemberPointConfigService { @@ -17,13 +17,13 @@ public interface MemberPointConfigService {
17 * 17 *
18 * @param saveReqVO 更新信息 18 * @param saveReqVO 更新信息
19 */ 19 */
20 - void saveConfig(@Valid MemberPointConfigSaveReqVO saveReqVO); 20 + void savePointConfig(@Valid MemberPointConfigSaveReqVO saveReqVO);
21 21
22 /** 22 /**
23 * 获得会员积分配置 23 * 获得会员积分配置
24 * 24 *
25 * @return 积分配置 25 * @return 积分配置
26 */ 26 */
27 - MemberPointConfigDO getConfig(); 27 + MemberPointConfigDO getPointConfig();
28 28
29 } 29 }
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/point/MemberPointConfigServiceImpl.java
  View file @8b98d13
@@ -24,9 +24,9 @@ public class MemberPointConfigServiceImpl implements MemberPointConfigService { @@ -24,9 +24,9 @@ public class MemberPointConfigServiceImpl implements MemberPointConfigService {
24 private MemberPointConfigMapper pointConfigMapper; 24 private MemberPointConfigMapper pointConfigMapper;
25 25
26 @Override 26 @Override
27 - public void saveConfig(MemberPointConfigSaveReqVO saveReqVO) { 27 + public void savePointConfig(MemberPointConfigSaveReqVO saveReqVO) {
28 // 存在，则进行更新 28 // 存在，则进行更新
29 - MemberPointConfigDO dbConfig = getConfig(); 29 + MemberPointConfigDO dbConfig = getPointConfig();
30 if (dbConfig != null) { 30 if (dbConfig != null) {
31 pointConfigMapper.updateById(MemberPointConfigConvert.INSTANCE.convert(saveReqVO).setId(dbConfig.getId())); 31 pointConfigMapper.updateById(MemberPointConfigConvert.INSTANCE.convert(saveReqVO).setId(dbConfig.getId()));
32 return; 32 return;
@@ -36,7 +36,7 @@ public class MemberPointConfigServiceImpl implements MemberPointConfigService { @@ -36,7 +36,7 @@ public class MemberPointConfigServiceImpl implements MemberPointConfigService {
36 } 36 }
37 37
38 @Override 38 @Override
39 - public MemberPointConfigDO getConfig() { 39 + public MemberPointConfigDO getPointConfig() {
40 List<MemberPointConfigDO> list = pointConfigMapper.selectList(); 40 List<MemberPointConfigDO> list = pointConfigMapper.selectList();
41 return CollectionUtils.getFirst(list); 41 return CollectionUtils.getFirst(list);
42 } 42 }
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/point/MemberPointRecordService.java
  View file @8b98d13
1 package cn.iocoder.yudao.module.member.service.point; 1 package cn.iocoder.yudao.module.member.service.point;
2 2
  3 +import cn.iocoder.yudao.framework.common.pojo.PageParam;
3 import cn.iocoder.yudao.framework.common.pojo.PageResult; 4 import cn.iocoder.yudao.framework.common.pojo.PageResult;
4 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;
5 import cn.iocoder.yudao.module.member.dal.dataobject.point.MemberPointRecordDO; 6 import cn.iocoder.yudao.module.member.dal.dataobject.point.MemberPointRecordDO;
6 -  
7 -import javax.validation.Valid; 7 +import cn.iocoder.yudao.module.member.enums.point.MemberPointBizTypeEnum;
8 8
9 /** 9 /**
10 * 用户积分记录 Service 接口 10 * 用户积分记录 Service 接口
@@ -14,11 +14,29 @@ import javax.validation.Valid; @@ -14,11 +14,29 @@ import javax.validation.Valid;
14 public interface MemberPointRecordService { 14 public interface MemberPointRecordService {
15 15
16 /** 16 /**
17 - * 获得用户积分记录分页 17 + * 【管理员】获得积分记录分页
18 * 18 *
19 * @param pageReqVO 分页查询 19 * @param pageReqVO 分页查询
20 - * @return 用户积分记录分页 20 + * @return 签到记录分页
  21 + */
  22 + PageResult<MemberPointRecordDO> getPointRecordPage(MemberPointRecordPageReqVO pageReqVO);
  23 +
  24 + /**
  25 + * 【会员】获得积分记录分页
  26 + *
  27 + * @param userId 用户编号
  28 + * @param pageVO 分页查询
  29 + * @return 签到记录分页
21 */ 30 */
22 - PageResult<MemberPointRecordDO> getRecordPage(MemberPointRecordPageReqVO pageReqVO); 31 + PageResult<MemberPointRecordDO> getPointRecordPage(Long userId, PageParam pageVO);
23 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);
24 } 42 }
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/point/MemberPointRecordServiceImpl.java
  View file @8b98d13
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;
  5 +import cn.iocoder.yudao.framework.common.pojo.PageParam;
3 import cn.iocoder.yudao.framework.common.pojo.PageResult; 6 import cn.iocoder.yudao.framework.common.pojo.PageResult;
4 -import cn.iocoder.yudao.module.member.api.user.MemberUserApi;  
5 -import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;  
6 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;
7 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;
8 import cn.iocoder.yudao.module.member.dal.mysql.point.MemberPointRecordMapper; 11 import cn.iocoder.yudao.module.member.dal.mysql.point.MemberPointRecordMapper;
9 -import com.google.common.collect.Sets; 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;
@@ -20,37 +25,71 @@ import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils. @@ -20,37 +25,71 @@ import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.
20 25
21 26
22 /** 27 /**
23 - * 用户积分记录 Service 实现类 28 + * 积分记录 Service 实现类
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> getRecordPage(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);  
48 - }  
49 - if (pageReqVO.getUserId() != null) {  
50 - userIds = Sets.newHashSet(pageReqVO.getUserId()); 55 + userIds = convertSet(users, MemberUserDO::getId);
51 } 56 }
52 // 执行查询 57 // 执行查询
53 return recordMapper.selectPage(pageReqVO, userIds); 58 return recordMapper.selectPage(pageReqVO, userIds);
54 } 59 }
55 60
  61 + @Override
  62 + public PageResult<MemberPointRecordDO> getPointRecordPage(Long userId, PageParam pageVO) {
  63 + return recordMapper.selectPage(userId, pageVO);
  64 + }
  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 +
56 } 95 }
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/signin/MemberSignInConfigService.java
  View file @8b98d13
@@ -45,10 +45,18 @@ public interface MemberSignInConfigService { @@ -45,10 +45,18 @@ public interface MemberSignInConfigService {
45 MemberSignInConfigDO getSignInConfig(Long id); 45 MemberSignInConfigDO getSignInConfig(Long id);
46 46
47 /** 47 /**
48 - * 获得签到规则分页 48 + * 获得签到规则列表
49 * 49 *
50 * @return 签到规则分页 50 * @return 签到规则分页
51 */ 51 */
52 List<MemberSignInConfigDO> getSignInConfigList(); 52 List<MemberSignInConfigDO> getSignInConfigList();
53 53
  54 + /**
  55 + * 获得签到规则列表
  56 + *
  57 + * @param status 状态
  58 + * @return 签到规则分页
  59 + */
  60 + List<MemberSignInConfigDO> getSignInConfigList(Integer status);
  61 +
54 } 62 }
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/signin/MemberSignInConfigServiceImpl.java
  View file @8b98d13
@@ -96,4 +96,11 @@ public class MemberSignInConfigServiceImpl implements MemberSignInConfigService @@ -96,4 +96,11 @@ public class MemberSignInConfigServiceImpl implements MemberSignInConfigService
96 return list; 96 return list;
97 } 97 }
98 98
  99 + @Override
  100 + public List<MemberSignInConfigDO> getSignInConfigList(Integer status) {
  101 + List<MemberSignInConfigDO> list = signInConfigMapper.selectListByStatus(status);
  102 + list.sort(Comparator.comparing(MemberSignInConfigDO::getDay));
  103 + return list;
  104 + }
  105 +
99 } 106 }
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/signin/MemberSignInRecordService.java
  View file @8b98d13
1 package cn.iocoder.yudao.module.member.service.signin; 1 package cn.iocoder.yudao.module.member.service.signin;
2 2
  3 +import cn.iocoder.yudao.framework.common.pojo.PageParam;
3 import cn.iocoder.yudao.framework.common.pojo.PageResult; 4 import cn.iocoder.yudao.framework.common.pojo.PageResult;
4 import cn.iocoder.yudao.module.member.controller.admin.signin.vo.record.MemberSignInRecordPageReqVO; 5 import cn.iocoder.yudao.module.member.controller.admin.signin.vo.record.MemberSignInRecordPageReqVO;
5 import cn.iocoder.yudao.module.member.dal.dataobject.signin.MemberSignInRecordDO; 6 import cn.iocoder.yudao.module.member.dal.dataobject.signin.MemberSignInRecordDO;
@@ -12,11 +13,20 @@ import cn.iocoder.yudao.module.member.dal.dataobject.signin.MemberSignInRecordDO @@ -12,11 +13,20 @@ import cn.iocoder.yudao.module.member.dal.dataobject.signin.MemberSignInRecordDO
12 public interface MemberSignInRecordService { 13 public interface MemberSignInRecordService {
13 14
14 /** 15 /**
15 - * 获得签到记录分页 16 + * 【管理员】获得签到记录分页
16 * 17 *
17 * @param pageReqVO 分页查询 18 * @param pageReqVO 分页查询
18 * @return 签到记录分页 19 * @return 签到记录分页
19 */ 20 */
20 PageResult<MemberSignInRecordDO> getSignInRecordPage(MemberSignInRecordPageReqVO pageReqVO); 21 PageResult<MemberSignInRecordDO> getSignInRecordPage(MemberSignInRecordPageReqVO pageReqVO);
21 22
  23 + /**
  24 + * 【会员】获得签到记录分页
  25 + *
  26 + * @param userId 用户编号
  27 + * @param pageParam 分页查询
  28 + * @return 签到记录分页
  29 + */
  30 + PageResult<MemberSignInRecordDO> getSignRecordPage(Long userId, PageParam pageParam);
  31 +
22 } 32 }
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/signin/MemberSignInRecordServiceImpl.java
  View file @8b98d13
1 package cn.iocoder.yudao.module.member.service.signin; 1 package cn.iocoder.yudao.module.member.service.signin;
2 2
  3 +import cn.iocoder.yudao.framework.common.pojo.PageParam;
3 import cn.iocoder.yudao.framework.common.pojo.PageResult; 4 import cn.iocoder.yudao.framework.common.pojo.PageResult;
4 import cn.iocoder.yudao.module.member.api.user.MemberUserApi; 5 import cn.iocoder.yudao.module.member.api.user.MemberUserApi;
5 import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO; 6 import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
6 import cn.iocoder.yudao.module.member.controller.admin.signin.vo.record.MemberSignInRecordPageReqVO; 7 import cn.iocoder.yudao.module.member.controller.admin.signin.vo.record.MemberSignInRecordPageReqVO;
7 import cn.iocoder.yudao.module.member.dal.dataobject.signin.MemberSignInRecordDO; 8 import cn.iocoder.yudao.module.member.dal.dataobject.signin.MemberSignInRecordDO;
8 import cn.iocoder.yudao.module.member.dal.mysql.signin.MemberSignInRecordMapper; 9 import cn.iocoder.yudao.module.member.dal.mysql.signin.MemberSignInRecordMapper;
9 -import com.google.common.collect.Sets;  
10 import org.apache.commons.lang3.StringUtils; 10 import org.apache.commons.lang3.StringUtils;
11 import org.springframework.stereotype.Service; 11 import org.springframework.stereotype.Service;
12 import org.springframework.util.CollectionUtils; 12 import org.springframework.util.CollectionUtils;
@@ -45,11 +45,13 @@ public class MemberSignInRecordServiceImpl implements MemberSignInRecordService @@ -45,11 +45,13 @@ public class MemberSignInRecordServiceImpl implements MemberSignInRecordService
45 } 45 }
46 userIds = convertSet(users, MemberUserRespDTO::getId); 46 userIds = convertSet(users, MemberUserRespDTO::getId);
47 } 47 }
48 - if (pageReqVO.getUserId() != null) {  
49 - userIds = Sets.newHashSet(pageReqVO.getUserId());  
50 - }  
51 // 分页查询 48 // 分页查询
52 return signInRecordMapper.selectPage(pageReqVO, userIds); 49 return signInRecordMapper.selectPage(pageReqVO, userIds);
53 } 50 }
54 51
  52 + @Override
  53 + public PageResult<MemberSignInRecordDO> getSignRecordPage(Long userId, PageParam pageParam) {
  54 + return signInRecordMapper.selectPage(userId, pageParam);
  55 + }
  56 +
55 } 57 }
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/tag/MemberTagService.java
  View file @8b98d13
@@ -63,4 +63,11 @@ public interface MemberTagService { @@ -63,4 +63,11 @@ public interface MemberTagService {
63 */ 63 */
64 PageResult<MemberTagDO> getTagPage(MemberTagPageReqVO pageReqVO); 64 PageResult<MemberTagDO> getTagPage(MemberTagPageReqVO pageReqVO);
65 65
  66 + /**
  67 + * 获取标签列表
  68 + *
  69 + * @return 标签列表
  70 + */
  71 + List<MemberTagDO> getTagList();
  72 +
66 } 73 }
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/tag/MemberTagServiceImpl.java
  View file @8b98d13
@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.member.service.tag; @@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.member.service.tag;
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.collection.ListUtil;
  5 +import cn.hutool.core.util.StrUtil;
5 import cn.iocoder.yudao.framework.common.pojo.PageResult; 6 import cn.iocoder.yudao.framework.common.pojo.PageResult;
6 import cn.iocoder.yudao.module.member.controller.admin.tag.vo.MemberTagCreateReqVO; 7 import cn.iocoder.yudao.module.member.controller.admin.tag.vo.MemberTagCreateReqVO;
7 import cn.iocoder.yudao.module.member.controller.admin.tag.vo.MemberTagPageReqVO; 8 import cn.iocoder.yudao.module.member.controller.admin.tag.vo.MemberTagPageReqVO;
@@ -9,6 +10,7 @@ import cn.iocoder.yudao.module.member.controller.admin.tag.vo.MemberTagUpdateReq @@ -9,6 +10,7 @@ import cn.iocoder.yudao.module.member.controller.admin.tag.vo.MemberTagUpdateReq
9 import cn.iocoder.yudao.module.member.convert.tag.MemberTagConvert; 10 import cn.iocoder.yudao.module.member.convert.tag.MemberTagConvert;
10 import cn.iocoder.yudao.module.member.dal.dataobject.tag.MemberTagDO; 11 import cn.iocoder.yudao.module.member.dal.dataobject.tag.MemberTagDO;
11 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.service.user.MemberUserService;
12 import org.springframework.stereotype.Service; 14 import org.springframework.stereotype.Service;
13 import org.springframework.validation.annotation.Validated; 15 import org.springframework.validation.annotation.Validated;
14 16
@@ -17,8 +19,7 @@ import java.util.Collection; @@ -17,8 +19,7 @@ import java.util.Collection;
17 import java.util.List; 19 import java.util.List;
18 20
19 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; 21 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
20 -import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.TAG_NAME_EXISTS;  
21 -import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.TAG_NOT_EXISTS; 22 +import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.*;
22 23
23 /** 24 /**
24 * 会员标签 Service 实现类 25 * 会员标签 Service 实现类
@@ -31,6 +32,8 @@ public class MemberTagServiceImpl implements MemberTagService { @@ -31,6 +32,8 @@ public class MemberTagServiceImpl implements MemberTagService {
31 32
32 @Resource 33 @Resource
33 private MemberTagMapper tagMapper; 34 private MemberTagMapper tagMapper;
  35 + @Resource
  36 + private MemberUserService memberUserService;
34 37
35 @Override 38 @Override
36 public Long createTag(MemberTagCreateReqVO createReqVO) { 39 public Long createTag(MemberTagCreateReqVO createReqVO) {
@@ -58,12 +61,12 @@ public class MemberTagServiceImpl implements MemberTagService { @@ -58,12 +61,12 @@ public class MemberTagServiceImpl implements MemberTagService {
58 public void deleteTag(Long id) { 61 public void deleteTag(Long id) {
59 // 校验存在 62 // 校验存在
60 validateTagExists(id); 63 validateTagExists(id);
  64 + // 校验标签下是否有用户
  65 + validateTagHasUser(id);
61 // 删除 66 // 删除
62 tagMapper.deleteById(id); 67 tagMapper.deleteById(id);
63 } 68 }
64 69
65 - // TODO @疯狂：校验 tag name 不重复，参考 validateMobileUnique 方法，Mapper 尽量逻辑通用，处理交给 Service  
66 -  
67 private void validateTagExists(Long id) { 70 private void validateTagExists(Long id) {
68 if (tagMapper.selectById(id) == null) { 71 if (tagMapper.selectById(id) == null) {
69 throw exception(TAG_NOT_EXISTS); 72 throw exception(TAG_NOT_EXISTS);
@@ -71,12 +74,30 @@ public class MemberTagServiceImpl implements MemberTagService { @@ -71,12 +74,30 @@ public class MemberTagServiceImpl implements MemberTagService {
71 } 74 }
72 75
73 private void validateTagNameUnique(Long id, String name) { 76 private void validateTagNameUnique(Long id, String name) {
74 - boolean exists = tagMapper.exists(id, name);  
75 - if (exists) { 77 + if (StrUtil.isBlank(name)) {
  78 + return;
  79 + }
  80 + MemberTagDO tag = tagMapper.selelctByName(name);
  81 + if (tag == null) {
  82 + return;
  83 + }
  84 +
  85 + // 如果 id 为空，说明不用比较是否为相同 id 的标签
  86 + if (id == null) {
  87 + throw exception(TAG_NAME_EXISTS);
  88 + }
  89 + if (!tag.getId().equals(id)) {
76 throw exception(TAG_NAME_EXISTS); 90 throw exception(TAG_NAME_EXISTS);
77 } 91 }
78 } 92 }
79 93
  94 + void validateTagHasUser(Long id) {
  95 + Long count = memberUserService.getUserCountByTagId(id);
  96 + if (count > 0) {
  97 + throw exception(TAG_HAS_USER);
  98 + }
  99 + }
  100 +
80 @Override 101 @Override
81 public MemberTagDO getTag(Long id) { 102 public MemberTagDO getTag(Long id) {
82 return tagMapper.selectById(id); 103 return tagMapper.selectById(id);
@@ -95,4 +116,9 @@ public class MemberTagServiceImpl implements MemberTagService { @@ -95,4 +116,9 @@ public class MemberTagServiceImpl implements MemberTagService {
95 return tagMapper.selectPage(pageReqVO); 116 return tagMapper.selectPage(pageReqVO);
96 } 117 }
97 118
  119 + @Override
  120 + public List<MemberTagDO> getTagList() {
  121 + return tagMapper.selectList();
  122 + }
  123 +
98 } 124 }
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserService.java
  View file @8b98d13
@@ -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 @8b98d13
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;
@@ -8,9 +9,9 @@ import cn.iocoder.yudao.module.infra.api.file.FileApi; @@ -8,9 +9,9 @@ import cn.iocoder.yudao.module.infra.api.file.FileApi;
8 import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserPageReqVO; 9 import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserPageReqVO;
9 import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserUpdateReqVO; 10 import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserUpdateReqVO;
10 import cn.iocoder.yudao.module.member.controller.app.user.vo.AppMemberUserResetPasswordReqVO; 11 import cn.iocoder.yudao.module.member.controller.app.user.vo.AppMemberUserResetPasswordReqVO;
  12 +import cn.iocoder.yudao.module.member.controller.app.user.vo.AppMemberUserUpdateMobileReqVO;
11 import cn.iocoder.yudao.module.member.controller.app.user.vo.AppMemberUserUpdatePasswordReqVO; 13 import cn.iocoder.yudao.module.member.controller.app.user.vo.AppMemberUserUpdatePasswordReqVO;
12 import cn.iocoder.yudao.module.member.controller.app.user.vo.AppMemberUserUpdateReqVO; 14 import cn.iocoder.yudao.module.member.controller.app.user.vo.AppMemberUserUpdateReqVO;
13 -import cn.iocoder.yudao.module.member.controller.app.user.vo.AppMemberUserUpdateMobileReqVO;  
14 import cn.iocoder.yudao.module.member.convert.auth.AuthConvert; 15 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;
@@ -181,9 +182,10 @@ public class MemberUserServiceImpl implements MemberUserService { @@ -181,9 +182,10 @@ public class MemberUserServiceImpl implements MemberUserService {
181 } 182 }
182 183
183 @Override 184 @Override
  185 + @Transactional(rollbackFor = Exception.class)
184 public void updateUser(MemberUserUpdateReqVO updateReqVO) { 186 public void updateUser(MemberUserUpdateReqVO updateReqVO) {
185 // 校验存在 187 // 校验存在
186 - validateUserExists(updateReqVO.getId()); 188 + MemberUserDO user = validateUserExists(updateReqVO.getId());
187 // 校验手机唯一 189 // 校验手机唯一
188 validateMobileUnique(updateReqVO.getId(), updateReqVO.getMobile()); 190 validateMobileUnique(updateReqVO.getId(), updateReqVO.getMobile());
189 191
@@ -227,4 +229,34 @@ public class MemberUserServiceImpl implements MemberUserService { @@ -227,4 +229,34 @@ public class MemberUserServiceImpl implements MemberUserService {
227 return memberUserMapper.selectPage(pageReqVO); 229 return memberUserMapper.selectPage(pageReqVO);
228 } 230 }
229 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 +
230 } 262 }
yudao-module-member/yudao-module-member-biz/src/test/java/cn/iocoder/yudao/module/member/service/group/MemberGroupServiceImplTest.java 0 → 100644
  View file @8b98d13
  1 +package cn.iocoder.yudao.module.member.service.group;
  2 +
  3 +import cn.hutool.core.util.RandomUtil;
  4 +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
  5 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  6 +import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
  7 +import cn.iocoder.yudao.module.member.controller.admin.group.vo.MemberGroupCreateReqVO;
  8 +import cn.iocoder.yudao.module.member.controller.admin.group.vo.MemberGroupPageReqVO;
  9 +import cn.iocoder.yudao.module.member.controller.admin.group.vo.MemberGroupUpdateReqVO;
  10 +import cn.iocoder.yudao.module.member.dal.dataobject.group.MemberGroupDO;
  11 +import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO;
  12 +import cn.iocoder.yudao.module.member.dal.mysql.group.MemberGroupMapper;
  13 +import cn.iocoder.yudao.module.member.dal.mysql.user.MemberUserMapper;
  14 +import cn.iocoder.yudao.module.system.enums.common.SexEnum;
  15 +import org.junit.jupiter.api.Test;
  16 +import org.springframework.context.annotation.Import;
  17 +
  18 +import javax.annotation.Resource;
  19 +
  20 +import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildBetweenTime;
  21 +import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildTime;
  22 +import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId;
  23 +import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
  24 +import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
  25 +import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
  26 +import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.GROUP_HAS_USER;
  27 +import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.GROUP_NOT_EXISTS;
  28 +import static org.junit.jupiter.api.Assertions.*;
  29 +
  30 +/**
  31 + * {@link MemberGroupServiceImpl} 的单元测试类
  32 + *
  33 + * @author owen
  34 + */
  35 +@Import(MemberGroupServiceImpl.class)
  36 +public class MemberGroupServiceImplTest extends BaseDbUnitTest {
  37 +
  38 + @Resource
  39 + private MemberGroupServiceImpl groupService;
  40 +
  41 + @Resource
  42 + private MemberGroupMapper groupMapper;
  43 + @Resource
  44 + private MemberUserMapper memberUserMapper;
  45 +
  46 + @Test
  47 + public void testCreateGroup_success() {
  48 + // 准备参数
  49 + MemberGroupCreateReqVO reqVO = randomPojo(MemberGroupCreateReqVO.class);
  50 +
  51 + // 调用
  52 + Long groupId = groupService.createGroup(reqVO);
  53 + // 断言
  54 + assertNotNull(groupId);
  55 + // 校验记录的属性是否正确
  56 + MemberGroupDO group = groupMapper.selectById(groupId);
  57 + assertPojoEquals(reqVO, group);
  58 + }
  59 +
  60 + @Test
  61 + public void testUpdateGroup_success() {
  62 + // mock 数据
  63 + MemberGroupDO dbGroup = randomPojo(MemberGroupDO.class);
  64 + groupMapper.insert(dbGroup);// @Sql: 先插入出一条存在的数据
  65 + // 准备参数
  66 + MemberGroupUpdateReqVO reqVO = randomPojo(MemberGroupUpdateReqVO.class, o -> {
  67 + o.setId(dbGroup.getId()); // 设置更新的 ID
  68 + });
  69 +
  70 + // 调用
  71 + groupService.updateGroup(reqVO);
  72 + // 校验是否更新正确
  73 + MemberGroupDO group = groupMapper.selectById(reqVO.getId()); // 获取最新的
  74 + assertPojoEquals(reqVO, group);
  75 + }
  76 +
  77 + @Test
  78 + public void testUpdateGroup_notExists() {
  79 + // 准备参数
  80 + MemberGroupUpdateReqVO reqVO = randomPojo(MemberGroupUpdateReqVO.class);
  81 +
  82 + // 调用, 并断言异常
  83 + assertServiceException(() -> groupService.updateGroup(reqVO), GROUP_NOT_EXISTS);
  84 + }
  85 +
  86 + @Test
  87 + public void testDeleteGroup_success() {
  88 + // mock 数据
  89 + MemberGroupDO dbGroup = randomPojo(MemberGroupDO.class);
  90 + groupMapper.insert(dbGroup);// @Sql: 先插入出一条存在的数据
  91 + // 准备参数
  92 + Long id = dbGroup.getId();
  93 +
  94 + // 调用
  95 + groupService.deleteGroup(id);
  96 + // 校验数据不存在了
  97 + assertNull(groupMapper.selectById(id));
  98 + }
  99 +
  100 + @Test
  101 + public void testDeleteGroup_notExists() {
  102 + // 准备参数
  103 + Long id = randomLongId();
  104 +
  105 + // 调用, 并断言异常
  106 + assertServiceException(() -> groupService.deleteGroup(id), GROUP_NOT_EXISTS);
  107 + }
  108 +
  109 + @Test
  110 + public void testDeleteGroup_hasUser() {
  111 + // mock 数据
  112 + MemberGroupDO dbGroup = randomPojo(MemberGroupDO.class);
  113 + groupMapper.insert(dbGroup);// @Sql: 先插入出一条存在的数据
  114 + // 准备参数
  115 + Long id = dbGroup.getId();
  116 +
  117 + // mock 会员数据
  118 + MemberUserDO dbUser = randomPojo(MemberUserDO.class, o -> {
  119 + o.setGroupId(id);
  120 + o.setSex(RandomUtil.randomEle(SexEnum.values()).getSex());
  121 + });
  122 + memberUserMapper.insert(dbUser);
  123 +
  124 + // 调用, 并断言异常
  125 + assertServiceException(() -> groupService.deleteGroup(id), GROUP_HAS_USER);
  126 + }
  127 +
  128 + @Test
  129 + public void testGetGroupPage() {
  130 + String name = randomString();
  131 + int status = CommonStatusEnum.ENABLE.getStatus();
  132 +
  133 + // mock 数据
  134 + MemberGroupDO dbGroup = randomPojo(MemberGroupDO.class, o -> { // 等会查询到
  135 + o.setName(name);
  136 + o.setStatus(status);
  137 + o.setCreateTime(buildTime(2023, 2, 18));
  138 + });
  139 + groupMapper.insert(dbGroup);
  140 + // 测试 name 不匹配
  141 + groupMapper.insert(cloneIgnoreId(dbGroup, o -> o.setName("")));
  142 + // 测试 status 不匹配
  143 + groupMapper.insert(cloneIgnoreId(dbGroup, o -> o.setStatus(CommonStatusEnum.DISABLE.getStatus())));
  144 + // 测试 createTime 不匹配
  145 + groupMapper.insert(cloneIgnoreId(dbGroup, o -> o.setCreateTime(null)));
  146 + // 准备参数
  147 + MemberGroupPageReqVO reqVO = new MemberGroupPageReqVO();
  148 + reqVO.setName(name);
  149 + reqVO.setStatus(status);
  150 + reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
  151 +
  152 + // 调用
  153 + PageResult<MemberGroupDO> pageResult = groupService.getGroupPage(reqVO);
  154 + // 断言
  155 + assertEquals(1, pageResult.getTotal());
  156 + assertEquals(1, pageResult.getList().size());
  157 + assertPojoEquals(dbGroup, pageResult.getList().get(0));
  158 + }
  159 +
  160 +}
yudao-module-member/yudao-module-member-biz/src/test/java/cn/iocoder/yudao/module/member/service/level/MemberLevelServiceImplTest.java 0 → 100644
  View file @8b98d13
  1 +package cn.iocoder.yudao.module.member.service.level;
  2 +
  3 +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
  4 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  5 +import cn.iocoder.yudao.framework.common.util.collection.ArrayUtils;
  6 +import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
  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.MemberLevelListReqVO;
  9 +import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelUpdateReqVO;
  10 +import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO;
  11 +import cn.iocoder.yudao.module.member.dal.mysql.level.MemberLevelMapper;
  12 +import org.junit.jupiter.api.Test;
  13 +import org.springframework.boot.test.mock.mockito.MockBean;
  14 +import org.springframework.context.annotation.Import;
  15 +
  16 +import javax.annotation.Resource;
  17 +import java.util.List;
  18 +import java.util.function.Consumer;
  19 +
  20 +import static cn.hutool.core.util.RandomUtil.randomInt;
  21 +import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId;
  22 +import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
  23 +import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
  24 +import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
  25 +import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.*;
  26 +import static org.junit.jupiter.api.Assertions.*;
  27 +
  28 +// TODO 芋艿：完全 review 完，在去 review 单测
  29 +/**
  30 + * {@link MemberLevelServiceImpl} 的单元测试类
  31 + *
  32 + * @author owen
  33 + */
  34 +@Import(MemberLevelServiceImpl.class)
  35 +public class MemberLevelServiceImplTest extends BaseDbUnitTest {
  36 +
  37 + @Resource
  38 + private MemberLevelServiceImpl levelService;
  39 +
  40 + @Resource
  41 + private MemberLevelMapper levelMapper;
  42 +
  43 + @MockBean
  44 + private MemberLevelRecordService memberLevelRecordService;
  45 + @MockBean
  46 + private MemberExperienceRecordService memberExperienceRecordService;
  47 +
  48 + @Test
  49 + public void testCreateLevel_success() {
  50 + // 准备参数
  51 + MemberLevelCreateReqVO reqVO = randomPojo(MemberLevelCreateReqVO.class, o -> {
  52 + o.setDiscountPercent(randomInt());
  53 + o.setIcon(randomURL());
  54 + o.setBackgroundUrl(randomURL());
  55 + });
  56 +
  57 + // 调用
  58 + Long levelId = levelService.createLevel(reqVO);
  59 + // 断言
  60 + assertNotNull(levelId);
  61 + // 校验记录的属性是否正确
  62 + MemberLevelDO level = levelMapper.selectById(levelId);
  63 + assertPojoEquals(reqVO, level);
  64 + }
  65 +
  66 + @Test
  67 + public void testUpdateLevel_success() {
  68 + // mock 数据
  69 + MemberLevelDO dbLevel = randomPojo(MemberLevelDO.class);
  70 + levelMapper.insert(dbLevel);// @Sql: 先插入出一条存在的数据
  71 + // 准备参数
  72 + MemberLevelUpdateReqVO reqVO = randomPojo(MemberLevelUpdateReqVO.class, o -> {
  73 + o.setId(dbLevel.getId()); // 设置更新的 ID
  74 + //以下要保持一致
  75 + o.setName(dbLevel.getName());
  76 + o.setLevel(dbLevel.getLevel());
  77 + o.setExperience(dbLevel.getExperience());
  78 + //以下是要修改的字段
  79 + o.setDiscountPercent(randomInt());
  80 + o.setIcon(randomURL());
  81 + o.setBackgroundUrl(randomURL());
  82 + });
  83 +
  84 + // 调用
  85 + levelService.updateLevel(reqVO);
  86 + // 校验是否更新正确
  87 + MemberLevelDO level = levelMapper.selectById(reqVO.getId()); // 获取最新的
  88 + assertPojoEquals(reqVO, level);
  89 + }
  90 +
  91 + @Test
  92 + public void testUpdateLevel_notExists() {
  93 + // 准备参数
  94 + MemberLevelUpdateReqVO reqVO = randomPojo(MemberLevelUpdateReqVO.class);
  95 +
  96 + // 调用, 并断言异常
  97 + assertServiceException(() -> levelService.updateLevel(reqVO), LEVEL_NOT_EXISTS);
  98 + }
  99 +
  100 + @Test
  101 + public void testDeleteLevel_success() {
  102 + // mock 数据
  103 + MemberLevelDO dbLevel = randomPojo(MemberLevelDO.class);
  104 + levelMapper.insert(dbLevel);// @Sql: 先插入出一条存在的数据
  105 + // 准备参数
  106 + Long id = dbLevel.getId();
  107 +
  108 + // 调用
  109 + levelService.deleteLevel(id);
  110 + // 校验数据不存在了
  111 + assertNull(levelMapper.selectById(id));
  112 + }
  113 +
  114 + @Test
  115 + public void testDeleteLevel_notExists() {
  116 + // 准备参数
  117 + Long id = randomLongId();
  118 +
  119 + // 调用, 并断言异常
  120 + assertServiceException(() -> levelService.deleteLevel(id), LEVEL_NOT_EXISTS);
  121 + }
  122 +
  123 + @Test
  124 + public void testGetLevelList() {
  125 + // mock 数据
  126 + MemberLevelDO dbLevel = randomPojo(MemberLevelDO.class, o -> { // 等会查询到
  127 + o.setName("黄金会员");
  128 + o.setStatus(1);
  129 + });
  130 + levelMapper.insert(dbLevel);
  131 + // 测试 name 不匹配
  132 + levelMapper.insert(cloneIgnoreId(dbLevel, o -> o.setName("")));
  133 + // 测试 status 不匹配
  134 + levelMapper.insert(cloneIgnoreId(dbLevel, o -> o.setStatus(0)));
  135 + // 准备参数
  136 + MemberLevelListReqVO reqVO = new MemberLevelListReqVO();
  137 + reqVO.setName("黄金会员");
  138 + reqVO.setStatus(1);
  139 +
  140 + // 调用
  141 + List<MemberLevelDO> list = levelService.getLevelList(reqVO);
  142 + // 断言
  143 + assertEquals(1, list.size());
  144 + assertPojoEquals(dbLevel, list.get(0));
  145 + }
  146 +
  147 + @Test
  148 + public void testCreateLevel_nameUnique() {
  149 + // 准备参数
  150 + String name = randomString();
  151 +
  152 + // mock 数据
  153 + levelMapper.insert(randomLevelDO(o -> o.setName(name)));
  154 +
  155 + // 调用，校验异常
  156 + List<MemberLevelDO> list = levelMapper.selectList();
  157 + assertServiceException(() -> levelService.validateNameUnique(list, null, name), LEVEL_NAME_EXISTS, name);
  158 + }
  159 +
  160 + @Test
  161 + public void testUpdateLevel_nameUnique() {
  162 + // 准备参数
  163 + Long id = randomLongId();
  164 + String name = randomString();
  165 +
  166 + // mock 数据
  167 + levelMapper.insert(randomLevelDO(o -> o.setName(name)));
  168 +
  169 + // 调用，校验异常
  170 + List<MemberLevelDO> list = levelMapper.selectList();
  171 + assertServiceException(() -> levelService.validateNameUnique(list, id, name), LEVEL_NAME_EXISTS, name);
  172 + }
  173 +
  174 + @Test
  175 + public void testCreateLevel_levelUnique() {
  176 + // 准备参数
  177 + Integer level = randomInteger();
  178 + String name = randomString();
  179 +
  180 + // mock 数据
  181 + levelMapper.insert(randomLevelDO(o -> {
  182 + o.setLevel(level);
  183 + o.setName(name);
  184 + }));
  185 +
  186 + // 调用，校验异常
  187 + List<MemberLevelDO> list = levelMapper.selectList();
  188 + assertServiceException(() -> levelService.validateLevelUnique(list, null, level), LEVEL_VALUE_EXISTS, level, name);
  189 + }
  190 +
  191 + @Test
  192 + public void testUpdateLevel_levelUnique() {
  193 + // 准备参数
  194 + Long id = randomLongId();
  195 + Integer level = randomInteger();
  196 + String name = randomString();
  197 +
  198 + // mock 数据
  199 + levelMapper.insert(randomLevelDO(o -> {
  200 + o.setLevel(level);
  201 + o.setName(name);
  202 + }));
  203 +
  204 + // 调用，校验异常
  205 + List<MemberLevelDO> list = levelMapper.selectList();
  206 + assertServiceException(() -> levelService.validateLevelUnique(list, id, level), LEVEL_VALUE_EXISTS, level, name);
  207 + }
  208 +
  209 + @Test
  210 + public void testCreateLevel_experienceOutRange() {
  211 + // 准备参数
  212 + int level = 10;
  213 + int experience = 10;
  214 + String name = randomString();
  215 +
  216 + // mock 数据
  217 + levelMapper.insert(randomLevelDO(o -> {
  218 + o.setLevel(level);
  219 + o.setExperience(experience);
  220 + o.setName(name);
  221 + }));
  222 + List<MemberLevelDO> list = levelMapper.selectList();
  223 +
  224 + // 调用，校验异常
  225 + assertServiceException(() -> levelService.validateExperienceOutRange(list, null, level + 1, experience - 1), LEVEL_EXPERIENCE_MIN, name, level);
  226 + // 调用，校验异常
  227 + assertServiceException(() -> levelService.validateExperienceOutRange(list, null, level - 1, experience + 1), LEVEL_EXPERIENCE_MAX, name, level);
  228 + }
  229 +
  230 + @Test
  231 + public void testUpdateLevel_experienceOutRange() {
  232 + // 准备参数
  233 + int level = 10;
  234 + int experience = 10;
  235 + Long id = randomLongId();
  236 + String name = randomString();
  237 +
  238 + // mock 数据
  239 + levelMapper.insert(randomLevelDO(o -> {
  240 + o.setLevel(level);
  241 + o.setExperience(experience);
  242 + o.setName(name);
  243 + }));
  244 + List<MemberLevelDO> list = levelMapper.selectList();
  245 +
  246 + // 调用，校验异常
  247 + assertServiceException(() -> levelService.validateExperienceOutRange(list, id, level + 1, experience - 1), LEVEL_EXPERIENCE_MIN, name, level);
  248 + // 调用，校验异常
  249 + assertServiceException(() -> levelService.validateExperienceOutRange(list, id, level - 1, experience + 1), LEVEL_EXPERIENCE_MAX, name, level);
  250 + }
  251 +
  252 + // ========== 随机对象 ==========
  253 +
  254 + @SafeVarargs
  255 + private static MemberLevelDO randomLevelDO(Consumer<MemberLevelDO>... consumers) {
  256 + Consumer<MemberLevelDO> consumer = (o) -> {
  257 + o.setStatus(CommonStatusEnum.ENABLE.getStatus());
  258 + o.setDiscountPercent(randomInt(0, 100));
  259 + o.setIcon(randomURL());
  260 + o.setBackgroundUrl(randomURL());
  261 + };
  262 + return randomPojo(MemberLevelDO.class, ArrayUtils.append(consumer, consumers));
  263 + }
  264 +}
yudao-module-member/yudao-module-member-biz/src/test/resources/sql/clean.sql
  View file @8b98d13
1 DELETE FROM "member_user"; 1 DELETE FROM "member_user";
2 DELETE FROM "member_address"; 2 DELETE FROM "member_address";
3 -DELETE FROM "member_tag";  
4 \ No newline at end of file 3 \ No newline at end of file
  4 +DELETE FROM "member_tag";
  5 +DELETE FROM "member_level";
  6 +DELETE FROM "member_group";
5 \ No newline at end of file 7 \ No newline at end of file
yudao-module-member/yudao-module-member-biz/src/test/resources/sql/create_tables.sql
  View file @8b98d13
1 -CREATE TABLE IF NOT EXISTS "member_user" (  
2 - "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY COMMENT '编号',  
3 - "nickname" varchar(30) NOT NULL DEFAULT '' COMMENT '用户昵称',  
4 - "avatar" varchar(255) NOT NULL DEFAULT '' COMMENT '头像',  
5 - "status" tinyint NOT NULL COMMENT '状态',  
6 - "mobile" varchar(11) NOT NULL COMMENT '手机号',  
7 - "password" varchar(100) NOT NULL DEFAULT '' COMMENT '密码', 1 +CREATE TABLE IF NOT EXISTS "member_user"
  2 +(
  3 + "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY COMMENT '编号',
  4 + "nickname" varchar(30) NOT NULL DEFAULT '' COMMENT '用户昵称',
  5 + "name" varchar(30) NULL COMMENT '真实名字',
  6 + sex tinyint null comment '性别',
  7 + birthday datetime null comment '出生日期',
  8 + area_id int null comment '所在地',
  9 + mark varchar(255) null comment '用户备注',
  10 + point int default 0 null comment '积分',
  11 + "avatar" varchar(255) NOT NULL DEFAULT '' COMMENT '头像',
  12 + "status" tinyint NOT NULL COMMENT '状态',
  13 + "mobile" varchar(11) NOT NULL COMMENT '手机号',
  14 + "password" varchar(100) NOT NULL DEFAULT '' COMMENT '密码',
8 "register_ip" varchar(32) NOT NULL COMMENT '注册 IP', 15 "register_ip" varchar(32) NOT NULL COMMENT '注册 IP',
9 - "login_ip" varchar(50) NULL DEFAULT '' COMMENT '最后登录IP',  
10 - "login_date" datetime NULL DEFAULT NULL COMMENT '最后登录时间',  
11 - "creator" varchar(64) NULL DEFAULT '' COMMENT '创建者',  
12 - "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',  
13 - "updater" varchar(64) NULL DEFAULT '' COMMENT '更新者',  
14 - "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',  
15 - "deleted" bit(1) NOT NULL DEFAULT '0' COMMENT '是否删除',  
16 - "tenant_id" bigint not null default '0', 16 + "login_ip" varchar(50) NULL DEFAULT '' COMMENT '最后登录IP',
  17 + "login_date" datetime NULL DEFAULT NULL COMMENT '最后登录时间',
  18 + "tag_ids" varchar(255) NULL DEFAULT NULL COMMENT '用户标签编号列表,以逗号分隔',
  19 + "level_id" bigint NULL DEFAULT NULL COMMENT '等级编号',
  20 + "experience" bigint NULL DEFAULT NULL COMMENT '经验',
  21 + "group_id" bigint NULL DEFAULT NULL COMMENT '用户分组编号',
  22 + "creator" varchar(64) NULL DEFAULT '' COMMENT '创建者',
  23 + "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
  24 + "updater" varchar(64) NULL DEFAULT '' COMMENT '更新者',
  25 + "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
  26 + "deleted" bit(1) NOT NULL DEFAULT '0' COMMENT '是否删除',
  27 + "tenant_id" bigint not null default '0',
17 PRIMARY KEY ("id") 28 PRIMARY KEY ("id")
18 ) COMMENT '会员表'; 29 ) COMMENT '会员表';
19 30
@@ -44,4 +55,38 @@ CREATE TABLE IF NOT EXISTS &quot;member_tag&quot; @@ -44,4 +55,38 @@ CREATE TABLE IF NOT EXISTS &quot;member_tag&quot;
44 "deleted" bit NOT NULL DEFAULT FALSE, 55 "deleted" bit NOT NULL DEFAULT FALSE,
45 "tenant_id" bigint NOT NULL default '0', 56 "tenant_id" bigint NOT NULL default '0',
46 PRIMARY KEY ("id") 57 PRIMARY KEY ("id")
47 -) COMMENT '会员标签';  
48 \ No newline at end of file 58 \ No newline at end of file
  59 +) COMMENT '会员标签';
  60 +
  61 +CREATE TABLE IF NOT EXISTS "member_level"
  62 +(
  63 + "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
  64 + "name" varchar NOT NULL,
  65 + "experience" int NOT NULL,
  66 + "level" int NOT NULL,
  67 + "discount" int NOT NULL,
  68 + "icon" varchar NOT NULL,
  69 + "background_url" varchar NOT NULL,
  70 + "creator" varchar DEFAULT '',
  71 + "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
  72 + "updater" varchar DEFAULT '',
  73 + "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
  74 + "deleted" bit NOT NULL DEFAULT FALSE,
  75 + "tenant_id" bigint not null default '0',
  76 + "status" int NOT NULL,
  77 + PRIMARY KEY ("id")
  78 +) COMMENT '会员等级';
  79 +
  80 +CREATE TABLE IF NOT EXISTS "member_group"
  81 +(
  82 + "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
  83 + "name" varchar NOT NULL,
  84 + "remark" varchar NOT NULL,
  85 + "status" varchar NOT NULL,
  86 + "creator" varchar DEFAULT '',
  87 + "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
  88 + "updater" varchar DEFAULT '',
  89 + "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
  90 + "deleted" bit NOT NULL DEFAULT FALSE,
  91 + "tenant_id" bigint not null default '0',
  92 + PRIMARY KEY ("id")
  93 +) COMMENT '用户分组';
49 \ No newline at end of file 94 \ No newline at end of file
yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/ErrorCodeConstants.java
  View file @8b98d13
@@ -27,6 +27,7 @@ public interface ErrorCodeConstants { @@ -27,6 +27,7 @@ public interface ErrorCodeConstants {
27 ErrorCode ORDER_IS_EXPIRED = new ErrorCode(1007002003, "支付订单已经过期"); 27 ErrorCode ORDER_IS_EXPIRED = new ErrorCode(1007002003, "支付订单已经过期");
28 ErrorCode ORDER_SUBMIT_CHANNEL_ERROR = new ErrorCode(1007002004, "发起支付报错，错误码：{}，错误提示：{}"); 28 ErrorCode ORDER_SUBMIT_CHANNEL_ERROR = new ErrorCode(1007002004, "发起支付报错，错误码：{}，错误提示：{}");
29 ErrorCode ORDER_REFUND_FAIL_STATUS_ERROR = new ErrorCode(1007002005, "支付订单退款失败，原因：状态不是已支付或已退款"); 29 ErrorCode ORDER_REFUND_FAIL_STATUS_ERROR = new ErrorCode(1007002005, "支付订单退款失败，原因：状态不是已支付或已退款");
  30 + ErrorCode ORDER_UPDATE_PRICE_FAIL_PAID = new ErrorCode(1007002006, "支付订单调价失败，原因：支付订单已付款,不能调价");
30 31
31 // ========== ORDER 模块(拓展单) 1007003000 ========== 32 // ========== ORDER 模块(拓展单) 1007003000 ==========
32 ErrorCode ORDER_EXTENSION_NOT_FOUND = new ErrorCode(1007003000, "支付交易拓展单不存在"); 33 ErrorCode ORDER_EXTENSION_NOT_FOUND = new ErrorCode(1007003000, "支付交易拓展单不存在");
@@ -40,6 +41,9 @@ public interface ErrorCodeConstants { @@ -40,6 +41,9 @@ public interface ErrorCodeConstants {
40 ErrorCode REFUND_NOT_FOUND = new ErrorCode(1007006004, "支付退款单不存在"); 41 ErrorCode REFUND_NOT_FOUND = new ErrorCode(1007006004, "支付退款单不存在");
41 ErrorCode REFUND_STATUS_IS_NOT_WAITING = new ErrorCode(1007006005, "支付退款单不处于待退款"); 42 ErrorCode REFUND_STATUS_IS_NOT_WAITING = new ErrorCode(1007006005, "支付退款单不处于待退款");
42 43
  44 + // ========== 钱包模块(退款) 1007007000 ==========
  45 + ErrorCode WALLET_NOT_FOUND = new ErrorCode(1007007000, "用户钱包不存在");
  46 +
43 // ========== 示例订单 1007900000 ========== 47 // ========== 示例订单 1007900000 ==========
44 ErrorCode DEMO_ORDER_NOT_FOUND = new ErrorCode(1007900000, "示例订单不存在"); 48 ErrorCode DEMO_ORDER_NOT_FOUND = new ErrorCode(1007900000, "示例订单不存在");
45 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 @8b98d13
@@ -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 @8b98d13
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 @8b98d13
  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 @8b98d13
  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 @8b98d13
  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 @8b98d13
  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 @8b98d13
  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 @8b98d13
  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 @8b98d13
  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 @8b98d13
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 @8b98d13
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 @02bc9d2
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 @02bc9d2
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 @8b98d13
  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 @8b98d13
  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 @8b98d13
  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 @8b98d13
  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 @8b98d13
  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 @8b98d13
  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 +}
yudao-server/pom.xml
  View file @8b98d13
@@ -54,11 +54,11 @@ @@ -54,11 +54,11 @@
54 <!-- <version>${revision}</version>--> 54 <!-- <version>${revision}</version>-->
55 <!-- </dependency>--> 55 <!-- </dependency>-->
56 <!-- 支付服务。默认注释，保证编译速度 --> 56 <!-- 支付服务。默认注释，保证编译速度 -->
57 -<!-- <dependency>-->  
58 -<!-- <groupId>cn.iocoder.boot</groupId>-->  
59 -<!-- <artifactId>yudao-module-pay-biz</artifactId>-->  
60 -<!-- <version>${revision}</version>-->  
61 -<!-- </dependency>--> 57 + <dependency>
  58 + <groupId>cn.iocoder.boot</groupId>
  59 + <artifactId>yudao-module-pay-biz</artifactId>
  60 + <version>${revision}</version>
  61 + </dependency>
62 62
63 <!-- 微信公众号模块。默认注释，保证编译速度 --> 63 <!-- 微信公众号模块。默认注释，保证编译速度 -->
64 <!-- <dependency>--> 64 <!-- <dependency>-->
@@ -68,21 +68,21 @@ @@ -68,21 +68,21 @@
68 <!-- </dependency>--> 68 <!-- </dependency>-->
69 69
70 <!-- 商城相关模块。默认注释，保证编译速度 --> 70 <!-- 商城相关模块。默认注释，保证编译速度 -->
71 -<!-- <dependency>-->  
72 -<!-- <groupId>cn.iocoder.boot</groupId>-->  
73 -<!-- <artifactId>yudao-module-promotion-biz</artifactId>-->  
74 -<!-- <version>${revision}</version>-->  
75 -<!-- </dependency>-->  
76 -<!-- <dependency>-->  
77 -<!-- <groupId>cn.iocoder.boot</groupId>-->  
78 -<!-- <artifactId>yudao-module-product-biz</artifactId>-->  
79 -<!-- <version>${revision}</version>-->  
80 -<!-- </dependency>-->  
81 -<!-- <dependency>-->  
82 -<!-- <groupId>cn.iocoder.boot</groupId>-->  
83 -<!-- <artifactId>yudao-module-trade-biz</artifactId>-->  
84 -<!-- <version>${revision}</version>-->  
85 -<!-- </dependency>--> 71 + <dependency>
  72 + <groupId>cn.iocoder.boot</groupId>
  73 + <artifactId>yudao-module-promotion-biz</artifactId>
  74 + <version>${revision}</version>
  75 + </dependency>
  76 + <dependency>
  77 + <groupId>cn.iocoder.boot</groupId>
  78 + <artifactId>yudao-module-product-biz</artifactId>
  79 + <version>${revision}</version>
  80 + </dependency>
  81 + <dependency>
  82 + <groupId>cn.iocoder.boot</groupId>
  83 + <artifactId>yudao-module-trade-biz</artifactId>
  84 + <version>${revision}</version>
  85 + </dependency>
86 86
87 <!-- spring boot 配置所需依赖 --> 87 <!-- spring boot 配置所需依赖 -->
88 <dependency> 88 <dependency>