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

pom.xml

@@ -16,11 +16,11 @@
         <module>yudao-module-member</module>
         <module>yudao-module-system</module>
         <module>yudao-module-infra</module>
-<!--        <module>yudao-module-pay</module>-->
-<!--        <module>yudao-module-bpm</module>-->
-<!--        <module>yudao-module-report</module>-->
-<!--        <module>yudao-module-mp</module>-->
-<!--        <module>yudao-module-mall</module>-->
+        <module>yudao-module-pay</module>
+        <module>yudao-module-bpm</module>
+        <module>yudao-module-report</module>
+        <module>yudao-module-mp</module>
+        <module>yudao-module-mall</module>
         <!-- 示例项目 -->
         <module>yudao-example</module>
     </modules>

sql/mysql/pay_wallet.sql

@@ -0,0 +1,44 @@
+-- ----------------------------
+-- 支付-钱包表
+-- ----------------------------
+DROP TABLE IF EXISTS `pay_wallet`;
+CREATE TABLE `pay_wallet`
+(
+    `id`             bigint   NOT NULL AUTO_INCREMENT COMMENT '编号',
+    `user_id`        bigint   NOT NULL COMMENT '用户 id',
+    `user_type`      tinyint  NOT NULL DEFAULT 0 COMMENT '用户类型',
+    `balance`        int      NOT NULL DEFAULT 0 COMMENT '余额, 单位分',
+    `total_expense`  bigint      NOT NULL DEFAULT 0 COMMENT '累计支出, 单位分',
+    `total_recharge` bigint      NOT NULL DEFAULT 0 COMMENT '累计充值, 单位分',
+    `creator`        varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '创建者',
+    `create_time`    datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `updater`        varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '更新者',
+    `update_time`    datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+    `deleted`        bit(1)   NOT NULL DEFAULT b'0' COMMENT '是否删除',
+    `tenant_id`      bigint   NOT NULL DEFAULT 0 COMMENT '租户编号',
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB COMMENT='支付钱包表';
+
+-- ----------------------------
+-- 支付- 钱包余额明细表
+-- ----------------------------
+DROP TABLE IF EXISTS `pay_wallet_transaction`;
+CREATE TABLE `pay_wallet_transaction`
+(
+    `id`               bigint      NOT NULL AUTO_INCREMENT COMMENT '编号',
+    `wallet_id`        bigint      NOT NULL COMMENT '会员钱包 id',
+    `biz_type`         tinyint     NOT NULL COMMENT '关联类型',
+    `biz_id`           bigint      NOT NULL COMMENT '关联业务编号',
+    `no`               varchar(64) NOT NULL COMMENT '流水号',
+    `description`      varchar(255)         COMMENT '操作说明',
+    `amount`           int         NOT NULL COMMENT '交易金额, 单位分',
+    `balance`          int         NOT NULL COMMENT '余额, 单位分',
+    `transaction_time` datetime    NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '交易时间',
+    `creator`          varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '创建者',
+    `create_time`      datetime    NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `updater`          varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '更新者',
+    `update_time`      datetime    NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+    `deleted`          bit(1)      NOT NULL DEFAULT b'0' COMMENT '是否删除',
+    `tenant_id`        bigint      NOT NULL DEFAULT 0 COMMENT '租户编号',
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB COMMENT='支付钱包余额明细表';

yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AbstractAlipayPayClient.java

@@ -27,6 +27,7 @@ import com.alipay.api.request.AlipayTradeRefundRequest;
 import com.alipay.api.response.AlipayTradeFastpayRefundQueryResponse;
 import com.alipay.api.response.AlipayTradeQueryResponse;
 import com.alipay.api.response.AlipayTradeRefundResponse;
+import lombok.Getter;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 
@@ -47,6 +48,7 @@ import static cn.hutool.core.date.DatePattern.NORM_DATETIME_FORMATTER;
 @Slf4j
 public abstract class AbstractAlipayPayClient extends AbstractPayClient<AlipayPayClientConfig> {
 
+    @Getter // 仅用于单测场景
     protected DefaultAlipayClient client;
 
     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

@@ -13,6 +13,8 @@ import com.alipay.api.request.AlipayTradePayRequest;
 import com.alipay.api.response.AlipayTradePayResponse;
 import lombok.extern.slf4j.Slf4j;
 
+import java.time.LocalDateTime;
+
 import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants.BAD_REQUEST;
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception0;
 
@@ -63,8 +65,10 @@ public class AlipayBarPayClient extends AbstractAlipayPayClient {
             return buildClosedPayOrderRespDTO(reqDTO, response);
         }
         if ("10000".equals(response.getCode())) { // 免密支付
-            return PayOrderRespDTO.successOf(response.getTradeNo(), response.getBuyerUserId(), LocalDateTimeUtil.of(response.getGmtPayment()),
-                    response.getOutTradeNo(), response);
+            LocalDateTime successTime = LocalDateTimeUtil.of(response.getGmtPayment());
+            return PayOrderRespDTO.successOf(response.getTradeNo(), response.getBuyerUserId(), successTime,
+                            response.getOutTradeNo(), response)
+                    .setDisplayMode(displayMode).setDisplayContent("");
         }
         // 大额支付，需要用户输入密码，所以返回 waiting。此时，前端一般会进行轮询
         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,0 +1,221 @@
+package cn.iocoder.yudao.framework.pay.core.client.impl.alipay;
+
+import cn.hutool.core.date.LocalDateTimeUtil;
+import cn.hutool.core.util.RandomUtil;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
+import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants;
+import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
+import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderUnifiedReqDTO;
+import cn.iocoder.yudao.framework.pay.core.client.dto.refund.PayRefundRespDTO;
+import cn.iocoder.yudao.framework.pay.core.client.dto.refund.PayRefundUnifiedReqDTO;
+import cn.iocoder.yudao.framework.pay.core.client.exception.PayException;
+import cn.iocoder.yudao.framework.pay.core.enums.refund.PayRefundStatusRespEnum;
+import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest;
+import com.alipay.api.AlipayApiException;
+import com.alipay.api.DefaultAlipayClient;
+import com.alipay.api.DefaultSigner;
+import com.alipay.api.domain.AlipayTradeRefundModel;
+import com.alipay.api.request.AlipayTradeRefundRequest;
+import com.alipay.api.response.AlipayTradeRefundResponse;
+import lombok.Setter;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentMatcher;
+import org.mockito.Mock;
+
+import javax.validation.ConstraintViolationException;
+import java.util.Date;
+
+import static cn.iocoder.yudao.framework.pay.core.client.impl.alipay.AlipayPayClientConfig.MODE_PUBLIC_KEY;
+import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.Mockito.when;
+
+/**
+ * 支付宝 Client 的测试基类
+ *
+ * @author jason
+ */
+public abstract class AbstractAlipayClientTest extends BaseMockitoUnitTest {
+
+    protected AlipayPayClientConfig config = randomPojo(AlipayPayClientConfig.class, o -> {
+        o.setServerUrl(randomURL());
+        o.setPrivateKey(randomString());
+        o.setMode(MODE_PUBLIC_KEY);
+        o.setSignType(AlipayPayClientConfig.SIGN_TYPE_DEFAULT);
+        o.setAppCertContent("");
+        o.setAlipayPublicCertContent("");
+        o.setRootCertContent("");
+    });
+
+    @Mock
+    protected DefaultAlipayClient defaultAlipayClient;
+
+    @Setter
+    private AbstractAlipayPayClient client;
+
+    /**
+     * 子类需要实现该方法. 设置 client 的具体实现
+     */
+    @BeforeEach
+    public abstract void setUp();
+
+    @Test
+    @DisplayName("支付宝 Client 初始化")
+    public void testDoInit() {
+        // 调用
+        client.doInit();
+        // 断言
+        DefaultAlipayClient realClient = client.getClient();
+        assertNotSame(defaultAlipayClient, realClient);
+        assertInstanceOf(DefaultSigner.class, realClient.getSigner());
+        assertEquals(config.getPrivateKey(), ((DefaultSigner) realClient.getSigner()).getPrivateKey());
+    }
+
+    @Test
+    @DisplayName("支付宝 Client 统一退款：成功")
+    public void testUnifiedRefund_success() throws AlipayApiException {
+        // mock 方法
+        String notifyUrl = randomURL();
+        Date refundTime = randomDate();
+        String outRefundNo = randomString();
+        String outTradeNo = randomString();
+        Integer refundAmount = randomInteger();
+        AlipayTradeRefundResponse response = randomPojo(AlipayTradeRefundResponse.class, o -> {
+            o.setSubCode("");
+            o.setGmtRefundPay(refundTime);
+        });
+        when(defaultAlipayClient.execute(argThat((ArgumentMatcher<AlipayTradeRefundRequest>) request -> {
+            assertInstanceOf(AlipayTradeRefundModel.class, request.getBizModel());
+            AlipayTradeRefundModel bizModel = (AlipayTradeRefundModel) request.getBizModel();
+            assertEquals(outRefundNo, bizModel.getOutRequestNo());
+            assertEquals(outTradeNo, bizModel.getOutTradeNo());
+            assertEquals(String.valueOf(refundAmount / 100.0), bizModel.getRefundAmount());
+            return true;
+        }))).thenReturn(response);
+        // 准备请求参数
+        PayRefundUnifiedReqDTO refundReqDTO = randomPojo(PayRefundUnifiedReqDTO.class, o -> {
+            o.setOutRefundNo(outRefundNo);
+            o.setOutTradeNo(outTradeNo);
+            o.setNotifyUrl(notifyUrl);
+            o.setRefundPrice(refundAmount);
+        });
+
+        // 调用
+        PayRefundRespDTO resp = client.unifiedRefund(refundReqDTO);
+        // 断言
+        assertEquals(PayRefundStatusRespEnum.SUCCESS.getStatus(), resp.getStatus());
+        assertEquals(outRefundNo, resp.getOutRefundNo());
+        assertNull(resp.getChannelRefundNo());
+        assertEquals(LocalDateTimeUtil.of(refundTime), resp.getSuccessTime());
+        assertSame(response, resp.getRawData());
+        assertNull(resp.getChannelErrorCode());
+        assertNull(resp.getChannelErrorMsg());
+    }
+
+    @Test
+    @DisplayName("支付宝 Client 统一退款：渠道返回失败")
+    public void test_unified_refund_channel_failed() throws AlipayApiException {
+        // mock 方法
+        String notifyUrl = randomURL();
+        String subCode = randomString();
+        String subMsg = randomString();
+        AlipayTradeRefundResponse response = randomPojo(AlipayTradeRefundResponse.class, o -> {
+            o.setSubCode(subCode);
+            o.setSubMsg(subMsg);
+        });
+        when(defaultAlipayClient.execute(argThat((ArgumentMatcher<AlipayTradeRefundRequest>) request -> {
+            assertInstanceOf(AlipayTradeRefundModel.class, request.getBizModel());
+            return true;
+        }))).thenReturn(response);
+        // 准备请求参数
+        String outRefundNo = randomString();
+        String outTradeNo = randomString();
+        PayRefundUnifiedReqDTO refundReqDTO = randomPojo(PayRefundUnifiedReqDTO.class, o -> {
+            o.setOutRefundNo(outRefundNo);
+            o.setOutTradeNo(outTradeNo);
+            o.setNotifyUrl(notifyUrl);
+        });
+
+        // 调用
+        PayRefundRespDTO resp = client.unifiedRefund(refundReqDTO);
+        // 断言
+        assertEquals(PayRefundStatusRespEnum.FAILURE.getStatus(), resp.getStatus());
+        assertEquals(outRefundNo, resp.getOutRefundNo());
+        assertNull(resp.getChannelRefundNo());
+        assertNull(resp.getSuccessTime());
+        assertSame(response, resp.getRawData());
+        assertEquals(subCode, resp.getChannelErrorCode());
+        assertEquals(subMsg, resp.getChannelErrorMsg());
+    }
+
+    @Test
+    @DisplayName("支付宝 Client 统一退款：参数校验不通过")
+    public void testUnifiedRefund_paramInvalidate() {
+        // 准备请求参数
+        String notifyUrl = randomURL();
+        PayRefundUnifiedReqDTO refundReqDTO = randomPojo(PayRefundUnifiedReqDTO.class, o -> {
+            o.setOutTradeNo("");
+            o.setNotifyUrl(notifyUrl);
+        });
+
+        // 调用，并断言
+        assertThrows(ConstraintViolationException.class, () -> client.unifiedRefund(refundReqDTO));
+    }
+
+    @Test
+    @DisplayName("支付宝 Client 统一退款：抛出业务异常")
+    public void testUnifiedRefund_throwServiceException() throws AlipayApiException {
+        // mock
+        when(defaultAlipayClient.execute(argThat((ArgumentMatcher<AlipayTradeRefundRequest>) request -> true)))
+                .thenThrow(ServiceExceptionUtil.exception(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR));
+        // 准备请求参数
+        String notifyUrl = randomURL();
+        PayRefundUnifiedReqDTO refundReqDTO = randomPojo(PayRefundUnifiedReqDTO.class, o -> o.setNotifyUrl(notifyUrl));
+
+        // 调用，并断言
+        assertThrows(ServiceException.class, () -> client.unifiedRefund(refundReqDTO));
+    }
+
+    @Test
+    @DisplayName("支付宝 Client 统一退款：抛出系统异常")
+    public void testUnifiedRefund_throwPayException() throws AlipayApiException {
+        // mock
+        when(defaultAlipayClient.execute(argThat((ArgumentMatcher<AlipayTradeRefundRequest>) request -> true)))
+                .thenThrow(new RuntimeException("系统异常"));
+        // 准备请求参数
+        String notifyUrl = randomURL();
+        PayRefundUnifiedReqDTO refundReqDTO = randomPojo(PayRefundUnifiedReqDTO.class, o -> o.setNotifyUrl(notifyUrl));
+
+        // 调用，并断言
+        assertThrows(PayException.class, () -> client.unifiedRefund(refundReqDTO));
+    }
+
+    @Test
+    @DisplayName("支付宝 Client 统一下单：参数校验不通过")
+    public void testUnifiedOrder_paramInvalidate() {
+        // 准备请求参数
+        String outTradeNo = randomString();
+        String notifyUrl = randomURL();
+        PayOrderUnifiedReqDTO reqDTO = randomPojo(PayOrderUnifiedReqDTO.class, o -> {
+            o.setOutTradeNo(outTradeNo);
+            o.setNotifyUrl(notifyUrl);
+        });
+
+        // 调用，并断言
+        assertThrows(ConstraintViolationException.class, () -> client.unifiedOrder(reqDTO));
+    }
+
+    protected PayOrderUnifiedReqDTO buildOrderUnifiedReqDTO(String notifyUrl, String outTradeNo, Integer price) {
+        return randomPojo(PayOrderUnifiedReqDTO.class, o -> {
+            o.setOutTradeNo(outTradeNo);
+            o.setNotifyUrl(notifyUrl);
+            o.setPrice(price);
+            o.setSubject(RandomUtil.randomString(32));
+            o.setBody(RandomUtil.randomString(32));
+        });
+    }
+
+}

yudao-framework/yudao-spring-boot-starter-biz-pay/src/test/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AlipayBarPayClientTest.java

@@ -0,0 +1,170 @@
+package cn.iocoder.yudao.framework.pay.core.client.impl.alipay;
+
+import cn.hutool.core.date.LocalDateTimeUtil;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
+import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderRespDTO;
+import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderUnifiedReqDTO;
+import cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderDisplayModeEnum;
+import cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderStatusRespEnum;
+import com.alipay.api.AlipayApiException;
+import com.alipay.api.domain.AlipayTradePayModel;
+import com.alipay.api.request.AlipayTradePayRequest;
+import com.alipay.api.response.AlipayTradePayResponse;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentMatcher;
+import org.mockito.InjectMocks;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+import static cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderStatusRespEnum.CLOSED;
+import static cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderStatusRespEnum.WAITING;
+import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.Mockito.when;
+
+/**
+ * {@link AlipayBarPayClient} 单元测试
+ *
+ * @author jason
+ */
+public class AlipayBarPayClientTest extends AbstractAlipayClientTest {
+
+    @InjectMocks
+    private AlipayBarPayClient client = new AlipayBarPayClient(randomLongId(), config);
+
+    @Override
+    @BeforeEach
+    public void setUp() {
+        setClient(client);
+    }
+
+    @Test
+    @DisplayName("支付宝条码支付：非免密码支付下单成功")
+    public void testUnifiedOrder_success() throws AlipayApiException {
+        // mock 方法
+        String outTradeNo = randomString();
+        String notifyUrl = randomURL();
+        Integer price = randomInteger();
+        String authCode = randomString();
+        AlipayTradePayResponse response = randomPojo(AlipayTradePayResponse.class, o -> o.setSubCode(""));
+        when(defaultAlipayClient.execute(argThat((ArgumentMatcher<AlipayTradePayRequest>) request -> {
+            assertInstanceOf(AlipayTradePayModel.class, request.getBizModel());
+            assertEquals(notifyUrl, request.getNotifyUrl());
+            AlipayTradePayModel model = (AlipayTradePayModel) request.getBizModel();
+            assertEquals(outTradeNo, model.getOutTradeNo());
+            assertEquals(String.valueOf(price / 100.0), model.getTotalAmount());
+            assertEquals(authCode, model.getAuthCode());
+            return true;
+        }))).thenReturn(response);
+        // 准备请求参数
+        PayOrderUnifiedReqDTO reqDTO = buildOrderUnifiedReqDTO(notifyUrl, outTradeNo, price);
+        Map<String, String> extraParam = new HashMap<>();
+        extraParam.put("auth_code", authCode);
+        reqDTO.setChannelExtras(extraParam);
+
+        // 调用方法
+        PayOrderRespDTO resp = client.unifiedOrder(reqDTO);
+        // 断言
+        assertEquals(WAITING.getStatus(), resp.getStatus());
+        assertEquals(outTradeNo, resp.getOutTradeNo());
+        assertNull(resp.getChannelOrderNo());
+        assertNull(resp.getChannelUserId());
+        assertNull(resp.getSuccessTime());
+        assertEquals(PayOrderDisplayModeEnum.BAR_CODE.getMode(), resp.getDisplayMode());
+        assertEquals("", resp.getDisplayContent());
+        assertSame(response, resp.getRawData());
+        assertNull(resp.getChannelErrorCode());
+        assertNull(resp.getChannelErrorMsg());
+    }
+
+    @Test
+    @DisplayName("支付宝条码支付：免密码支付下单成功")
+    public void testUnifiedOrder_code10000Success() throws AlipayApiException {
+        // mock 方法
+        String outTradeNo = randomString();
+        String channelNo = randomString();
+        String channelUserId = randomString();
+        Date payTime = randomDate();
+        AlipayTradePayResponse response = randomPojo(AlipayTradePayResponse.class, o -> {
+            o.setSubCode("");
+            o.setCode("10000");
+            o.setOutTradeNo(outTradeNo);
+            o.setTradeNo(channelNo);
+            o.setBuyerUserId(channelUserId);
+            o.setGmtPayment(payTime);
+        });
+        when(defaultAlipayClient.execute(argThat((ArgumentMatcher<AlipayTradePayRequest>) request -> true)))
+                .thenReturn(response);
+        // 准备请求参数
+        String authCode = randomString();
+        PayOrderUnifiedReqDTO reqDTO = buildOrderUnifiedReqDTO(randomURL(), outTradeNo, randomInteger());
+        Map<String, String> extraParam = new HashMap<>();
+        extraParam.put("auth_code", authCode);
+        reqDTO.setChannelExtras(extraParam);
+
+        // 下单请求
+        PayOrderRespDTO resp = client.unifiedOrder(reqDTO);
+        // 断言
+        assertEquals(PayOrderStatusRespEnum.SUCCESS.getStatus(), resp.getStatus());
+        assertEquals(outTradeNo, resp.getOutTradeNo());
+        assertEquals(channelNo, resp.getChannelOrderNo());
+        assertEquals(channelUserId, resp.getChannelUserId());
+        assertEquals(LocalDateTimeUtil.of(payTime), resp.getSuccessTime());
+        assertEquals(PayOrderDisplayModeEnum.BAR_CODE.getMode(), resp.getDisplayMode());
+        assertEquals("", resp.getDisplayContent());
+        assertSame(response, resp.getRawData());
+        assertNull(resp.getChannelErrorCode());
+        assertNull(resp.getChannelErrorMsg());
+    }
+
+    @Test
+    @DisplayName("支付宝条码支付：没有传条码")
+    public void testUnifiedOrder_emptyAuthCode() {
+        // 准备参数
+        PayOrderUnifiedReqDTO reqDTO = buildOrderUnifiedReqDTO(randomURL(), randomString(), randomInteger());
+
+        // 调用，并断言
+        assertThrows(ServiceException.class, () -> client.unifiedOrder(reqDTO));
+    }
+
+    @Test
+    @DisplayName("支付宝条码支付：渠道返回失败")
+    public void test_unified_order_channel_failed() throws AlipayApiException {
+        // mock 方法
+        String subCode = randomString();
+        String subMsg = randomString();
+        AlipayTradePayResponse response = randomPojo(AlipayTradePayResponse.class, o -> {
+            o.setSubCode(subCode);
+            o.setSubMsg(subMsg);
+        });
+        when(defaultAlipayClient.execute(argThat((ArgumentMatcher<AlipayTradePayRequest>) request -> true)))
+                .thenReturn(response);
+        // 准备请求参数
+        String authCode = randomString();
+        String outTradeNo = randomString();
+        PayOrderUnifiedReqDTO reqDTO = buildOrderUnifiedReqDTO(randomURL(), outTradeNo, randomInteger());
+        Map<String, String> extraParam = new HashMap<>();
+        extraParam.put("auth_code", authCode);
+        reqDTO.setChannelExtras(extraParam);
+
+        // 调用方法
+        PayOrderRespDTO resp = client.unifiedOrder(reqDTO);
+        // 断言
+        assertEquals(CLOSED.getStatus(), resp.getStatus());
+        assertEquals(outTradeNo, resp.getOutTradeNo());
+        assertNull(resp.getChannelOrderNo());
+        assertNull(resp.getChannelUserId());
+        assertNull(resp.getSuccessTime());
+        assertNull(resp.getDisplayMode());
+        assertNull(resp.getDisplayContent());
+        assertSame(response, resp.getRawData());
+        assertEquals(subCode, resp.getChannelErrorCode());
+        assertEquals(subMsg, resp.getChannelErrorMsg());
+    }
+
+}

yudao-framework/yudao-spring-boot-starter-biz-pay/src/test/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AlipayPcPayClientTest.java

@@ -0,0 +1,131 @@
+package cn.iocoder.yudao.framework.pay.core.client.impl.alipay;
+
+import cn.hutool.http.Method;
+import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderRespDTO;
+import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderUnifiedReqDTO;
+import cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderDisplayModeEnum;
+import com.alipay.api.AlipayApiException;
+import com.alipay.api.request.AlipayTradePagePayRequest;
+import com.alipay.api.response.AlipayTradePagePayResponse;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentMatcher;
+import org.mockito.InjectMocks;
+
+import static cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderStatusRespEnum.CLOSED;
+import static cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderStatusRespEnum.WAITING;
+import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
+import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.when;
+
+/**
+ * {@link  AlipayPcPayClient} 单元测试
+ *
+ * @author jason
+ */
+public class AlipayPcPayClientTest extends AbstractAlipayClientTest {
+
+    @InjectMocks
+    private AlipayPcPayClient client = new AlipayPcPayClient(randomLongId(), config);
+
+    @Override
+    @BeforeEach
+    public void setUp() {
+        setClient(client);
+    }
+
+    @Test
+    @DisplayName("支付宝 PC 网站支付：URL Display Mode 下单成功")
+    public void testUnifiedOrder_urlSuccess() throws AlipayApiException {
+        // mock 方法
+        String notifyUrl = randomURL();
+        AlipayTradePagePayResponse response = randomPojo(AlipayTradePagePayResponse.class, o -> o.setSubCode(""));
+        when(defaultAlipayClient.pageExecute(argThat((ArgumentMatcher<AlipayTradePagePayRequest>) request -> true),
+                eq(Method.GET.name()))).thenReturn(response);
+        // 准备请求参数
+        String outTradeNo = randomString();
+        Integer price = randomInteger();
+        PayOrderUnifiedReqDTO reqDTO = buildOrderUnifiedReqDTO(notifyUrl, outTradeNo, price);
+        reqDTO.setDisplayMode(null);
+
+        // 调用
+        PayOrderRespDTO resp = client.unifiedOrder(reqDTO);
+        // 断言
+        assertEquals(WAITING.getStatus(), resp.getStatus());
+        assertEquals(outTradeNo, resp.getOutTradeNo());
+        assertNull(resp.getChannelOrderNo());
+        assertNull(resp.getChannelUserId());
+        assertNull(resp.getSuccessTime());
+        assertEquals(PayOrderDisplayModeEnum.URL.getMode(), resp.getDisplayMode());
+        assertEquals(response.getBody(), resp.getDisplayContent());
+        assertSame(response, resp.getRawData());
+        assertNull(resp.getChannelErrorCode());
+        assertNull(resp.getChannelErrorMsg());
+    }
+
+    @Test
+    @DisplayName("支付宝 PC 网站支付：Form Display Mode 下单成功")
+    public void testUnifiedOrder_formSuccess() throws AlipayApiException {
+        // mock
+        String notifyUrl = randomURL();
+        AlipayTradePagePayResponse response = randomPojo(AlipayTradePagePayResponse.class, o -> o.setSubCode(""));
+        when(defaultAlipayClient.pageExecute(argThat((ArgumentMatcher<AlipayTradePagePayRequest>) request -> true),
+                eq(Method.POST.name()))).thenReturn(response);
+        // 准备请求参数
+        String outTradeNo = randomString();
+        Integer price = randomInteger();
+        PayOrderUnifiedReqDTO reqDTO = buildOrderUnifiedReqDTO(notifyUrl, outTradeNo, price);
+        reqDTO.setDisplayMode(PayOrderDisplayModeEnum.FORM.getMode());
+
+        // 调用
+        PayOrderRespDTO resp = client.unifiedOrder(reqDTO);
+        // 断言
+        assertEquals(WAITING.getStatus(), resp.getStatus());
+        assertEquals(outTradeNo, resp.getOutTradeNo());
+        assertNull(resp.getChannelOrderNo());
+        assertNull(resp.getChannelUserId());
+        assertNull(resp.getSuccessTime());
+        assertEquals(PayOrderDisplayModeEnum.FORM.getMode(), resp.getDisplayMode());
+        assertEquals(response.getBody(), resp.getDisplayContent());
+        assertSame(response, resp.getRawData());
+        assertNull(resp.getChannelErrorCode());
+        assertNull(resp.getChannelErrorMsg());
+    }
+
+    @Test
+    @DisplayName("支付宝 PC 网站支付：渠道返回失败")
+    public void testUnifiedOrder_channelFailed() throws AlipayApiException {
+        // mock
+        String subCode = randomString();
+        String subMsg = randomString();
+        AlipayTradePagePayResponse response = randomPojo(AlipayTradePagePayResponse.class, o -> {
+            o.setSubCode(subCode);
+            o.setSubMsg(subMsg);
+        });
+        when(defaultAlipayClient.pageExecute(argThat((ArgumentMatcher<AlipayTradePagePayRequest>) request -> true),
+                eq(Method.GET.name()))).thenReturn(response);
+        // 准备请求参数
+        String outTradeNo = randomString();
+        PayOrderUnifiedReqDTO reqDTO = buildOrderUnifiedReqDTO(randomURL(), outTradeNo, randomInteger());
+        reqDTO.setDisplayMode(PayOrderDisplayModeEnum.URL.getMode());
+
+        // 调用
+        PayOrderRespDTO resp = client.unifiedOrder(reqDTO);
+        // 断言
+        assertEquals(CLOSED.getStatus(), resp.getStatus());
+        assertEquals(outTradeNo, resp.getOutTradeNo());
+        assertNull(resp.getChannelOrderNo());
+        assertNull(resp.getChannelUserId());
+        assertNull(resp.getSuccessTime());
+        assertNull(resp.getDisplayMode());
+        assertNull(resp.getDisplayContent());
+        assertSame(response, resp.getRawData());
+        assertEquals(subCode, resp.getChannelErrorCode());
+        assertEquals(subMsg, resp.getChannelErrorMsg());
+    }
+
+}

yudao-framework/yudao-spring-boot-starter-biz-pay/src/test/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AlipayQrPayClientTest.java

@@ -1,76 +1,50 @@
 package cn.iocoder.yudao.framework.pay.core.client.impl.alipay;
 
-import cn.hutool.core.date.LocalDateTimeUtil;
-import cn.hutool.core.util.RandomUtil;
-import cn.hutool.core.util.ReflectUtil;
 import cn.iocoder.yudao.framework.common.exception.ServiceException;
 import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants;
 import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
 import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderRespDTO;
 import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderUnifiedReqDTO;
-import cn.iocoder.yudao.framework.pay.core.client.dto.refund.PayRefundRespDTO;
-import cn.iocoder.yudao.framework.pay.core.client.dto.refund.PayRefundUnifiedReqDTO;
 import cn.iocoder.yudao.framework.pay.core.client.exception.PayException;
 import cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderDisplayModeEnum;
-import cn.iocoder.yudao.framework.pay.core.enums.refund.PayRefundStatusRespEnum;
-import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest;
 import com.alipay.api.AlipayApiException;
-import com.alipay.api.DefaultAlipayClient;
-import com.alipay.api.domain.AlipayTradeRefundModel;
 import com.alipay.api.request.AlipayTradePrecreateRequest;
-import com.alipay.api.request.AlipayTradeRefundRequest;
 import com.alipay.api.response.AlipayTradePrecreateResponse;
-import com.alipay.api.response.AlipayTradeRefundResponse;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentMatcher;
 import org.mockito.InjectMocks;
-import org.mockito.Mock;
 
-import javax.validation.ConstraintViolationException;
-import java.util.Date;
-
-import static cn.iocoder.yudao.framework.pay.core.client.impl.alipay.AlipayPayClientConfig.MODE_PUBLIC_KEY;
 import static cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderStatusRespEnum.CLOSED;
 import static cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderStatusRespEnum.WAITING;
 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.argThat;
 import static org.mockito.Mockito.when;
+
 /**
  * {@link AlipayQrPayClient} 单元测试
  *
  * @author jason
  */
-public class AlipayQrPayClientTest extends BaseMockitoUnitTest {
-
-    private final AlipayPayClientConfig config = randomPojo(AlipayPayClientConfig.class, t -> {
-        t.setServerUrl(randomURL());
-        t.setMode(MODE_PUBLIC_KEY);
-        t.setSignType(AlipayPayClientConfig.SIGN_TYPE_DEFAULT);
-        t.setAppCertContent("");
-        t.setAlipayPublicCertContent("");
-        t.setRootCertContent("");
-    });
+public class AlipayQrPayClientTest extends AbstractAlipayClientTest {
 
     @InjectMocks
-    AlipayQrPayClient client = new AlipayQrPayClient(randomLongId(), config);
+    private AlipayQrPayClient client = new AlipayQrPayClient(randomLongId(), config);
 
-    @Mock
-    private DefaultAlipayClient defaultAlipayClient;
-
-    @Test
-    public void test_do_init() {
-        client.doInit();
-        assertNotSame(defaultAlipayClient, ReflectUtil.getFieldValue(client, "defaultAlipayClient"));
+    @BeforeEach
+    public void setUp() {
+        setClient(client);
     }
 
     @Test
-    @DisplayName("支付包扫描支付下单成功")
+    @DisplayName("支付宝扫描支付下单成功")
     public void test_unified_order_success() throws AlipayApiException {
         // 准备返回对象
         String notifyUrl = randomURL();
         String qrCode = randomString();
+        Integer price = randomInteger();
         AlipayTradePrecreateResponse response = randomPojo(AlipayTradePrecreateResponse.class, o -> {
             o.setQrCode(qrCode);
             o.setSubCode("");
@@ -82,7 +56,7 @@ public class AlipayQrPayClientTest extends BaseMockitoUnitTest {
         }))).thenReturn(response);
         // 准备请求参数
         String outTradeNo = randomString();
-        PayOrderUnifiedReqDTO reqDTO = buildOrderUnifiedReqDTO(notifyUrl, outTradeNo);
+        PayOrderUnifiedReqDTO reqDTO = buildOrderUnifiedReqDTO(notifyUrl, outTradeNo, price);
 
         PayOrderRespDTO resp = client.unifiedOrder(reqDTO);
         // 断言
@@ -94,11 +68,12 @@ public class AlipayQrPayClientTest extends BaseMockitoUnitTest {
     }
 
     @Test
-    @DisplayName("支付包扫描支付,渠道返回失败")
+    @DisplayName("支付宝扫描支付,渠道返回失败")
     public void test_unified_order_channel_failed() throws AlipayApiException {
         String notifyUrl = randomURL();
         String subCode = randomString();
         String subMsg = randomString();
+        Integer price = randomInteger();
         AlipayTradePrecreateResponse response = randomPojo(AlipayTradePrecreateResponse.class, o -> {
             o.setSubCode(subCode);
             o.setSubMsg(subMsg);
@@ -110,7 +85,7 @@ public class AlipayQrPayClientTest extends BaseMockitoUnitTest {
         }))).thenReturn(response);
         // 准备请求参数
         String outTradeNo = randomString();
-        PayOrderUnifiedReqDTO reqDTO = buildOrderUnifiedReqDTO(notifyUrl, outTradeNo);
+        PayOrderUnifiedReqDTO reqDTO = buildOrderUnifiedReqDTO(notifyUrl, outTradeNo, price);
 
         PayOrderRespDTO resp = client.unifiedOrder(reqDTO);
         // 断言
@@ -121,174 +96,38 @@ public class AlipayQrPayClientTest extends BaseMockitoUnitTest {
     }
 
     @Test
-    @DisplayName("支付包扫描支付,抛出系统异常")
+    @DisplayName("支付宝扫描支付, 抛出系统异常")
     public void test_unified_order_throw_pay_exception() throws AlipayApiException {
         // 准备请求参数
         String outTradeNo = randomString();
         String notifyUrl = randomURL();
+        Integer price = randomInteger();
         // mock
         when(defaultAlipayClient.execute(argThat((ArgumentMatcher<AlipayTradePrecreateRequest>) request -> {
             assertEquals(notifyUrl, request.getNotifyUrl());
             return true;
         }))).thenThrow(new RuntimeException("系统异常"));
         // 准备请求参数
-        PayOrderUnifiedReqDTO reqDTO = buildOrderUnifiedReqDTO(notifyUrl, outTradeNo);
+        PayOrderUnifiedReqDTO reqDTO = buildOrderUnifiedReqDTO(notifyUrl, outTradeNo,price);
         // 断言
         assertThrows(PayException.class, () -> client.unifiedOrder(reqDTO));
     }
 
     @Test
-    @DisplayName("支付包扫描支付,抛出业务异常")
+    @DisplayName("支付宝 Client 统一下单,抛出业务异常")
     public void test_unified_order_throw_service_exception() throws AlipayApiException {
         // 准备请求参数
         String outTradeNo = randomString();
         String notifyUrl = randomURL();
+        Integer price = randomInteger();
         // mock
         when(defaultAlipayClient.execute(argThat((ArgumentMatcher<AlipayTradePrecreateRequest>) request -> {
             assertEquals(notifyUrl, request.getNotifyUrl());
             return true;
         }))).thenThrow(ServiceExceptionUtil.exception(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR));
         // 准备请求参数
-        PayOrderUnifiedReqDTO reqDTO = buildOrderUnifiedReqDTO(notifyUrl, outTradeNo);
+        PayOrderUnifiedReqDTO reqDTO = buildOrderUnifiedReqDTO(notifyUrl, outTradeNo, price);
         // 断言
         assertThrows(ServiceException.class, () -> client.unifiedOrder(reqDTO));
     }
-
-    @Test
-    @DisplayName("支付包扫描支付,参数校验不通过")
-    public void test_unified_order_param_validate() {
-        // 准备请求参数
-        String outTradeNo = randomString();
-        String notifyUrl = randomURL();
-        PayOrderUnifiedReqDTO reqDTO = randomPojo(PayOrderUnifiedReqDTO.class, o -> {
-            o.setOutTradeNo(outTradeNo);
-            o.setNotifyUrl(notifyUrl);
-        });
-        // 断言
-        assertThrows(ConstraintViolationException.class, () -> client.unifiedOrder(reqDTO));
-    }
-
-    private PayOrderUnifiedReqDTO buildOrderUnifiedReqDTO(String notifyUrl, String outTradeNo) {
-        return randomPojo(PayOrderUnifiedReqDTO.class, o -> {
-            o.setOutTradeNo(outTradeNo);
-            o.setNotifyUrl(notifyUrl);
-            o.setSubject(RandomUtil.randomString(32));
-            o.setBody(RandomUtil.randomString(32));
-        });
-    }
-
-    @Test
-    @DisplayName("支付包扫描退款成功")
-    public void test_unified_refund_success() throws AlipayApiException {
-        // 准备返回对象
-        String notifyUrl = randomURL();
-        Date refundTime = randomDate();
-        String outRefundNo = randomString();
-        String outTradeNo = randomString();
-        Integer refundAmount = randomInteger();
-        AlipayTradeRefundResponse response = randomPojo(AlipayTradeRefundResponse.class, o -> {
-            o.setSubCode("");
-            o.setGmtRefundPay(refundTime);
-        });
-        // mock
-        when(defaultAlipayClient.execute(argThat((ArgumentMatcher<AlipayTradeRefundRequest>) request -> {
-            assertInstanceOf(AlipayTradeRefundModel.class, request.getBizModel());
-            AlipayTradeRefundModel bizModel = (AlipayTradeRefundModel) request.getBizModel();
-            assertEquals(outRefundNo, bizModel.getOutRequestNo());
-            assertEquals(outTradeNo, bizModel.getOutTradeNo());
-            assertEquals(String.valueOf(refundAmount / 100.0), bizModel.getRefundAmount());
-            return true;
-        }))).thenReturn(response);
-        // 准备请求参数
-        PayRefundUnifiedReqDTO refundReqDTO = randomPojo(PayRefundUnifiedReqDTO.class, o -> {
-            o.setOutRefundNo(outRefundNo);
-            o.setOutTradeNo(outTradeNo);
-            o.setNotifyUrl(notifyUrl);
-            o.setRefundPrice(refundAmount);
-        });
-        PayRefundRespDTO resp = client.unifiedRefund(refundReqDTO);
-        // 断言
-        assertEquals(PayRefundStatusRespEnum.SUCCESS.getStatus(), resp.getStatus());
-        assertNull(resp.getChannelRefundNo());
-        assertEquals(LocalDateTimeUtil.of(refundTime), resp.getSuccessTime());
-        assertEquals(outRefundNo, resp.getOutRefundNo());
-        assertSame(response, resp.getRawData());
-    }
-
-    @Test
-    @DisplayName("支付包扫描退款,渠道返回失败")
-    public void test_unified_refund_channel_failed() throws AlipayApiException {
-        // 准备返回对象
-        String notifyUrl = randomURL();
-        String subCode = randomString();
-        String subMsg = randomString();
-        AlipayTradeRefundResponse response = randomPojo(AlipayTradeRefundResponse.class, o -> {
-            o.setSubCode(subCode);
-            o.setSubMsg(subMsg);
-        });
-        // mock
-        when(defaultAlipayClient.execute(argThat((ArgumentMatcher<AlipayTradeRefundRequest>) request -> {
-            assertInstanceOf(AlipayTradeRefundModel.class, request.getBizModel());
-            return true;
-        }))).thenReturn(response);
-        // 准备请求参数
-        String outRefundNo = randomString();
-        String outTradeNo = randomString();
-        PayRefundUnifiedReqDTO refundReqDTO = randomPojo(PayRefundUnifiedReqDTO.class, o -> {
-            o.setOutRefundNo(outRefundNo);
-            o.setOutTradeNo(outTradeNo);
-            o.setNotifyUrl(notifyUrl);
-        });
-        PayRefundRespDTO resp = client.unifiedRefund(refundReqDTO);
-        // 断言
-        assertEquals(PayRefundStatusRespEnum.FAILURE.getStatus(), resp.getStatus());
-        assertNull(resp.getChannelRefundNo());
-        assertEquals(subCode, resp.getChannelErrorCode());
-        assertEquals(subMsg, resp.getChannelErrorMsg());
-        assertNull(resp.getSuccessTime());
-        assertEquals(outRefundNo, resp.getOutRefundNo());
-        assertSame(response, resp.getRawData());
-    }
-
-    @Test
-    @DisplayName("支付包扫描退款,参数校验不通过")
-    public void test_unified_refund_param_validate() {
-        // 准备请求参数
-        String notifyUrl = randomURL();
-        PayRefundUnifiedReqDTO refundReqDTO = randomPojo(PayRefundUnifiedReqDTO.class, o -> {
-            o.setOutTradeNo("");
-            o.setNotifyUrl(notifyUrl);
-        });
-        // 断言
-        assertThrows(ConstraintViolationException.class, () -> client.unifiedRefund(refundReqDTO));
-    }
-
-    @Test
-    @DisplayName("支付包扫描退款,抛出业务异常")
-    public void test_unified_refund_throw_service_exception() throws AlipayApiException {
-        // mock
-        when(defaultAlipayClient.execute(argThat((ArgumentMatcher<AlipayTradeRefundRequest>) request -> true)))
-                .thenThrow(ServiceExceptionUtil.exception(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR));
-        // 准备请求参数
-        String notifyUrl = randomURL();
-        PayRefundUnifiedReqDTO refundReqDTO = randomPojo(PayRefundUnifiedReqDTO.class, o -> {
-            o.setNotifyUrl(notifyUrl);
-        });
-        // 断言
-        assertThrows(ServiceException.class, () -> client.unifiedRefund(refundReqDTO));
-    }
-    @Test
-    @DisplayName("支付包扫描退款,抛出系统异常")
-    public void test_unified_refund_throw_pay_exception() throws AlipayApiException {
-        // mock
-        when(defaultAlipayClient.execute(argThat((ArgumentMatcher<AlipayTradeRefundRequest>) request -> true)))
-                .thenThrow(new RuntimeException("系统异常"));
-        // 准备请求参数
-        String notifyUrl = randomURL();
-        PayRefundUnifiedReqDTO refundReqDTO = randomPojo(PayRefundUnifiedReqDTO.class, o -> {
-            o.setNotifyUrl(notifyUrl);
-        });
-        // 断言
-        assertThrows(PayException.class, () -> client.unifiedRefund(refundReqDTO));
-    }
 }

yudao-framework/yudao-spring-boot-starter-biz-pay/src/test/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AlipayWapPayClientTest.java

@@ -0,0 +1,96 @@
+package cn.iocoder.yudao.framework.pay.core.client.impl.alipay;
+
+import cn.hutool.http.Method;
+import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderRespDTO;
+import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderUnifiedReqDTO;
+import cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderDisplayModeEnum;
+import com.alipay.api.AlipayApiException;
+import com.alipay.api.domain.AlipayTradeWapPayModel;
+import com.alipay.api.request.AlipayTradeWapPayRequest;
+import com.alipay.api.response.AlipayTradeWapPayResponse;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentMatcher;
+import org.mockito.InjectMocks;
+
+import static cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderStatusRespEnum.CLOSED;
+import static cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderStatusRespEnum.WAITING;
+import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
+import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.when;
+
+/**
+ * {@link AlipayWapPayClient} 单元测试
+ *
+ * @author jason
+ */
+public class AlipayWapPayClientTest extends AbstractAlipayClientTest {
+
+    /**
+     * 支付宝 H5 支付 Client
+     */
+    @InjectMocks
+    private AlipayWapPayClient client = new AlipayWapPayClient(randomLongId(), config);
+
+    @BeforeEach
+    public void setUp() {
+        setClient(client);
+    }
+
+    @Test
+    @DisplayName("支付宝 H5 支付下单成功")
+    public void test_unified_order_success() throws AlipayApiException {
+        // 准备响应对象
+        String h5Body = randomString();
+        Integer price = randomInteger();
+        AlipayTradeWapPayResponse response = randomPojo(AlipayTradeWapPayResponse.class, o -> {
+            o.setSubCode("");
+            o.setBody(h5Body);
+        });
+        String notifyUrl = randomURL();
+        // mock
+        when(defaultAlipayClient.pageExecute(argThat((ArgumentMatcher<AlipayTradeWapPayRequest>) request -> {
+            assertInstanceOf(AlipayTradeWapPayModel.class, request.getBizModel());
+            AlipayTradeWapPayModel bizModel = (AlipayTradeWapPayModel) request.getBizModel();
+            assertEquals(String.valueOf(price / 100.0), bizModel.getTotalAmount());
+            assertEquals(notifyUrl, request.getNotifyUrl());
+            return true;
+        }), eq(Method.GET.name()))).thenReturn(response);
+
+        String outTradeNo = randomString();
+        PayOrderUnifiedReqDTO reqDTO = buildOrderUnifiedReqDTO(notifyUrl, outTradeNo, price);
+        PayOrderRespDTO resp = client.unifiedOrder(reqDTO);
+        assertEquals(WAITING.getStatus(), resp.getStatus());
+        assertEquals(PayOrderDisplayModeEnum.URL.getMode(), resp.getDisplayMode());
+        assertEquals(outTradeNo, resp.getOutTradeNo());
+        assertEquals(h5Body, resp.getDisplayContent());
+        assertSame(response, resp.getRawData());
+    }
+
+    @Test
+    @DisplayName("支付宝 H5 支付,渠道返回失败")
+    public void test_unified_order_channel_failed() throws AlipayApiException {
+        // 准备响应对象
+        String subCode = randomString();
+        String subMsg = randomString();
+        AlipayTradeWapPayResponse response = randomPojo(AlipayTradeWapPayResponse.class, o -> {
+            o.setSubCode(subCode);
+            o.setSubMsg(subMsg);
+        });
+        // mock
+        when(defaultAlipayClient.pageExecute(argThat((ArgumentMatcher<AlipayTradeWapPayRequest>) request -> true),
+                eq(Method.GET.name()))).thenReturn(response);
+        PayOrderUnifiedReqDTO reqDTO = buildOrderUnifiedReqDTO(randomURL(), randomString(), randomInteger());
+
+        PayOrderRespDTO resp = client.unifiedOrder(reqDTO);
+        // 断言
+        assertEquals(CLOSED.getStatus(), resp.getStatus());
+        assertEquals(subCode, resp.getChannelErrorCode());
+        assertEquals(subMsg, resp.getChannelErrorMsg());
+        assertSame(response, resp.getRawData());
+    }
+}

yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/comment/ProductCommentController.java

@@ -51,7 +51,7 @@ public class ProductCommentController {
         return success(true);
     }
 
-    @PutMapping("/create")
+    @PostMapping("/create")
     @Operation(summary = "添加自评")
     @PreAuthorize("@ss.hasPermission('product:comment:update')")
     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

@@ -11,11 +11,9 @@ import java.util.List;
 public class ProductCommentBaseVO {
 
     @Schema(description = "评价人", requiredMode = Schema.RequiredMode.REQUIRED, example = "16868")
-    @NotNull(message = "评价人不能为空")
     private Long userId;
 
     @Schema(description = "评价订单项", requiredMode = Schema.RequiredMode.REQUIRED, example = "19292")
-    @NotNull(message = "评价订单项不能为空")
     private Long orderItemId;
 
     @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

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.product.controller.admin.comment.vo;
 
+import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuBaseVO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -7,6 +8,7 @@ import lombok.ToString;
 
 import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
+import java.util.List;
 
 @Schema(description = "管理后台 - 商品评价 Response VO")
 @Data
@@ -23,10 +25,10 @@ public class ProductCommentRespVO extends ProductCommentBaseVO {
     @Schema(description = "交易订单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "24428")
     private Long orderId;
 
-    @Schema(description = "是否可见：[true:显示 false:隐藏]", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "是否可见", requiredMode = Schema.RequiredMode.REQUIRED)
     private Boolean visible;
 
-    @Schema(description = "商家是否回复：[1:回复 0:未回复]", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "商家是否回复", requiredMode = Schema.RequiredMode.REQUIRED)
     private Boolean replyStatus;
 
     @Schema(description = "回复管理员编号", example = "9527")
@@ -52,4 +54,10 @@ public class ProductCommentRespVO extends ProductCommentBaseVO {
     @NotNull(message = "商品 SPU 名称不能为空")
     private String spuName;
 
+    @Schema(description = "商品 SKU 图片地址", example = "https://www.iocoder.cn/yudao.jpg")
+    private String skuPicUrl;
+
+    @Schema(description = "商品 SKU 规格值数组")
+    private List<ProductSkuBaseVO.Property> skuProperties;
+
 }

yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/ProductSkuController.java

@@ -1,57 +1,14 @@
 package cn.iocoder.yudao.module.product.controller.admin.sku;
 
-import cn.hutool.core.collection.CollUtil;
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
-import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuOptionRespVO;
-import cn.iocoder.yudao.module.product.convert.sku.ProductSkuConvert;
-import cn.iocoder.yudao.module.product.dal.dataobject.sku.ProductSkuDO;
-import cn.iocoder.yudao.module.product.dal.dataobject.spu.ProductSpuDO;
-import cn.iocoder.yudao.module.product.service.sku.ProductSkuService;
-import cn.iocoder.yudao.module.product.service.spu.ProductSpuService;
-import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.annotation.Resource;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
-
-@Tag(name = "管理后台 - 商品 sku")
+@Tag(name = "管理后台 - 商品 SKU")
 @RestController
 @RequestMapping("/product/sku")
 @Validated
 public class ProductSkuController {
 
-    @Resource
-    private ProductSkuService productSkuService;
-    @Resource
-    private ProductSpuService productSpuService;
-
-    @GetMapping("/get-option-list")
-    @Operation(summary = "获得商品 SKU 选项的列表")
-//    @PreAuthorize("@ss.hasPermission('product:sku:query')")
-    public CommonResult<List<ProductSkuOptionRespVO>> getSkuOptionList() {
-        // 获得 SKU 列表
-        List<ProductSkuDO> skus = productSkuService.getSkuList();
-        if (CollUtil.isEmpty(skus)) {
-            return success(Collections.emptyList());
-        }
-
-        // 获得对应的 SPU 映射
-        Map<Long, ProductSpuDO> spuMap = productSpuService.getSpuMap(convertSet(skus, ProductSkuDO::getSpuId));
-        // 转换为返回结果
-        List<ProductSkuOptionRespVO> skuVOs = ProductSkuConvert.INSTANCE.convertList05(skus);
-        skuVOs.forEach(sku -> MapUtils.findAndThen(spuMap, sku.getSpuId(),
-                spu -> sku.setSpuId(spu.getId()).setSpuName(spu.getName())));
-        return success(skuVOs);
-    }
-
 }

yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuOptionRespVO.java

@@ -1,30 +0,0 @@
-package cn.iocoder.yudao.module.product.controller.admin.sku.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-@Schema(description = "管理后台 - 商品 SKU 选项 Response VO") // 用于前端 SELECT 选项
-@Data
-public class ProductSkuOptionRespVO {
-
-    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
-    private Long id;
-
-    @Schema(description = "商品 SKU 名字", example = "红色")
-    private String name;
-
-    @Schema(description = "销售价格", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
-    private String price;
-
-    @Schema(description = "库存", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
-    private Integer stock;
-
-    // ========== 商品 SPU 信息 ==========
-
-    @Schema(description = "商品 SPU 编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    private Long spuId;
-
-    @Schema(description = "商品 SPU 名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "iPhone 11")
-    private String spuName;
-
-}

yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/comment/ProductCommentConvert.java

@@ -3,7 +3,6 @@ package cn.iocoder.yudao.module.product.convert.comment;
 import cn.hutool.core.util.ObjectUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
-import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
 import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
 import cn.iocoder.yudao.module.product.api.comment.dto.ProductCommentCreateReqDTO;
 import cn.iocoder.yudao.module.product.controller.admin.comment.vo.ProductCommentCreateReqVO;
@@ -24,6 +23,8 @@ import java.math.RoundingMode;
 import java.util.List;
 import java.util.Map;
 
+import static cn.iocoder.yudao.framework.common.util.collection.MapUtils.findAndThen;
+
 /**
  * 商品评价 Convert
  *
@@ -60,7 +61,7 @@ public interface ProductCommentConvert {
                 item.setUserNickname(ProductCommentDO.NICKNAME_ANONYMOUS);
             }
             // 设置 SKU 规格值
-            MapUtils.findAndThen(skuMap, item.getSkuId(),
+            findAndThen(skuMap, item.getSkuId(),
                     sku -> item.setSkuProperties(convertList01(sku.getProperties())));
         });
         return page;
@@ -87,7 +88,7 @@ public interface ProductCommentConvert {
 
     @Mapping(target = "scores",
             expression = "java(convertScores(createReqDTO.getDescriptionScores(), createReqDTO.getBenefitScores()))")
-    default ProductCommentDO convert(ProductCommentCreateReqDTO createReqDTO, ProductSpuDO spuDO, MemberUserRespDTO user) {
+    default ProductCommentDO convert(ProductCommentCreateReqDTO createReqDTO, ProductSpuDO spuDO, ProductSkuDO skuDO, MemberUserRespDTO user) {
         ProductCommentDO commentDO = convert(createReqDTO);
         if (user != null) {
             commentDO.setUserId(user.getId());
@@ -98,9 +99,15 @@ public interface ProductCommentConvert {
             commentDO.setSpuId(spuDO.getId());
             commentDO.setSpuName(spuDO.getName());
         }
+        if (skuDO != null) {
+            commentDO.setSkuPicUrl(skuDO.getPicUrl());
+            commentDO.setSkuProperties(skuDO.getProperties());
+        }
         return commentDO;
     }
 
+    @Mapping(target = "visible", constant = "true")
+    @Mapping(target = "replyStatus", constant = "false")
     @Mapping(target = "userId", constant = "0L")
     @Mapping(target = "orderId", constant = "0L")
     @Mapping(target = "orderItemId", constant = "0L")
@@ -111,4 +118,15 @@ public interface ProductCommentConvert {
 
     List<AppProductCommentRespVO> convertList02(List<ProductCommentDO> list);
 
+    default ProductCommentDO convert(ProductCommentCreateReqVO createReq, ProductSpuDO spu, ProductSkuDO sku) {
+        ProductCommentDO commentDO = convert(createReq);
+        if (spu != null) {
+            commentDO.setSpuId(spu.getId()).setSpuName(spu.getName());
+        }
+        if (sku != null) {
+            commentDO.setSkuPicUrl(sku.getPicUrl()).setSkuProperties(sku.getProperties());
+        }
+        return commentDO;
+    }
+
 }

yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/sku/ProductSkuConvert.java

@@ -5,7 +5,6 @@ import cn.hutool.core.util.StrUtil;
 import cn.iocoder.yudao.module.product.api.sku.dto.ProductSkuRespDTO;
 import cn.iocoder.yudao.module.product.api.sku.dto.ProductSkuUpdateStockReqDTO;
 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuCreateOrUpdateReqVO;
-import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuOptionRespVO;
 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuRespVO;
 import cn.iocoder.yudao.module.product.dal.dataobject.sku.ProductSkuDO;
 import org.mapstruct.Mapper;
@@ -44,8 +43,6 @@ public interface ProductSkuConvert {
 
     List<ProductSkuRespDTO> convertList04(List<ProductSkuDO> list);
 
-    List<ProductSkuOptionRespVO> convertList05(List<ProductSkuDO> skus);
-
     /**
      * 获得 SPU 的库存变化 Map
      *

yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/comment/ProductCommentDO.java

@@ -73,11 +73,14 @@ public class ProductCommentDO extends BaseDO {
 
     /**
      * 商品 SPU 编号
+     *
      * 关联 {@link ProductSpuDO#getId()}
      */
     private Long spuId;
     /**
      * 商品 SPU 名称
+     *
+     * 关联 {@link ProductSpuDO#getName()}
      */
     private String spuName;
     /**
@@ -86,6 +89,19 @@ public class ProductCommentDO extends BaseDO {
      * 关联 {@link ProductSkuDO#getId()}
      */
     private Long skuId;
+    /**
+     * 商品 SKU 图片地址
+     *
+     * 关联 {@link ProductSkuDO#getPicUrl()}
+     */
+    private String skuPicUrl;
+    /**
+     * 属性数组，JSON 格式
+     *
+     * 关联 {@link ProductSkuDO#getProperties()}
+     */
+    @TableField(typeHandler = ProductSkuDO.PropertyTypeHandler.class)
+    private List<ProductSkuDO.Property> skuProperties;
 
     /**
      * 是否可见

yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/comment/ProductCommentMapper.java

@@ -1,6 +1,5 @@
 package cn.iocoder.yudao.module.product.dal.mysql.comment;
 
-
 import cn.hutool.core.util.ObjectUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
@@ -20,6 +19,7 @@ public interface ProductCommentMapper extends BaseMapperX<ProductCommentDO> {
                 .eqIfPresent(ProductCommentDO::getOrderId, reqVO.getOrderId())
                 .eqIfPresent(ProductCommentDO::getSpuId, reqVO.getSpuId())
                 .eqIfPresent(ProductCommentDO::getScores, reqVO.getScores())
+                .eqIfPresent(ProductCommentDO::getReplyStatus, reqVO.getReplyStatus())
                 .betweenIfPresent(ProductCommentDO::getCreateTime, reqVO.getCreateTime())
                 .likeIfPresent(ProductCommentDO::getSpuName, reqVO.getSpuName())
                 .orderByDesc(ProductCommentDO::getId));
@@ -53,11 +53,10 @@ public interface ProductCommentMapper extends BaseMapperX<ProductCommentDO> {
         return selectPage(reqVO, queryWrapper);
     }
 
-    default ProductCommentDO selectByUserIdAndOrderItemIdAndSpuId(Long userId, Long orderItemId, Long skuId) {
+    default ProductCommentDO selectByUserIdAndOrderItemId(Long userId, Long orderItemId) {
         return selectOne(new LambdaQueryWrapperX<ProductCommentDO>()
                 .eq(ProductCommentDO::getUserId, userId)
-                .eq(ProductCommentDO::getOrderItemId, orderItemId)
-                .eq(ProductCommentDO::getSpuId, skuId));
+                .eq(ProductCommentDO::getOrderItemId, orderItemId));
     }
 
     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

@@ -25,12 +25,21 @@ import java.util.List;
 public interface ProductCommentService {
 
     /**
-     * 获得商品评价分页
+     * 创建商品评论
+     * 后台管理员创建评论使用
      *
-     * @param pageReqVO 分页查询
-     * @return 商品评价分页
+     * @param createReqVO 商品评价创建 Request VO 对象
      */
-    PageResult<ProductCommentDO> getCommentPage(ProductCommentPageReqVO pageReqVO);
+    void createComment(ProductCommentCreateReqVO createReqVO);
+
+    /**
+     * 创建评论
+     * 创建商品评论 APP 端创建商品评论使用
+     *
+     * @param createReqDTO 创建请求 dto
+     * @return 返回评论 id
+     */
+    Long createComment(ProductCommentCreateReqDTO createReqDTO);
 
     /**
      * 修改评论是否可见
@@ -43,35 +52,26 @@ public interface ProductCommentService {
      * 商家回复
      *
      * @param replyVO     商家回复
-     * @param loginUserId 管理后台商家登陆人 ID
+     * @param userId 管理后台商家登陆人 ID
      */
-    void replyComment(ProductCommentReplyReqVO replyVO, Long loginUserId);
+    void replyComment(ProductCommentReplyReqVO replyVO, Long userId);
 
     /**
-     * 获得商品评价分页
+     * 【管理员】获得商品评价分页
      *
-     * @param pageVO  分页查询
-     * @param visible 是否可见
+     * @param pageReqVO 分页查询
      * @return 商品评价分页
      */
-    PageResult<ProductCommentDO> getCommentPage(AppCommentPageReqVO pageVO, Boolean visible);
+    PageResult<ProductCommentDO> getCommentPage(ProductCommentPageReqVO pageReqVO);
 
     /**
-     * 创建商品评论
-     * 后台管理员创建评论使用
+     * 【会员】获得商品评价分页
      *
-     * @param createReqVO 商品评价创建 Request VO 对象
-     */
-    void createComment(ProductCommentCreateReqVO createReqVO);
-
-    /**
-     * 创建评论
-     * 创建商品评论 APP 端创建商品评论使用
-     *
-     * @param createReqDTO 创建请求 dto
-     * @return 返回评论 id
+     * @param pageVO  分页查询
+     * @param visible 是否可见
+     * @return 商品评价分页
      */
-    Long createComment(ProductCommentCreateReqDTO createReqDTO);
+    PageResult<ProductCommentDO> getCommentPage(AppCommentPageReqVO pageVO, Boolean visible);
 
     /**
      * 获得商品的评价统计

yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/comment/ProductCommentServiceImpl.java

@@ -20,7 +20,6 @@ import cn.iocoder.yudao.module.product.service.sku.ProductSkuService;
 import cn.iocoder.yudao.module.product.service.spu.ProductSpuService;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
@@ -53,69 +52,55 @@ public class ProductCommentServiceImpl implements ProductCommentService {
     private MemberUserApi memberUserApi;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void updateCommentVisible(ProductCommentUpdateVisibleReqVO updateReqVO) {
-        // 校验评论是否存在
-        ProductCommentDO productCommentDO = validateCommentExists(updateReqVO.getId());
-        productCommentDO.setVisible(updateReqVO.getVisible());
-
-        // 更新可见状态
-        productCommentMapper.updateById(productCommentDO);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void replyComment(ProductCommentReplyReqVO replyVO, Long loginUserId) {
-        // 校验评论是否存在
-        ProductCommentDO productCommentDO = validateCommentExists(replyVO.getId());
-        productCommentDO.setReplyTime(LocalDateTime.now());
-        productCommentDO.setReplyUserId(loginUserId);
-        productCommentDO.setReplyStatus(Boolean.TRUE);
-        productCommentDO.setReplyContent(replyVO.getReplyContent());
-
-        // 回复评论
-        productCommentMapper.updateById(productCommentDO);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
     public void createComment(ProductCommentCreateReqVO createReqVO) {
-        // 校验评论
-        validateComment(createReqVO.getSkuId(), createReqVO.getUserId(), createReqVO.getOrderItemId());
+        // 校验 SKU
+        ProductSkuDO skuDO = validateSku(createReqVO.getSkuId());
+        // 校验 SPU
+        ProductSpuDO spuDO = validateSpu(skuDO.getSpuId());
 
-        ProductCommentDO commentDO = ProductCommentConvert.INSTANCE.convert(createReqVO);
-        productCommentMapper.insert(commentDO);
+        // 创建评论
+        ProductCommentDO comment = ProductCommentConvert.INSTANCE.convert(createReqVO, spuDO, skuDO);
+        productCommentMapper.insert(comment);
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public Long createComment(ProductCommentCreateReqDTO createReqDTO) {
-        // 通过 sku ID 拿到 spu 相关信息
-        ProductSkuDO sku = productSkuService.getSku(createReqDTO.getSkuId());
-        if (sku == null) {
-            throw exception(SKU_NOT_EXISTS);
-        }
-        // 校验 spu 如果存在返回详情
-        ProductSpuDO spuDO = validateSpu(sku.getSpuId());
+        // 校验 SKU
+        ProductSkuDO skuDO = validateSku(createReqDTO.getSkuId());
+        // 校验 SPU
+        ProductSpuDO spuDO = validateSpu(skuDO.getSpuId());
         // 校验评论
-        validateComment(spuDO.getId(), createReqDTO.getUserId(), createReqDTO.getOrderId());
+        validateCommentExists(createReqDTO.getUserId(), createReqDTO.getOrderId());
         // 获取用户详细信息
         MemberUserRespDTO user = memberUserApi.getUser(createReqDTO.getUserId());
 
         // 创建评论
-        ProductCommentDO commentDO = ProductCommentConvert.INSTANCE.convert(createReqDTO, spuDO, user);
-        productCommentMapper.insert(commentDO);
-        return commentDO.getId();
+        ProductCommentDO comment = ProductCommentConvert.INSTANCE.convert(createReqDTO, spuDO, skuDO, user);
+        productCommentMapper.insert(comment);
+        return comment.getId();
     }
 
-    private void validateComment(Long skuId, Long userId, Long orderItemId) {
-        // 判断当前订单的当前商品用户是否评价过
-        ProductCommentDO exist = productCommentMapper.selectByUserIdAndOrderItemIdAndSpuId(userId, orderItemId, skuId);
-        if (null != exist) {
+    /**
+     * 判断当前订单的当前商品用户是否评价过
+     *
+     * @param userId      用户编号
+     * @param orderItemId 订单项编号
+     */
+    private void validateCommentExists(Long userId, Long orderItemId) {
+        ProductCommentDO exist = productCommentMapper.selectByUserIdAndOrderItemId(userId, orderItemId);
+        if (exist != null) {
             throw exception(COMMENT_ORDER_EXISTS);
         }
     }
 
+    private ProductSkuDO validateSku(Long skuId) {
+        ProductSkuDO sku = productSkuService.getSku(skuId);
+        if (sku == null) {
+            throw exception(SKU_NOT_EXISTS);
+        }
+        return sku;
+    }
+
     private ProductSpuDO validateSpu(Long spuId) {
         ProductSpuDO spu = productSpuService.getSpu(spuId);
         if (null == spu) {
@@ -124,6 +109,26 @@ public class ProductCommentServiceImpl implements ProductCommentService {
         return spu;
     }
 
+    @Override
+    public void updateCommentVisible(ProductCommentUpdateVisibleReqVO updateReqVO) {
+        // 校验评论是否存在
+        validateCommentExists(updateReqVO.getId());
+
+        // 更新可见状态
+        productCommentMapper.updateById(new ProductCommentDO().setId(updateReqVO.getId())
+                .setVisible(true));
+    }
+
+    @Override
+    public void replyComment(ProductCommentReplyReqVO replyVO, Long userId) {
+        // 校验评论是否存在
+        validateCommentExists(replyVO.getId());
+        // 回复评论
+        productCommentMapper.updateById(new ProductCommentDO().setId(replyVO.getId())
+                .setReplyTime(LocalDateTime.now()).setReplyUserId(userId)
+                .setReplyStatus(Boolean.TRUE).setReplyContent(replyVO.getReplyContent()));
+    }
+
     private ProductCommentDO validateCommentExists(Long id) {
         ProductCommentDO productComment = productCommentMapper.selectById(id);
         if (productComment == null) {

yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java

@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.product.service.sku;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.iocoder.yudao.module.product.api.sku.dto.ProductSkuUpdateStockReqDTO;
 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuBaseVO;
@@ -74,6 +75,9 @@ public class ProductSkuServiceImpl implements ProductSkuService {
 
     @Override
     public List<ProductSkuDO> getSkuList(Collection<Long> ids) {
+        if (CollUtil.isEmpty(ids)) {
+            return ListUtil.empty();
+        }
         return productSkuMapper.selectBatchIds(ids);
     }
 

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/bargain/vo/BargainActivityBaseVO.java

@@ -18,7 +18,7 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 @Data
 public class BargainActivityBaseVO {
 
-    @Schema(description = "砍价活动名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "越拼越省钱")
+    @Schema(description = "砍价活动名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "砍得越多省得越多，是兄弟就来砍我")
     @NotNull(message = "砍价名称不能为空")
     private String name;
 

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/DeliveryExpressController.java

@@ -1,11 +1,11 @@
 package cn.iocoder.yudao.module.trade.controller.admin.delivery;
 
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
 import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.express.*;
-import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.express.DeliveryExpressUpdateReqVO;
 import cn.iocoder.yudao.module.trade.convert.delivery.DeliveryExpressConvert;
 import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryExpressDO;
 import cn.iocoder.yudao.module.trade.service.delivery.DeliveryExpressService;
@@ -67,6 +67,13 @@ public class DeliveryExpressController {
         return success(DeliveryExpressConvert.INSTANCE.convert(deliveryExpress));
     }
 
+    @GetMapping("/list-all-simple")
+    @Operation(summary = "获取快递公司精简信息列表", description = "主要用于前端的下拉选项")
+    public CommonResult<List<DeliveryExpressSimpleRespVO>> getSimpleDeliveryExpressList() {
+        List<DeliveryExpressDO> list = deliveryExpressService.getDeliveryExpressListByStatus(CommonStatusEnum.ENABLE.getStatus());
+        return success(DeliveryExpressConvert.INSTANCE.convertList1(list));
+    }
+
     @GetMapping("/page")
     @Operation(summary = "获得快递公司分页")
     @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

@@ -1,9 +1,8 @@
 package cn.iocoder.yudao.module.trade.controller.admin.delivery;
 
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
-import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.*;
 import cn.iocoder.yudao.module.trade.convert.delivery.DeliveryPickUpStoreConvert;
 import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryPickUpStoreDO;
@@ -16,14 +15,11 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
-import java.io.IOException;
 import java.util.Collection;
 import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 
 @Tag(name = "管理后台 - 自提门店")
 @RestController
@@ -67,6 +63,13 @@ public class DeliveryPickUpStoreController {
         return success(DeliveryPickUpStoreConvert.INSTANCE.convert(deliveryPickUpStore));
     }
 
+    @GetMapping("/list-all-simple")
+    @Operation(summary = "获取快递公司精简信息列表")
+    public CommonResult<List<DeliveryPickUpStoreSimpleRespVO>> getSimpleDeliveryPickUpStoreList() {
+        List<DeliveryPickUpStoreDO> list = deliveryPickUpStoreService.getDeliveryPickUpStoreListByStatus(CommonStatusEnum.ENABLE.getStatus());
+        return success(DeliveryPickUpStoreConvert.INSTANCE.convertList1(list));
+    }
+
     @GetMapping("/list")
     @Operation(summary = "获得自提门店列表")
     @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
@@ -84,16 +87,4 @@ public class DeliveryPickUpStoreController {
         return success(DeliveryPickUpStoreConvert.INSTANCE.convertPage(pageResult));
     }
 
-    // TODO @jason：导出去掉好列；简化下，一般用不到哈。
-    @GetMapping("/export-excel")
-    @Operation(summary = "导出自提门店 Excel")
-    @PreAuthorize("@ss.hasPermission('trade:delivery:pick-up-store:export')")
-    @OperateLog(type = EXPORT)
-    public void exportDeliveryPickUpStoreExcel(@Valid DeliveryPickUpStoreExportReqVO exportReqVO,
-              HttpServletResponse response) throws IOException {
-        List<DeliveryPickUpStoreDO> list = deliveryPickUpStoreService.getDeliveryPickUpStoreList(exportReqVO);
-        // 导出 Excel
-        List<DeliveryPickUpStoreExcelVO> datas = DeliveryPickUpStoreConvert.INSTANCE.convertList02(list);
-        ExcelUtils.write(response, "自提门店.xls", "数据", DeliveryPickUpStoreExcelVO.class, datas);
-    }
 }

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/vo/express/DeliveryExpressSimpleRespVO.java

@@ -0,0 +1,24 @@
+package cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.express;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotNull;
+
+@Schema(description = "管理后台 - 快递公司精简信息 Response VO")
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class DeliveryExpressSimpleRespVO {
+
+    @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "6592")
+    @NotNull(message = "编号不能为空")
+    private Long id;
+
+    @Schema(description = "快递公司名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "顺丰速运")
+    @NotNull(message = "快递公司名称不能为空")
+    private String name;
+
+}

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/vo/pickup/DeliveryPickUpStoreExcelVO.java

@@ -1,58 +0,0 @@
-package cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup;
-
-import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
-import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
-import cn.iocoder.yudao.module.system.enums.DictTypeConstants;
-import com.alibaba.excel.annotation.ExcelProperty;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Data
-public class DeliveryPickUpStoreExcelVO {
-
-    @ExcelProperty("编号")
-    private Long id;
-
-    @ExcelProperty("门店名称")
-    private String name;
-
-    @ExcelProperty("门店简介")
-    private String introduction;
-
-    @ExcelProperty("门店手机")
-    private String phone;
-
-    @ExcelProperty("门店所在区域")
-    private String areaName;
-
-    @ExcelProperty("门店详细地址")
-    private String detailAddress;
-
-    @ExcelProperty("门店logo")
-    private String logo;
-
-    // TODO @jason：是不是可以加个 convert？
-    /**
-     * easy-excel 好像暂时不支持 LocalTime. 转成string
-     */
-    @ExcelProperty("营业开始时间")
-    private String openingTime;
-
-    @ExcelProperty("营业结束时间")
-    private String closingTime;
-
-    @ExcelProperty("纬度")
-    private String latitude;
-
-    @ExcelProperty("经度")
-    private String longitude;
-
-    @ExcelProperty(value = "状态", converter = DictConvert.class)
-    @DictFormat(DictTypeConstants.COMMON_STATUS)
-    private Integer status;
-
-    @ExcelProperty("创建时间")
-    private LocalDateTime createTime;
-
-}

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/vo/pickup/DeliveryPickUpStoreExportReqVO.java

@@ -1,34 +0,0 @@
-package cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup;
-
-import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
-import cn.iocoder.yudao.framework.common.validation.InEnum;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.time.LocalDateTime;
-
-import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
-
-@Schema(description = "管理后台 - 自提门店 Excel 导出 Request VO，参数和 DeliveryPickUpStorePageReqVO 是一致的")
-@Data
-public class DeliveryPickUpStoreExportReqVO {
-
-    @Schema(description = "门店名称", example = "李四")
-    private String name;
-
-    @Schema(description = "门店手机")
-    private String phone;
-
-    @Schema(description = "区域id", example = "18733")
-    private Integer areaId;
-
-    @Schema(description = "门店状态", example = "1")
-    @InEnum(CommonStatusEnum.class)
-    private Integer status;
-
-    @Schema(description = "创建时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] createTime;
-
-}

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/vo/pickup/DeliveryPickUpStoreSimpleRespVO.java

@@ -0,0 +1,31 @@
+package cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Schema(description = "管理后台 - 自提门店精简信息 Response VO")
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class DeliveryPickUpStoreSimpleRespVO {
+
+    @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "23128")
+    private Long id;
+
+    @Schema(description = "门店名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四")
+    private String name;
+
+    @Schema(description = "门店手机", requiredMode = Schema.RequiredMode.REQUIRED, example = "15601892312")
+    private String phone;
+
+    @Schema(description = "区域编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "18733")
+    private Integer areaId;
+
+    // TODO @puhui999：要把 areaName 也返回哈
+
+    @Schema(description = "门店详细地址", requiredMode = Schema.RequiredMode.REQUIRED, example = "复旦大学路 188 号")
+    private String detailAddress;
+
+}

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/TradeOrderController.java

@@ -5,10 +5,7 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.member.api.user.MemberUserApi;
 import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
-import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderDeliveryReqVO;
-import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderDetailRespVO;
-import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderPageItemRespVO;
-import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderPageReqVO;
+import cn.iocoder.yudao.module.trade.controller.admin.order.vo.*;
 import cn.iocoder.yudao.module.trade.convert.order.TradeOrderConvert;
 import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderDO;
 import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderItemDO;
@@ -79,12 +76,56 @@ public class TradeOrderController {
         return success(TradeOrderConvert.INSTANCE.convert(order, orderItems, user));
     }
 
+    @GetMapping("/get-express-track-list")
+    @Operation(summary = "获得交易订单的物流轨迹")
+    @Parameter(name = "id", description = "交易订单编号")
+    @PreAuthorize("@ss.hasPermission('trade:order:query')")
+    public CommonResult<List<?>> getOrderExpressTrackList(@RequestParam("id") Long id) {
+        return success(TradeOrderConvert.INSTANCE.convertList02(
+                tradeOrderQueryService.getExpressTrackList(id, getLoginUserId())));
+    }
+
+    // TODO @puhui999：put 请求哈
     @PostMapping("/delivery")
-    @Operation(summary = "发货订单")
-    @PreAuthorize("@ss.hasPermission('trade:order:delivery')")
+    @Operation(summary = "订单发货")
+    @PreAuthorize("@ss.hasPermission('trade:order:update')")
     public CommonResult<Boolean> deliveryOrder(@RequestBody TradeOrderDeliveryReqVO deliveryReqVO) {
-        tradeOrderUpdateService.deliveryOrder(getLoginUserId(), deliveryReqVO);
+        tradeOrderUpdateService.deliveryOrder(deliveryReqVO);
         return success(true);
     }
 
+    // TODO @puhui999：put 请求哈，update-remark；
+    @PostMapping("/remark")
+    @Operation(summary = "订单备注")
+    @PreAuthorize("@ss.hasPermission('trade:order:update')")
+    public CommonResult<Boolean> updateOrderRemark(@RequestBody TradeOrderRemarkReqVO reqVO) {
+        tradeOrderUpdateService.updateOrderRemark(reqVO);
+        return success(true);
+    }
+
+    // TODO @puhui999：put 请求哈，update-price；
+    @PostMapping("/adjust-price")
+    @Operation(summary = "订单调价")
+    @PreAuthorize("@ss.hasPermission('trade:order:update')")
+    public CommonResult<Boolean> updateOrderPrice(@RequestBody TradeOrderUpdatePriceReqVO reqVO) {
+        tradeOrderUpdateService.updateOrderPrice(reqVO);
+        return success(true);
+    }
+
+    // TODO @puhui999：put 请求哈，update-address；
+    @PostMapping("/adjust-address")
+    @Operation(summary = "修改订单收货地址")
+    @PreAuthorize("@ss.hasPermission('trade:order:update')")
+    public CommonResult<Boolean> updateOrderAddress(@RequestBody TradeOrderUpdateAddressReqVO reqVO) {
+        tradeOrderUpdateService.updateOrderAddress(reqVO);
+        return success(true);
+    }
+
+    // TODO @puhui999 订单物流详情
+    // TODO @puhui999 【前台】订单取消
+    // TODO @puhui999 【后台】订单取消
+    // TODO @puhui999 【前台】订单核销
+    // TODO @puhui999 【前台】订单删除
+    // TODO @puhui999 【后台】订单统计
+
 }

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderBaseVO.java

@@ -6,9 +6,9 @@ import lombok.Data;
 import java.time.LocalDateTime;
 
 /**
-* 交易订单 Base VO，提供给添加、修改、详细的子 VO 使用
-* 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
-*/
+ * 交易订单 Base VO，提供给添加、修改、详细的子 VO 使用
+ * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
+ */
 @Data
 public class TradeOrderBaseVO {
 
@@ -87,6 +87,12 @@ public class TradeOrderBaseVO {
 
     // ========== 收件 + 物流基本信息 ==========
 
+    @Schema(description = "配送方式", example = "10")
+    private Integer deliveryType;
+
+    @Schema(description = "自提门店", example = "10")
+    private Long pickUpStoreId;
+
     @Schema(description = "配送模板编号", example = "1024")
     private Long deliveryTemplateId;
 

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderDeliveryReqVO.java

@@ -1,11 +1,8 @@
 package cn.iocoder.yudao.module.trade.controller.admin.order.vo;
 
-import cn.iocoder.yudao.framework.common.validation.InEnum;
-import cn.iocoder.yudao.module.trade.enums.delivery.DeliveryTypeEnum;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 
 @Schema(description = "管理后台 - 订单发货 Request VO")
@@ -16,18 +13,11 @@ public class TradeOrderDeliveryReqVO {
     @NotNull(message = "订单编号不能为空")
     private Long id;
 
-    // TODO @puhui999：可以去掉 type；如果无需发货，则 logisticsId 传递 0；logisticsNo 传递空串
-    @Schema(description = "发货类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
-    @InEnum(DeliveryTypeEnum.class)
-    @NotNull(message = "发货类型不能为空")
-    private Integer type;
-
     @Schema(description = "发货物流公司编号", example = "1")
     @NotNull(message = "发货物流公司不能为空")
     private Long logisticsId;
 
     @Schema(description = "发货物流单号", example = "SF123456789")
-    @NotEmpty(message = "发货物流单号不能为空")
     private String logisticsNo;
 
 }

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderPageReqVO.java

@@ -10,6 +10,7 @@ import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
@@ -30,6 +31,12 @@ public class TradeOrderPageReqVO extends PageParam {
     @Mobile
     private String userMobile;
 
+    @Schema(description = "发货物流公司编号", example = "1")
+    private Long logisticsId;
+
+    @Schema(description = "自提门店编号", example = "[1,2]")
+    private List<Long> pickUpStoreIds;
+
     @Schema(description = "收件人名称", example = "小红")
     private String receiverName;
 

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderRemarkReqVO.java

@@ -0,0 +1,21 @@
+package cn.iocoder.yudao.module.trade.controller.admin.order.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
+@Schema(description = "管理后台 - 订单备注 Request VO")
+@Data
+public class TradeOrderRemarkReqVO {
+
+    @Schema(description = "订单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+    @NotNull(message = "订单编号不能为空")
+    private Long id;
+
+    @Schema(description = "商家备注", example = "你猜一下")
+    @NotEmpty(message = "订单备注不能为空")
+    private String remark;
+
+}

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderUpdateAddressReqVO.java

@@ -0,0 +1,33 @@
+package cn.iocoder.yudao.module.trade.controller.admin.order.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
+@Schema(description = "管理后台 - 订单修改地址 Request VO")
+@Data
+public class TradeOrderUpdateAddressReqVO {
+
+    @Schema(description = "订单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @NotNull(message = "订单编号不能为空")
+    private Long id;
+
+    @Schema(description = "收件人名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "z张三")
+    @NotEmpty(message = "收件人名称不能为空")
+    private String receiverName;
+
+    @Schema(description = "收件人手机", requiredMode = Schema.RequiredMode.REQUIRED, example = "19988188888")
+    @NotEmpty(message = "收件人手机不能为空")
+    private String receiverMobile;
+
+    @Schema(description = "收件人地区编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "7310")
+    @NotNull(message = "收件人地区编号不能为空")
+    private Integer receiverAreaId;
+
+    @Schema(description = "收件人详细地址", requiredMode = Schema.RequiredMode.REQUIRED, example = "昆明市五华区xxx小区xxx")
+    @NotEmpty(message = "收件人详细地址不能为空")
+    private String receiverDetailAddress;
+
+}

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderUpdatePriceReqVO.java

@@ -0,0 +1,20 @@
+package cn.iocoder.yudao.module.trade.controller.admin.order.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Schema(description = "管理后台 - 订单改价 Request VO")
+@Data
+public class TradeOrderUpdatePriceReqVO {
+
+    @Schema(description = "订单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+    @NotNull(message = "订单编号不能为空")
+    private Long id;
+
+    @Schema(description = "订单调价，单位：分。正数，加价；负数，减价", requiredMode = Schema.RequiredMode.REQUIRED, example = "-100")
+    @NotNull(message = "订单调价价格不能为空")
+    private Integer adjustPrice;
+
+}

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/delivery/AppDeliverExpressController.java

@@ -31,7 +31,7 @@ public class AppDeliverExpressController {
     @GetMapping("/list")
     @Operation(summary = "获得快递公司列表")
     public CommonResult<List<AppDeliveryExpressRespVO>> getDeliveryExpressList() {
-        List<DeliveryExpressDO> list = deliveryExpressService.getDeliveryExpressList(CommonStatusEnum.ENABLE.getStatus());
+        List<DeliveryExpressDO> list = deliveryExpressService.getDeliveryExpressListByStatus(CommonStatusEnum.ENABLE.getStatus());
         list.sort(Comparator.comparing(DeliveryExpressDO::getSort));
         return success(DeliveryExpressConvert.INSTANCE.convertList03(list));
     }

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/delivery/DeliveryExpressConvert.java

@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.trade.convert.delivery;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.express.*;
 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.express.DeliveryExpressCreateReqVO;
 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.express.DeliveryExpressExcelVO;
 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.express.DeliveryExpressRespVO;
@@ -29,6 +30,8 @@ public interface DeliveryExpressConvert {
 
     List<DeliveryExpressExcelVO> convertList02(List<DeliveryExpressDO> list);
 
+    List<DeliveryExpressSimpleRespVO> convertList1(List<DeliveryExpressDO> list);
+
     List<AppDeliveryExpressRespVO> convertList03(List<DeliveryExpressDO> list);
 
 }

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/delivery/DeliveryPickUpStoreConvert.java

@@ -1,20 +1,18 @@
 package cn.iocoder.yudao.module.trade.convert.delivery;
 
-import java.util.*;
-
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-
 import cn.iocoder.yudao.framework.ip.core.utils.AreaUtils;
 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreCreateReqVO;
-import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreExcelVO;
 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreRespVO;
+import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreSimpleRespVO;
 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreUpdateReqVO;
 import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryPickUpStoreDO;
 import org.mapstruct.Mapper;
-import org.mapstruct.Mapping;
 import org.mapstruct.Named;
 import org.mapstruct.factory.Mappers;
 
+import java.util.List;
+
 @Mapper
 public interface DeliveryPickUpStoreConvert {
 
@@ -30,14 +28,10 @@ public interface DeliveryPickUpStoreConvert {
 
     PageResult<DeliveryPickUpStoreRespVO> convertPage(PageResult<DeliveryPickUpStoreDO> page);
 
-    List<DeliveryPickUpStoreExcelVO> convertList02(List<DeliveryPickUpStoreDO> list);
-
-    @Mapping(source = "areaId", target = "areaName",  qualifiedByName = "convertAreaIdToName")
-    DeliveryPickUpStoreExcelVO convert2(DeliveryPickUpStoreDO bean);
-
     @Named("convertAreaIdToName")
     default String convertAreaIdToName(Integer areaId) {
         return AreaUtils.format(areaId);
     }
 
+    List<DeliveryPickUpStoreSimpleRespVO> convertList1(List<DeliveryPickUpStoreDO> list);
 }

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java

@@ -17,8 +17,7 @@ import cn.iocoder.yudao.module.promotion.api.combination.dto.CombinationRecordCr
 import cn.iocoder.yudao.module.trade.api.order.dto.TradeOrderRespDTO;
 import cn.iocoder.yudao.module.trade.controller.admin.base.member.user.MemberUserRespVO;
 import cn.iocoder.yudao.module.trade.controller.admin.base.product.property.ProductPropertyValueDetailRespVO;
-import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderDetailRespVO;
-import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderPageItemRespVO;
+import cn.iocoder.yudao.module.trade.controller.admin.order.vo.*;
 import cn.iocoder.yudao.module.trade.controller.app.base.property.AppProductPropertyValueDetailRespVO;
 import cn.iocoder.yudao.module.trade.controller.app.order.vo.*;
 import cn.iocoder.yudao.module.trade.controller.app.order.vo.item.AppTradeOrderItemCommentCreateReqVO;
@@ -278,4 +277,10 @@ public interface TradeOrderConvert {
 
     List<AppOrderExpressTrackRespDTO> convertList02(List<ExpressTrackRespDTO> list);
 
+    TradeOrderDO convert(TradeOrderUpdateAddressReqVO reqVO);
+
+    TradeOrderDO convert(TradeOrderUpdatePriceReqVO reqVO);
+
+    TradeOrderDO convert(TradeOrderRemarkReqVO reqVO);
+
 }

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/delivery/DeliveryPickUpStoreMapper.java

@@ -3,7 +3,6 @@ package cn.iocoder.yudao.module.trade.dal.mysql.delivery;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
-import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreExportReqVO;
 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStorePageReqVO;
 import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryPickUpStoreDO;
 import org.apache.ibatis.annotations.Mapper;
@@ -23,15 +22,10 @@ public interface DeliveryPickUpStoreMapper extends BaseMapperX<DeliveryPickUpSto
                 .orderByDesc(DeliveryPickUpStoreDO::getId));
     }
 
-    default List<DeliveryPickUpStoreDO> selectList(DeliveryPickUpStoreExportReqVO reqVO) {
-        return selectList(new LambdaQueryWrapperX<DeliveryPickUpStoreDO>()
-                .likeIfPresent(DeliveryPickUpStoreDO::getName, reqVO.getName())
-                .eqIfPresent(DeliveryPickUpStoreDO::getPhone, reqVO.getPhone())
-                .eqIfPresent(DeliveryPickUpStoreDO::getAreaId, reqVO.getAreaId())
-                .eqIfPresent(DeliveryPickUpStoreDO::getStatus, reqVO.getStatus())
-                .betweenIfPresent(DeliveryPickUpStoreDO::getCreateTime, reqVO.getCreateTime())
-                .orderByDesc(DeliveryPickUpStoreDO::getId));
+    default List<DeliveryPickUpStoreDO> selectListByStatus(Integer status) {
+        return selectList(DeliveryPickUpStoreDO::getStatus, status);
     }
+
 }
 
 

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/order/TradeOrderMapper.java

@@ -34,6 +34,8 @@ public interface TradeOrderMapper extends BaseMapperX<TradeOrderDO> {
                 .eqIfPresent(TradeOrderDO::getStatus, reqVO.getStatus())
                 .eqIfPresent(TradeOrderDO::getPayChannelCode, reqVO.getPayChannelCode())
                 .eqIfPresent(TradeOrderDO::getTerminal,reqVO.getTerminal())
+                .eqIfPresent(TradeOrderDO::getLogisticsId, reqVO.getLogisticsId())
+                .inIfPresent(TradeOrderDO::getPickUpStoreId, reqVO.getPickUpStoreIds())
                 .betweenIfPresent(TradeOrderDO::getCreateTime, reqVO.getCreateTime()));
     }
 

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/delivery/DeliveryExpressService.java

@@ -64,11 +64,10 @@ public interface DeliveryExpressService {
     List<DeliveryExpressDO> getDeliveryExpressList(DeliveryExpressExportReqVO exportReqVO);
 
     /**
-     * 获得快递公司列表
+     * 获取指定状态的快递公司列表
      *
      * @param status 状态
      * @return 快递公司列表
      */
-    List<DeliveryExpressDO> getDeliveryExpressList(Integer status);
-
+    List<DeliveryExpressDO> getDeliveryExpressListByStatus(Integer status);
 }

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/delivery/DeliveryExpressServiceImpl.java

@@ -12,6 +12,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
+import java.util.Collection;
 import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -95,7 +96,7 @@ public class DeliveryExpressServiceImpl implements DeliveryExpressService {
     }
 
     @Override
-    public List<DeliveryExpressDO> getDeliveryExpressList(Integer status) {
+    public List<DeliveryExpressDO> getDeliveryExpressListByStatus(Integer status) {
         return deliveryExpressMapper.selectListByStatus(status);
     }
 

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/delivery/DeliveryPickUpStoreService.java

@@ -1,14 +1,15 @@
 package cn.iocoder.yudao.module.trade.service.delivery;
 
-import java.util.*;
-import javax.validation.*;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreCreateReqVO;
-import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreExportReqVO;
 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStorePageReqVO;
 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreUpdateReqVO;
 import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryPickUpStoreDO;
 
+import javax.validation.Valid;
+import java.util.Collection;
+import java.util.List;
+
 /**
  * 自提门店 Service 接口
  *
@@ -63,10 +64,10 @@ public interface DeliveryPickUpStoreService {
     PageResult<DeliveryPickUpStoreDO> getDeliveryPickUpStorePage(DeliveryPickUpStorePageReqVO pageReqVO);
 
     /**
-     * 获得自提门店列表, 用于 Excel 导出
+     * 获得指定状态的自提门店列表
      *
-     * @param exportReqVO 查询条件
+     * @param status 状态
      * @return 自提门店列表
      */
-    List<DeliveryPickUpStoreDO> getDeliveryPickUpStoreList(DeliveryPickUpStoreExportReqVO exportReqVO);
+    List<DeliveryPickUpStoreDO> getDeliveryPickUpStoreListByStatus(Integer status);
 }

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/delivery/DeliveryPickUpStoreServiceImpl.java

@@ -2,21 +2,20 @@ package cn.iocoder.yudao.module.trade.service.delivery;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreCreateReqVO;
-import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreExportReqVO;
 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStorePageReqVO;
 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreUpdateReqVO;
 import cn.iocoder.yudao.module.trade.convert.delivery.DeliveryPickUpStoreConvert;
 import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryPickUpStoreDO;
 import cn.iocoder.yudao.module.trade.dal.mysql.delivery.DeliveryPickUpStoreMapper;
 import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
 
-import java.util.*;
-
+import javax.annotation.Resource;
+import java.util.Collection;
+import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.module.trade.enums.ErrorCodeConstants.*;
+import static cn.iocoder.yudao.module.trade.enums.ErrorCodeConstants.PICK_UP_STORE_NOT_EXISTS;
 
 /**
  * 自提门店 Service 实现类
@@ -78,7 +77,8 @@ public class DeliveryPickUpStoreServiceImpl implements DeliveryPickUpStoreServic
     }
 
     @Override
-    public List<DeliveryPickUpStoreDO> getDeliveryPickUpStoreList(DeliveryPickUpStoreExportReqVO exportReqVO) {
-        return deliveryPickUpStoreMapper.selectList(exportReqVO);
+    public List<DeliveryPickUpStoreDO> getDeliveryPickUpStoreListByStatus(Integer status) {
+        return deliveryPickUpStoreMapper.selectListByStatus(status);
     }
+
 }

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateService.java

@@ -1,6 +1,9 @@
 package cn.iocoder.yudao.module.trade.service.order;
 
+import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderUpdateAddressReqVO;
+import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderUpdatePriceReqVO;
 import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderDeliveryReqVO;
+import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderRemarkReqVO;
 import cn.iocoder.yudao.module.trade.controller.app.order.vo.AppTradeOrderCreateReqVO;
 import cn.iocoder.yudao.module.trade.controller.app.order.vo.AppTradeOrderSettlementReqVO;
 import cn.iocoder.yudao.module.trade.controller.app.order.vo.AppTradeOrderSettlementRespVO;
@@ -20,7 +23,7 @@ public interface TradeOrderUpdateService {
     /**
      * 获得订单结算信息
      *
-     * @param userId 登录用户
+     * @param userId          登录用户
      * @param settlementReqVO 订单结算请求
      * @return 订单结算结果
      */
@@ -29,8 +32,8 @@ public interface TradeOrderUpdateService {
     /**
      * 【会员】创建交易订单
      *
-     * @param userId 登录用户
-     * @param userIp 用户 IP 地址
+     * @param userId      登录用户
+     * @param userIp      用户 IP 地址
      * @param createReqVO 创建交易订单请求模型
      * @return 交易订单的
      */
@@ -39,7 +42,7 @@ public interface TradeOrderUpdateService {
     /**
      * 更新交易订单已支付
      *
-     * @param id 交易订单编号
+     * @param id         交易订单编号
      * @param payOrderId 支付订单编号
      */
     void updateOrderPaid(Long id, Long payOrderId);
@@ -47,10 +50,9 @@ public interface TradeOrderUpdateService {
     /**
      * 【管理员】发货交易订单
      *
-     * @param userId 管理员编号
      * @param deliveryReqVO 发货请求
      */
-    void deliveryOrder(Long userId, TradeOrderDeliveryReqVO deliveryReqVO);
+    void deliveryOrder(TradeOrderDeliveryReqVO deliveryReqVO);
 
     /**
      * 【会员】收货交易订单
@@ -60,12 +62,33 @@ public interface TradeOrderUpdateService {
      */
     void receiveOrder(Long userId, Long id);
 
+    /**
+     * 【管理员】交易订单备注
+     *
+     * @param reqVO 请求
+     */
+    void updateOrderRemark(TradeOrderRemarkReqVO reqVO);
+
+    /**
+     * 【管理员】调整价格
+     *
+     * @param reqVO 请求
+     */
+    void updateOrderPrice(TradeOrderUpdatePriceReqVO reqVO);
+
+    /**
+     * 【管理员】调整地址
+     *
+     * @param reqVO 请求
+     */
+    void updateOrderAddress(TradeOrderUpdateAddressReqVO reqVO);
+
     // =================== Order Item ===================
 
     /**
      * 更新交易订单项的售后状态
      *
-     * @param id 交易订单项编号
+     * @param id                 交易订单项编号
      * @param oldAfterSaleStatus 当前售后状态；如果不符，更新后会抛出异常
      * @param newAfterSaleStatus 目标售后状态
      */
@@ -76,11 +99,11 @@ public interface TradeOrderUpdateService {
     /**
      * 更新交易订单项的售后状态
      *
-     * @param id 交易订单项编号
+     * @param id                 交易订单项编号
      * @param oldAfterSaleStatus 当前售后状态；如果不符，更新后会抛出异常
      * @param newAfterSaleStatus 目标售后状态
-     * @param afterSaleId 售后单编号；当订单项发起售后时，必须传递该字段
-     * @param refundPrice 退款金额；当订单项退款成功时，必须传递该值
+     * @param afterSaleId        售后单编号；当订单项发起售后时，必须传递该字段
+     * @param refundPrice        退款金额；当订单项退款成功时，必须传递该值
      */
     void updateOrderItemAfterSaleStatus(Long id, Integer oldAfterSaleStatus, Integer newAfterSaleStatus,
                                         Long afterSaleId, Integer refundPrice);

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java

@@ -5,6 +5,7 @@ import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.extra.spring.SpringUtil;
 import cn.iocoder.yudao.framework.common.core.KeyValue;
 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.common.enums.TerminalEnum;
@@ -12,8 +13,12 @@ import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
 import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
 import cn.iocoder.yudao.module.member.api.address.AddressApi;
 import cn.iocoder.yudao.module.member.api.address.dto.AddressRespDTO;
+import cn.iocoder.yudao.module.member.api.level.MemberLevelApi;
+import cn.iocoder.yudao.module.member.api.point.MemberPointApi;
 import cn.iocoder.yudao.module.member.api.user.MemberUserApi;
 import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
+import cn.iocoder.yudao.module.member.enums.MemberExperienceBizTypeEnum;
+import cn.iocoder.yudao.module.member.enums.point.MemberPointBizTypeEnum;
 import cn.iocoder.yudao.module.pay.api.order.PayOrderApi;
 import cn.iocoder.yudao.module.pay.api.order.dto.PayOrderCreateReqDTO;
 import cn.iocoder.yudao.module.pay.api.order.dto.PayOrderRespDTO;
@@ -30,6 +35,9 @@ import cn.iocoder.yudao.module.promotion.api.coupon.CouponApi;
 import cn.iocoder.yudao.module.promotion.api.coupon.dto.CouponUseReqDTO;
 import cn.iocoder.yudao.module.promotion.enums.combination.CombinationRecordStatusEnum;
 import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderDeliveryReqVO;
+import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderRemarkReqVO;
+import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderUpdateAddressReqVO;
+import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderUpdatePriceReqVO;
 import cn.iocoder.yudao.module.trade.controller.app.order.vo.AppTradeOrderCreateReqVO;
 import cn.iocoder.yudao.module.trade.controller.app.order.vo.AppTradeOrderSettlementReqVO;
 import cn.iocoder.yudao.module.trade.controller.app.order.vo.AppTradeOrderSettlementRespVO;
@@ -53,6 +61,8 @@ import cn.iocoder.yudao.module.trade.service.price.TradePriceService;
 import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateReqBO;
 import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateRespBO;
 import lombok.extern.slf4j.Slf4j;
+import org.jetbrains.annotations.NotNull;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -64,6 +74,7 @@ import java.util.Objects;
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
 import static cn.iocoder.yudao.module.pay.enums.ErrorCodeConstants.ORDER_NOT_FOUND;
+import static cn.iocoder.yudao.module.pay.enums.ErrorCodeConstants.ORDER_UPDATE_PRICE_FAIL_PAID;
 import static cn.iocoder.yudao.module.trade.enums.ErrorCodeConstants.*;
 
 /**
@@ -96,9 +107,15 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
     private AddressApi addressApi;
     @Resource
     private CouponApi couponApi;
+
     @Resource
     private MemberUserApi memberUserApi;
     @Resource
+    private MemberLevelApi memberLevelApi;
+    @Resource
+    private MemberPointApi memberPointApi;
+
+    @Resource
     private ProductCommentApi productCommentApi;
     @Resource
     private TradeMessageService tradeMessageService;
@@ -331,6 +348,11 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
         // TODO 芋艿：发送站内信
 
         // TODO 芋艿：OrderLog
+
+        // 增加用户积分
+        getSelf().addUserPointAsync(order.getUserId(), order.getPayPrice(), order.getId());
+        // 增加用户经验
+        getSelf().addUserExperienceAsync(order.getUserId(), order.getPayPrice(), order.getId());
     }
 
     /**
@@ -345,10 +367,7 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
      */
     private KeyValue<TradeOrderDO, PayOrderRespDTO> validateOrderPayable(Long id, Long payOrderId) {
         // 校验订单是否存在
-        TradeOrderDO order = tradeOrderMapper.selectById(id);
-        if (order == null) {
-            throw exception(ORDER_NOT_FOUND);
-        }
+        TradeOrderDO order = validateOrderExists(id);
         // 校验订单未支付
         if (!TradeOrderStatusEnum.isUnpaid(order.getStatus()) || order.getPayStatus()) {
             log.error("[validateOrderPaid][order({}) 不处于待支付状态，请进行处理！order 数据是：{}]",
@@ -391,14 +410,16 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void deliveryOrder(Long userId, TradeOrderDeliveryReqVO deliveryReqVO) {
+    public void deliveryOrder(TradeOrderDeliveryReqVO deliveryReqVO) {
         // TODO @puhui999：只有选择快递的，才可以发货
         // 1.1 校验并获得交易订单（可发货）
         TradeOrderDO order = validateOrderDeliverable(deliveryReqVO.getId());
-        TradeOrderDO updateOrderObj = new TradeOrderDO();
+
+        // TODO @puhui999：下面不修改 deliveryType，直接校验 deliveryType 是否为快递，是快递才可以发货；先做严格的方式哈。
         // 判断发货类型
+        TradeOrderDO updateOrderObj = new TradeOrderDO();
         // 2.1 快递发货
-        if (Objects.equals(deliveryReqVO.getType(), DeliveryTypeEnum.EXPRESS.getMode())) {
+        if (ObjectUtil.notEqual(deliveryReqVO.getLogisticsId(), 0L)) {
             // 校验快递公司
             DeliveryExpressDO deliveryExpress = deliveryExpressService.getDeliveryExpress(deliveryReqVO.getLogisticsId());
             if (deliveryExpress == null) {
@@ -408,27 +429,24 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
                 throw exception(EXPRESS_STATUS_NOT_ENABLE);
             }
             updateOrderObj.setLogisticsId(deliveryReqVO.getLogisticsId()).setLogisticsNo(deliveryReqVO.getLogisticsNo()).setDeliveryType(DeliveryTypeEnum.EXPRESS.getMode());
+        } else {
+            // 2.2 无需发货
+            updateOrderObj.setLogisticsId(0L).setLogisticsNo("").setDeliveryType(DeliveryTypeEnum.NULL.getMode());
         }
-        // TODO @puhui999：无需发货时，更新 logisticsId 为 0；
-        // 2.2 无需发货
-        if (Objects.equals(deliveryReqVO.getType(), DeliveryTypeEnum.NULL.getMode())) {
-            updateOrderObj.setLogisticsId(null).setLogisticsNo("").setDeliveryType(DeliveryTypeEnum.NULL.getMode());
-        }
-
         // 更新 TradeOrderDO 状态为已发货，等待收货
         updateOrderObj.setStatus(TradeOrderStatusEnum.DELIVERED.getStatus()).setDeliveryTime(LocalDateTime.now());
         int updateCount = tradeOrderMapper.updateByIdAndStatus(order.getId(), order.getStatus(), updateOrderObj);
         if (updateCount == 0) {
             throw exception(ORDER_DELIVERY_FAIL_STATUS_NOT_UNDELIVERED);
         }
+
         // TODO 芋艿：发送订单变化的消息
 
         // 发送站内信
         tradeMessageService.sendMessageWhenDeliveryOrder(new TradeOrderMessageWhenDeliveryOrderReqBO().setOrderId(order.getId())
-                .setUserId(userId).setMessage(null));
+                .setUserId(order.getUserId()).setMessage(null));
 
         // TODO 芋艿：OrderLog
-        // TODO 设计：lili：是不是发货后，才支持售后？
     }
 
     /**
@@ -440,12 +458,9 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
      * @return 交易订单
      */
     private TradeOrderDO validateOrderDeliverable(Long id) {
-        // 校验订单是否存在
-        TradeOrderDO order = tradeOrderMapper.selectById(id);
-        if (order == null) {
-            throw exception(ORDER_NOT_FOUND);
-        }
+        TradeOrderDO order = validateOrderExists(id);
         // 校验订单是否是待发货状态
+        // TODO @puhui999：已经发货，可以重新发货，修改信息；
         if (!TradeOrderStatusEnum.isUndelivered(order.getStatus())) {
             throw exception(ORDER_DELIVERY_FAIL_STATUS_NOT_UNDELIVERED);
         }
@@ -456,6 +471,7 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
         // 订单类型：拼团
         if (Objects.equals(TradeOrderTypeEnum.COMBINATION.getType(), order.getType())) {
             // 校验订单拼团是否成功
+            // TODO @puhui999：是不是取反？
             if (combinationRecordApi.isCombinationRecordSuccess(order.getUserId(), order.getId())) {
                 throw exception(ORDER_DELIVERY_FAIL_COMBINATION_RECORD_STATUS_NOT_SUCCESS);
             }
@@ -463,6 +479,7 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
         // 订单类类型：砍价
         if (Objects.equals(TradeOrderTypeEnum.BARGAIN.getType(), order.getType())) {
             // 校验订单砍价是否成功
+            // TODO @puhui999：是不是取反？
             if (bargainRecordApi.isBargainRecordSuccess(order.getUserId(), order.getId())) {
                 throw exception(ORDER_DELIVERY_FAIL_BARGAIN_RECORD_STATUS_NOT_SUCCESS);
             }
@@ -470,6 +487,16 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
         return order;
     }
 
+    @NotNull
+    private TradeOrderDO validateOrderExists(Long id) {
+        // 校验订单是否存在
+        TradeOrderDO order = tradeOrderMapper.selectById(id);
+        if (order == null) {
+            throw exception(ORDER_NOT_FOUND);
+        }
+        return order;
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void receiveOrder(Long userId, Long id) {
@@ -489,6 +516,43 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
         // TODO 芋艿：lili 发送商品被购买完成的数据
     }
 
+    @Override
+    public void updateOrderRemark(TradeOrderRemarkReqVO reqVO) {
+        // 校验并获得交易订单
+        validateOrderExists(reqVO.getId());
+
+        // 更新
+        TradeOrderDO order = TradeOrderConvert.INSTANCE.convert(reqVO);
+        tradeOrderMapper.updateById(order);
+    }
+
+    @Override
+    public void updateOrderPrice(TradeOrderUpdatePriceReqVO reqVO) {
+        // 校验交易订单
+        TradeOrderDO order = validateOrderExists(reqVO.getId());
+        if (order.getPayStatus()) {
+            throw exception(ORDER_UPDATE_PRICE_FAIL_PAID);
+        }
+
+        // 更新
+        // TODO @puhui999：TradeOrderItemDO 需要做 adjustPrice 的分摊；另外，支付订单那的价格，需要 update 下；
+        TradeOrderDO update = TradeOrderConvert.INSTANCE.convert(reqVO);
+        update.setPayPrice(update.getPayPrice() + update.getAdjustPrice());
+        tradeOrderMapper.updateById(update);
+    }
+
+    @Override
+    public void updateOrderAddress(TradeOrderUpdateAddressReqVO reqVO) {
+        // 校验交易订单
+        validateOrderExists(reqVO.getId());
+        // TODO 是否需要校验订单是否发货
+        // TODO 发货后是否支持修改收货地址
+
+        // 更新
+        TradeOrderDO update = TradeOrderConvert.INSTANCE.convert(reqVO);
+        tradeOrderMapper.updateById(update);
+    }
+
     /**
      * 校验交易订单满足可售货的条件
      *
@@ -555,6 +619,11 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
         }
 
         // TODO 芋艿：未来如果有分佣，需要更新相关分佣订单为已失效
+
+        // 扣减用户积分
+        getSelf().reduceUserPointAsync(order.getUserId(), orderRefundPrice, afterSaleId);
+        // 扣减用户经验
+        getSelf().reduceUserExperienceAsync(order.getUserId(), orderRefundPrice, afterSaleId);
     }
 
     @Override
@@ -602,4 +671,37 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
                 TradeOrderItemAfterSaleStatusEnum.SUCCESS.getStatus()));
     }
 
+    @Async
+    protected void addUserExperienceAsync(Long userId, Integer payPrice, Long orderId) {
+        int bizType = MemberExperienceBizTypeEnum.ORDER.getType();
+        memberLevelApi.addExperience(userId, payPrice, bizType, String.valueOf(orderId));
+    }
+
+    @Async
+    protected void reduceUserExperienceAsync(Long userId, Integer refundPrice, Long afterSaleId) {
+        int bizType = MemberExperienceBizTypeEnum.REFUND.getType();
+        memberLevelApi.addExperience(userId, -refundPrice, bizType, String.valueOf(afterSaleId));
+    }
+
+    @Async
+    protected void addUserPointAsync(Long userId, Integer payPrice, Long orderId) {
+        int bizType = MemberPointBizTypeEnum.ORDER_BUY.getType();
+        memberPointApi.addPoint(userId, payPrice, bizType, String.valueOf(orderId));
+    }
+
+    @Async
+    protected void reduceUserPointAsync(Long userId, Integer refundPrice, Long afterSaleId) {
+        int bizType = MemberPointBizTypeEnum.ORDER_CANCEL.getType();
+        memberPointApi.addPoint(userId, -refundPrice, bizType, String.valueOf(afterSaleId));
+    }
+
+    /**
+     * 获得自身的代理对象，解决 AOP 生效问题
+     *
+     * @return 自己
+     */
+    private TradeOrderUpdateServiceImpl getSelf() {
+        return SpringUtil.getBean(getClass());
+    }
+
 }

yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/aftersale/TradeAfterSaleServiceTest.java

@@ -56,6 +56,7 @@ public class TradeAfterSaleServiceTest extends BaseDbUnitTest {
     private TradeOrderUpdateService tradeOrderUpdateService;
     @Resource
     private TradeOrderQueryService tradeOrderQueryService;
+
     @MockBean
     private PayRefundApi payRefundApi;
 

yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceTest.java

@@ -23,7 +23,10 @@ import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderDO;
 import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderItemDO;
 import cn.iocoder.yudao.module.trade.dal.mysql.order.TradeOrderItemMapper;
 import cn.iocoder.yudao.module.trade.dal.mysql.order.TradeOrderMapper;
-import cn.iocoder.yudao.module.trade.enums.order.*;
+import cn.iocoder.yudao.module.trade.enums.order.TradeOrderItemAfterSaleStatusEnum;
+import cn.iocoder.yudao.module.trade.enums.order.TradeOrderRefundStatusEnum;
+import cn.iocoder.yudao.module.trade.enums.order.TradeOrderStatusEnum;
+import cn.iocoder.yudao.module.trade.enums.order.TradeOrderTypeEnum;
 import cn.iocoder.yudao.module.trade.framework.order.config.TradeOrderConfig;
 import cn.iocoder.yudao.module.trade.framework.order.config.TradeOrderProperties;
 import org.junit.jupiter.api.BeforeEach;
@@ -38,7 +41,6 @@ import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.util.collection.SetUtils.asSet;
 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
-import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomLongId;
 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;
 import static java.util.Collections.singletonList;
 import static org.junit.jupiter.api.Assertions.*;
@@ -282,7 +284,7 @@ public class TradeOrderUpdateServiceTest extends BaseDbUnitTest {
         // mock 方法（支付单）
 
         // 调用
-        tradeOrderUpdateService.deliveryOrder(randomLongId(), deliveryReqVO);
+        tradeOrderUpdateService.deliveryOrder(deliveryReqVO);
         // 断言
         TradeOrderDO dbOrder = tradeOrderMapper.selectById(1L);
         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,0 +1,22 @@
+package cn.iocoder.yudao.module.member.api.level;
+
+import cn.iocoder.yudao.module.member.enums.MemberExperienceBizTypeEnum;
+
+/**
+ * 会员等级 API 接口
+ *
+ * @author owen
+ */
+public interface MemberLevelApi {
+
+    /**
+     * 增加会员经验
+     *
+     * @param userId     会员ID
+     * @param experience 经验
+     * @param bizType    业务类型 {@link MemberExperienceBizTypeEnum}
+     * @param bizId      业务编号
+     */
+    void addExperience(Long userId, Integer experience, Integer bizType, String bizId);
+
+}

yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/point/MemberPointApi.java

@@ -0,0 +1,22 @@
+package cn.iocoder.yudao.module.member.api.point;
+
+import cn.iocoder.yudao.module.member.enums.point.MemberPointBizTypeEnum;
+
+/**
+ * 用户积分的 API 接口
+ *
+ * @author owen
+ */
+public interface MemberPointApi {
+
+    /**
+     * 增加用户积分
+     *
+     * @param userId  用户编号
+     * @param point   积分
+     * @param bizType 业务类型 {@link MemberPointBizTypeEnum}
+     * @param bizId   业务编号
+     */
+    void addPoint(Long userId, Integer point, Integer bizType, String bizId);
+
+}

yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/user/MemberUserApi.java

@@ -56,5 +56,4 @@ public interface MemberUserApi {
      * @return 用户信息
      */
     MemberUserRespDTO getUserByMobile(String mobile);
-
 }

yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/DictTypeConstants.java

@@ -0,0 +1,15 @@
+package cn.iocoder.yudao.module.member.enums;
+
+/**
+ * Member 字典类型的枚举类
+ *
+ * @author owen
+ */
+public interface DictTypeConstants {
+
+    /**
+     * 会员经验记录 - 业务类型
+     */
+    String MEMBER_EXPERIENCE_BIZ_TYPE = "member_experience_biz_type";
+
+}

yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java

@@ -4,7 +4,7 @@ import cn.iocoder.yudao.framework.common.exception.ErrorCode;
 
 /**
  * Member 错误码枚举类
- *
+ * <p>
  * member 系统，使用 1-004-000-000 段
  */
 public interface ErrorCodeConstants {
@@ -24,13 +24,15 @@ public interface ErrorCodeConstants {
     // ========== 用户收件地址 1004004000 ==========
     ErrorCode ADDRESS_NOT_EXISTS = new ErrorCode(1004004000, "用户收件地址不存在");
 
-    //========== 会员标签 1004006000 ==========
-    ErrorCode TAG_NOT_EXISTS = new ErrorCode(1004006000, "会员标签不存在");
-    ErrorCode TAG_NAME_EXISTS = new ErrorCode(1004006001, "会员标签已经存在");
+    //========== 用户标签 1004006000 ==========
+    ErrorCode TAG_NOT_EXISTS = new ErrorCode(1004006000, "用户标签不存在");
+    ErrorCode TAG_NAME_EXISTS = new ErrorCode(1004006001, "用户标签已经存在");
+    ErrorCode TAG_HAS_USER = new ErrorCode(1004006002, "用户标签下存在用户，无法删除");
 
     //========== 积分配置 1004007000 ==========
 
     //========== 积分记录 1004008000 ==========
+    ErrorCode POINT_RECORD_BIZ_NOT_SUPPORT = new ErrorCode(1004008000, "用户积分记录业务类型不支持");
 
     //========== 签到配置 1004009000 ==========
     ErrorCode SIGN_IN_CONFIG_NOT_EXISTS = new ErrorCode(1004009000, "签到天数规则不存在");
@@ -38,4 +40,19 @@ public interface ErrorCodeConstants {
 
     //========== 签到配置 1004010000 ==========
 
+
+    //========== 用户等级 1004011000 ==========
+    ErrorCode LEVEL_NOT_EXISTS = new ErrorCode(1004011000, "用户等级不存在");
+    ErrorCode LEVEL_NAME_EXISTS = new ErrorCode(1004011001, "用户等级名称[{}]已被使用");
+    ErrorCode LEVEL_VALUE_EXISTS = new ErrorCode(1004011002, "用户等级值[{}]已被[{}]使用");
+    ErrorCode LEVEL_EXPERIENCE_MIN = new ErrorCode(1004011003, "升级经验必须大于上一个等级[{}]设置的升级经验[{}]");
+    ErrorCode LEVEL_EXPERIENCE_MAX = new ErrorCode(1004011004, "升级经验必须小于下一个等级[{}]设置的升级经验[{}]");
+    ErrorCode LEVEL_HAS_USER = new ErrorCode(1004011005, "用户等级下存在用户，无法删除");
+
+    ErrorCode EXPERIENCE_BIZ_NOT_SUPPORT = new ErrorCode(1004011201, "用户经验业务类型不支持");
+
+    //========== 用户分组 1004012000 ==========
+    ErrorCode GROUP_NOT_EXISTS = new ErrorCode(1004012000, "用户分组不存在");
+    ErrorCode GROUP_HAS_USER = new ErrorCode(1004012001, "用户分组下存在用户，无法删除");
+
 }

yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/MemberExperienceBizTypeEnum.java

@@ -0,0 +1,50 @@
+package cn.iocoder.yudao.module.member.enums;
+
+import cn.hutool.core.util.EnumUtil;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Objects;
+
+/**
+ * 会员经验 - 业务类型
+ *
+ * @author owen
+ */
+@Getter
+@AllArgsConstructor
+public enum MemberExperienceBizTypeEnum {
+
+    /**
+     * 管理员调整、邀请新用户、下单、退单、签到、抽奖
+     */
+    ADMIN(0, "管理员调整", "管理员调整获得 {} 经验", true),
+    INVITE_REGISTER(1, "邀新奖励", "邀请好友获得 {} 经验", true),
+    ORDER(2, "下单奖励", "下单获得 {} 经验", true),
+    REFUND(3, "退单扣除", "退单获得 {} 经验", false),
+    SIGN_IN(4, "签到奖励", "签到获得 {} 经验", true),
+    LOTTERY(5, "抽奖奖励", "抽奖获得 {} 经验", true),
+    ;
+
+    /**
+     * 业务类型
+     */
+    private final int type;
+    /**
+     * 标题
+     */
+    private final String title;
+    /**
+     * 描述
+     */
+    private final String description;
+    /**
+     * 是否为扣减积分
+     */
+    private final boolean add;
+
+    public static MemberExperienceBizTypeEnum getByType(Integer type) {
+        return EnumUtil.getBy(MemberExperienceBizTypeEnum.class,
+                e -> Objects.equals(type, e.getType()));
+    }
+}

yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/point/MemberPointBizTypeEnum.java

@@ -1,9 +1,12 @@
 package cn.iocoder.yudao.module.member.enums.point;
 
+import cn.hutool.core.util.EnumUtil;
 import cn.iocoder.yudao.framework.common.core.IntArrayValuable;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
+import java.util.Objects;
+
 /**
  * 会员积分的业务类型枚举
  *
@@ -13,9 +16,9 @@ import lombok.Getter;
 @Getter
 public enum MemberPointBizTypeEnum implements IntArrayValuable {
 
-    SIGN(1, "签到"),
-    ORDER_BUY(10, "订单消费"),
-    ORDER_CANCEL(11, "订单取消"); // 退回积分
+    SIGN(1, "签到", "签到获得 {} 积分", true),
+    ORDER_BUY(10, "订单消费", "下单获得 {} 积分", true),
+    ORDER_CANCEL(11, "订单取消", "退单获得 {} 积分", false); // 退回积分
 
     /**
      * 类型
@@ -25,10 +28,23 @@ public enum MemberPointBizTypeEnum implements IntArrayValuable {
      * 名字
      */
     private final String name;
+    /**
+     * 描述
+     */
+    private final String description;
+    /**
+     * 是否为扣减积分
+     */
+    private final boolean add;
 
     @Override
     public int[] array() {
         return new int[0];
     }
 
+    public static MemberPointBizTypeEnum getByType(Integer type) {
+        return EnumUtil.getBy(MemberPointBizTypeEnum.class,
+                e -> Objects.equals(type, e.getType()));
+    }
+
 }

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/level/MemberLevelApiImpl.java

@@ -0,0 +1,34 @@
+package cn.iocoder.yudao.module.member.api.level;
+
+import cn.iocoder.yudao.module.member.enums.MemberExperienceBizTypeEnum;
+import cn.iocoder.yudao.module.member.service.level.MemberLevelService;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import javax.annotation.Resource;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.EXPERIENCE_BIZ_NOT_SUPPORT;
+
+/**
+ * 会员等级 API 实现类
+ *
+ * @author owen
+ */
+@Service
+@Validated
+public class MemberLevelApiImpl implements MemberLevelApi {
+
+    @Resource
+    private MemberLevelService memberLevelService;
+
+    @Override
+    public void addExperience(Long userId, Integer experience, Integer bizType, String bizId) {
+        MemberExperienceBizTypeEnum bizTypeEnum = MemberExperienceBizTypeEnum.getByType(bizType);
+        if (bizTypeEnum == null) {
+            throw exception(EXPERIENCE_BIZ_NOT_SUPPORT);
+        }
+        memberLevelService.addExperience(userId, experience, bizTypeEnum, bizId);
+    }
+
+}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/point/MemberPointApiImpl.java

@@ -0,0 +1,34 @@
+package cn.iocoder.yudao.module.member.api.point;
+
+import cn.iocoder.yudao.module.member.enums.point.MemberPointBizTypeEnum;
+import cn.iocoder.yudao.module.member.service.point.MemberPointRecordService;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import javax.annotation.Resource;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.POINT_RECORD_BIZ_NOT_SUPPORT;
+
+/**
+ * 用户积分的 API 实现类
+ *
+ * @author owen
+ */
+@Service
+@Validated
+public class MemberPointApiImpl implements MemberPointApi {
+
+    @Resource
+    private MemberPointRecordService memberPointRecordService;
+
+    @Override
+    public void addPoint(Long userId, Integer point, Integer bizType, String bizId) {
+        MemberPointBizTypeEnum bizTypeEnum = MemberPointBizTypeEnum.getByType(bizType);
+        if (bizTypeEnum == null) {
+            throw exception(POINT_RECORD_BIZ_NOT_SUPPORT);
+        }
+        memberPointRecordService.createPointRecord(userId, point, bizTypeEnum, bizId);
+    }
+
+}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/address/AddressController.java

@@ -1,33 +1,25 @@
 package cn.iocoder.yudao.module.member.controller.admin.address;
 
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.module.member.controller.admin.address.vo.AddressRespVO;
+import cn.iocoder.yudao.module.member.convert.address.AddressConvert;
 import cn.iocoder.yudao.module.member.dal.dataobject.address.MemberAddressDO;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
+import cn.iocoder.yudao.module.member.service.address.AddressService;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
-import javax.validation.constraints.*;
-import javax.validation.*;
-import javax.servlet.http.*;
-import java.util.*;
-import java.io.IOException;
+import javax.annotation.Resource;
+import java.util.List;
 
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 
-import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
-
-import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
-import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.*;
-
-import cn.iocoder.yudao.module.member.controller.admin.address.vo.*;
-import cn.iocoder.yudao.module.member.convert.address.AddressConvert;
-import cn.iocoder.yudao.module.member.service.address.AddressService;
-
 @Tag(name = "管理后台 - 用户收件地址")
 @RestController
 @RequestMapping("/member/address")
@@ -37,66 +29,13 @@ public class AddressController {
     @Resource
     private AddressService addressService;
 
-    @PostMapping("/create")
-    @Operation(summary = "创建用户收件地址")
-    @PreAuthorize("@ss.hasPermission('member:address:create')")
-    public CommonResult<Long> createAddress(@Valid @RequestBody AddressCreateReqVO createReqVO) {
-        return success(addressService.createAddress(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新用户收件地址")
-    @PreAuthorize("@ss.hasPermission('member:address:update')")
-    public CommonResult<Boolean> updateAddress(@Valid @RequestBody AddressUpdateReqVO updateReqVO) {
-        addressService.updateAddress(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除用户收件地址")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('member:address:delete')")
-    public CommonResult<Boolean> deleteAddress(@RequestParam("id") Long id) {
-        addressService.deleteAddress(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得用户收件地址")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('member:address:query')")
-    public CommonResult<AddressRespVO> getAddress(@RequestParam("id") Long id) {
-        MemberAddressDO address = addressService.getAddress(id);
-        return success(AddressConvert.INSTANCE.convert2(address));
-    }
-
     @GetMapping("/list")
     @Operation(summary = "获得用户收件地址列表")
-    @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
-    @PreAuthorize("@ss.hasPermission('member:address:query')")
-    public CommonResult<List<AddressRespVO>> getAddressList(@RequestParam("ids") Collection<Long> ids) {
-        List<MemberAddressDO> list = addressService.getAddressList(ids);
+    @Parameter(name = "userId", description = "用户编号", required = true)
+    @PreAuthorize("@ss.hasPermission('member:user:query')")
+    public CommonResult<List<AddressRespVO>> getAddressList(@RequestParam("userId") Long userId) {
+        List<MemberAddressDO> list = addressService.getAddressList(userId);
         return success(AddressConvert.INSTANCE.convertList2(list));
     }
 
-    @GetMapping("/page")
-    @Operation(summary = "获得用户收件地址分页")
-    @PreAuthorize("@ss.hasPermission('member:address:query')")
-    public CommonResult<PageResult<AddressRespVO>> getAddressPage(@Valid AddressPageReqVO pageVO) {
-        PageResult<MemberAddressDO> pageResult = addressService.getAddressPage(pageVO);
-        return success(AddressConvert.INSTANCE.convertPage(pageResult));
-    }
-
-    @GetMapping("/export-excel")
-    @Operation(summary = "导出用户收件地址 Excel")
-    @PreAuthorize("@ss.hasPermission('member:address:export')")
-    @OperateLog(type = EXPORT)
-    public void exportAddressExcel(@Valid AddressExportReqVO exportReqVO,
-              HttpServletResponse response) throws IOException {
-        List<MemberAddressDO> list = addressService.getAddressList(exportReqVO);
-        // 导出 Excel
-        List<AddressExcelVO> datas = AddressConvert.INSTANCE.convertList02(list);
-        ExcelUtils.write(response, "用户收件地址.xls", "数据", AddressExcelVO.class, datas);
-    }
-
 }

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/address/vo/AddressCreateReqVO.java

@@ -1,14 +0,0 @@
-package cn.iocoder.yudao.module.member.controller.admin.address.vo;
-
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
-import javax.validation.constraints.*;
-
-@Schema(description = "管理后台 - 用户收件地址创建 Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class AddressCreateReqVO extends AddressBaseVO {
-
-}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/address/vo/AddressExcelVO.java

@@ -1,40 +0,0 @@
-package cn.iocoder.yudao.module.member.controller.admin.address.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-
-import com.alibaba.excel.annotation.ExcelProperty;
-
-/**
- * 用户收件地址 Excel VO
- *
- * @author 绮梦
- */
-@Data
-public class AddressExcelVO {
-
-    @ExcelProperty("收件地址编号")
-    private Long id;
-
-    @ExcelProperty("收件人名称")
-    private String name;
-
-    @ExcelProperty("手机号")
-    private String mobile;
-
-    @ExcelProperty("地区编码")
-    private Long areaId;
-
-    @ExcelProperty("收件详细地址")
-    private String detailAddress;
-
-    @ExcelProperty("是否默认")
-    private Boolean defaultStatus;
-
-    @ExcelProperty("创建时间")
-    private LocalDateTime createTime;
-
-}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/address/vo/AddressExportReqVO.java

@@ -1,38 +0,0 @@
-package cn.iocoder.yudao.module.member.controller.admin.address.vo;
-
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import java.time.LocalDateTime;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
-
-@Schema(description = "管理后台 - 用户收件地址 Excel 导出 Request VO，参数和 AddressPageReqVO 是一致的")
-@Data
-public class AddressExportReqVO {
-
-    @Schema(description = "用户编号", example = "20369")
-    private Long userId;
-
-    @Schema(description = "收件人名称", example = "张三")
-    private String name;
-
-    @Schema(description = "手机号")
-    private String mobile;
-
-    @Schema(description = "地区编码", example = "15716")
-    private Long areaId;
-
-    @Schema(description = "收件详细地址")
-    private String detailAddress;
-
-    @Schema(description = "是否默认", example = "2")
-    private Boolean defaultStatus;
-
-    @Schema(description = "创建时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] createTime;
-
-}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/address/vo/AddressPageReqVO.java

@@ -1,40 +0,0 @@
-package cn.iocoder.yudao.module.member.controller.admin.address.vo;
-
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.time.LocalDateTime;
-
-import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
-
-@Schema(description = "管理后台 - 用户收件地址分页 Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class AddressPageReqVO extends PageParam {
-
-    @Schema(description = "用户编号", example = "20369")
-    private Long userId;
-
-    @Schema(description = "收件人名称", example = "张三")
-    private String name;
-
-    @Schema(description = "手机号")
-    private String mobile;
-
-    @Schema(description = "地区编码", example = "15716")
-    private Long areaId;
-
-    @Schema(description = "收件详细地址")
-    private String detailAddress;
-
-    @Schema(description = "是否默认", example = "2")
-    private Boolean defaultStatus;
-
-    @Schema(description = "创建时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] createTime;
-
-}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/address/vo/AddressUpdateReqVO.java

@@ -1,18 +0,0 @@
-package cn.iocoder.yudao.module.member.controller.admin.address.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import javax.validation.constraints.*;
-
-@Schema(description = "管理后台 - 用户收件地址更新 Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class AddressUpdateReqVO extends AddressBaseVO {
-
-    @Schema(description = "收件地址编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "7380")
-    @NotNull(message = "收件地址编号不能为空")
-    private Long id;
-
-}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/group/MemberGroupController.java

@@ -0,0 +1,81 @@
+package cn.iocoder.yudao.module.member.controller.admin.group;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.member.controller.admin.group.vo.*;
+import cn.iocoder.yudao.module.member.convert.group.MemberGroupConvert;
+import cn.iocoder.yudao.module.member.dal.dataobject.group.MemberGroupDO;
+import cn.iocoder.yudao.module.member.service.group.MemberGroupService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+
+@Tag(name = "管理后台 - 用户分组")
+@RestController
+@RequestMapping("/member/group")
+@Validated
+public class MemberGroupController {
+
+    @Resource
+    private MemberGroupService groupService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建用户分组")
+    @PreAuthorize("@ss.hasPermission('member:group:create')")
+    public CommonResult<Long> createGroup(@Valid @RequestBody MemberGroupCreateReqVO createReqVO) {
+        return success(groupService.createGroup(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新用户分组")
+    @PreAuthorize("@ss.hasPermission('member:group:update')")
+    public CommonResult<Boolean> updateGroup(@Valid @RequestBody MemberGroupUpdateReqVO updateReqVO) {
+        groupService.updateGroup(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除用户分组")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('member:group:delete')")
+    public CommonResult<Boolean> deleteGroup(@RequestParam("id") Long id) {
+        groupService.deleteGroup(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得用户分组")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('member:group:query')")
+    public CommonResult<MemberGroupRespVO> getGroup(@RequestParam("id") Long id) {
+        MemberGroupDO group = groupService.getGroup(id);
+        return success(MemberGroupConvert.INSTANCE.convert(group));
+    }
+
+    @GetMapping("/list-all-simple")
+    @Operation(summary = "获取会员分组精简信息列表", description = "只包含被开启的会员分组，主要用于前端的下拉选项")
+    public CommonResult<List<MemberGroupSimpleRespVO>> getSimpleGroupList() {
+        // 获用户列表，只要开启状态的
+        List<MemberGroupDO> list = groupService.getEnableGroupList();
+        return success(MemberGroupConvert.INSTANCE.convertSimpleList(list));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得用户分组分页")
+    @PreAuthorize("@ss.hasPermission('member:group:query')")
+    public CommonResult<PageResult<MemberGroupRespVO>> getGroupPage(@Valid MemberGroupPageReqVO pageVO) {
+        PageResult<MemberGroupDO> pageResult = groupService.getGroupPage(pageVO);
+        return success(MemberGroupConvert.INSTANCE.convertPage(pageResult));
+    }
+
+}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/group/vo/MemberGroupBaseVO.java

@@ -0,0 +1,29 @@
+package cn.iocoder.yudao.module.member.controller.admin.group.vo;
+
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
+import cn.iocoder.yudao.framework.common.validation.InEnum;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * 用户分组 Base VO，提供给添加、修改、详细的子 VO 使用
+ * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
+ */
+@Data
+public class MemberGroupBaseVO {
+
+    @Schema(description = "名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "购物达人")
+    @NotNull(message = "名称不能为空")
+    private String name;
+
+    @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "你猜")
+    private String remark;
+
+    @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @NotNull(message = "状态不能为空")
+    @InEnum(CommonStatusEnum.class)
+    private Integer status;
+
+}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/group/vo/MemberGroupCreateReqVO.java

@@ -0,0 +1,14 @@
+package cn.iocoder.yudao.module.member.controller.admin.group.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+@Schema(description = "管理后台 - 用户分组创建 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class MemberGroupCreateReqVO extends MemberGroupBaseVO {
+
+}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/group/vo/MemberGroupPageReqVO.java

@@ -0,0 +1,30 @@
+package cn.iocoder.yudao.module.member.controller.admin.group.vo;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 用户分组分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class MemberGroupPageReqVO extends PageParam {
+
+    @Schema(description = "名称", example = "购物达人")
+    private String name;
+
+    @Schema(description = "状态", example = "1")
+    private Integer status;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/group/vo/MemberGroupRespVO.java

@@ -0,0 +1,22 @@
+package cn.iocoder.yudao.module.member.controller.admin.group.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - 用户分组 Response VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class MemberGroupRespVO extends MemberGroupBaseVO {
+
+    @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "20357")
+    private Long id;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    private LocalDateTime createTime;
+
+}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/group/vo/MemberGroupSimpleRespVO.java

@@ -0,0 +1,18 @@
+package cn.iocoder.yudao.module.member.controller.admin.group.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.ToString;
+
+@Schema(description = "管理后台 - 用户分组 Response VO")
+@Data
+@ToString(callSuper = true)
+public class MemberGroupSimpleRespVO {
+
+    @Schema(description = "编号", example = "6103")
+    private Long id;
+
+    @Schema(description = "等级名称", example = "芋艿")
+    private String name;
+
+}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/group/vo/MemberGroupUpdateReqVO.java

@@ -0,0 +1,20 @@
+package cn.iocoder.yudao.module.member.controller.admin.group.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Schema(description = "管理后台 - 用户分组更新 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class MemberGroupUpdateReqVO extends MemberGroupBaseVO {
+
+    @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "20357")
+    @NotNull(message = "编号不能为空")
+    private Long id;
+
+}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/MemberExperienceRecordController.java

@@ -0,0 +1,52 @@
+package cn.iocoder.yudao.module.member.controller.admin.level;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.member.controller.admin.level.vo.experience.MemberExperienceRecordPageReqVO;
+import cn.iocoder.yudao.module.member.controller.admin.level.vo.experience.MemberExperienceRecordRespVO;
+import cn.iocoder.yudao.module.member.convert.level.MemberExperienceRecordConvert;
+import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberExperienceRecordDO;
+import cn.iocoder.yudao.module.member.service.level.MemberExperienceRecordService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "管理后台 - 会员经验记录")
+@RestController
+@RequestMapping("/member/experience-record")
+@Validated
+public class MemberExperienceRecordController {
+
+    @Resource
+    private MemberExperienceRecordService experienceLogService;
+
+    @GetMapping("/get")
+    @Operation(summary = "获得会员经验记录")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('member:experience-record:query')")
+    public CommonResult<MemberExperienceRecordRespVO> getExperienceRecord(@RequestParam("id") Long id) {
+        MemberExperienceRecordDO experienceLog = experienceLogService.getExperienceRecord(id);
+        return success(MemberExperienceRecordConvert.INSTANCE.convert(experienceLog));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得会员经验记录分页")
+    @PreAuthorize("@ss.hasPermission('member:experience-record:query')")
+    public CommonResult<PageResult<MemberExperienceRecordRespVO>> getExperienceRecordPage(
+            @Valid MemberExperienceRecordPageReqVO pageVO) {
+        PageResult<MemberExperienceRecordDO> pageResult = experienceLogService.getExperienceRecordPage(pageVO);
+        return success(MemberExperienceRecordConvert.INSTANCE.convertPage(pageResult));
+    }
+
+}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/MemberLevelController.java

@@ -0,0 +1,80 @@
+package cn.iocoder.yudao.module.member.controller.admin.level;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.*;
+import cn.iocoder.yudao.module.member.convert.level.MemberLevelConvert;
+import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO;
+import cn.iocoder.yudao.module.member.service.level.MemberLevelService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "管理后台 - 会员等级")
+@RestController
+@RequestMapping("/member/level")
+@Validated
+public class MemberLevelController {
+
+    @Resource
+    private MemberLevelService levelService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建会员等级")
+    @PreAuthorize("@ss.hasPermission('member:level:create')")
+    public CommonResult<Long> createLevel(@Valid @RequestBody MemberLevelCreateReqVO createReqVO) {
+        return success(levelService.createLevel(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新会员等级")
+    @PreAuthorize("@ss.hasPermission('member:level:update')")
+    public CommonResult<Boolean> updateLevel(@Valid @RequestBody MemberLevelUpdateReqVO updateReqVO) {
+        levelService.updateLevel(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除会员等级")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('member:level:delete')")
+    public CommonResult<Boolean> deleteLevel(@RequestParam("id") Long id) {
+        levelService.deleteLevel(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得会员等级")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('member:level:query')")
+    public CommonResult<MemberLevelRespVO> getLevel(@RequestParam("id") Long id) {
+        MemberLevelDO level = levelService.getLevel(id);
+        return success(MemberLevelConvert.INSTANCE.convert(level));
+    }
+
+    @GetMapping("/list-all-simple")
+    @Operation(summary = "获取会员等级精简信息列表", description = "只包含被开启的会员等级，主要用于前端的下拉选项")
+    public CommonResult<List<MemberLevelSimpleRespVO>> getSimpleLevelList() {
+        // 获用户列表，只要开启状态的
+        List<MemberLevelDO> list = levelService.getEnableLevelList();
+        // 排序后，返回给前端
+        return success(MemberLevelConvert.INSTANCE.convertSimpleList(list));
+    }
+
+    @GetMapping("/list")
+    @Operation(summary = "获得会员等级列表")
+    @PreAuthorize("@ss.hasPermission('member:level:query')")
+    public CommonResult<List<MemberLevelRespVO>> getLevelList(@Valid MemberLevelListReqVO pageVO) {
+        List<MemberLevelDO> result = levelService.getLevelList(pageVO);
+        return success(MemberLevelConvert.INSTANCE.convertList(result));
+    }
+
+}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/MemberLevelRecordController.java

@@ -0,0 +1,52 @@
+package cn.iocoder.yudao.module.member.controller.admin.level;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.member.controller.admin.level.vo.log.MemberLevelRecordPageReqVO;
+import cn.iocoder.yudao.module.member.controller.admin.level.vo.log.MemberLevelRecordRespVO;
+import cn.iocoder.yudao.module.member.convert.level.MemberLevelRecordConvert;
+import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelRecordDO;
+import cn.iocoder.yudao.module.member.service.level.MemberLevelRecordService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "管理后台 - 会员等级记录")
+@RestController
+@RequestMapping("/member/level-record")
+@Validated
+public class MemberLevelRecordController {
+
+    @Resource
+    private MemberLevelRecordService levelLogService;
+
+    @GetMapping("/get")
+    @Operation(summary = "获得会员等级记录")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('member:level-record:query')")
+    public CommonResult<MemberLevelRecordRespVO> getLevelRecord(@RequestParam("id") Long id) {
+        MemberLevelRecordDO levelLog = levelLogService.getLevelRecord(id);
+        return success(MemberLevelRecordConvert.INSTANCE.convert(levelLog));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得会员等级记录分页")
+    @PreAuthorize("@ss.hasPermission('member:level-record:query')")
+    public CommonResult<PageResult<MemberLevelRecordRespVO>> getLevelRecordPage(
+            @Valid MemberLevelRecordPageReqVO pageVO) {
+        PageResult<MemberLevelRecordDO> pageResult = levelLogService.getLevelRecordPage(pageVO);
+        return success(MemberLevelRecordConvert.INSTANCE.convertPage(pageResult));
+    }
+
+}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/experience/MemberExperienceRecordBaseVO.java

@@ -0,0 +1,43 @@
+package cn.iocoder.yudao.module.member.controller.admin.level.vo.experience;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * 会员经验记录 Base VO，提供给添加、修改、详细的子 VO 使用
+ * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
+ */
+@Data
+public class MemberExperienceRecordBaseVO {
+
+    @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "3638")
+    @NotNull(message = "用户编号不能为空")
+    private Long userId;
+
+    @Schema(description = "业务编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "12164")
+    @NotNull(message = "业务编号不能为空")
+    private String bizId;
+
+    @Schema(description = "业务类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @NotNull(message = "业务类型不能为空")
+    private Integer bizType;
+
+    @Schema(description = "标题", requiredMode = Schema.RequiredMode.REQUIRED, example = "增加经验")
+    @NotNull(message = "标题不能为空")
+    private String title;
+
+    @Schema(description = "经验", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
+    @NotNull(message = "经验不能为空")
+    private Integer experience;
+
+    @Schema(description = "变更后的经验", requiredMode = Schema.RequiredMode.REQUIRED, example = "200")
+    @NotNull(message = "变更后的经验不能为空")
+    private Integer totalExperience;
+
+    @Schema(description = "描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "下单增加 100 经验")
+    @NotNull(message = "描述不能为空")
+    private String description;
+
+}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/experience/MemberExperienceRecordPageReqVO.java

@@ -0,0 +1,36 @@
+package cn.iocoder.yudao.module.member.controller.admin.level.vo.experience;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 会员经验记录分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class MemberExperienceRecordPageReqVO extends PageParam {
+
+    @Schema(description = "用户编号", example = "3638")
+    private Long userId;
+
+    @Schema(description = "业务编号", example = "12164")
+    private String bizId;
+
+    @Schema(description = "业务类型", example = "1")
+    private Integer bizType;
+
+    @Schema(description = "标题", example = "增加经验")
+    private String title;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/experience/MemberExperienceRecordRespVO.java

@@ -0,0 +1,22 @@
+package cn.iocoder.yudao.module.member.controller.admin.level.vo.experience;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - 会员经验记录 Response VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class MemberExperienceRecordRespVO extends MemberExperienceRecordBaseVO {
+
+    @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "19610")
+    private Long id;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    private LocalDateTime createTime;
+
+}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/level/MemberLevelBaseVO.java

@@ -0,0 +1,53 @@
+package cn.iocoder.yudao.module.member.controller.admin.level.vo.level;
+
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
+import cn.iocoder.yudao.framework.common.validation.InEnum;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.hibernate.validator.constraints.Range;
+import org.hibernate.validator.constraints.URL;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Positive;
+
+/**
+ * 会员等级 Base VO，提供给添加、修改、详细的子 VO 使用
+ * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
+ */
+@Data
+public class MemberLevelBaseVO {
+
+    @Schema(description = "等级名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
+    @NotBlank(message = "等级名称不能为空")
+    private String name;
+
+    @Schema(description = "升级经验", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
+    @NotNull(message = "升级经验不能为空")
+    @Positive(message = "升级经验必须大于 0")
+    private Integer experience;
+
+    @Schema(description = "等级", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @NotNull(message = "等级不能为空")
+    @Positive(message = "等级必须大于 0")
+    private Integer level;
+
+    @Schema(description = "享受折扣", requiredMode = Schema.RequiredMode.REQUIRED, example = "98")
+    @NotNull(message = "享受折扣不能为空")
+    @Range(min = 0, max = 100, message = "享受折扣的范围为 0-100")
+    private Integer discountPercent;
+
+    @Schema(description = "等级图标", example = "https://www.iocoder.cn/yudao.jpg")
+    @URL(message = "等级图标必须是 URL 格式")
+    private String icon;
+
+    @Schema(description = "等级背景图", example = "https://www.iocoder.cn/yudao.jpg")
+    @URL(message = "等级背景图必须是 URL 格式")
+    private String backgroundUrl;
+
+    @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @NotNull(message = "状态不能为空")
+    @InEnum(CommonStatusEnum.class)
+    private Integer status;
+
+}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/level/MemberLevelCreateReqVO.java

@@ -0,0 +1,14 @@
+package cn.iocoder.yudao.module.member.controller.admin.level.vo.level;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+@Schema(description = "管理后台 - 会员等级创建 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class MemberLevelCreateReqVO extends MemberLevelBaseVO {
+
+}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/level/MemberLevelListReqVO.java

@@ -0,0 +1,18 @@
+package cn.iocoder.yudao.module.member.controller.admin.level.vo.level;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.ToString;
+
+@Schema(description = "管理后台 - 会员等级列表筛选 Request VO")
+@Data
+@ToString(callSuper = true)
+public class MemberLevelListReqVO {
+
+    @Schema(description = "等级名称", example = "芋艿")
+    private String name;
+
+    @Schema(description = "状态", example = "1")
+    private Integer status;
+
+}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/level/MemberLevelRespVO.java

@@ -0,0 +1,22 @@
+package cn.iocoder.yudao.module.member.controller.admin.level.vo.level;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - 会员等级 Response VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class MemberLevelRespVO extends MemberLevelBaseVO {
+
+    @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "6103")
+    private Long id;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    private LocalDateTime createTime;
+
+}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/level/MemberLevelSimpleRespVO.java

@@ -0,0 +1,21 @@
+package cn.iocoder.yudao.module.member.controller.admin.level.vo.level;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.ToString;
+
+@Schema(description = "管理后台 - 会员等级 Response VO")
+@Data
+@ToString(callSuper = true)
+public class MemberLevelSimpleRespVO {
+
+    @Schema(description = "编号", example = "6103")
+    private Long id;
+
+    @Schema(description = "等级名称", example = "芋艿")
+    private String name;
+
+    @Schema(description = "等级图标", example = "https://www.iocoder.cn/yudao.jpg")
+    private String icon;
+
+}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/level/MemberLevelUpdateReqVO.java

@@ -0,0 +1,20 @@
+package cn.iocoder.yudao.module.member.controller.admin.level.vo.level;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Schema(description = "管理后台 - 会员等级更新 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class MemberLevelUpdateReqVO extends MemberLevelBaseVO {
+
+    @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "6103")
+    @NotNull(message = "编号不能为空")
+    private Long id;
+
+}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/log/MemberLevelRecordBaseVO.java

@@ -0,0 +1,47 @@
+package cn.iocoder.yudao.module.member.controller.admin.level.vo.log;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * 会员等级记录 Base VO，提供给添加、修改、详细的子 VO 使用
+ * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
+ */
+@Data
+public class MemberLevelRecordBaseVO {
+
+    @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "25923")
+    @NotNull(message = "用户编号不能为空")
+    private Long userId;
+
+    @Schema(description = "等级编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "25985")
+    @NotNull(message = "等级编号不能为空")
+    private Long levelId;
+
+    @Schema(description = "会员等级", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "会员等级不能为空")
+    private Integer level;
+
+    @Schema(description = "享受折扣", requiredMode = Schema.RequiredMode.REQUIRED, example = "13319")
+    @NotNull(message = "享受折扣不能为空")
+    private Integer discountPercent;
+
+    @Schema(description = "升级经验", requiredMode = Schema.RequiredMode.REQUIRED, example = "13319")
+    @NotNull(message = "升级经验不能为空")
+    private Integer experience;
+
+    @Schema(description = "会员此时的经验", requiredMode = Schema.RequiredMode.REQUIRED, example = "13319")
+    @NotNull(message = "会员此时的经验不能为空")
+    private Integer userExperience;
+
+    @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "推广需要")
+    @NotNull(message = "备注不能为空")
+    private String remark;
+
+    @Schema(description = "描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "升级为金牌会员")
+    @NotNull(message = "描述不能为空")
+    private String description;
+
+}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/log/MemberLevelRecordPageReqVO.java

@@ -0,0 +1,30 @@
+package cn.iocoder.yudao.module.member.controller.admin.level.vo.log;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 会员等级记录分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class MemberLevelRecordPageReqVO extends PageParam {
+
+    @Schema(description = "用户编号", example = "25923")
+    private Long userId;
+
+    @Schema(description = "等级编号", example = "25985")
+    private Long levelId;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/log/MemberLevelRecordRespVO.java

@@ -0,0 +1,22 @@
+package cn.iocoder.yudao.module.member.controller.admin.level.vo.log;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - 会员等级记录 Response VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class MemberLevelRecordRespVO extends MemberLevelRecordBaseVO {
+
+    @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "8741")
+    private Long id;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    private LocalDateTime createTime;
+
+}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/point/MemberPointConfigController.java

@@ -29,16 +29,16 @@ public class MemberPointConfigController {
     @PutMapping("/save")
     @Operation(summary = "保存会员积分配置")
     @PreAuthorize("@ss.hasPermission('point:config:save')")
-    public CommonResult<Boolean> updateConfig(@Valid @RequestBody MemberPointConfigSaveReqVO saveReqVO) {
-        memberPointConfigService.saveConfig(saveReqVO);
+    public CommonResult<Boolean> savePointConfig(@Valid @RequestBody MemberPointConfigSaveReqVO saveReqVO) {
+        memberPointConfigService.savePointConfig(saveReqVO);
         return success(true);
     }
 
     @GetMapping("/get")
     @Operation(summary = "获得会员积分配置")
     @PreAuthorize("@ss.hasPermission('point:config:query')")
-    public CommonResult<MemberPointConfigRespVO> getConfig() {
-        MemberPointConfigDO config = memberPointConfigService.getConfig();
+    public CommonResult<MemberPointConfigRespVO> getPointConfig() {
+        MemberPointConfigDO config = memberPointConfigService.getPointConfig();
         return success(MemberPointConfigConvert.INSTANCE.convert(config));
     }
 

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/point/MemberPointRecordController.java

@@ -25,6 +25,7 @@ import java.util.List;
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
 
+@Tag(name = "管理后台 - 签到记录")
 @RestController
 @RequestMapping("/member/point/record")
 @Validated
@@ -39,9 +40,9 @@ public class MemberPointRecordController {
     @GetMapping("/page")
     @Operation(summary = "获得用户积分记录分页")
     @PreAuthorize("@ss.hasPermission('point:record:query')")
-    public CommonResult<PageResult<MemberPointRecordRespVO>> getRecordPage(@Valid MemberPointRecordPageReqVO pageVO) {
+    public CommonResult<PageResult<MemberPointRecordRespVO>> getPointRecordPage(@Valid MemberPointRecordPageReqVO pageVO) {
         // 执行分页查询
-        PageResult<MemberPointRecordDO> pageResult = pointRecordService.getRecordPage(pageVO);
+        PageResult<MemberPointRecordDO> pageResult = pointRecordService.getPointRecordPage(pageVO);
         if (CollectionUtils.isEmpty(pageResult.getList())) {
             return success(PageResult.empty(pageResult.getTotal()));
         }

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/point/vo/recrod/MemberPointRecordPageReqVO.java

@@ -15,7 +15,7 @@ public class MemberPointRecordPageReqVO extends PageParam {
     @Schema(description = "用户昵称", example = "张三")
     private String nickname;
 
-    @Schema(description = "用户ID", example = "123")
+    @Schema(description = "用户编号", example = "123")
     private Long userId;
 
     @Schema(description = "业务类型", example = "1")

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/signin/MemberSignInConfigController.java

@@ -20,9 +20,10 @@ import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 
+// TODO 芋艿：url
 @Tag(name = "管理后台 - 签到规则")
 @RestController
-@RequestMapping("/member/point/sign-in-config")
+@RequestMapping("/member/sign-in/config")
 @Validated
 public class MemberSignInConfigController {
 
@@ -66,8 +67,8 @@ public class MemberSignInConfigController {
     @Operation(summary = "获得签到规则列表")
     @PreAuthorize("@ss.hasPermission('point:sign-in-config:query')")
     public CommonResult<List<MemberSignInConfigRespVO>> getSignInConfigList() {
-        List<MemberSignInConfigDO> pageResult = signInConfigService.getSignInConfigList();
-        return success(MemberSignInConfigConvert.INSTANCE.convertList(pageResult));
+        List<MemberSignInConfigDO> list = signInConfigService.getSignInConfigList();
+        return success(MemberSignInConfigConvert.INSTANCE.convertList(list));
     }
 
 }

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/signin/MemberSignInRecordController.java

@@ -27,7 +27,7 @@ import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.
 
 @Tag(name = "管理后台 - 签到记录")
 @RestController
-@RequestMapping("/member/point/sign-in-record")
+@RequestMapping("/member/sign-in/record")
 @Validated
 public class MemberSignInRecordController {
 

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/signin/vo/record/MemberSignInRecordPageReqVO.java

@@ -23,7 +23,7 @@ public class MemberSignInRecordPageReqVO extends PageParam {
     @Schema(description = "第几天签到", example = "10")
     private Integer day;
 
-    @Schema(description = "用户ID", example = "123")
+    @Schema(description = "用户编号", example = "123")
     private Long userId;
 
     @Schema(description = "签到时间")

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/tag/MemberTagController.java

@@ -65,6 +65,15 @@ public class MemberTagController {
         return success(MemberTagConvert.INSTANCE.convert(tag));
     }
 
+    @GetMapping("/list-all-simple")
+    @Operation(summary = "获取会员标签精简信息列表", description = "只包含被开启的会员标签，主要用于前端的下拉选项")
+    public CommonResult<List<MemberTagRespVO>> getSimpleTagList() {
+        // 获用户列表，只要开启状态的
+        List<MemberTagDO> list = tagService.getTagList();
+        // 排序后，返回给前端
+        return success(MemberTagConvert.INSTANCE.convertList(list));
+    }
+
     @GetMapping("/list")
     @Operation(summary = "获得会员标签列表")
     @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

@@ -5,10 +5,15 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserPageReqVO;
 import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserRespVO;
+import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserUpdateLevelReqVO;
 import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserUpdateReqVO;
 import cn.iocoder.yudao.module.member.convert.user.MemberUserConvert;
+import cn.iocoder.yudao.module.member.dal.dataobject.group.MemberGroupDO;
+import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO;
 import cn.iocoder.yudao.module.member.dal.dataobject.tag.MemberTagDO;
 import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO;
+import cn.iocoder.yudao.module.member.service.group.MemberGroupService;
+import cn.iocoder.yudao.module.member.service.level.MemberLevelService;
 import cn.iocoder.yudao.module.member.service.tag.MemberTagService;
 import cn.iocoder.yudao.module.member.service.user.MemberUserService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -27,6 +32,7 @@ import java.util.Set;
 import java.util.stream.Collectors;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
 
 @Tag(name = "管理后台 - 会员用户")
 @RestController
@@ -38,6 +44,10 @@ public class MemberUserController {
     private MemberUserService memberUserService;
     @Resource
     private MemberTagService memberTagService;
+    @Resource
+    private MemberLevelService memberLevelService;
+    @Resource
+    private MemberGroupService memberGroupService;
 
     @PutMapping("/update")
     @Operation(summary = "更新会员用户")
@@ -47,6 +57,14 @@ public class MemberUserController {
         return success(true);
     }
 
+    @PutMapping("/update-level")
+    @Operation(summary = "更新会员用户等级")
+    @PreAuthorize("@ss.hasPermission('member:user:update-level')")
+    public CommonResult<Boolean> updateUserLevel(@Valid @RequestBody MemberUserUpdateLevelReqVO updateReqVO) {
+        memberLevelService.updateUserLevel(updateReqVO);
+        return success(true);
+    }
+
     @GetMapping("/get")
     @Operation(summary = "获得会员用户")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
@@ -65,14 +83,20 @@ public class MemberUserController {
             return success(PageResult.empty());
         }
 
-        // 处理会员标签返显
+        // 处理用户标签返显
         Set<Long> tagIds = pageResult.getList().stream()
                 .map(MemberUserDO::getTagIds)
                 .filter(Objects::nonNull)
                 .flatMap(Collection::stream)
                 .collect(Collectors.toSet());
         List<MemberTagDO> tags = memberTagService.getTagList(tagIds);
-        return success(MemberUserConvert.INSTANCE.convertPage(pageResult, tags));
+        // 处理用户级别返显
+        List<MemberLevelDO> levels = memberLevelService.getLevelList(
+                convertSet(pageResult.getList(), MemberUserDO::getLevelId));
+        // 处理用户分组返显
+        List<MemberGroupDO> groups = memberGroupService.getGroupList(
+                convertSet(pageResult.getList(), MemberUserDO::getGroupId));
+        return success(MemberUserConvert.INSTANCE.convertPage(pageResult, tags, levels, groups));
     }
 
 }

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserBaseVO.java

@@ -40,10 +40,10 @@ public class MemberUserBaseVO {
     @Schema(description = "用户性别", example = "1")
     private Byte sex;
 
-    @Schema(description = "所在地", example = "4371")
+    @Schema(description = "所在地编号", example = "4371")
     private Long areaId;
 
-    @Schema(description = "所在地可视化显示", example = "4371")
+    @Schema(description = "所在地全程", example = "上海上海市普陀区")
     private String areaName;
 
     @Schema(description = "出生日期", example = "2023-03-12")
@@ -56,4 +56,10 @@ public class MemberUserBaseVO {
     @Schema(description = "会员标签", example = "[1, 2]")
     private List<Long> tagIds;
 
+    @Schema(description = "会员等级编号", example = "1")
+    private Long levelId;
+
+    @Schema(description = "用户分组编号", example = "1")
+    private Long groupId;
+
 }

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserPageReqVO.java

@@ -32,7 +32,13 @@ public class MemberUserPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 
-    @Schema(description = "会员标签", example = "[1, 2]")
+    @Schema(description = "会员标签编号列表", example = "[1, 2]")
     private List<Long> tagIds;
 
+    @Schema(description = "会员等级编号", example = "1")
+    private Long levelId;
+
+    @Schema(description = "用户分组编号", example = "1")
+    private Long groupId;
+
 }

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserRespVO.java

@@ -29,10 +29,24 @@ public class MemberUserRespVO extends MemberUserBaseVO {
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     private LocalDateTime createTime;
 
-
     // ========== 其它信息 ==========
 
+    @Schema(description = "积分", requiredMode  = Schema.RequiredMode.REQUIRED, example = "100")
+    private Integer point;
+
+    @Schema(description = "总积分", requiredMode = Schema.RequiredMode.REQUIRED, example = "2000")
+    private Integer totalPoint;
+
     @Schema(description = "会员标签", example = "[红色, 快乐]")
     private List<String> tagNames;
 
+    @Schema(description = "会员等级", example = "黄金会员")
+    private String levelName;
+
+    @Schema(description = "用户分组", example = "购物达人")
+    private String groupName;
+
+    @Schema(description = "用户经验值", requiredMode  = Schema.RequiredMode.REQUIRED, example = "200")
+    private Integer experience;
+
 }

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserUpdateLevelReqVO.java

@@ -0,0 +1,31 @@
+package cn.iocoder.yudao.module.member.controller.admin.user.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+@Schema(description = "管理后台 - 会员用户 修改等级 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class MemberUserUpdateLevelReqVO extends MemberUserBaseVO {
+
+    @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "23788")
+    @NotNull(message = "用户编号不能为空")
+    private Long id;
+
+    /**
+     * 取消用户等级时，值为空
+     */
+    @Schema(description = "用户等级编号", example = "1")
+    private Long levelId;
+
+    @Schema(description = "修改原因", requiredMode = Schema.RequiredMode.REQUIRED, example = "推广需要")
+    @NotBlank(message = "修改原因不能为空")
+    private String reason;
+
+}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/point/AppMemberPointRecordController.java

@@ -0,0 +1,39 @@
+package cn.iocoder.yudao.module.member.controller.app.point;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.member.controller.app.point.vo.AppMemberPointRecordRespVO;
+import cn.iocoder.yudao.module.member.convert.point.MemberPointRecordConvert;
+import cn.iocoder.yudao.module.member.dal.dataobject.point.MemberPointRecordDO;
+import cn.iocoder.yudao.module.member.service.point.MemberPointRecordService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
+
+@Tag(name = "用户 App - 签到记录")
+@RestController
+@RequestMapping("/member/point/record")
+@Validated
+public class AppMemberPointRecordController {
+
+    @Resource
+    private MemberPointRecordService pointRecordService;
+
+    @GetMapping("/page")
+    @Operation(summary = "获得用户积分记录分页")
+    public CommonResult<PageResult<AppMemberPointRecordRespVO>> getPointRecordPage(@Valid PageParam pageVO) {
+        PageResult<MemberPointRecordDO> pageResult = pointRecordService.getPointRecordPage(getLoginUserId(), pageVO);
+        return success(MemberPointRecordConvert.INSTANCE.convertPage02(pageResult));
+    }
+
+}