地址优化

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

@@ -82,7 +82,7 @@ public class CartController extends Controller {
 //        if (itemDetail.getItemPrice() != null || itemDetail.getSkuPrice() != null || itemDetail.getRealItemPrice() != null) {
 //            return new Result(ResultCodeEnum.SERVICE_ERROR.getCode(), "Invalid request, Parameter cannot contain price field");
 //        }
-        int count = repository.countByUserId(userId);
+        int count = repository.countByUserIdAndEnableFlag(userId, 1);
 
         if (count > 99) {
             return new Result(ResultCodeEnum.SERVICE_ERROR.getCode(), "Your shopping cart is full");
@@ -143,9 +143,9 @@ public class CartController extends Controller {
         String itemId = itemDetail.getItemId();
         boolean hasItemId = itemId != null && !itemId.isEmpty();
         if (hasItemId) {
-            optionalItem = repository.findFirstByUserIdAndItemImgAndItemSkuAndEnableFlag(userId, itemDetail.getItemImg(), itemDetail.getItemSku(),1);
+            optionalItem = repository.findFirstByUserIdAndItemImgAndItemSkuAndEnableFlag(userId, itemDetail.getItemImg(), itemDetail.getItemSku(), 1);
         } else {
-            optionalItem = repository.findFirstByUserIdAndSourceItemIdAndItemSkuAndEnableFlag(userId, itemDetail.getSourceItemId(), itemDetail.getItemSku(),1);
+            optionalItem = repository.findFirstByUserIdAndSourceItemIdAndItemSkuAndEnableFlag(userId, itemDetail.getSourceItemId(), itemDetail.getItemSku(), 1);
         }
 
         TbCfCartRecordR detail;
@@ -163,7 +163,7 @@ public class CartController extends Controller {
         }
 
         // Check if the item exist in cart
-        Optional<TbCfCartRecordR> cartOptional = repository.findFirstByUserIdAndItemIdAndItemSkuAndEnableFlag(userId, itemId, itemDetail.getItemSku(),1);
+        Optional<TbCfCartRecordR> cartOptional = repository.findFirstByUserIdAndItemIdAndItemSkuAndEnableFlag(userId, itemId, itemDetail.getItemSku(), 1);
         Integer flag = itemDetail.getCheckFlag() != null ? itemDetail.getCheckFlag() : StateConstant.VALID;
 
         if (cartOptional.isPresent()) {
@@ -178,7 +178,7 @@ public class CartController extends Controller {
         }
 
         if (user.hasFcm()) {
-            int i = repository.countByUserId(userId);
+            int i = repository.countByUserIdAndEnableFlag(userId, 1);
             sendNotification(user.getFcm(), "Cart updates", "Item added to cart, " + i + " item(s) are pending, continue with order");
         }
 

src/main/java/com/example/afrishop_v3/models/TbCfAddress.java

@@ -87,7 +87,21 @@ public class TbCfAddress {
      */
     private Date updateTime;
 
-//    public String getDeliveryName() {
+    public String getAddress2() {
+        if (address2 == null) {
+            address2 = "";
+        }
+        return address2;
+    }
+
+    public String getProvince() {
+        if (province == null) {
+            province = "";
+        }
+        return province;
+    }
+
+    //    public String getDeliveryName() {
 //        if (lastName != null) {
 //            deliveryName += lastName;
 //        }

src/main/java/com/example/afrishop_v3/repository/TbCfCartRecordRRepository.java

@@ -11,7 +11,7 @@ import java.util.List;
 import java.util.Optional;
 
 public interface TbCfCartRecordRRepository extends PagingAndSortingRepository<TbCfCartRecordR, String> {
-    int countByUserId(String userId);
+    int countByUserIdAndEnableFlag(String userId,Integer flag);
 
     Optional<TbCfCartRecordR> findFirstByUserIdAndItemIdAndItemSkuAndEnableFlag(String userId, String itemId, String itemSku, Integer flag);