commit

src/main/java/com/example/afrishop_v3/controllers/AddressController.java

@@ -43,10 +43,11 @@ public class AddressController extends Controller{
             return new Result(e.getCode(),"Delivery name is required");
         if( address.getPhone() == null || address.getPhone().trim().isEmpty())
             return new Result(e.getCode(),"Phone is required");
-        if( repository.existsByAddressDetailAndUserId(address.getAddressDetail(), userId))
+        if( repository.existsByAddressDetailAndUserId(address.getAddressDetail().trim(), userId))
             return new Result(e.getCode(),"Address already existed");
 
 
+        address.setAddressDetail(address.getAddressDetail().trim());
         address.setUserId(userId);
         address.setAddressId(uid());
         return new Result<>(repository.save(address));
@@ -69,9 +70,10 @@ public class AddressController extends Controller{
         if( address.getPhone() == null || address.getPhone().trim().isEmpty())
             return new Result(e.getCode(),"Phone is required");
 
-        if( repository.existsByAddressDetailAndUserIdAndAddressIdIsNot(address.getAddressDetail(), userId,addressId))
+        if( repository.existsByAddressDetailAndUserIdAndAddressIdIsNot(address.getAddressDetail().trim(), userId,addressId))
             return new Result(e.getCode(),"Address already existed");
 
+        address.setAddressDetail(address.getAddressDetail().trim());
         address.setAddressId(addressId);
         address.setUserId(userId);
         return new Result<>(repository.save(address));

src/main/java/com/example/afrishop_v3/controllers/ItemController.java

@@ -42,7 +42,7 @@ public class ItemController {
     }
 
     @GetMapping("/queryAll")
-    public Result queryAll(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+    public Result queryAll(@RequestParam(value = "pageNum", defaultValue = "0") Integer pageNum,
                            @RequestParam(value = "pageSize", defaultValue = "6") Integer pageSize) {
 
         return new Result<>(repository.findAll(PageRequest.of(pageNum,pageSize)));
@@ -51,7 +51,7 @@ public class ItemController {
 
     @GetMapping("/queryItemsByTypeTwo")
     public Result queryItemsByTypeTwo( @RequestParam("typeTwoId") String typeTwoId,
-                                      @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                      @RequestParam(value = "pageNum", defaultValue = "0") Integer pageNum,
                                       @RequestParam(value = "pageSize", defaultValue = "6") Integer pageSize,
                                       @RequestParam(value = "order", required = false) String order) {
 
@@ -83,7 +83,7 @@ public class ItemController {
     @GetMapping("/searchItems")
     public Result searchItems(@RequestParam(value = "name") String name,
                               @RequestParam(value = "order", required = false) String order,
-                              @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                              @RequestParam(value = "pageNum", defaultValue = "0") Integer pageNum,
                               @RequestParam(value = "pageSize", defaultValue = "6") Integer pageSize) {
 
         Page<TbCfStationItem> list = repository.findAllByItemNameContainingOrItemTagsContaining(name, name, PageRequest.of(pageNum, pageSize, sort(order)));
@@ -99,7 +99,7 @@ public class ItemController {
 
     @GetMapping("/getRecommendItems")
     public Result getRecommendItems(@RequestParam("itemId") String itemId,
-                                    @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                    @RequestParam(value = "pageNum", defaultValue = "0") Integer pageNum,
                                     @RequestParam(value = "pageSize", defaultValue = "12") Integer pageSize) {
 
         Optional<TbCfStationItem> byId = repository.findById(itemId);
@@ -121,7 +121,7 @@ public class ItemController {
 
     @GetMapping("/queryItemsByTypeThree")
     public Result queryItemsByTypeThree( @RequestParam("typeThreeId") String typeThreeId,
-                                         @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                         @RequestParam(value = "pageNum", defaultValue = "0") Integer pageNum,
                                         @RequestParam(value = "pageSize", defaultValue = "6") Integer pageSize,
                                         @RequestParam(value = "order", required = false) String order) {
         return new Result<>(repository.findAllByItemDescritionId(typeThreeId, PageRequest.of(pageNum,pageSize,sort(order))));
@@ -134,7 +134,7 @@ public class ItemController {
 
     @GetMapping("/queryItemsByLabel")
     public Result queryItemsByLabel(@RequestParam("label") String label,
-                                    @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                    @RequestParam(value = "pageNum", defaultValue = "0") Integer pageNum,
                                     @RequestParam(value = "pageSize", defaultValue = "6") Integer pageSize,
                                     @RequestParam(value = "order", required = false) String order) {
         return new Result<>(repository.findAllByItemLabelContaining(label, PageRequest.of(pageNum,pageSize,sort(order))));

src/main/java/com/example/afrishop_v3/controllers/ShopifyController.java

@@ -24,7 +24,7 @@ public class ShopifyController {
 
     @GetMapping("/querycomments")
     public Result queryComments(@RequestParam(value = "itemId") String itemId,
-                                 @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                 @RequestParam(value = "pageNum", defaultValue = "0") Integer pageNum,
                                 @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
                                 @RequestParam(value = "userId", required = false) String userId) {
         Page<TbCfItemComment> list = repository.findAllByItemId(itemId, PageRequest.of(pageNum, pageSize));

src/main/java/com/example/afrishop_v3/controllers/TbCfHomePageEntityController.java

@@ -45,7 +45,7 @@ public class TbCfHomePageEntityController extends Controller {
     }
 
     @GetMapping("/store")
-    public Result getStores( @RequestParam(required = false,defaultValue = "1") Integer pageNum, @RequestParam(defaultValue = "10",required = false) Integer pageSize) {
+    public Result getStores( @RequestParam(required = false,defaultValue = "0") Integer pageNum, @RequestParam(defaultValue = "10",required = false) Integer pageSize) {
 
         return new Result<>(storeRepository.findAll(PageRequest.of(pageNum,pageSize)));
     }