BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 4dd2d80887e1fb544985b59afe65ad79afc51772

Authored by owen
2 parents 4132cf14 60875a04

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

# Conflicts:
#	sql/mysql/member_level.sql
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberExperienceLogService.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelLogService.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelLogServiceImpl.java
Inline Side-by-side
Showing 46 changed files with 647 additions and 290 deletions
sql/mysql/member_group.sql deleted
View file @4132cf1
1 -create table member_group  
2 -(  
3 - id bigint auto_increment comment '编号' primary key,  
4 - name varchar(30) default '' not null comment '名称',  
5 - remark varchar(255) default '' not null comment '备注',  
6 - status tinyint default 0 not null comment '状态',  
7 - creator varchar(64) default '' null comment '创建者',  
8 - create_time datetime default CURRENT_TIMESTAMP not null comment '创建时间',  
9 - updater varchar(64) default '' null comment '更新者',  
10 - update_time datetime default CURRENT_TIMESTAMP not null on update CURRENT_TIMESTAMP comment '更新时间',  
11 - deleted bit default b'0' not null comment '是否删除',  
12 - tenant_id bigint default 0 not null comment '租户编号'  
13 -)  
14 - comment '用户分组';  
15 -  
16 -alter table member_user add column group_id bigint null comment '用户分组编号';  
17 -  
18 --- 菜单 SQL  
19 -INSERT INTO system_menu(name, permission, type, sort, parent_id, path, icon, component, status, component_name)  
20 -VALUES ('用户分组', '', 2, 5, 2262, 'group', '', 'member/group/index', 0, 'MemberGroup');  
21 -  
22 --- 按钮父菜单ID  
23 --- 暂时只支持 MySQL。如果你是 Oracle、PostgreSQL、SQLServer 的话，需要手动修改 @parentId 的部分的代码  
24 -SELECT @parentId := LAST_INSERT_ID();  
25 -  
26 --- 按钮 SQL  
27 -INSERT INTO system_menu(name, permission, type, sort, parent_id, path, icon, component, status)  
28 -VALUES ('用户分组查询', 'member:group:query', 3, 1, @parentId, '', '', '', 0);  
29 -INSERT INTO system_menu(name, permission, type, sort, parent_id, path, icon, component, status)  
30 -VALUES ('用户分组创建', 'member:group:create', 3, 2, @parentId, '', '', '', 0);  
31 -INSERT INTO system_menu(name, permission, type, sort, parent_id, path, icon, component, status)  
32 -VALUES ('用户分组更新', 'member:group:update', 3, 3, @parentId, '', '', '', 0);  
33 -INSERT INTO system_menu(name, permission, type, sort, parent_id, path, icon, component, status)  
34 -VALUES ('用户分组删除', 'member:group:delete', 3, 4, @parentId, '', '', '', 0);  
35 -INSERT INTO system_menu(name, permission, type, sort, parent_id, path, icon, component, status)  
36 -VALUES ('用户分组导出', 'member:group:export', 3, 5, @parentId, '', '', '', 0);  
yudao-framework/yudao-spring-boot-starter-biz-pay/src/test/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AbstractAlipayClientTest.java
  View file @4dd2d80
1 package cn.iocoder.yudao.framework.pay.core.client.impl.alipay; 1 package cn.iocoder.yudao.framework.pay.core.client.impl.alipay;
2 2
3 import cn.hutool.core.date.LocalDateTimeUtil; 3 import cn.hutool.core.date.LocalDateTimeUtil;
  4 +import cn.hutool.core.util.RandomUtil;
4 import cn.hutool.core.util.ReflectUtil; 5 import cn.hutool.core.util.ReflectUtil;
5 import cn.iocoder.yudao.framework.common.exception.ServiceException; 6 import cn.iocoder.yudao.framework.common.exception.ServiceException;
6 import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants; 7 import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants;
7 import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil; 8 import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
  9 +import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderUnifiedReqDTO;
8 import cn.iocoder.yudao.framework.pay.core.client.dto.refund.PayRefundRespDTO; 10 import cn.iocoder.yudao.framework.pay.core.client.dto.refund.PayRefundRespDTO;
9 import cn.iocoder.yudao.framework.pay.core.client.dto.refund.PayRefundUnifiedReqDTO; 11 import cn.iocoder.yudao.framework.pay.core.client.dto.refund.PayRefundUnifiedReqDTO;
10 import cn.iocoder.yudao.framework.pay.core.client.exception.PayException; 12 import cn.iocoder.yudao.framework.pay.core.client.exception.PayException;
@@ -16,6 +18,7 @@ import com.alipay.api.DefaultSigner; @@ -16,6 +18,7 @@ import com.alipay.api.DefaultSigner;
16 import com.alipay.api.domain.AlipayTradeRefundModel; 18 import com.alipay.api.domain.AlipayTradeRefundModel;
17 import com.alipay.api.request.AlipayTradeRefundRequest; 19 import com.alipay.api.request.AlipayTradeRefundRequest;
18 import com.alipay.api.response.AlipayTradeRefundResponse; 20 import com.alipay.api.response.AlipayTradeRefundResponse;
  21 +import org.junit.jupiter.api.BeforeEach;
19 import org.junit.jupiter.api.DisplayName; 22 import org.junit.jupiter.api.DisplayName;
20 import org.junit.jupiter.api.Test; 23 import org.junit.jupiter.api.Test;
21 import org.mockito.ArgumentMatcher; 24 import org.mockito.ArgumentMatcher;
@@ -52,6 +55,12 @@ public abstract class AbstractAlipayClientTest extends BaseMockitoUnitTest { @@ -52,6 +55,12 @@ public abstract class AbstractAlipayClientTest extends BaseMockitoUnitTest {
52 55
53 private AbstractAlipayPayClient client; 56 private AbstractAlipayPayClient client;
54 57
  58 + /**
  59 + * 子类需要实现该方法. 设置 client 的具体实现
  60 + */
  61 + @BeforeEach
  62 + public abstract void setUp();
  63 +
55 public void setClient(AbstractAlipayPayClient client) { 64 public void setClient(AbstractAlipayPayClient client) {
56 this.client = client; 65 this.client = client;
57 } 66 }
@@ -177,4 +186,28 @@ public abstract class AbstractAlipayClientTest extends BaseMockitoUnitTest { @@ -177,4 +186,28 @@ public abstract class AbstractAlipayClientTest extends BaseMockitoUnitTest {
177 // 断言 186 // 断言
178 assertThrows(PayException.class, () -> client.unifiedRefund(refundReqDTO)); 187 assertThrows(PayException.class, () -> client.unifiedRefund(refundReqDTO));
179 } 188 }
  189 +
  190 + @Test
  191 + @DisplayName("支付宝 Client 统一下单, 参数校验不通过")
  192 + public void test_unified_order_param_validate() {
  193 + // 准备请求参数
  194 + String outTradeNo = randomString();
  195 + String notifyUrl = randomURL();
  196 + PayOrderUnifiedReqDTO reqDTO = randomPojo(PayOrderUnifiedReqDTO.class, o -> {
  197 + o.setOutTradeNo(outTradeNo);
  198 + o.setNotifyUrl(notifyUrl);
  199 + });
  200 + // 断言
  201 + assertThrows(ConstraintViolationException.class, () -> client.unifiedOrder(reqDTO));
  202 + }
  203 +
  204 + protected PayOrderUnifiedReqDTO buildOrderUnifiedReqDTO(String notifyUrl, String outTradeNo, Integer price) {
  205 + return randomPojo(PayOrderUnifiedReqDTO.class, o -> {
  206 + o.setOutTradeNo(outTradeNo);
  207 + o.setNotifyUrl(notifyUrl);
  208 + o.setPrice(price);
  209 + o.setSubject(RandomUtil.randomString(32));
  210 + o.setBody(RandomUtil.randomString(32));
  211 + });
  212 + }
180 } 213 }
yudao-framework/yudao-spring-boot-starter-biz-pay/src/test/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AlipayPcPayClientTest.java 0 → 100644
  View file @4dd2d80
  1 +package cn.iocoder.yudao.framework.pay.core.client.impl.alipay;
  2 +
  3 +import cn.hutool.http.Method;
  4 +import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderRespDTO;
  5 +import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderUnifiedReqDTO;
  6 +import cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderDisplayModeEnum;
  7 +import com.alipay.api.AlipayApiException;
  8 +import com.alipay.api.request.AlipayTradePagePayRequest;
  9 +import com.alipay.api.response.AlipayTradePagePayResponse;
  10 +import org.junit.jupiter.api.BeforeEach;
  11 +import org.junit.jupiter.api.DisplayName;
  12 +import org.junit.jupiter.api.Test;
  13 +import org.mockito.ArgumentMatcher;
  14 +import org.mockito.InjectMocks;
  15 +
  16 +import static cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderStatusRespEnum.CLOSED;
  17 +import static cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderStatusRespEnum.WAITING;
  18 +import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
  19 +import static org.junit.jupiter.api.Assertions.assertEquals;
  20 +import static org.junit.jupiter.api.Assertions.assertSame;
  21 +import static org.mockito.ArgumentMatchers.argThat;
  22 +import static org.mockito.ArgumentMatchers.eq;
  23 +import static org.mockito.Mockito.when;
  24 +
  25 +/**
  26 + * @author jason
  27 + */
  28 +public class AlipayPcPayClientTest extends AbstractAlipayClientTest {
  29 +
  30 + @InjectMocks
  31 + private AlipayPcPayClient client = new AlipayPcPayClient(randomLongId(), config);
  32 +
  33 + @Override
  34 + @BeforeEach
  35 + public void setUp() {
  36 + setClient(client);
  37 + }
  38 +
  39 + @Test
  40 + @DisplayName("支付宝 PC 网站支付 URL Display Mode 下单成功")
  41 + public void test_unified_order_url_display_mode_success() throws AlipayApiException {
  42 + // 准备返回对象
  43 + String notifyUrl = randomURL();
  44 + Integer price = randomInteger();
  45 + AlipayTradePagePayResponse response = randomPojo(AlipayTradePagePayResponse.class, o -> {
  46 + o.setSubCode("");
  47 + });
  48 + // mock
  49 + when(defaultAlipayClient.pageExecute(argThat((ArgumentMatcher<AlipayTradePagePayRequest>) request -> true),
  50 + eq(Method.GET.name()))).thenReturn(response);
  51 + // 准备请求参数
  52 + String outTradeNo = randomString();
  53 + PayOrderUnifiedReqDTO reqDTO = buildOrderUnifiedReqDTO(notifyUrl, outTradeNo, price);
  54 + // 设置 displayMode 为 null.
  55 + reqDTO.setDisplayMode(null);
  56 +
  57 + PayOrderRespDTO resp = client.unifiedOrder(reqDTO);
  58 + // 断言
  59 + assertEquals(WAITING.getStatus(), resp.getStatus());
  60 + assertEquals(PayOrderDisplayModeEnum.URL.getMode(), resp.getDisplayMode());
  61 + assertEquals(outTradeNo, resp.getOutTradeNo());
  62 + assertSame(response, resp.getRawData());
  63 + }
  64 +
  65 + @Test
  66 + @DisplayName("支付宝 PC 网站支付 FORM Display Mode 下单成功")
  67 + public void test_unified_order_form_display_mode_success() throws AlipayApiException {
  68 + // 准备返回对象
  69 + String notifyUrl = randomURL();
  70 + Integer price = randomInteger();
  71 + AlipayTradePagePayResponse response = randomPojo(AlipayTradePagePayResponse.class, o -> {
  72 + o.setSubCode("");
  73 + });
  74 + // mock
  75 + when(defaultAlipayClient.pageExecute(argThat((ArgumentMatcher<AlipayTradePagePayRequest>) request -> true),
  76 + eq(Method.POST.name()))).thenReturn(response);
  77 + // 准备请求参数
  78 + String outTradeNo = randomString();
  79 + PayOrderUnifiedReqDTO reqDTO = buildOrderUnifiedReqDTO(notifyUrl, outTradeNo, price);
  80 + reqDTO.setDisplayMode(PayOrderDisplayModeEnum.FORM.getMode());
  81 +
  82 + PayOrderRespDTO resp = client.unifiedOrder(reqDTO);
  83 + // 断言
  84 + assertEquals(WAITING.getStatus(), resp.getStatus());
  85 + assertEquals(PayOrderDisplayModeEnum.FORM.getMode(), resp.getDisplayMode());
  86 + assertEquals(outTradeNo, resp.getOutTradeNo());
  87 + assertSame(response, resp.getRawData());
  88 + }
  89 +
  90 + @Test
  91 + @DisplayName("支付宝 PC 网站支付,渠道返回失败")
  92 + public void test_unified_order_channel_failed() throws AlipayApiException {
  93 + // 准备响应对象
  94 + String subCode = randomString();
  95 + String subMsg = randomString();
  96 + AlipayTradePagePayResponse response = randomPojo(AlipayTradePagePayResponse.class, o -> {
  97 + o.setSubCode(subCode);
  98 + o.setSubMsg(subMsg);
  99 + });
  100 + // mock
  101 + when(defaultAlipayClient.pageExecute(argThat((ArgumentMatcher<AlipayTradePagePayRequest>) request -> true),
  102 + eq(Method.GET.name()))).thenReturn(response);
  103 + // 准备请求参数
  104 + PayOrderUnifiedReqDTO reqDTO = buildOrderUnifiedReqDTO(randomURL(), randomString(), randomInteger());
  105 + reqDTO.setDisplayMode(PayOrderDisplayModeEnum.URL.getMode());
  106 +
  107 + PayOrderRespDTO resp = client.unifiedOrder(reqDTO);
  108 + // 断言
  109 + assertEquals(CLOSED.getStatus(), resp.getStatus());
  110 + assertEquals(subCode, resp.getChannelErrorCode());
  111 + assertEquals(subMsg, resp.getChannelErrorMsg());
  112 + assertSame(response, resp.getRawData());
  113 + }
  114 +}
yudao-framework/yudao-spring-boot-starter-biz-pay/src/test/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AlipayQrPayClientTest.java
  View file @4dd2d80
1 package cn.iocoder.yudao.framework.pay.core.client.impl.alipay; 1 package cn.iocoder.yudao.framework.pay.core.client.impl.alipay;
2 2
3 -import cn.hutool.core.util.RandomUtil;  
4 import cn.iocoder.yudao.framework.common.exception.ServiceException; 3 import cn.iocoder.yudao.framework.common.exception.ServiceException;
5 import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants; 4 import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants;
6 import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil; 5 import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
@@ -17,8 +16,6 @@ import org.junit.jupiter.api.Test; @@ -17,8 +16,6 @@ import org.junit.jupiter.api.Test;
17 import org.mockito.ArgumentMatcher; 16 import org.mockito.ArgumentMatcher;
18 import org.mockito.InjectMocks; 17 import org.mockito.InjectMocks;
19 18
20 -import javax.validation.ConstraintViolationException;  
21 -  
22 import static cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderStatusRespEnum.CLOSED; 19 import static cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderStatusRespEnum.CLOSED;
23 import static cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderStatusRespEnum.WAITING; 20 import static cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderStatusRespEnum.WAITING;
24 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*; 21 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
@@ -42,11 +39,12 @@ public class AlipayQrPayClientTest extends AbstractAlipayClientTest { @@ -42,11 +39,12 @@ public class AlipayQrPayClientTest extends AbstractAlipayClientTest {
42 } 39 }
43 40
44 @Test 41 @Test
45 - @DisplayName("支付包扫描支付下单成功") 42 + @DisplayName("支付宝扫描支付下单成功")
46 public void test_unified_order_success() throws AlipayApiException { 43 public void test_unified_order_success() throws AlipayApiException {
47 // 准备返回对象 44 // 准备返回对象
48 String notifyUrl = randomURL(); 45 String notifyUrl = randomURL();
49 String qrCode = randomString(); 46 String qrCode = randomString();
  47 + Integer price = randomInteger();
50 AlipayTradePrecreateResponse response = randomPojo(AlipayTradePrecreateResponse.class, o -> { 48 AlipayTradePrecreateResponse response = randomPojo(AlipayTradePrecreateResponse.class, o -> {
51 o.setQrCode(qrCode); 49 o.setQrCode(qrCode);
52 o.setSubCode(""); 50 o.setSubCode("");
@@ -58,7 +56,7 @@ public class AlipayQrPayClientTest extends AbstractAlipayClientTest { @@ -58,7 +56,7 @@ public class AlipayQrPayClientTest extends AbstractAlipayClientTest {
58 }))).thenReturn(response); 56 }))).thenReturn(response);
59 // 准备请求参数 57 // 准备请求参数
60 String outTradeNo = randomString(); 58 String outTradeNo = randomString();
61 - PayOrderUnifiedReqDTO reqDTO = buildOrderUnifiedReqDTO(notifyUrl, outTradeNo); 59 + PayOrderUnifiedReqDTO reqDTO = buildOrderUnifiedReqDTO(notifyUrl, outTradeNo, price);
62 60
63 PayOrderRespDTO resp = client.unifiedOrder(reqDTO); 61 PayOrderRespDTO resp = client.unifiedOrder(reqDTO);
64 // 断言 62 // 断言
@@ -70,11 +68,12 @@ public class AlipayQrPayClientTest extends AbstractAlipayClientTest { @@ -70,11 +68,12 @@ public class AlipayQrPayClientTest extends AbstractAlipayClientTest {
70 } 68 }
71 69
72 @Test 70 @Test
73 - @DisplayName("支付包扫描支付,渠道返回失败") 71 + @DisplayName("支付宝扫描支付,渠道返回失败")
74 public void test_unified_order_channel_failed() throws AlipayApiException { 72 public void test_unified_order_channel_failed() throws AlipayApiException {
75 String notifyUrl = randomURL(); 73 String notifyUrl = randomURL();
76 String subCode = randomString(); 74 String subCode = randomString();
77 String subMsg = randomString(); 75 String subMsg = randomString();
  76 + Integer price = randomInteger();
78 AlipayTradePrecreateResponse response = randomPojo(AlipayTradePrecreateResponse.class, o -> { 77 AlipayTradePrecreateResponse response = randomPojo(AlipayTradePrecreateResponse.class, o -> {
79 o.setSubCode(subCode); 78 o.setSubCode(subCode);
80 o.setSubMsg(subMsg); 79 o.setSubMsg(subMsg);
@@ -86,7 +85,7 @@ public class AlipayQrPayClientTest extends AbstractAlipayClientTest { @@ -86,7 +85,7 @@ public class AlipayQrPayClientTest extends AbstractAlipayClientTest {
86 }))).thenReturn(response); 85 }))).thenReturn(response);
87 // 准备请求参数 86 // 准备请求参数
88 String outTradeNo = randomString(); 87 String outTradeNo = randomString();
89 - PayOrderUnifiedReqDTO reqDTO = buildOrderUnifiedReqDTO(notifyUrl, outTradeNo); 88 + PayOrderUnifiedReqDTO reqDTO = buildOrderUnifiedReqDTO(notifyUrl, outTradeNo, price);
90 89
91 PayOrderRespDTO resp = client.unifiedOrder(reqDTO); 90 PayOrderRespDTO resp = client.unifiedOrder(reqDTO);
92 // 断言 91 // 断言
@@ -97,59 +96,38 @@ public class AlipayQrPayClientTest extends AbstractAlipayClientTest { @@ -97,59 +96,38 @@ public class AlipayQrPayClientTest extends AbstractAlipayClientTest {
97 } 96 }
98 97
99 @Test 98 @Test
100 - @DisplayName("支付包扫描支付,抛出系统异常") 99 + @DisplayName("支付宝扫描支付, 抛出系统异常")
101 public void test_unified_order_throw_pay_exception() throws AlipayApiException { 100 public void test_unified_order_throw_pay_exception() throws AlipayApiException {
102 // 准备请求参数 101 // 准备请求参数
103 String outTradeNo = randomString(); 102 String outTradeNo = randomString();
104 String notifyUrl = randomURL(); 103 String notifyUrl = randomURL();
  104 + Integer price = randomInteger();
105 // mock 105 // mock
106 when(defaultAlipayClient.execute(argThat((ArgumentMatcher<AlipayTradePrecreateRequest>) request -> { 106 when(defaultAlipayClient.execute(argThat((ArgumentMatcher<AlipayTradePrecreateRequest>) request -> {
107 assertEquals(notifyUrl, request.getNotifyUrl()); 107 assertEquals(notifyUrl, request.getNotifyUrl());
108 return true; 108 return true;
109 }))).thenThrow(new RuntimeException("系统异常")); 109 }))).thenThrow(new RuntimeException("系统异常"));
110 // 准备请求参数 110 // 准备请求参数
111 - PayOrderUnifiedReqDTO reqDTO = buildOrderUnifiedReqDTO(notifyUrl, outTradeNo); 111 + PayOrderUnifiedReqDTO reqDTO = buildOrderUnifiedReqDTO(notifyUrl, outTradeNo,price);
112 // 断言 112 // 断言
113 assertThrows(PayException.class, () -> client.unifiedOrder(reqDTO)); 113 assertThrows(PayException.class, () -> client.unifiedOrder(reqDTO));
114 } 114 }
115 115
116 @Test 116 @Test
117 - @DisplayName("支付包扫描支付,抛出业务异常") 117 + @DisplayName("支付宝 Client 统一下单,抛出业务异常")
118 public void test_unified_order_throw_service_exception() throws AlipayApiException { 118 public void test_unified_order_throw_service_exception() throws AlipayApiException {
119 // 准备请求参数 119 // 准备请求参数
120 String outTradeNo = randomString(); 120 String outTradeNo = randomString();
121 String notifyUrl = randomURL(); 121 String notifyUrl = randomURL();
  122 + Integer price = randomInteger();
122 // mock 123 // mock
123 when(defaultAlipayClient.execute(argThat((ArgumentMatcher<AlipayTradePrecreateRequest>) request -> { 124 when(defaultAlipayClient.execute(argThat((ArgumentMatcher<AlipayTradePrecreateRequest>) request -> {
124 assertEquals(notifyUrl, request.getNotifyUrl()); 125 assertEquals(notifyUrl, request.getNotifyUrl());
125 return true; 126 return true;
126 }))).thenThrow(ServiceExceptionUtil.exception(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR)); 127 }))).thenThrow(ServiceExceptionUtil.exception(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR));
127 // 准备请求参数 128 // 准备请求参数
128 - PayOrderUnifiedReqDTO reqDTO = buildOrderUnifiedReqDTO(notifyUrl, outTradeNo); 129 + PayOrderUnifiedReqDTO reqDTO = buildOrderUnifiedReqDTO(notifyUrl, outTradeNo, price);
129 // 断言 130 // 断言
130 assertThrows(ServiceException.class, () -> client.unifiedOrder(reqDTO)); 131 assertThrows(ServiceException.class, () -> client.unifiedOrder(reqDTO));
131 } 132 }
132 -  
133 - @Test  
134 - @DisplayName("支付包扫描支付,参数校验不通过")  
135 - public void test_unified_order_param_validate() {  
136 - // 准备请求参数  
137 - String outTradeNo = randomString();  
138 - String notifyUrl = randomURL();  
139 - PayOrderUnifiedReqDTO reqDTO = randomPojo(PayOrderUnifiedReqDTO.class, o -> {  
140 - o.setOutTradeNo(outTradeNo);  
141 - o.setNotifyUrl(notifyUrl);  
142 - });  
143 - // 断言  
144 - assertThrows(ConstraintViolationException.class, () -> client.unifiedOrder(reqDTO));  
145 - }  
146 -  
147 - private PayOrderUnifiedReqDTO buildOrderUnifiedReqDTO(String notifyUrl, String outTradeNo) {  
148 - return randomPojo(PayOrderUnifiedReqDTO.class, o -> {  
149 - o.setOutTradeNo(outTradeNo);  
150 - o.setNotifyUrl(notifyUrl);  
151 - o.setSubject(RandomUtil.randomString(32));  
152 - o.setBody(RandomUtil.randomString(32));  
153 - });  
154 - }  
155 } 133 }
yudao-framework/yudao-spring-boot-starter-biz-pay/src/test/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AlipayWapPayClientTest.java 0 → 100644
  View file @4dd2d80
  1 +package cn.iocoder.yudao.framework.pay.core.client.impl.alipay;
  2 +
  3 +import cn.hutool.http.Method;
  4 +import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderRespDTO;
  5 +import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderUnifiedReqDTO;
  6 +import cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderDisplayModeEnum;
  7 +import com.alipay.api.AlipayApiException;
  8 +import com.alipay.api.domain.AlipayTradeWapPayModel;
  9 +import com.alipay.api.request.AlipayTradeWapPayRequest;
  10 +import com.alipay.api.response.AlipayTradeWapPayResponse;
  11 +import org.junit.jupiter.api.BeforeEach;
  12 +import org.junit.jupiter.api.DisplayName;
  13 +import org.junit.jupiter.api.Test;
  14 +import org.mockito.ArgumentMatcher;
  15 +import org.mockito.InjectMocks;
  16 +
  17 +import static cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderStatusRespEnum.CLOSED;
  18 +import static cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderStatusRespEnum.WAITING;
  19 +import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
  20 +import static org.junit.jupiter.api.Assertions.*;
  21 +import static org.junit.jupiter.api.Assertions.assertEquals;
  22 +import static org.mockito.ArgumentMatchers.argThat;
  23 +import static org.mockito.ArgumentMatchers.eq;
  24 +import static org.mockito.Mockito.when;
  25 +
  26 +/**
  27 + * {@link AlipayWapPayClient} 单元测试
  28 + *
  29 + * @author jason
  30 + */
  31 +public class AlipayWapPayClientTest extends AbstractAlipayClientTest {
  32 +
  33 + /**
  34 + * 支付宝 H5 支付 Client
  35 + */
  36 + @InjectMocks
  37 + private AlipayWapPayClient client = new AlipayWapPayClient(randomLongId(), config);
  38 +
  39 + @BeforeEach
  40 + public void setUp() {
  41 + setClient(client);
  42 + }
  43 +
  44 + @Test
  45 + @DisplayName("支付宝 H5 支付下单成功")
  46 + public void test_unified_order_success() throws AlipayApiException {
  47 + // 准备响应对象
  48 + String h5Body = randomString();
  49 + Integer price = randomInteger();
  50 + AlipayTradeWapPayResponse response = randomPojo(AlipayTradeWapPayResponse.class, o -> {
  51 + o.setSubCode("");
  52 + o.setBody(h5Body);
  53 + });
  54 + String notifyUrl = randomURL();
  55 + // mock
  56 + when(defaultAlipayClient.pageExecute(argThat((ArgumentMatcher<AlipayTradeWapPayRequest>) request -> {
  57 + assertInstanceOf(AlipayTradeWapPayModel.class, request.getBizModel());
  58 + AlipayTradeWapPayModel bizModel = (AlipayTradeWapPayModel) request.getBizModel();
  59 + assertEquals(String.valueOf(price / 100.0), bizModel.getTotalAmount());
  60 + assertEquals(notifyUrl, request.getNotifyUrl());
  61 + return true;
  62 + }), eq(Method.GET.name()))).thenReturn(response);
  63 +
  64 + String outTradeNo = randomString();
  65 + PayOrderUnifiedReqDTO reqDTO = buildOrderUnifiedReqDTO(notifyUrl, outTradeNo, price);
  66 + PayOrderRespDTO resp = client.unifiedOrder(reqDTO);
  67 + assertEquals(WAITING.getStatus(), resp.getStatus());
  68 + assertEquals(PayOrderDisplayModeEnum.URL.getMode(), resp.getDisplayMode());
  69 + assertEquals(outTradeNo, resp.getOutTradeNo());
  70 + assertEquals(h5Body, resp.getDisplayContent());
  71 + assertSame(response, resp.getRawData());
  72 + }
  73 +
  74 + @Test
  75 + @DisplayName("支付宝 H5 支付,渠道返回失败")
  76 + public void test_unified_order_channel_failed() throws AlipayApiException {
  77 + // 准备响应对象
  78 + String subCode = randomString();
  79 + String subMsg = randomString();
  80 + AlipayTradeWapPayResponse response = randomPojo(AlipayTradeWapPayResponse.class, o -> {
  81 + o.setSubCode(subCode);
  82 + o.setSubMsg(subMsg);
  83 + });
  84 + // mock
  85 + when(defaultAlipayClient.pageExecute(argThat((ArgumentMatcher<AlipayTradeWapPayRequest>) request -> true),
  86 + eq(Method.GET.name()))).thenReturn(response);
  87 + PayOrderUnifiedReqDTO reqDTO = buildOrderUnifiedReqDTO(randomURL(), randomString(), randomInteger());
  88 +
  89 + PayOrderRespDTO resp = client.unifiedOrder(reqDTO);
  90 + // 断言
  91 + assertEquals(CLOSED.getStatus(), resp.getStatus());
  92 + assertEquals(subCode, resp.getChannelErrorCode());
  93 + assertEquals(subMsg, resp.getChannelErrorMsg());
  94 + assertSame(response, resp.getRawData());
  95 + }
  96 +}
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/bargain/vo/BargainActivityBaseVO.java
  View file @4dd2d80
@@ -18,7 +18,7 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_ @@ -18,7 +18,7 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
18 @Data 18 @Data
19 public class BargainActivityBaseVO { 19 public class BargainActivityBaseVO {
20 20
21 - @Schema(description = "砍价活动名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "越拼越省钱") 21 + @Schema(description = "砍价活动名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "砍得越多省得越多，是兄弟就来砍我")
22 @NotNull(message = "砍价名称不能为空") 22 @NotNull(message = "砍价名称不能为空")
23 private String name; 23 private String name;
24 24
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/DeliveryExpressController.java
  View file @4dd2d80
1 package cn.iocoder.yudao.module.trade.controller.admin.delivery; 1 package cn.iocoder.yudao.module.trade.controller.admin.delivery;
2 2
  3 +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
3 import cn.iocoder.yudao.framework.common.pojo.CommonResult; 4 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
4 import cn.iocoder.yudao.framework.common.pojo.PageResult; 5 import cn.iocoder.yudao.framework.common.pojo.PageResult;
5 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; 6 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
6 import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; 7 import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
7 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.express.*; 8 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.express.*;
8 -import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.express.DeliveryExpressUpdateReqVO;  
9 import cn.iocoder.yudao.module.trade.convert.delivery.DeliveryExpressConvert; 9 import cn.iocoder.yudao.module.trade.convert.delivery.DeliveryExpressConvert;
10 import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryExpressDO; 10 import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryExpressDO;
11 import cn.iocoder.yudao.module.trade.service.delivery.DeliveryExpressService; 11 import cn.iocoder.yudao.module.trade.service.delivery.DeliveryExpressService;
@@ -67,6 +67,13 @@ public class DeliveryExpressController { @@ -67,6 +67,13 @@ public class DeliveryExpressController {
67 return success(DeliveryExpressConvert.INSTANCE.convert(deliveryExpress)); 67 return success(DeliveryExpressConvert.INSTANCE.convert(deliveryExpress));
68 } 68 }
69 69
  70 + @GetMapping("/list-all-simple")
  71 + @Operation(summary = "获取快递公司精简信息列表", description = "主要用于前端的下拉选项")
  72 + public CommonResult<List<DeliveryExpressSimpleRespVO>> getSimpleDeliveryExpressList() {
  73 + List<DeliveryExpressDO> list = deliveryExpressService.getDeliveryExpressListByStatus(CommonStatusEnum.ENABLE.getStatus());
  74 + return success(DeliveryExpressConvert.INSTANCE.convertList1(list));
  75 + }
  76 +
70 @GetMapping("/page") 77 @GetMapping("/page")
71 @Operation(summary = "获得快递公司分页") 78 @Operation(summary = "获得快递公司分页")
72 @PreAuthorize("@ss.hasPermission('trade:delivery:express:query')") 79 @PreAuthorize("@ss.hasPermission('trade:delivery:express:query')")
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/DeliveryPickUpStoreController.java
  View file @4dd2d80
1 package cn.iocoder.yudao.module.trade.controller.admin.delivery; 1 package cn.iocoder.yudao.module.trade.controller.admin.delivery;
2 2
  3 +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
3 import cn.iocoder.yudao.framework.common.pojo.CommonResult; 4 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
4 import cn.iocoder.yudao.framework.common.pojo.PageResult; 5 import cn.iocoder.yudao.framework.common.pojo.PageResult;
5 -import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;  
6 -import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;  
7 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.*; 6 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.*;
8 import cn.iocoder.yudao.module.trade.convert.delivery.DeliveryPickUpStoreConvert; 7 import cn.iocoder.yudao.module.trade.convert.delivery.DeliveryPickUpStoreConvert;
9 import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryPickUpStoreDO; 8 import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryPickUpStoreDO;
@@ -16,14 +15,11 @@ import org.springframework.validation.annotation.Validated; @@ -16,14 +15,11 @@ import org.springframework.validation.annotation.Validated;
16 import org.springframework.web.bind.annotation.*; 15 import org.springframework.web.bind.annotation.*;
17 16
18 import javax.annotation.Resource; 17 import javax.annotation.Resource;
19 -import javax.servlet.http.HttpServletResponse;  
20 import javax.validation.Valid; 18 import javax.validation.Valid;
21 -import java.io.IOException;  
22 import java.util.Collection; 19 import java.util.Collection;
23 import java.util.List; 20 import java.util.List;
24 21
25 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; 22 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
26 -import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;  
27 23
28 @Tag(name = "管理后台 - 自提门店") 24 @Tag(name = "管理后台 - 自提门店")
29 @RestController 25 @RestController
@@ -67,6 +63,13 @@ public class DeliveryPickUpStoreController { @@ -67,6 +63,13 @@ public class DeliveryPickUpStoreController {
67 return success(DeliveryPickUpStoreConvert.INSTANCE.convert(deliveryPickUpStore)); 63 return success(DeliveryPickUpStoreConvert.INSTANCE.convert(deliveryPickUpStore));
68 } 64 }
69 65
  66 + @GetMapping("/list-all-simple")
  67 + @Operation(summary = "获取快递公司精简信息列表")
  68 + public CommonResult<List<DeliveryPickUpStoreSimpleRespVO>> getSimpleDeliveryPickUpStoreList() {
  69 + List<DeliveryPickUpStoreDO> list = deliveryPickUpStoreService.getDeliveryPickUpStoreListByStatus(CommonStatusEnum.ENABLE.getStatus());
  70 + return success(DeliveryPickUpStoreConvert.INSTANCE.convertList1(list));
  71 + }
  72 +
70 @GetMapping("/list") 73 @GetMapping("/list")
71 @Operation(summary = "获得自提门店列表") 74 @Operation(summary = "获得自提门店列表")
72 @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") 75 @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
@@ -84,16 +87,4 @@ public class DeliveryPickUpStoreController { @@ -84,16 +87,4 @@ public class DeliveryPickUpStoreController {
84 return success(DeliveryPickUpStoreConvert.INSTANCE.convertPage(pageResult)); 87 return success(DeliveryPickUpStoreConvert.INSTANCE.convertPage(pageResult));
85 } 88 }
86 89
87 - // TODO @jason：导出去掉好列；简化下，一般用不到哈。  
88 - @GetMapping("/export-excel")  
89 - @Operation(summary = "导出自提门店 Excel")  
90 - @PreAuthorize("@ss.hasPermission('trade:delivery:pick-up-store:export')")  
91 - @OperateLog(type = EXPORT)  
92 - public void exportDeliveryPickUpStoreExcel(@Valid DeliveryPickUpStoreExportReqVO exportReqVO,  
93 - HttpServletResponse response) throws IOException {  
94 - List<DeliveryPickUpStoreDO> list = deliveryPickUpStoreService.getDeliveryPickUpStoreList(exportReqVO);  
95 - // 导出 Excel  
96 - List<DeliveryPickUpStoreExcelVO> datas = DeliveryPickUpStoreConvert.INSTANCE.convertList02(list);  
97 - ExcelUtils.write(response, "自提门店.xls", "数据", DeliveryPickUpStoreExcelVO.class, datas);  
98 - }  
99 } 90 }
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/vo/express/DeliveryExpressSimpleRespVO.java 0 → 100644
  View file @4dd2d80
  1 +package cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.express;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.AllArgsConstructor;
  5 +import lombok.Data;
  6 +import lombok.NoArgsConstructor;
  7 +
  8 +import javax.validation.constraints.NotNull;
  9 +
  10 +@Schema(description = "管理后台 - 快递公司精简信息 Response VO")
  11 +@Data
  12 +@NoArgsConstructor
  13 +@AllArgsConstructor
  14 +public class DeliveryExpressSimpleRespVO {
  15 +
  16 + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "6592")
  17 + @NotNull(message = "编号不能为空")
  18 + private Long id;
  19 +
  20 + @Schema(description = "快递公司名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "顺丰速运")
  21 + @NotNull(message = "快递公司名称不能为空")
  22 + private String name;
  23 +
  24 +}
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/vo/pickup/DeliveryPickUpStoreExcelVO.java deleted
View file @4132cf1
1 -package cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup;  
2 -  
3 -import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;  
4 -import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;  
5 -import cn.iocoder.yudao.module.system.enums.DictTypeConstants;  
6 -import com.alibaba.excel.annotation.ExcelProperty;  
7 -import lombok.Data;  
8 -  
9 -import java.time.LocalDateTime;  
10 -  
11 -@Data  
12 -public class DeliveryPickUpStoreExcelVO {  
13 -  
14 - @ExcelProperty("编号")  
15 - private Long id;  
16 -  
17 - @ExcelProperty("门店名称")  
18 - private String name;  
19 -  
20 - @ExcelProperty("门店简介")  
21 - private String introduction;  
22 -  
23 - @ExcelProperty("门店手机")  
24 - private String phone;  
25 -  
26 - @ExcelProperty("门店所在区域")  
27 - private String areaName;  
28 -  
29 - @ExcelProperty("门店详细地址")  
30 - private String detailAddress;  
31 -  
32 - @ExcelProperty("门店logo")  
33 - private String logo;  
34 -  
35 - // TODO @jason：是不是可以加个 convert？  
36 - /**  
37 - * easy-excel 好像暂时不支持 LocalTime. 转成string  
38 - */  
39 - @ExcelProperty("营业开始时间")  
40 - private String openingTime;  
41 -  
42 - @ExcelProperty("营业结束时间")  
43 - private String closingTime;  
44 -  
45 - @ExcelProperty("纬度")  
46 - private String latitude;  
47 -  
48 - @ExcelProperty("经度")  
49 - private String longitude;  
50 -  
51 - @ExcelProperty(value = "状态", converter = DictConvert.class)  
52 - @DictFormat(DictTypeConstants.COMMON_STATUS)  
53 - private Integer status;  
54 -  
55 - @ExcelProperty("创建时间")  
56 - private LocalDateTime createTime;  
57 -  
58 -}  
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/vo/pickup/DeliveryPickUpStoreExportReqVO.java deleted
View file @4132cf1
1 -package cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup;  
2 -  
3 -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;  
4 -import cn.iocoder.yudao.framework.common.validation.InEnum;  
5 -import io.swagger.v3.oas.annotations.media.Schema;  
6 -import lombok.Data;  
7 -import org.springframework.format.annotation.DateTimeFormat;  
8 -  
9 -import java.time.LocalDateTime;  
10 -  
11 -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;  
12 -  
13 -@Schema(description = "管理后台 - 自提门店 Excel 导出 Request VO，参数和 DeliveryPickUpStorePageReqVO 是一致的")  
14 -@Data  
15 -public class DeliveryPickUpStoreExportReqVO {  
16 -  
17 - @Schema(description = "门店名称", example = "李四")  
18 - private String name;  
19 -  
20 - @Schema(description = "门店手机")  
21 - private String phone;  
22 -  
23 - @Schema(description = "区域id", example = "18733")  
24 - private Integer areaId;  
25 -  
26 - @Schema(description = "门店状态", example = "1")  
27 - @InEnum(CommonStatusEnum.class)  
28 - private Integer status;  
29 -  
30 - @Schema(description = "创建时间")  
31 - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)  
32 - private LocalDateTime[] createTime;  
33 -  
34 -}  
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/vo/pickup/DeliveryPickUpStoreSimpleRespVO.java 0 → 100644
  View file @4dd2d80
  1 +package cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.AllArgsConstructor;
  5 +import lombok.Data;
  6 +import lombok.NoArgsConstructor;
  7 +
  8 +@Schema(description = "管理后台 - 自提门店精简信息 Response VO")
  9 +@Data
  10 +@NoArgsConstructor
  11 +@AllArgsConstructor
  12 +public class DeliveryPickUpStoreSimpleRespVO {
  13 +
  14 + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "23128")
  15 + private Long id;
  16 +
  17 + @Schema(description = "门店名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四")
  18 + private String name;
  19 +
  20 + @Schema(description = "门店手机", requiredMode = Schema.RequiredMode.REQUIRED, example = "15601892312")
  21 + private String phone;
  22 +
  23 + @Schema(description = "区域编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "18733")
  24 + private Integer areaId;
  25 +
  26 + // TODO @puhui999：要把 areaName 也返回哈
  27 +
  28 + @Schema(description = "门店详细地址", requiredMode = Schema.RequiredMode.REQUIRED, example = "复旦大学路 188 号")
  29 + private String detailAddress;
  30 +
  31 +}
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/TradeOrderController.java
  View file @4dd2d80
@@ -5,10 +5,7 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult; @@ -5,10 +5,7 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult;
5 import cn.iocoder.yudao.framework.common.pojo.PageResult; 5 import cn.iocoder.yudao.framework.common.pojo.PageResult;
6 import cn.iocoder.yudao.module.member.api.user.MemberUserApi; 6 import cn.iocoder.yudao.module.member.api.user.MemberUserApi;
7 import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO; 7 import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
8 -import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderDeliveryReqVO;  
9 -import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderDetailRespVO;  
10 -import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderPageItemRespVO;  
11 -import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderPageReqVO; 8 +import cn.iocoder.yudao.module.trade.controller.admin.order.vo.*;
12 import cn.iocoder.yudao.module.trade.convert.order.TradeOrderConvert; 9 import cn.iocoder.yudao.module.trade.convert.order.TradeOrderConvert;
13 import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderDO; 10 import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderDO;
14 import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderItemDO; 11 import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderItemDO;
@@ -79,12 +76,56 @@ public class TradeOrderController { @@ -79,12 +76,56 @@ public class TradeOrderController {
79 return success(TradeOrderConvert.INSTANCE.convert(order, orderItems, user)); 76 return success(TradeOrderConvert.INSTANCE.convert(order, orderItems, user));
80 } 77 }
81 78
  79 + @GetMapping("/get-express-track-list")
  80 + @Operation(summary = "获得交易订单的物流轨迹")
  81 + @Parameter(name = "id", description = "交易订单编号")
  82 + @PreAuthorize("@ss.hasPermission('trade:order:query')")
  83 + public CommonResult<List<?>> getOrderExpressTrackList(@RequestParam("id") Long id) {
  84 + return success(TradeOrderConvert.INSTANCE.convertList02(
  85 + tradeOrderQueryService.getExpressTrackList(id, getLoginUserId())));
  86 + }
  87 +
  88 + // TODO @puhui999：put 请求哈
82 @PostMapping("/delivery") 89 @PostMapping("/delivery")
83 - @Operation(summary = "发货订单")  
84 - @PreAuthorize("@ss.hasPermission('trade:order:delivery')") 90 + @Operation(summary = "订单发货")
  91 + @PreAuthorize("@ss.hasPermission('trade:order:update')")
85 public CommonResult<Boolean> deliveryOrder(@RequestBody TradeOrderDeliveryReqVO deliveryReqVO) { 92 public CommonResult<Boolean> deliveryOrder(@RequestBody TradeOrderDeliveryReqVO deliveryReqVO) {
86 - tradeOrderUpdateService.deliveryOrder(getLoginUserId(), deliveryReqVO); 93 + tradeOrderUpdateService.deliveryOrder(deliveryReqVO);
87 return success(true); 94 return success(true);
88 } 95 }
89 96
  97 + // TODO @puhui999：put 请求哈，update-remark；
  98 + @PostMapping("/remark")
  99 + @Operation(summary = "订单备注")
  100 + @PreAuthorize("@ss.hasPermission('trade:order:update')")
  101 + public CommonResult<Boolean> updateOrderRemark(@RequestBody TradeOrderRemarkReqVO reqVO) {
  102 + tradeOrderUpdateService.updateOrderRemark(reqVO);
  103 + return success(true);
  104 + }
  105 +
  106 + // TODO @puhui999：put 请求哈，update-price；
  107 + @PostMapping("/adjust-price")
  108 + @Operation(summary = "订单调价")
  109 + @PreAuthorize("@ss.hasPermission('trade:order:update')")
  110 + public CommonResult<Boolean> updateOrderPrice(@RequestBody TradeOrderUpdatePriceReqVO reqVO) {
  111 + tradeOrderUpdateService.updateOrderPrice(reqVO);
  112 + return success(true);
  113 + }
  114 +
  115 + // TODO @puhui999：put 请求哈，update-address；
  116 + @PostMapping("/adjust-address")
  117 + @Operation(summary = "修改订单收货地址")
  118 + @PreAuthorize("@ss.hasPermission('trade:order:update')")
  119 + public CommonResult<Boolean> updateOrderAddress(@RequestBody TradeOrderUpdateAddressReqVO reqVO) {
  120 + tradeOrderUpdateService.updateOrderAddress(reqVO);
  121 + return success(true);
  122 + }
  123 +
  124 + // TODO @puhui999 订单物流详情
  125 + // TODO @puhui999 【前台】订单取消
  126 + // TODO @puhui999 【后台】订单取消
  127 + // TODO @puhui999 【前台】订单核销
  128 + // TODO @puhui999 【前台】订单删除
  129 + // TODO @puhui999 【后台】订单统计
  130 +
90 } 131 }
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderBaseVO.java
  View file @4dd2d80
@@ -6,9 +6,9 @@ import lombok.Data; @@ -6,9 +6,9 @@ import lombok.Data;
6 import java.time.LocalDateTime; 6 import java.time.LocalDateTime;
7 7
8 /** 8 /**
9 -* 交易订单 Base VO，提供给添加、修改、详细的子 VO 使用  
10 -* 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成  
11 -*/ 9 + * 交易订单 Base VO，提供给添加、修改、详细的子 VO 使用
  10 + * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
  11 + */
12 @Data 12 @Data
13 public class TradeOrderBaseVO { 13 public class TradeOrderBaseVO {
14 14
@@ -87,6 +87,12 @@ public class TradeOrderBaseVO { @@ -87,6 +87,12 @@ public class TradeOrderBaseVO {
87 87
88 // ========== 收件 + 物流基本信息 ========== 88 // ========== 收件 + 物流基本信息 ==========
89 89
  90 + @Schema(description = "配送方式", example = "10")
  91 + private Integer deliveryType;
  92 +
  93 + @Schema(description = "自提门店", example = "10")
  94 + private Long pickUpStoreId;
  95 +
90 @Schema(description = "配送模板编号", example = "1024") 96 @Schema(description = "配送模板编号", example = "1024")
91 private Long deliveryTemplateId; 97 private Long deliveryTemplateId;
92 98
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderDeliveryReqVO.java
  View file @4dd2d80
1 package cn.iocoder.yudao.module.trade.controller.admin.order.vo; 1 package cn.iocoder.yudao.module.trade.controller.admin.order.vo;
2 2
3 -import cn.iocoder.yudao.framework.common.validation.InEnum;  
4 -import cn.iocoder.yudao.module.trade.enums.delivery.DeliveryTypeEnum;  
5 import io.swagger.v3.oas.annotations.media.Schema; 3 import io.swagger.v3.oas.annotations.media.Schema;
6 import lombok.Data; 4 import lombok.Data;
7 5
8 -import javax.validation.constraints.NotEmpty;  
9 import javax.validation.constraints.NotNull; 6 import javax.validation.constraints.NotNull;
10 7
11 @Schema(description = "管理后台 - 订单发货 Request VO") 8 @Schema(description = "管理后台 - 订单发货 Request VO")
@@ -16,18 +13,11 @@ public class TradeOrderDeliveryReqVO { @@ -16,18 +13,11 @@ public class TradeOrderDeliveryReqVO {
16 @NotNull(message = "订单编号不能为空") 13 @NotNull(message = "订单编号不能为空")
17 private Long id; 14 private Long id;
18 15
19 - // TODO @puhui999：可以去掉 type；如果无需发货，则 logisticsId 传递 0；logisticsNo 传递空串  
20 - @Schema(description = "发货类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")  
21 - @InEnum(DeliveryTypeEnum.class)  
22 - @NotNull(message = "发货类型不能为空")  
23 - private Integer type;  
24 -  
25 @Schema(description = "发货物流公司编号", example = "1") 16 @Schema(description = "发货物流公司编号", example = "1")
26 @NotNull(message = "发货物流公司不能为空") 17 @NotNull(message = "发货物流公司不能为空")
27 private Long logisticsId; 18 private Long logisticsId;
28 19
29 @Schema(description = "发货物流单号", example = "SF123456789") 20 @Schema(description = "发货物流单号", example = "SF123456789")
30 - @NotEmpty(message = "发货物流单号不能为空")  
31 private String logisticsNo; 21 private String logisticsNo;
32 22
33 } 23 }
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderPageReqVO.java
  View file @4dd2d80
@@ -10,6 +10,7 @@ import lombok.Data; @@ -10,6 +10,7 @@ import lombok.Data;
10 import org.springframework.format.annotation.DateTimeFormat; 10 import org.springframework.format.annotation.DateTimeFormat;
11 11
12 import java.time.LocalDateTime; 12 import java.time.LocalDateTime;
  13 +import java.util.List;
13 14
14 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; 15 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
15 16
@@ -30,6 +31,12 @@ public class TradeOrderPageReqVO extends PageParam { @@ -30,6 +31,12 @@ public class TradeOrderPageReqVO extends PageParam {
30 @Mobile 31 @Mobile
31 private String userMobile; 32 private String userMobile;
32 33
  34 + @Schema(description = "发货物流公司编号", example = "1")
  35 + private Long logisticsId;
  36 +
  37 + @Schema(description = "自提门店编号", example = "[1,2]")
  38 + private List<Long> pickUpStoreIds;
  39 +
33 @Schema(description = "收件人名称", example = "小红") 40 @Schema(description = "收件人名称", example = "小红")
34 private String receiverName; 41 private String receiverName;
35 42
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderRemarkReqVO.java 0 → 100644
  View file @4dd2d80
  1 +package cn.iocoder.yudao.module.trade.controller.admin.order.vo;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +
  6 +import javax.validation.constraints.NotEmpty;
  7 +import javax.validation.constraints.NotNull;
  8 +
  9 +@Schema(description = "管理后台 - 订单备注 Request VO")
  10 +@Data
  11 +public class TradeOrderRemarkReqVO {
  12 +
  13 + @Schema(description = "订单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
  14 + @NotNull(message = "订单编号不能为空")
  15 + private Long id;
  16 +
  17 + @Schema(description = "商家备注", example = "你猜一下")
  18 + @NotEmpty(message = "订单备注不能为空")
  19 + private String remark;
  20 +
  21 +}
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderUpdateAddressReqVO.java 0 → 100644
  View file @4dd2d80
  1 +package cn.iocoder.yudao.module.trade.controller.admin.order.vo;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +
  6 +import javax.validation.constraints.NotEmpty;
  7 +import javax.validation.constraints.NotNull;
  8 +
  9 +@Schema(description = "管理后台 - 订单修改地址 Request VO")
  10 +@Data
  11 +public class TradeOrderUpdateAddressReqVO {
  12 +
  13 + @Schema(description = "订单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
  14 + @NotNull(message = "订单编号不能为空")
  15 + private Long id;
  16 +
  17 + @Schema(description = "收件人名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "z张三")
  18 + @NotEmpty(message = "收件人名称不能为空")
  19 + private String receiverName;
  20 +
  21 + @Schema(description = "收件人手机", requiredMode = Schema.RequiredMode.REQUIRED, example = "19988188888")
  22 + @NotEmpty(message = "收件人手机不能为空")
  23 + private String receiverMobile;
  24 +
  25 + @Schema(description = "收件人地区编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "7310")
  26 + @NotNull(message = "收件人地区编号不能为空")
  27 + private Integer receiverAreaId;
  28 +
  29 + @Schema(description = "收件人详细地址", requiredMode = Schema.RequiredMode.REQUIRED, example = "昆明市五华区xxx小区xxx")
  30 + @NotEmpty(message = "收件人详细地址不能为空")
  31 + private String receiverDetailAddress;
  32 +
  33 +}
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderUpdatePriceReqVO.java 0 → 100644
  View file @4dd2d80
  1 +package cn.iocoder.yudao.module.trade.controller.admin.order.vo;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +
  6 +import javax.validation.constraints.NotNull;
  7 +
  8 +@Schema(description = "管理后台 - 订单改价 Request VO")
  9 +@Data
  10 +public class TradeOrderUpdatePriceReqVO {
  11 +
  12 + @Schema(description = "订单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
  13 + @NotNull(message = "订单编号不能为空")
  14 + private Long id;
  15 +
  16 + @Schema(description = "订单调价，单位：分。正数，加价；负数，减价", requiredMode = Schema.RequiredMode.REQUIRED, example = "-100")
  17 + @NotNull(message = "订单调价价格不能为空")
  18 + private Integer adjustPrice;
  19 +
  20 +}
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/delivery/AppDeliverExpressController.java
  View file @4dd2d80
@@ -31,7 +31,7 @@ public class AppDeliverExpressController { @@ -31,7 +31,7 @@ public class AppDeliverExpressController {
31 @GetMapping("/list") 31 @GetMapping("/list")
32 @Operation(summary = "获得快递公司列表") 32 @Operation(summary = "获得快递公司列表")
33 public CommonResult<List<AppDeliveryExpressRespVO>> getDeliveryExpressList() { 33 public CommonResult<List<AppDeliveryExpressRespVO>> getDeliveryExpressList() {
34 - List<DeliveryExpressDO> list = deliveryExpressService.getDeliveryExpressList(CommonStatusEnum.ENABLE.getStatus()); 34 + List<DeliveryExpressDO> list = deliveryExpressService.getDeliveryExpressListByStatus(CommonStatusEnum.ENABLE.getStatus());
35 list.sort(Comparator.comparing(DeliveryExpressDO::getSort)); 35 list.sort(Comparator.comparing(DeliveryExpressDO::getSort));
36 return success(DeliveryExpressConvert.INSTANCE.convertList03(list)); 36 return success(DeliveryExpressConvert.INSTANCE.convertList03(list));
37 } 37 }
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/delivery/DeliveryExpressConvert.java
  View file @4dd2d80
1 package cn.iocoder.yudao.module.trade.convert.delivery; 1 package cn.iocoder.yudao.module.trade.convert.delivery;
2 2
3 import cn.iocoder.yudao.framework.common.pojo.PageResult; 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
  4 +import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.express.*;
4 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.express.DeliveryExpressCreateReqVO; 5 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.express.DeliveryExpressCreateReqVO;
5 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.express.DeliveryExpressExcelVO; 6 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.express.DeliveryExpressExcelVO;
6 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.express.DeliveryExpressRespVO; 7 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.express.DeliveryExpressRespVO;
@@ -29,6 +30,8 @@ public interface DeliveryExpressConvert { @@ -29,6 +30,8 @@ public interface DeliveryExpressConvert {
29 30
30 List<DeliveryExpressExcelVO> convertList02(List<DeliveryExpressDO> list); 31 List<DeliveryExpressExcelVO> convertList02(List<DeliveryExpressDO> list);
31 32
  33 + List<DeliveryExpressSimpleRespVO> convertList1(List<DeliveryExpressDO> list);
  34 +
32 List<AppDeliveryExpressRespVO> convertList03(List<DeliveryExpressDO> list); 35 List<AppDeliveryExpressRespVO> convertList03(List<DeliveryExpressDO> list);
33 36
34 } 37 }
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/delivery/DeliveryPickUpStoreConvert.java
  View file @4dd2d80
1 package cn.iocoder.yudao.module.trade.convert.delivery; 1 package cn.iocoder.yudao.module.trade.convert.delivery;
2 2
3 -import java.util.*;  
4 -  
5 import cn.iocoder.yudao.framework.common.pojo.PageResult; 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
6 -  
7 import cn.iocoder.yudao.framework.ip.core.utils.AreaUtils; 4 import cn.iocoder.yudao.framework.ip.core.utils.AreaUtils;
8 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreCreateReqVO; 5 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreCreateReqVO;
9 -import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreExcelVO;  
10 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreRespVO; 6 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreRespVO;
  7 +import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreSimpleRespVO;
11 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreUpdateReqVO; 8 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreUpdateReqVO;
12 import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryPickUpStoreDO; 9 import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryPickUpStoreDO;
13 import org.mapstruct.Mapper; 10 import org.mapstruct.Mapper;
14 -import org.mapstruct.Mapping;  
15 import org.mapstruct.Named; 11 import org.mapstruct.Named;
16 import org.mapstruct.factory.Mappers; 12 import org.mapstruct.factory.Mappers;
17 13
  14 +import java.util.List;
  15 +
18 @Mapper 16 @Mapper
19 public interface DeliveryPickUpStoreConvert { 17 public interface DeliveryPickUpStoreConvert {
20 18
@@ -30,14 +28,10 @@ public interface DeliveryPickUpStoreConvert { @@ -30,14 +28,10 @@ public interface DeliveryPickUpStoreConvert {
30 28
31 PageResult<DeliveryPickUpStoreRespVO> convertPage(PageResult<DeliveryPickUpStoreDO> page); 29 PageResult<DeliveryPickUpStoreRespVO> convertPage(PageResult<DeliveryPickUpStoreDO> page);
32 30
33 - List<DeliveryPickUpStoreExcelVO> convertList02(List<DeliveryPickUpStoreDO> list);  
34 -  
35 - @Mapping(source = "areaId", target = "areaName", qualifiedByName = "convertAreaIdToName")  
36 - DeliveryPickUpStoreExcelVO convert2(DeliveryPickUpStoreDO bean);  
37 -  
38 @Named("convertAreaIdToName") 31 @Named("convertAreaIdToName")
39 default String convertAreaIdToName(Integer areaId) { 32 default String convertAreaIdToName(Integer areaId) {
40 return AreaUtils.format(areaId); 33 return AreaUtils.format(areaId);
41 } 34 }
42 35
  36 + List<DeliveryPickUpStoreSimpleRespVO> convertList1(List<DeliveryPickUpStoreDO> list);
43 } 37 }
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java
  View file @4dd2d80
@@ -17,8 +17,7 @@ import cn.iocoder.yudao.module.promotion.api.combination.dto.CombinationRecordCr @@ -17,8 +17,7 @@ import cn.iocoder.yudao.module.promotion.api.combination.dto.CombinationRecordCr
17 import cn.iocoder.yudao.module.trade.api.order.dto.TradeOrderRespDTO; 17 import cn.iocoder.yudao.module.trade.api.order.dto.TradeOrderRespDTO;
18 import cn.iocoder.yudao.module.trade.controller.admin.base.member.user.MemberUserRespVO; 18 import cn.iocoder.yudao.module.trade.controller.admin.base.member.user.MemberUserRespVO;
19 import cn.iocoder.yudao.module.trade.controller.admin.base.product.property.ProductPropertyValueDetailRespVO; 19 import cn.iocoder.yudao.module.trade.controller.admin.base.product.property.ProductPropertyValueDetailRespVO;
20 -import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderDetailRespVO;  
21 -import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderPageItemRespVO; 20 +import cn.iocoder.yudao.module.trade.controller.admin.order.vo.*;
22 import cn.iocoder.yudao.module.trade.controller.app.base.property.AppProductPropertyValueDetailRespVO; 21 import cn.iocoder.yudao.module.trade.controller.app.base.property.AppProductPropertyValueDetailRespVO;
23 import cn.iocoder.yudao.module.trade.controller.app.order.vo.*; 22 import cn.iocoder.yudao.module.trade.controller.app.order.vo.*;
24 import cn.iocoder.yudao.module.trade.controller.app.order.vo.item.AppTradeOrderItemCommentCreateReqVO; 23 import cn.iocoder.yudao.module.trade.controller.app.order.vo.item.AppTradeOrderItemCommentCreateReqVO;
@@ -278,4 +277,10 @@ public interface TradeOrderConvert { @@ -278,4 +277,10 @@ public interface TradeOrderConvert {
278 277
279 List<AppOrderExpressTrackRespDTO> convertList02(List<ExpressTrackRespDTO> list); 278 List<AppOrderExpressTrackRespDTO> convertList02(List<ExpressTrackRespDTO> list);
280 279
  280 + TradeOrderDO convert(TradeOrderUpdateAddressReqVO reqVO);
  281 +
  282 + TradeOrderDO convert(TradeOrderUpdatePriceReqVO reqVO);
  283 +
  284 + TradeOrderDO convert(TradeOrderRemarkReqVO reqVO);
  285 +
281 } 286 }
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/delivery/DeliveryPickUpStoreMapper.java
  View file @4dd2d80
@@ -3,7 +3,6 @@ package cn.iocoder.yudao.module.trade.dal.mysql.delivery; @@ -3,7 +3,6 @@ package cn.iocoder.yudao.module.trade.dal.mysql.delivery;
3 import cn.iocoder.yudao.framework.common.pojo.PageResult; 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
4 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; 4 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
5 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; 5 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
6 -import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreExportReqVO;  
7 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStorePageReqVO; 6 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStorePageReqVO;
8 import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryPickUpStoreDO; 7 import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryPickUpStoreDO;
9 import org.apache.ibatis.annotations.Mapper; 8 import org.apache.ibatis.annotations.Mapper;
@@ -23,15 +22,10 @@ public interface DeliveryPickUpStoreMapper extends BaseMapperX&lt;DeliveryPickUpSto @@ -23,15 +22,10 @@ public interface DeliveryPickUpStoreMapper extends BaseMapperX&lt;DeliveryPickUpSto
23 .orderByDesc(DeliveryPickUpStoreDO::getId)); 22 .orderByDesc(DeliveryPickUpStoreDO::getId));
24 } 23 }
25 24
26 - default List<DeliveryPickUpStoreDO> selectList(DeliveryPickUpStoreExportReqVO reqVO) {  
27 - return selectList(new LambdaQueryWrapperX<DeliveryPickUpStoreDO>()  
28 - .likeIfPresent(DeliveryPickUpStoreDO::getName, reqVO.getName())  
29 - .eqIfPresent(DeliveryPickUpStoreDO::getPhone, reqVO.getPhone())  
30 - .eqIfPresent(DeliveryPickUpStoreDO::getAreaId, reqVO.getAreaId())  
31 - .eqIfPresent(DeliveryPickUpStoreDO::getStatus, reqVO.getStatus())  
32 - .betweenIfPresent(DeliveryPickUpStoreDO::getCreateTime, reqVO.getCreateTime())  
33 - .orderByDesc(DeliveryPickUpStoreDO::getId)); 25 + default List<DeliveryPickUpStoreDO> selectListByStatus(Integer status) {
  26 + return selectList(DeliveryPickUpStoreDO::getStatus, status);
34 } 27 }
  28 +
35 } 29 }
36 30
37 31
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/order/TradeOrderMapper.java
  View file @4dd2d80
@@ -34,6 +34,8 @@ public interface TradeOrderMapper extends BaseMapperX&lt;TradeOrderDO&gt; { @@ -34,6 +34,8 @@ public interface TradeOrderMapper extends BaseMapperX&lt;TradeOrderDO&gt; {
34 .eqIfPresent(TradeOrderDO::getStatus, reqVO.getStatus()) 34 .eqIfPresent(TradeOrderDO::getStatus, reqVO.getStatus())
35 .eqIfPresent(TradeOrderDO::getPayChannelCode, reqVO.getPayChannelCode()) 35 .eqIfPresent(TradeOrderDO::getPayChannelCode, reqVO.getPayChannelCode())
36 .eqIfPresent(TradeOrderDO::getTerminal,reqVO.getTerminal()) 36 .eqIfPresent(TradeOrderDO::getTerminal,reqVO.getTerminal())
  37 + .eqIfPresent(TradeOrderDO::getLogisticsId, reqVO.getLogisticsId())
  38 + .inIfPresent(TradeOrderDO::getPickUpStoreId, reqVO.getPickUpStoreIds())
37 .betweenIfPresent(TradeOrderDO::getCreateTime, reqVO.getCreateTime())); 39 .betweenIfPresent(TradeOrderDO::getCreateTime, reqVO.getCreateTime()));
38 } 40 }
39 41
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/delivery/DeliveryExpressService.java
  View file @4dd2d80
@@ -64,11 +64,10 @@ public interface DeliveryExpressService { @@ -64,11 +64,10 @@ public interface DeliveryExpressService {
64 List<DeliveryExpressDO> getDeliveryExpressList(DeliveryExpressExportReqVO exportReqVO); 64 List<DeliveryExpressDO> getDeliveryExpressList(DeliveryExpressExportReqVO exportReqVO);
65 65
66 /** 66 /**
67 - * 获得快递公司列表 67 + * 获取指定状态的快递公司列表
68 * 68 *
69 * @param status 状态 69 * @param status 状态
70 * @return 快递公司列表 70 * @return 快递公司列表
71 */ 71 */
72 - List<DeliveryExpressDO> getDeliveryExpressList(Integer status);  
73 - 72 + List<DeliveryExpressDO> getDeliveryExpressListByStatus(Integer status);
74 } 73 }
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/delivery/DeliveryExpressServiceImpl.java
  View file @4dd2d80
@@ -12,6 +12,7 @@ import org.springframework.stereotype.Service; @@ -12,6 +12,7 @@ import org.springframework.stereotype.Service;
12 import org.springframework.validation.annotation.Validated; 12 import org.springframework.validation.annotation.Validated;
13 13
14 import javax.annotation.Resource; 14 import javax.annotation.Resource;
  15 +import java.util.Collection;
15 import java.util.List; 16 import java.util.List;
16 17
17 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; 18 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -95,7 +96,7 @@ public class DeliveryExpressServiceImpl implements DeliveryExpressService { @@ -95,7 +96,7 @@ public class DeliveryExpressServiceImpl implements DeliveryExpressService {
95 } 96 }
96 97
97 @Override 98 @Override
98 - public List<DeliveryExpressDO> getDeliveryExpressList(Integer status) { 99 + public List<DeliveryExpressDO> getDeliveryExpressListByStatus(Integer status) {
99 return deliveryExpressMapper.selectListByStatus(status); 100 return deliveryExpressMapper.selectListByStatus(status);
100 } 101 }
101 102
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/delivery/DeliveryPickUpStoreService.java
  View file @4dd2d80
1 package cn.iocoder.yudao.module.trade.service.delivery; 1 package cn.iocoder.yudao.module.trade.service.delivery;
2 2
3 -import java.util.*;  
4 -import javax.validation.*;  
5 import cn.iocoder.yudao.framework.common.pojo.PageResult; 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
6 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreCreateReqVO; 4 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreCreateReqVO;
7 -import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreExportReqVO;  
8 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStorePageReqVO; 5 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStorePageReqVO;
9 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreUpdateReqVO; 6 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreUpdateReqVO;
10 import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryPickUpStoreDO; 7 import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryPickUpStoreDO;
11 8
  9 +import javax.validation.Valid;
  10 +import java.util.Collection;
  11 +import java.util.List;
  12 +
12 /** 13 /**
13 * 自提门店 Service 接口 14 * 自提门店 Service 接口
14 * 15 *
@@ -63,10 +64,10 @@ public interface DeliveryPickUpStoreService { @@ -63,10 +64,10 @@ public interface DeliveryPickUpStoreService {
63 PageResult<DeliveryPickUpStoreDO> getDeliveryPickUpStorePage(DeliveryPickUpStorePageReqVO pageReqVO); 64 PageResult<DeliveryPickUpStoreDO> getDeliveryPickUpStorePage(DeliveryPickUpStorePageReqVO pageReqVO);
64 65
65 /** 66 /**
66 - * 获得自提门店列表, 用于 Excel 导出 67 + * 获得指定状态的自提门店列表
67 * 68 *
68 - * @param exportReqVO 查询条件 69 + * @param status 状态
69 * @return 自提门店列表 70 * @return 自提门店列表
70 */ 71 */
71 - List<DeliveryPickUpStoreDO> getDeliveryPickUpStoreList(DeliveryPickUpStoreExportReqVO exportReqVO); 72 + List<DeliveryPickUpStoreDO> getDeliveryPickUpStoreListByStatus(Integer status);
72 } 73 }
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/delivery/DeliveryPickUpStoreServiceImpl.java
  View file @4dd2d80
@@ -2,21 +2,20 @@ package cn.iocoder.yudao.module.trade.service.delivery; @@ -2,21 +2,20 @@ package cn.iocoder.yudao.module.trade.service.delivery;
2 2
3 import cn.iocoder.yudao.framework.common.pojo.PageResult; 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
4 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreCreateReqVO; 4 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreCreateReqVO;
5 -import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreExportReqVO;  
6 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStorePageReqVO; 5 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStorePageReqVO;
7 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreUpdateReqVO; 6 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreUpdateReqVO;
8 import cn.iocoder.yudao.module.trade.convert.delivery.DeliveryPickUpStoreConvert; 7 import cn.iocoder.yudao.module.trade.convert.delivery.DeliveryPickUpStoreConvert;
9 import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryPickUpStoreDO; 8 import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryPickUpStoreDO;
10 import cn.iocoder.yudao.module.trade.dal.mysql.delivery.DeliveryPickUpStoreMapper; 9 import cn.iocoder.yudao.module.trade.dal.mysql.delivery.DeliveryPickUpStoreMapper;
11 import org.springframework.stereotype.Service; 10 import org.springframework.stereotype.Service;
12 -import javax.annotation.Resource;  
13 import org.springframework.validation.annotation.Validated; 11 import org.springframework.validation.annotation.Validated;
14 12
15 -import java.util.*;  
16 - 13 +import javax.annotation.Resource;
  14 +import java.util.Collection;
  15 +import java.util.List;
17 16
18 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; 17 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
19 -import static cn.iocoder.yudao.module.trade.enums.ErrorCodeConstants.*; 18 +import static cn.iocoder.yudao.module.trade.enums.ErrorCodeConstants.PICK_UP_STORE_NOT_EXISTS;
20 19
21 /** 20 /**
22 * 自提门店 Service 实现类 21 * 自提门店 Service 实现类
@@ -78,7 +77,8 @@ public class DeliveryPickUpStoreServiceImpl implements DeliveryPickUpStoreServic @@ -78,7 +77,8 @@ public class DeliveryPickUpStoreServiceImpl implements DeliveryPickUpStoreServic
78 } 77 }
79 78
80 @Override 79 @Override
81 - public List<DeliveryPickUpStoreDO> getDeliveryPickUpStoreList(DeliveryPickUpStoreExportReqVO exportReqVO) {  
82 - return deliveryPickUpStoreMapper.selectList(exportReqVO); 80 + public List<DeliveryPickUpStoreDO> getDeliveryPickUpStoreListByStatus(Integer status) {
  81 + return deliveryPickUpStoreMapper.selectListByStatus(status);
83 } 82 }
  83 +
84 } 84 }
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateService.java
  View file @4dd2d80
1 package cn.iocoder.yudao.module.trade.service.order; 1 package cn.iocoder.yudao.module.trade.service.order;
2 2
  3 +import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderUpdateAddressReqVO;
  4 +import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderUpdatePriceReqVO;
3 import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderDeliveryReqVO; 5 import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderDeliveryReqVO;
  6 +import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderRemarkReqVO;
4 import cn.iocoder.yudao.module.trade.controller.app.order.vo.AppTradeOrderCreateReqVO; 7 import cn.iocoder.yudao.module.trade.controller.app.order.vo.AppTradeOrderCreateReqVO;
5 import cn.iocoder.yudao.module.trade.controller.app.order.vo.AppTradeOrderSettlementReqVO; 8 import cn.iocoder.yudao.module.trade.controller.app.order.vo.AppTradeOrderSettlementReqVO;
6 import cn.iocoder.yudao.module.trade.controller.app.order.vo.AppTradeOrderSettlementRespVO; 9 import cn.iocoder.yudao.module.trade.controller.app.order.vo.AppTradeOrderSettlementRespVO;
@@ -20,7 +23,7 @@ public interface TradeOrderUpdateService { @@ -20,7 +23,7 @@ public interface TradeOrderUpdateService {
20 /** 23 /**
21 * 获得订单结算信息 24 * 获得订单结算信息
22 * 25 *
23 - * @param userId 登录用户 26 + * @param userId 登录用户
24 * @param settlementReqVO 订单结算请求 27 * @param settlementReqVO 订单结算请求
25 * @return 订单结算结果 28 * @return 订单结算结果
26 */ 29 */
@@ -29,8 +32,8 @@ public interface TradeOrderUpdateService { @@ -29,8 +32,8 @@ public interface TradeOrderUpdateService {
29 /** 32 /**
30 * 【会员】创建交易订单 33 * 【会员】创建交易订单
31 * 34 *
32 - * @param userId 登录用户  
33 - * @param userIp 用户 IP 地址 35 + * @param userId 登录用户
  36 + * @param userIp 用户 IP 地址
34 * @param createReqVO 创建交易订单请求模型 37 * @param createReqVO 创建交易订单请求模型
35 * @return 交易订单的 38 * @return 交易订单的
36 */ 39 */
@@ -39,7 +42,7 @@ public interface TradeOrderUpdateService { @@ -39,7 +42,7 @@ public interface TradeOrderUpdateService {
39 /** 42 /**
40 * 更新交易订单已支付 43 * 更新交易订单已支付
41 * 44 *
42 - * @param id 交易订单编号 45 + * @param id 交易订单编号
43 * @param payOrderId 支付订单编号 46 * @param payOrderId 支付订单编号
44 */ 47 */
45 void updateOrderPaid(Long id, Long payOrderId); 48 void updateOrderPaid(Long id, Long payOrderId);
@@ -47,10 +50,9 @@ public interface TradeOrderUpdateService { @@ -47,10 +50,9 @@ public interface TradeOrderUpdateService {
47 /** 50 /**
48 * 【管理员】发货交易订单 51 * 【管理员】发货交易订单
49 * 52 *
50 - * @param userId 管理员编号  
51 * @param deliveryReqVO 发货请求 53 * @param deliveryReqVO 发货请求
52 */ 54 */
53 - void deliveryOrder(Long userId, TradeOrderDeliveryReqVO deliveryReqVO); 55 + void deliveryOrder(TradeOrderDeliveryReqVO deliveryReqVO);
54 56
55 /** 57 /**
56 * 【会员】收货交易订单 58 * 【会员】收货交易订单
@@ -60,12 +62,33 @@ public interface TradeOrderUpdateService { @@ -60,12 +62,33 @@ public interface TradeOrderUpdateService {
60 */ 62 */
61 void receiveOrder(Long userId, Long id); 63 void receiveOrder(Long userId, Long id);
62 64
  65 + /**
  66 + * 【管理员】交易订单备注
  67 + *
  68 + * @param reqVO 请求
  69 + */
  70 + void updateOrderRemark(TradeOrderRemarkReqVO reqVO);
  71 +
  72 + /**
  73 + * 【管理员】调整价格
  74 + *
  75 + * @param reqVO 请求
  76 + */
  77 + void updateOrderPrice(TradeOrderUpdatePriceReqVO reqVO);
  78 +
  79 + /**
  80 + * 【管理员】调整地址
  81 + *
  82 + * @param reqVO 请求
  83 + */
  84 + void updateOrderAddress(TradeOrderUpdateAddressReqVO reqVO);
  85 +
63 // =================== Order Item =================== 86 // =================== Order Item ===================
64 87
65 /** 88 /**
66 * 更新交易订单项的售后状态 89 * 更新交易订单项的售后状态
67 * 90 *
68 - * @param id 交易订单项编号 91 + * @param id 交易订单项编号
69 * @param oldAfterSaleStatus 当前售后状态；如果不符，更新后会抛出异常 92 * @param oldAfterSaleStatus 当前售后状态；如果不符，更新后会抛出异常
70 * @param newAfterSaleStatus 目标售后状态 93 * @param newAfterSaleStatus 目标售后状态
71 */ 94 */
@@ -76,11 +99,11 @@ public interface TradeOrderUpdateService { @@ -76,11 +99,11 @@ public interface TradeOrderUpdateService {
76 /** 99 /**
77 * 更新交易订单项的售后状态 100 * 更新交易订单项的售后状态
78 * 101 *
79 - * @param id 交易订单项编号 102 + * @param id 交易订单项编号
80 * @param oldAfterSaleStatus 当前售后状态；如果不符，更新后会抛出异常 103 * @param oldAfterSaleStatus 当前售后状态；如果不符，更新后会抛出异常
81 * @param newAfterSaleStatus 目标售后状态 104 * @param newAfterSaleStatus 目标售后状态
82 - * @param afterSaleId 售后单编号；当订单项发起售后时，必须传递该字段  
83 - * @param refundPrice 退款金额；当订单项退款成功时，必须传递该值 105 + * @param afterSaleId 售后单编号；当订单项发起售后时，必须传递该字段
  106 + * @param refundPrice 退款金额；当订单项退款成功时，必须传递该值
84 */ 107 */
85 void updateOrderItemAfterSaleStatus(Long id, Integer oldAfterSaleStatus, Integer newAfterSaleStatus, 108 void updateOrderItemAfterSaleStatus(Long id, Integer oldAfterSaleStatus, Integer newAfterSaleStatus,
86 Long afterSaleId, Integer refundPrice); 109 Long afterSaleId, Integer refundPrice);
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java
  View file @4dd2d80
@@ -29,7 +29,10 @@ import cn.iocoder.yudao.module.promotion.api.combination.dto.CombinationRecordUp @@ -29,7 +29,10 @@ import cn.iocoder.yudao.module.promotion.api.combination.dto.CombinationRecordUp
29 import cn.iocoder.yudao.module.promotion.api.coupon.CouponApi; 29 import cn.iocoder.yudao.module.promotion.api.coupon.CouponApi;
30 import cn.iocoder.yudao.module.promotion.api.coupon.dto.CouponUseReqDTO; 30 import cn.iocoder.yudao.module.promotion.api.coupon.dto.CouponUseReqDTO;
31 import cn.iocoder.yudao.module.promotion.enums.combination.CombinationRecordStatusEnum; 31 import cn.iocoder.yudao.module.promotion.enums.combination.CombinationRecordStatusEnum;
  32 +import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderUpdateAddressReqVO;
  33 +import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderUpdatePriceReqVO;
32 import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderDeliveryReqVO; 34 import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderDeliveryReqVO;
  35 +import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderRemarkReqVO;
33 import cn.iocoder.yudao.module.trade.controller.app.order.vo.AppTradeOrderCreateReqVO; 36 import cn.iocoder.yudao.module.trade.controller.app.order.vo.AppTradeOrderCreateReqVO;
34 import cn.iocoder.yudao.module.trade.controller.app.order.vo.AppTradeOrderSettlementReqVO; 37 import cn.iocoder.yudao.module.trade.controller.app.order.vo.AppTradeOrderSettlementReqVO;
35 import cn.iocoder.yudao.module.trade.controller.app.order.vo.AppTradeOrderSettlementRespVO; 38 import cn.iocoder.yudao.module.trade.controller.app.order.vo.AppTradeOrderSettlementRespVO;
@@ -53,6 +56,7 @@ import cn.iocoder.yudao.module.trade.service.price.TradePriceService; @@ -53,6 +56,7 @@ import cn.iocoder.yudao.module.trade.service.price.TradePriceService;
53 import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateReqBO; 56 import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateReqBO;
54 import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateRespBO; 57 import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateRespBO;
55 import lombok.extern.slf4j.Slf4j; 58 import lombok.extern.slf4j.Slf4j;
  59 +import org.jetbrains.annotations.NotNull;
56 import org.springframework.stereotype.Service; 60 import org.springframework.stereotype.Service;
57 import org.springframework.transaction.annotation.Transactional; 61 import org.springframework.transaction.annotation.Transactional;
58 62
@@ -64,6 +68,7 @@ import java.util.Objects; @@ -64,6 +68,7 @@ import java.util.Objects;
64 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; 68 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
65 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*; 69 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
66 import static cn.iocoder.yudao.module.pay.enums.ErrorCodeConstants.ORDER_NOT_FOUND; 70 import static cn.iocoder.yudao.module.pay.enums.ErrorCodeConstants.ORDER_NOT_FOUND;
  71 +import static cn.iocoder.yudao.module.pay.enums.ErrorCodeConstants.ORDER_UPDATE_PRICE_FAIL_PAID;
67 import static cn.iocoder.yudao.module.trade.enums.ErrorCodeConstants.*; 72 import static cn.iocoder.yudao.module.trade.enums.ErrorCodeConstants.*;
68 73
69 /** 74 /**
@@ -345,10 +350,7 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService { @@ -345,10 +350,7 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
345 */ 350 */
346 private KeyValue<TradeOrderDO, PayOrderRespDTO> validateOrderPayable(Long id, Long payOrderId) { 351 private KeyValue<TradeOrderDO, PayOrderRespDTO> validateOrderPayable(Long id, Long payOrderId) {
347 // 校验订单是否存在 352 // 校验订单是否存在
348 - TradeOrderDO order = tradeOrderMapper.selectById(id);  
349 - if (order == null) {  
350 - throw exception(ORDER_NOT_FOUND);  
351 - } 353 + TradeOrderDO order = validateOrderExists(id);
352 // 校验订单未支付 354 // 校验订单未支付
353 if (!TradeOrderStatusEnum.isUnpaid(order.getStatus()) || order.getPayStatus()) { 355 if (!TradeOrderStatusEnum.isUnpaid(order.getStatus()) || order.getPayStatus()) {
354 log.error("[validateOrderPaid][order({}) 不处于待支付状态，请进行处理！order 数据是：{}]", 356 log.error("[validateOrderPaid][order({}) 不处于待支付状态，请进行处理！order 数据是：{}]",
@@ -391,14 +393,16 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService { @@ -391,14 +393,16 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
391 393
392 @Override 394 @Override
393 @Transactional(rollbackFor = Exception.class) 395 @Transactional(rollbackFor = Exception.class)
394 - public void deliveryOrder(Long userId, TradeOrderDeliveryReqVO deliveryReqVO) { 396 + public void deliveryOrder(TradeOrderDeliveryReqVO deliveryReqVO) {
395 // TODO @puhui999：只有选择快递的，才可以发货 397 // TODO @puhui999：只有选择快递的，才可以发货
396 // 1.1 校验并获得交易订单（可发货） 398 // 1.1 校验并获得交易订单（可发货）
397 TradeOrderDO order = validateOrderDeliverable(deliveryReqVO.getId()); 399 TradeOrderDO order = validateOrderDeliverable(deliveryReqVO.getId());
398 - TradeOrderDO updateOrderObj = new TradeOrderDO(); 400 +
  401 + // TODO @puhui999：下面不修改 deliveryType，直接校验 deliveryType 是否为快递，是快递才可以发货；先做严格的方式哈。
399 // 判断发货类型 402 // 判断发货类型
  403 + TradeOrderDO updateOrderObj = new TradeOrderDO();
400 // 2.1 快递发货 404 // 2.1 快递发货
401 - if (Objects.equals(deliveryReqVO.getType(), DeliveryTypeEnum.EXPRESS.getMode())) { 405 + if (ObjectUtil.notEqual(deliveryReqVO.getLogisticsId(), 0L)) {
402 // 校验快递公司 406 // 校验快递公司
403 DeliveryExpressDO deliveryExpress = deliveryExpressService.getDeliveryExpress(deliveryReqVO.getLogisticsId()); 407 DeliveryExpressDO deliveryExpress = deliveryExpressService.getDeliveryExpress(deliveryReqVO.getLogisticsId());
404 if (deliveryExpress == null) { 408 if (deliveryExpress == null) {
@@ -408,27 +412,24 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService { @@ -408,27 +412,24 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
408 throw exception(EXPRESS_STATUS_NOT_ENABLE); 412 throw exception(EXPRESS_STATUS_NOT_ENABLE);
409 } 413 }
410 updateOrderObj.setLogisticsId(deliveryReqVO.getLogisticsId()).setLogisticsNo(deliveryReqVO.getLogisticsNo()).setDeliveryType(DeliveryTypeEnum.EXPRESS.getMode()); 414 updateOrderObj.setLogisticsId(deliveryReqVO.getLogisticsId()).setLogisticsNo(deliveryReqVO.getLogisticsNo()).setDeliveryType(DeliveryTypeEnum.EXPRESS.getMode());
  415 + } else {
  416 + // 2.2 无需发货
  417 + updateOrderObj.setLogisticsId(0L).setLogisticsNo("").setDeliveryType(DeliveryTypeEnum.NULL.getMode());
411 } 418 }
412 - // TODO @puhui999：无需发货时，更新 logisticsId 为 0；  
413 - // 2.2 无需发货  
414 - if (Objects.equals(deliveryReqVO.getType(), DeliveryTypeEnum.NULL.getMode())) {  
415 - updateOrderObj.setLogisticsId(null).setLogisticsNo("").setDeliveryType(DeliveryTypeEnum.NULL.getMode());  
416 - }  
417 -  
418 // 更新 TradeOrderDO 状态为已发货，等待收货 419 // 更新 TradeOrderDO 状态为已发货，等待收货
419 updateOrderObj.setStatus(TradeOrderStatusEnum.DELIVERED.getStatus()).setDeliveryTime(LocalDateTime.now()); 420 updateOrderObj.setStatus(TradeOrderStatusEnum.DELIVERED.getStatus()).setDeliveryTime(LocalDateTime.now());
420 int updateCount = tradeOrderMapper.updateByIdAndStatus(order.getId(), order.getStatus(), updateOrderObj); 421 int updateCount = tradeOrderMapper.updateByIdAndStatus(order.getId(), order.getStatus(), updateOrderObj);
421 if (updateCount == 0) { 422 if (updateCount == 0) {
422 throw exception(ORDER_DELIVERY_FAIL_STATUS_NOT_UNDELIVERED); 423 throw exception(ORDER_DELIVERY_FAIL_STATUS_NOT_UNDELIVERED);
423 } 424 }
  425 +
424 // TODO 芋艿：发送订单变化的消息 426 // TODO 芋艿：发送订单变化的消息
425 427
426 // 发送站内信 428 // 发送站内信
427 tradeMessageService.sendMessageWhenDeliveryOrder(new TradeOrderMessageWhenDeliveryOrderReqBO().setOrderId(order.getId()) 429 tradeMessageService.sendMessageWhenDeliveryOrder(new TradeOrderMessageWhenDeliveryOrderReqBO().setOrderId(order.getId())
428 - .setUserId(userId).setMessage(null)); 430 + .setUserId(order.getUserId()).setMessage(null));
429 431
430 // TODO 芋艿：OrderLog 432 // TODO 芋艿：OrderLog
431 - // TODO 设计：lili：是不是发货后，才支持售后？  
432 } 433 }
433 434
434 /** 435 /**
@@ -440,12 +441,9 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService { @@ -440,12 +441,9 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
440 * @return 交易订单 441 * @return 交易订单
441 */ 442 */
442 private TradeOrderDO validateOrderDeliverable(Long id) { 443 private TradeOrderDO validateOrderDeliverable(Long id) {
443 - // 校验订单是否存在  
444 - TradeOrderDO order = tradeOrderMapper.selectById(id);  
445 - if (order == null) {  
446 - throw exception(ORDER_NOT_FOUND);  
447 - } 444 + TradeOrderDO order = validateOrderExists(id);
448 // 校验订单是否是待发货状态 445 // 校验订单是否是待发货状态
  446 + // TODO @puhui999：已经发货，可以重新发货，修改信息；
449 if (!TradeOrderStatusEnum.isUndelivered(order.getStatus())) { 447 if (!TradeOrderStatusEnum.isUndelivered(order.getStatus())) {
450 throw exception(ORDER_DELIVERY_FAIL_STATUS_NOT_UNDELIVERED); 448 throw exception(ORDER_DELIVERY_FAIL_STATUS_NOT_UNDELIVERED);
451 } 449 }
@@ -456,6 +454,7 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService { @@ -456,6 +454,7 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
456 // 订单类型：拼团 454 // 订单类型：拼团
457 if (Objects.equals(TradeOrderTypeEnum.COMBINATION.getType(), order.getType())) { 455 if (Objects.equals(TradeOrderTypeEnum.COMBINATION.getType(), order.getType())) {
458 // 校验订单拼团是否成功 456 // 校验订单拼团是否成功
  457 + // TODO @puhui999：是不是取反？
459 if (combinationRecordApi.isCombinationRecordSuccess(order.getUserId(), order.getId())) { 458 if (combinationRecordApi.isCombinationRecordSuccess(order.getUserId(), order.getId())) {
460 throw exception(ORDER_DELIVERY_FAIL_COMBINATION_RECORD_STATUS_NOT_SUCCESS); 459 throw exception(ORDER_DELIVERY_FAIL_COMBINATION_RECORD_STATUS_NOT_SUCCESS);
461 } 460 }
@@ -463,6 +462,7 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService { @@ -463,6 +462,7 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
463 // 订单类类型：砍价 462 // 订单类类型：砍价
464 if (Objects.equals(TradeOrderTypeEnum.BARGAIN.getType(), order.getType())) { 463 if (Objects.equals(TradeOrderTypeEnum.BARGAIN.getType(), order.getType())) {
465 // 校验订单砍价是否成功 464 // 校验订单砍价是否成功
  465 + // TODO @puhui999：是不是取反？
466 if (bargainRecordApi.isBargainRecordSuccess(order.getUserId(), order.getId())) { 466 if (bargainRecordApi.isBargainRecordSuccess(order.getUserId(), order.getId())) {
467 throw exception(ORDER_DELIVERY_FAIL_BARGAIN_RECORD_STATUS_NOT_SUCCESS); 467 throw exception(ORDER_DELIVERY_FAIL_BARGAIN_RECORD_STATUS_NOT_SUCCESS);
468 } 468 }
@@ -470,6 +470,16 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService { @@ -470,6 +470,16 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
470 return order; 470 return order;
471 } 471 }
472 472
  473 + @NotNull
  474 + private TradeOrderDO validateOrderExists(Long id) {
  475 + // 校验订单是否存在
  476 + TradeOrderDO order = tradeOrderMapper.selectById(id);
  477 + if (order == null) {
  478 + throw exception(ORDER_NOT_FOUND);
  479 + }
  480 + return order;
  481 + }
  482 +
473 @Override 483 @Override
474 @Transactional(rollbackFor = Exception.class) 484 @Transactional(rollbackFor = Exception.class)
475 public void receiveOrder(Long userId, Long id) { 485 public void receiveOrder(Long userId, Long id) {
@@ -489,6 +499,43 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService { @@ -489,6 +499,43 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
489 // TODO 芋艿：lili 发送商品被购买完成的数据 499 // TODO 芋艿：lili 发送商品被购买完成的数据
490 } 500 }
491 501
  502 + @Override
  503 + public void updateOrderRemark(TradeOrderRemarkReqVO reqVO) {
  504 + // 校验并获得交易订单
  505 + validateOrderExists(reqVO.getId());
  506 +
  507 + // 更新
  508 + TradeOrderDO order = TradeOrderConvert.INSTANCE.convert(reqVO);
  509 + tradeOrderMapper.updateById(order);
  510 + }
  511 +
  512 + @Override
  513 + public void updateOrderPrice(TradeOrderUpdatePriceReqVO reqVO) {
  514 + // 校验交易订单
  515 + TradeOrderDO order = validateOrderExists(reqVO.getId());
  516 + if (order.getPayStatus()) {
  517 + throw exception(ORDER_UPDATE_PRICE_FAIL_PAID);
  518 + }
  519 +
  520 + // 更新
  521 + // TODO @puhui999：TradeOrderItemDO 需要做 adjustPrice 的分摊；另外，支付订单那的价格，需要 update 下；
  522 + TradeOrderDO update = TradeOrderConvert.INSTANCE.convert(reqVO);
  523 + update.setPayPrice(update.getPayPrice() + update.getAdjustPrice());
  524 + tradeOrderMapper.updateById(update);
  525 + }
  526 +
  527 + @Override
  528 + public void updateOrderAddress(TradeOrderUpdateAddressReqVO reqVO) {
  529 + // 校验交易订单
  530 + validateOrderExists(reqVO.getId());
  531 + // TODO 是否需要校验订单是否发货
  532 + // TODO 发货后是否支持修改收货地址
  533 +
  534 + // 更新
  535 + TradeOrderDO update = TradeOrderConvert.INSTANCE.convert(reqVO);
  536 + tradeOrderMapper.updateById(update);
  537 + }
  538 +
492 /** 539 /**
493 * 校验交易订单满足可售货的条件 540 * 校验交易订单满足可售货的条件
494 * 541 *
yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/aftersale/TradeAfterSaleServiceTest.java
  View file @4dd2d80
@@ -56,6 +56,7 @@ public class TradeAfterSaleServiceTest extends BaseDbUnitTest { @@ -56,6 +56,7 @@ public class TradeAfterSaleServiceTest extends BaseDbUnitTest {
56 private TradeOrderUpdateService tradeOrderUpdateService; 56 private TradeOrderUpdateService tradeOrderUpdateService;
57 @Resource 57 @Resource
58 private TradeOrderQueryService tradeOrderQueryService; 58 private TradeOrderQueryService tradeOrderQueryService;
  59 +
59 @MockBean 60 @MockBean
60 private PayRefundApi payRefundApi; 61 private PayRefundApi payRefundApi;
61 62
yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceTest.java
  View file @4dd2d80
@@ -23,7 +23,10 @@ import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderDO; @@ -23,7 +23,10 @@ import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderDO;
23 import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderItemDO; 23 import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderItemDO;
24 import cn.iocoder.yudao.module.trade.dal.mysql.order.TradeOrderItemMapper; 24 import cn.iocoder.yudao.module.trade.dal.mysql.order.TradeOrderItemMapper;
25 import cn.iocoder.yudao.module.trade.dal.mysql.order.TradeOrderMapper; 25 import cn.iocoder.yudao.module.trade.dal.mysql.order.TradeOrderMapper;
26 -import cn.iocoder.yudao.module.trade.enums.order.*; 26 +import cn.iocoder.yudao.module.trade.enums.order.TradeOrderItemAfterSaleStatusEnum;
  27 +import cn.iocoder.yudao.module.trade.enums.order.TradeOrderRefundStatusEnum;
  28 +import cn.iocoder.yudao.module.trade.enums.order.TradeOrderStatusEnum;
  29 +import cn.iocoder.yudao.module.trade.enums.order.TradeOrderTypeEnum;
27 import cn.iocoder.yudao.module.trade.framework.order.config.TradeOrderConfig; 30 import cn.iocoder.yudao.module.trade.framework.order.config.TradeOrderConfig;
28 import cn.iocoder.yudao.module.trade.framework.order.config.TradeOrderProperties; 31 import cn.iocoder.yudao.module.trade.framework.order.config.TradeOrderProperties;
29 import org.junit.jupiter.api.BeforeEach; 32 import org.junit.jupiter.api.BeforeEach;
@@ -38,7 +41,6 @@ import java.util.List; @@ -38,7 +41,6 @@ import java.util.List;
38 41
39 import static cn.iocoder.yudao.framework.common.util.collection.SetUtils.asSet; 42 import static cn.iocoder.yudao.framework.common.util.collection.SetUtils.asSet;
40 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals; 43 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
41 -import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomLongId;  
42 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo; 44 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;
43 import static java.util.Collections.singletonList; 45 import static java.util.Collections.singletonList;
44 import static org.junit.jupiter.api.Assertions.*; 46 import static org.junit.jupiter.api.Assertions.*;
@@ -282,7 +284,7 @@ public class TradeOrderUpdateServiceTest extends BaseDbUnitTest { @@ -282,7 +284,7 @@ public class TradeOrderUpdateServiceTest extends BaseDbUnitTest {
282 // mock 方法（支付单） 284 // mock 方法（支付单）
283 285
284 // 调用 286 // 调用
285 - tradeOrderUpdateService.deliveryOrder(randomLongId(), deliveryReqVO); 287 + tradeOrderUpdateService.deliveryOrder(deliveryReqVO);
286 // 断言 288 // 断言
287 TradeOrderDO dbOrder = tradeOrderMapper.selectById(1L); 289 TradeOrderDO dbOrder = tradeOrderMapper.selectById(1L);
288 assertEquals(dbOrder.getStatus(), TradeOrderStatusEnum.DELIVERED.getStatus()); 290 assertEquals(dbOrder.getStatus(), TradeOrderStatusEnum.DELIVERED.getStatus());
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/level/MemberLevelBaseVO.java
  View file @4dd2d80
@@ -35,7 +35,7 @@ public class MemberLevelBaseVO { @@ -35,7 +35,7 @@ public class MemberLevelBaseVO {
35 @Schema(description = "享受折扣", requiredMode = Schema.RequiredMode.REQUIRED, example = "98") 35 @Schema(description = "享受折扣", requiredMode = Schema.RequiredMode.REQUIRED, example = "98")
36 @NotNull(message = "享受折扣不能为空") 36 @NotNull(message = "享受折扣不能为空")
37 @Range(min = 0, max = 100, message = "享受折扣的范围为 0-100") 37 @Range(min = 0, max = 100, message = "享受折扣的范围为 0-100")
38 - private Integer discount; 38 + private Integer discountPercent;
39 39
40 @Schema(description = "等级图标", example = "https://www.iocoder.cn/yudao.jpg") 40 @Schema(description = "等级图标", example = "https://www.iocoder.cn/yudao.jpg")
41 @URL(message = "等级图标必须是 URL 格式") 41 @URL(message = "等级图标必须是 URL 格式")
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/log/MemberLevelRecordBaseVO.java
  View file @4dd2d80
@@ -26,7 +26,7 @@ public class MemberLevelRecordBaseVO { @@ -26,7 +26,7 @@ public class MemberLevelRecordBaseVO {
26 26
27 @Schema(description = "享受折扣", requiredMode = Schema.RequiredMode.REQUIRED, example = "13319") 27 @Schema(description = "享受折扣", requiredMode = Schema.RequiredMode.REQUIRED, example = "13319")
28 @NotNull(message = "享受折扣不能为空") 28 @NotNull(message = "享受折扣不能为空")
29 - private Integer discount; 29 + private Integer discountPercent;
30 30
31 @Schema(description = "升级经验", requiredMode = Schema.RequiredMode.REQUIRED, example = "13319") 31 @Schema(description = "升级经验", requiredMode = Schema.RequiredMode.REQUIRED, example = "13319")
32 @NotNull(message = "升级经验不能为空") 32 @NotNull(message = "升级经验不能为空")
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/point/vo/recrod/MemberPointRecordPageReqVO.java
  View file @4dd2d80
@@ -15,6 +15,9 @@ public class MemberPointRecordPageReqVO extends PageParam { @@ -15,6 +15,9 @@ public class MemberPointRecordPageReqVO extends PageParam {
15 @Schema(description = "用户昵称", example = "张三") 15 @Schema(description = "用户昵称", example = "张三")
16 private String nickname; 16 private String nickname;
17 17
  18 + @Schema(description = "用户编号", example = "123")
  19 + private Long userId;
  20 +
18 @Schema(description = "业务类型", example = "1") 21 @Schema(description = "业务类型", example = "1")
19 private Integer bizType; 22 private Integer bizType;
20 23
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/signin/vo/record/MemberSignInRecordPageReqVO.java
  View file @4dd2d80
@@ -23,6 +23,9 @@ public class MemberSignInRecordPageReqVO extends PageParam { @@ -23,6 +23,9 @@ public class MemberSignInRecordPageReqVO extends PageParam {
23 @Schema(description = "第几天签到", example = "10") 23 @Schema(description = "第几天签到", example = "10")
24 private Integer day; 24 private Integer day;
25 25
  26 + @Schema(description = "用户编号", example = "123")
  27 + private Long userId;
  28 +
26 @Schema(description = "签到时间") 29 @Schema(description = "签到时间")
27 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) 30 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
28 private LocalDateTime[] createTime; 31 private LocalDateTime[] createTime;
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserRespVO.java
  View file @4dd2d80
@@ -29,9 +29,11 @@ public class MemberUserRespVO extends MemberUserBaseVO { @@ -29,9 +29,11 @@ public class MemberUserRespVO extends MemberUserBaseVO {
29 @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) 29 @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
30 private LocalDateTime createTime; 30 private LocalDateTime createTime;
31 31
32 -  
33 // ========== 其它信息 ========== 32 // ========== 其它信息 ==========
34 33
  34 + @Schema(description = "积分", example = "100")
  35 + private Integer point;
  36 +
35 @Schema(description = "会员标签", example = "[红色, 快乐]") 37 @Schema(description = "会员标签", example = "[红色, 快乐]")
36 private List<String> tagNames; 38 private List<String> tagNames;
37 39
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/level/MemberExperienceRecordDO.java
  View file @4dd2d80
1 package cn.iocoder.yudao.module.member.dal.dataobject.level; 1 package cn.iocoder.yudao.module.member.dal.dataobject.level;
2 2
3 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; 3 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
  4 +import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO;
4 import cn.iocoder.yudao.module.member.enums.MemberExperienceBizTypeEnum; 5 import cn.iocoder.yudao.module.member.enums.MemberExperienceBizTypeEnum;
5 import com.baomidou.mybatisplus.annotation.KeySequence; 6 import com.baomidou.mybatisplus.annotation.KeySequence;
6 import com.baomidou.mybatisplus.annotation.TableId; 7 import com.baomidou.mybatisplus.annotation.TableId;
@@ -29,6 +30,8 @@ public class MemberExperienceRecordDO extends BaseDO { @@ -29,6 +30,8 @@ public class MemberExperienceRecordDO extends BaseDO {
29 private Long id; 30 private Long id;
30 /** 31 /**
31 * 用户编号 32 * 用户编号
  33 + *
  34 + * 关联 {@link MemberUserDO#getId()} 字段
32 */ 35 */
33 private Long userId; 36 private Long userId;
34 /** 37 /**
@@ -46,6 +49,10 @@ public class MemberExperienceRecordDO extends BaseDO { @@ -46,6 +49,10 @@ public class MemberExperienceRecordDO extends BaseDO {
46 */ 49 */
47 private String title; 50 private String title;
48 /** 51 /**
  52 + * 描述
  53 + */
  54 + private String description;
  55 + /**
49 * 经验 56 * 经验
50 */ 57 */
51 private Integer experience; 58 private Integer experience;
@@ -53,9 +60,5 @@ public class MemberExperienceRecordDO extends BaseDO { @@ -53,9 +60,5 @@ public class MemberExperienceRecordDO extends BaseDO {
53 * 变更后的经验 60 * 变更后的经验
54 */ 61 */
55 private Integer totalExperience; 62 private Integer totalExperience;
56 - /**  
57 - * 描述  
58 - */  
59 - private String description;  
60 63
61 } 64 }
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/level/MemberLevelDO.java
  View file @4dd2d80
@@ -34,17 +34,18 @@ public class MemberLevelDO extends BaseDO { @@ -34,17 +34,18 @@ public class MemberLevelDO extends BaseDO {
34 */ 34 */
35 private String name; 35 private String name;
36 /** 36 /**
37 - * 升级经验  
38 - */  
39 - private Integer experience;  
40 - /**  
41 * 等级 37 * 等级
42 */ 38 */
43 private Integer level; 39 private Integer level;
44 /** 40 /**
  41 + * 升级经验
  42 + */
  43 + private Integer experience;
  44 + /**
45 * 享受折扣 45 * 享受折扣
46 */ 46 */
47 - private Integer discount; 47 + private Integer discountPercent;
  48 +
48 /** 49 /**
49 * 等级图标 50 * 等级图标
50 */ 51 */
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/level/MemberLevelRecordDO.java
  View file @4dd2d80
1 package cn.iocoder.yudao.module.member.dal.dataobject.level; 1 package cn.iocoder.yudao.module.member.dal.dataobject.level;
2 2
3 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; 3 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
  4 +import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO;
4 import com.baomidou.mybatisplus.annotation.KeySequence; 5 import com.baomidou.mybatisplus.annotation.KeySequence;
5 import com.baomidou.mybatisplus.annotation.TableId; 6 import com.baomidou.mybatisplus.annotation.TableId;
6 import com.baomidou.mybatisplus.annotation.TableName; 7 import com.baomidou.mybatisplus.annotation.TableName;
@@ -30,20 +31,26 @@ public class MemberLevelRecordDO extends BaseDO { @@ -30,20 +31,26 @@ public class MemberLevelRecordDO extends BaseDO {
30 private Long id; 31 private Long id;
31 /** 32 /**
32 * 用户编号 33 * 用户编号
  34 + *
  35 + * 关联 {@link MemberUserDO#getId()} 字段
33 */ 36 */
34 private Long userId; 37 private Long userId;
35 /** 38 /**
36 * 等级编号 39 * 等级编号
  40 + *
  41 + * 关联 {@link MemberLevelDO#getId()} 字段
37 */ 42 */
38 private Long levelId; 43 private Long levelId;
39 /** 44 /**
40 * 会员等级 45 * 会员等级
  46 + *
  47 + * 冗余 {@link MemberLevelDO#getLevel()} 字段
41 */ 48 */
42 private Integer level; 49 private Integer level;
43 /** 50 /**
44 * 享受折扣 51 * 享受折扣
45 */ 52 */
46 - private Integer discount; 53 + private Integer discountPercent;
47 /** 54 /**
48 * 升级经验 55 * 升级经验
49 */ 56 */
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/point/MemberPointRecordMapper.java
  View file @4dd2d80
@@ -21,6 +21,7 @@ public interface MemberPointRecordMapper extends BaseMapperX&lt;MemberPointRecordDO @@ -21,6 +21,7 @@ public interface MemberPointRecordMapper extends BaseMapperX&lt;MemberPointRecordDO
21 default PageResult<MemberPointRecordDO> selectPage(MemberPointRecordPageReqVO reqVO, Set<Long> userIds) { 21 default PageResult<MemberPointRecordDO> selectPage(MemberPointRecordPageReqVO reqVO, Set<Long> userIds) {
22 return selectPage(reqVO, new LambdaQueryWrapperX<MemberPointRecordDO>() 22 return selectPage(reqVO, new LambdaQueryWrapperX<MemberPointRecordDO>()
23 .inIfPresent(MemberPointRecordDO::getUserId, userIds) 23 .inIfPresent(MemberPointRecordDO::getUserId, userIds)
  24 + .eqIfPresent(MemberPointRecordDO::getUserId, reqVO.getUserId())
24 .eqIfPresent(MemberPointRecordDO::getBizType, reqVO.getBizType()) 25 .eqIfPresent(MemberPointRecordDO::getBizType, reqVO.getBizType())
25 .likeIfPresent(MemberPointRecordDO::getTitle, reqVO.getTitle()) 26 .likeIfPresent(MemberPointRecordDO::getTitle, reqVO.getTitle())
26 .orderByDesc(MemberPointRecordDO::getId)); 27 .orderByDesc(MemberPointRecordDO::getId));
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/signin/MemberSignInRecordMapper.java
  View file @4dd2d80
@@ -21,6 +21,7 @@ public interface MemberSignInRecordMapper extends BaseMapperX&lt;MemberSignInRecord @@ -21,6 +21,7 @@ public interface MemberSignInRecordMapper extends BaseMapperX&lt;MemberSignInRecord
21 default PageResult<MemberSignInRecordDO> selectPage(MemberSignInRecordPageReqVO reqVO, Set<Long> userIds) { 21 default PageResult<MemberSignInRecordDO> selectPage(MemberSignInRecordPageReqVO reqVO, Set<Long> userIds) {
22 return selectPage(reqVO, new LambdaQueryWrapperX<MemberSignInRecordDO>() 22 return selectPage(reqVO, new LambdaQueryWrapperX<MemberSignInRecordDO>()
23 .inIfPresent(MemberSignInRecordDO::getUserId, userIds) 23 .inIfPresent(MemberSignInRecordDO::getUserId, userIds)
  24 + .eqIfPresent(MemberSignInRecordDO::getUserId, reqVO.getUserId())
24 .eqIfPresent(MemberSignInRecordDO::getDay, reqVO.getDay()) 25 .eqIfPresent(MemberSignInRecordDO::getDay, reqVO.getDay())
25 .betweenIfPresent(MemberSignInRecordDO::getCreateTime, reqVO.getCreateTime()) 26 .betweenIfPresent(MemberSignInRecordDO::getCreateTime, reqVO.getCreateTime())
26 .orderByDesc(MemberSignInRecordDO::getId)); 27 .orderByDesc(MemberSignInRecordDO::getId));
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/signin/MemberSignInRecordServiceImpl.java
  View file @4dd2d80
@@ -5,7 +5,6 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult; @@ -5,7 +5,6 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
5 import cn.iocoder.yudao.module.member.api.user.MemberUserApi; 5 import cn.iocoder.yudao.module.member.api.user.MemberUserApi;
6 import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO; 6 import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
7 import cn.iocoder.yudao.module.member.controller.admin.signin.vo.record.MemberSignInRecordPageReqVO; 7 import cn.iocoder.yudao.module.member.controller.admin.signin.vo.record.MemberSignInRecordPageReqVO;
8 -import cn.iocoder.yudao.module.member.controller.app.signin.vo.record.AppMemberSignInRecordRespVO;  
9 import cn.iocoder.yudao.module.member.dal.dataobject.signin.MemberSignInRecordDO; 8 import cn.iocoder.yudao.module.member.dal.dataobject.signin.MemberSignInRecordDO;
10 import cn.iocoder.yudao.module.member.dal.mysql.signin.MemberSignInRecordMapper; 9 import cn.iocoder.yudao.module.member.dal.mysql.signin.MemberSignInRecordMapper;
11 import org.apache.commons.lang3.StringUtils; 10 import org.apache.commons.lang3.StringUtils;
yudao-module-member/yudao-module-member-biz/src/test/java/cn/iocoder/yudao/module/member/service/level/MemberLevelServiceImplTest.java
  View file @4dd2d80
@@ -49,7 +49,7 @@ public class MemberLevelServiceImplTest extends BaseDbUnitTest { @@ -49,7 +49,7 @@ public class MemberLevelServiceImplTest extends BaseDbUnitTest {
49 public void testCreateLevel_success() { 49 public void testCreateLevel_success() {
50 // 准备参数 50 // 准备参数
51 MemberLevelCreateReqVO reqVO = randomPojo(MemberLevelCreateReqVO.class, o -> { 51 MemberLevelCreateReqVO reqVO = randomPojo(MemberLevelCreateReqVO.class, o -> {
52 - o.setDiscount(randomInt()); 52 + o.setDiscountPercent(randomInt());
53 o.setIcon(randomURL()); 53 o.setIcon(randomURL());
54 o.setBackgroundUrl(randomURL()); 54 o.setBackgroundUrl(randomURL());
55 }); 55 });
@@ -76,7 +76,7 @@ public class MemberLevelServiceImplTest extends BaseDbUnitTest { @@ -76,7 +76,7 @@ public class MemberLevelServiceImplTest extends BaseDbUnitTest {
76 o.setLevel(dbLevel.getLevel()); 76 o.setLevel(dbLevel.getLevel());
77 o.setExperience(dbLevel.getExperience()); 77 o.setExperience(dbLevel.getExperience());
78 //以下是要修改的字段 78 //以下是要修改的字段
79 - o.setDiscount(randomInt()); 79 + o.setDiscountPercent(randomInt());
80 o.setIcon(randomURL()); 80 o.setIcon(randomURL());
81 o.setBackgroundUrl(randomURL()); 81 o.setBackgroundUrl(randomURL());
82 }); 82 });
@@ -255,7 +255,7 @@ public class MemberLevelServiceImplTest extends BaseDbUnitTest { @@ -255,7 +255,7 @@ public class MemberLevelServiceImplTest extends BaseDbUnitTest {
255 private static MemberLevelDO randomLevelDO(Consumer<MemberLevelDO>... consumers) { 255 private static MemberLevelDO randomLevelDO(Consumer<MemberLevelDO>... consumers) {
256 Consumer<MemberLevelDO> consumer = (o) -> { 256 Consumer<MemberLevelDO> consumer = (o) -> {
257 o.setStatus(CommonStatusEnum.ENABLE.getStatus()); 257 o.setStatus(CommonStatusEnum.ENABLE.getStatus());
258 - o.setDiscount(randomInt(0, 100)); 258 + o.setDiscountPercent(randomInt(0, 100));
259 o.setIcon(randomURL()); 259 o.setIcon(randomURL());
260 o.setBackgroundUrl(randomURL()); 260 o.setBackgroundUrl(randomURL());
261 }; 261 };
yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/ErrorCodeConstants.java
  View file @4dd2d80
@@ -27,6 +27,7 @@ public interface ErrorCodeConstants { @@ -27,6 +27,7 @@ public interface ErrorCodeConstants {
27 ErrorCode ORDER_IS_EXPIRED = new ErrorCode(1007002003, "支付订单已经过期"); 27 ErrorCode ORDER_IS_EXPIRED = new ErrorCode(1007002003, "支付订单已经过期");
28 ErrorCode ORDER_SUBMIT_CHANNEL_ERROR = new ErrorCode(1007002004, "发起支付报错，错误码：{}，错误提示：{}"); 28 ErrorCode ORDER_SUBMIT_CHANNEL_ERROR = new ErrorCode(1007002004, "发起支付报错，错误码：{}，错误提示：{}");
29 ErrorCode ORDER_REFUND_FAIL_STATUS_ERROR = new ErrorCode(1007002005, "支付订单退款失败，原因：状态不是已支付或已退款"); 29 ErrorCode ORDER_REFUND_FAIL_STATUS_ERROR = new ErrorCode(1007002005, "支付订单退款失败，原因：状态不是已支付或已退款");
  30 + ErrorCode ORDER_UPDATE_PRICE_FAIL_PAID = new ErrorCode(1007002006, "支付订单调价失败，原因：支付订单已付款,不能调价");
30 31
31 // ========== ORDER 模块(拓展单) 1007003000 ========== 32 // ========== ORDER 模块(拓展单) 1007003000 ==========
32 ErrorCode ORDER_EXTENSION_NOT_FOUND = new ErrorCode(1007003000, "支付交易拓展单不存在"); 33 ErrorCode ORDER_EXTENSION_NOT_FOUND = new ErrorCode(1007003000, "支付交易拓展单不存在");