licailing 5 лет назад
Родитель
Сommit
60a33ea6fc

+ 4 - 0
src/main/java/com/izouma/dingdong/dto/MerchantDTO.java

@@ -56,6 +56,7 @@ public class MerchantDTO {
         startingAmount = merchantSettings.getStartingAmount();
         preparationTime = merchantSettings.getPreparationTime();
         isOpening = merchantSettings.getIsOpening();
+        automaticOrder = merchantSettings.getAutomaticOrder();
     }
 
 
@@ -167,4 +168,7 @@ public class MerchantDTO {
     @ApiModelProperty(value = "是否营业中", name = "isOpening")
     private Boolean isOpening;
 
+    @ApiModelProperty(value = "自动接单")
+    private Boolean automaticOrder;
+
 }

+ 2 - 7
src/test/java/com/izouma/dingdong/service/MerchantServiceTest.java

@@ -28,13 +28,8 @@ public class MerchantServiceTest {
     @Test
     public void testChange(){
         MerchantDTO merchantDTO = MerchantDTO.builder()
-                .mid(421L)
-                .address("测试测试")
-                .aliAccount("11111")
-                .aliName("测试")
-                .logo("https://idingdong.oss-cn-hangzhou.aliyuncs.com/image/2020-05-14-10-01-57oAziBRXO.jpg")
-                .phone("222333")
-                .password("222333")
+                .mid(189L)
+                .automaticOrder(true)
                 .build();
         merchantService.change(merchantDTO);
     }