diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/PageData.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/PageData.java index 0da1203b..b4bb215f 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/PageData.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/PageData.java @@ -7,6 +7,7 @@ import lombok.experimental.Accessors; import java.io.Serializable; import java.util.Collection; +import java.util.Collections; @Getter @Accessors(chain = true) @@ -38,18 +39,18 @@ public class PageData implements Serializable { //是否有下一页 private boolean hasNextPage; - public boolean isHasNextPage(){ + public boolean isHasNextPage() { return page < getTotalPages(); } //是否有上一页 private boolean hasPrevPage; - public boolean isHasPrevPage(){ + public boolean isHasPrevPage() { return page > 1; } //分页数据 @Setter - private Collection items; + private Collection items = Collections.emptyList(); } diff --git a/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/controller/app/ShoppingController.java b/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/controller/app/ShoppingController.java index c400ee51..8409d597 100644 --- a/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/controller/app/ShoppingController.java +++ b/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/controller/app/ShoppingController.java @@ -4,13 +4,16 @@ import com.nflg.mobilebroken.common.pojo.ApiResult; import com.nflg.mobilebroken.common.pojo.vo.SimpleUserVO; import com.nflg.mobilebroken.common.util.AppUserUtil; import com.nflg.mobilebroken.quotation.controller.ControllerBase; +import com.nflg.mobilebroken.quotation.pojo.request.ShoppingInitRequest; import com.nflg.mobilebroken.repository.entity.TBaseCustomer; import com.nflg.mobilebroken.repository.service.IAppUserService; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import javax.validation.Valid; import java.util.List; import java.util.stream.Collectors; @@ -47,4 +50,9 @@ public class ShoppingController extends ControllerBase { ); } } -} + + public ApiResult init(@Valid @RequestBody ShoppingInitRequest request){ + //TODO + return ApiResult.success(); + } +} \ No newline at end of file diff --git a/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/pojo/request/ShoppingInitRequest.java b/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/pojo/request/ShoppingInitRequest.java new file mode 100644 index 00000000..45467ac7 --- /dev/null +++ b/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/pojo/request/ShoppingInitRequest.java @@ -0,0 +1,21 @@ +package com.nflg.mobilebroken.quotation.pojo.request; + +import lombok.Data; + +import javax.validation.constraints.NotNull; + +@Data +public class ShoppingInitRequest { + + /** + * 机型ID + */ + @NotNull + private Long modelId; + + /** + * 报价对象ID + */ + @NotNull + private Integer targetId; +}