wangpeng/LinHelp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: enrich goods delivery task contact info

Browse Source
This commit is contained in:
王鹏
2026-07-07 17:29:06 +08:00
parent d2886fbd8f
commit d9e8234d27
3 changed files with 76 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
backend/src/test/java/com/linhelp/delivery/DeliveryAssignmentServiceTests.java
View File

@@ -8,6 +8,9 @@ import com.linhelp.order.GoodsOrderResponse;
import com.linhelp.order.GoodsOrderService;
import com.linhelp.product.ProductService;
import com.linhelp.product.ProductSkuResponse;
import com.linhelp.user.AddressRequest;
import com.linhelp.user.AddressResponse;
import com.linhelp.user.UserAddressService;
import org.junit.jupiter.api.Test;
import java.util.Collections;
@@ -27,6 +30,9 @@ class DeliveryAssignmentServiceTests {
assertThat(task.getBizType()).isEqualTo(DeliveryAssignmentService.BIZ_TYPE_GOODS_ORDER);
assertThat(task.getStatus()).isEqualTo(DeliveryTaskStatus.ASSIGNED);
assertThat(task.getRiderId()).isEqualTo(rider.getId());
assertThat(task.getContactName()).isEqualTo("李女士");
assertThat(task.getContactPhone()).isEqualTo("13800001000");
assertThat(task.getAddress()).isEqualTo("1号楼 1201 东门旁");
}
@Test
@@ -43,8 +49,9 @@ class DeliveryAssignmentServiceTests {
private final ProductService productService = new ProductService();
private final GoodsOrderService goodsOrderService = new GoodsOrderService(productService);
private final DeliveryUserService deliveryUserService = new DeliveryUserService();
private final UserAddressService addressService = new UserAddressService();
private final DeliveryAssignmentService assignmentService =
new DeliveryAssignmentService(deliveryUserService, goodsOrderService, null);
new DeliveryAssignmentService(deliveryUserService, goodsOrderService, null, addressService);
private GoodsOrderResponse preparedDeliveryOrder() {
return preparedOrder(DeliveryMethod.IMMEDIATE, 1L);
@@ -55,12 +62,13 @@ class DeliveryAssignmentServiceTests {
}
private GoodsOrderResponse preparedOrder(DeliveryMethod deliveryMethod, Long addressId) {
Long resolvedAddressId = addressId == null ? null : address().getId();
ProductSkuResponse sku = productService.createDemoSku(1L, 1L, 1L, "500g", 990, 5);
CreateGoodsOrderRequest request = new CreateGoodsOrderRequest();
request.setTenantId(1L);
request.setCommunityId(1L);
request.setMerchantId(1L);
request.setAddressId(addressId);
request.setAddressId(resolvedAddressId);
request.setDeliveryMethod(deliveryMethod);
request.setItems(Collections.singletonList(new CreateGoodsOrderItemRequest(1L, sku.getId(), 1)));
GoodsOrderResponse order = goodsOrderService.create(1L, request);
@@ -68,6 +76,18 @@ class DeliveryAssignmentServiceTests {
return goodsOrderService.markPrepared(order.getId());
}
private AddressResponse address() {
AddressRequest request = new AddressRequest();
request.setTenantId(1L);
request.setCommunityId(1L);
request.setContactName("李女士");
request.setPhone("13800001000");
request.setBuilding("1号楼");
request.setRoom("1201");
request.setDetail("东门旁");
return addressService.create(1L, request);
}
private DeliveryUserResponse rider() {
DeliveryUserRequest request = new DeliveryUserRequest();
request.setTenantId(1L);

21
backend/src/test/java/com/linhelp/delivery/RiderTaskServiceTests.java
View File

@@ -9,6 +9,9 @@ import com.linhelp.order.GoodsOrderResponse;
import com.linhelp.order.GoodsOrderService;
import com.linhelp.product.ProductService;
import com.linhelp.product.ProductSkuResponse;
import com.linhelp.user.AddressRequest;
import com.linhelp.user.AddressResponse;
import com.linhelp.user.UserAddressService;
import org.junit.jupiter.api.Test;
import java.util.Collections;
@@ -60,18 +63,20 @@ class RiderTaskServiceTests {
private final ProductService productService = new ProductService();
private final GoodsOrderService goodsOrderService = new GoodsOrderService(productService);
private final DeliveryUserService deliveryUserService = new DeliveryUserService();
private final UserAddressService addressService = new UserAddressService();
private final DeliveryAssignmentService assignmentService =
new DeliveryAssignmentService(deliveryUserService, goodsOrderService, null);
new DeliveryAssignmentService(deliveryUserService, goodsOrderService, null, addressService);
private final RiderTaskService riderTaskService =
new RiderTaskService(assignmentService, goodsOrderService, null);
private GoodsOrderResponse preparedDeliveryOrder() {
ProductSkuResponse sku = productService.createDemoSku(1L, 1L, 1L, "500g", 990, 5);
CreateGoodsOrderRequest request = new CreateGoodsOrderRequest();
AddressResponse address = address();
request.setTenantId(1L);
request.setCommunityId(1L);
request.setMerchantId(1L);
request.setAddressId(1L);
request.setAddressId(address.getId());
request.setDeliveryMethod(DeliveryMethod.IMMEDIATE);
request.setItems(Collections.singletonList(new CreateGoodsOrderItemRequest(1L, sku.getId(), 1)));
GoodsOrderResponse order = goodsOrderService.create(1L, request);
@@ -79,6 +84,18 @@ class RiderTaskServiceTests {
return goodsOrderService.markPrepared(order.getId());
}
private AddressResponse address() {
AddressRequest request = new AddressRequest();
request.setTenantId(1L);
request.setCommunityId(1L);
request.setContactName("李女士");
request.setPhone("13800001000");
request.setBuilding("1号楼");
request.setRoom("1201");
request.setDetail("东门旁");
return addressService.create(1L, request);
}
private DeliveryUserResponse rider(Long userId, String name) {
DeliveryUserRequest request = new DeliveryUserRequest();
request.setTenantId(1L);