Explorar el Código

合并test回归修复:闪送列表DTO字段集与payType测试同步实际行为

- ListViewTest 补 orderVersion(用户列表)/payType(骑手列表) 期望字段
- createRejectsUnsupportedPayType 重写为透传断言(05cc7e4 已放宽 normalizePayType)

Co-Authored-By: Claude Code <noreply@anthropic.com>
qmj hace 4 días
padre
commit
f3b50ac4d2

+ 3 - 2
ruoyi-admin/src/test/java/com/ruoyi/app/flashdelivery/dto/FlashDeliveryRiderOrderListViewTest.java

@@ -15,7 +15,8 @@ class FlashDeliveryRiderOrderListViewTest {
                 "quantity", "weightRange", "baseDeliveryFee", "urgentFee", "tipAmount",
                 "deliveryMode", "scheduledPickupStartAt", "scheduledPickupEndAt", "pickupAddress",
                 "pickupDetailAddress", "deliveryAddress", "deliveryDetailAddress",
-                "estimatedDurationSeconds", "amount", "currency", "deliveredAt", "createTime");
+                "estimatedDurationSeconds", "amount", "currency", "deliveredAt", "createTime",
+                "orderVersion");
         org.junit.jupiter.api.Assertions.assertEquals(expected, fields);
     }
 
@@ -29,7 +30,7 @@ class FlashDeliveryRiderOrderListViewTest {
                 "pinRequired", "pickupAddress", "pickupDetailAddress", "deliveryAddress",
                 "deliveryDetailAddress", "pickupDistanceMeters", "distanceMeters",
                 "estimatedDurationSeconds", "baseDeliveryFee", "distanceFee", "urgentFee",
-                "tipAmount", "amount", "currency", "createTime");
+                "tipAmount", "amount", "currency", "payType", "createTime");
         org.junit.jupiter.api.Assertions.assertEquals(expected, fields);
     }
 

+ 6 - 3
ruoyi-admin/src/test/java/com/ruoyi/app/flashdelivery/service/FlashDeliveryApplicationServiceTest.java

@@ -850,16 +850,19 @@ class FlashDeliveryApplicationServiceTest {
     }
 
     @Test
-    void createRejectsUnsupportedPayType() {
+    void createPassesThroughPayTypeAsProvided() {
+        // 05cc7e4 放宽 normalizePayType:不再限定 4/6,任意 payType 透传存储(缺省仍为现金)。
         Fixture fixture = new Fixture();
         when(fixture.pricingMapper.selectAtTime(anyString())).thenReturn(List.of(pricing()));
         when(fixture.routeService.calculate(any(), any())).thenReturn(new RouteDistance(3200, 600, "ROUTE"));
         FlashDeliveryCreateRequest request = createRequest();
         request.setPayType("2");
 
-        assertThrows(ServiceException.class, () -> fixture.service.create(7L, request));
+        fixture.service.create(7L, request);
 
-        verify(fixture.orderMapper, never()).insert(any(FlashDeliveryOrder.class));
+        ArgumentCaptor<FlashDeliveryOrder> saved = ArgumentCaptor.forClass(FlashDeliveryOrder.class);
+        verify(fixture.orderMapper).insert(saved.capture());
+        assertEquals("2", saved.getValue().getPayType());
     }
 
     @Test