地址优化

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

@@ -55,6 +55,7 @@ public class AddressController extends Controller {
 //            address.setDefaultFlag(1);
 //        }
 //        address.setAddress1(address.getAddress1().trim());
+        address.setAddressDetail(address.getAddressDetail().trim());
         address.setUserId(userId);
         address.setCreateTime(new Date());
         address.setAddressId(uid());
@@ -66,7 +67,7 @@ public class AddressController extends Controller {
 //        user.setAddress(address);
 //        userRepository.save(user);
 
-        configDefaultAddress(save.getAddressId());
+//        configDefaultAddress(save.getAddressId());
 
         return new Result<>(save);
     }
@@ -94,14 +95,17 @@ 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().trim(), userId, addressId))
-            return new Result(e.getCode(), "Address already existed");
+//        if (repository.existsByAddressDetailAndUserIdAndAddressIdIsNot(address.getAddressDetail().trim(), userId, addressId))
+//            return new Result(e.getCode(), "Address already existed");
 
-//        address.setAddress1(address.getAddress1().trim());
+
+        address.setAddressDetail(address.getAddressDetail().trim());
         address.setAddressId(addressId);
         address.setUpdateTime(new Date());
-//        address.setUserId(userId);
-        return new Result<>(repository.save(address));
+        address.setUserId(userId);
+        TbCfAddress save = repository.save(address);
+//        configDefaultAddress(save.getAddressId());
+        return new Result<>(save);
     }
 
     @DeleteMapping("/{addressId}")
@@ -132,7 +136,7 @@ public class AddressController extends Controller {
             TbCfUserInfo user = this.user.user();
 
 
-            System.out.println("address:"+address);
+            System.out.println("address:" + address);
             repository.resetToDefault(user.getUserId());
 
             address.setDefaultFlag(StateConstant.VALID);

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

@@ -3,6 +3,7 @@ package com.example.afrishop_v3.models;
 import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
+import org.apache.commons.lang3.StringUtils;
 import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
@@ -21,7 +22,7 @@ import java.util.Date;
 @Entity
 @Data
 @DynamicUpdate
-public class TbCfAddress{
+public class TbCfAddress {
 
 
     @Id
@@ -33,8 +34,9 @@ public class TbCfAddress{
     /**
      * 姓
      */
-    @Column(name = "first_name")
     private String deliveryName;
+
+    private String firstName;
     /**
      * 名
      */
@@ -54,8 +56,8 @@ public class TbCfAddress{
     /**
      * 地址详情1
      */
-    @Column(name = "address1")
     private String addressDetail;
+    private String address1;
     /**
      * 地址详情2
      */
@@ -85,5 +87,31 @@ public class TbCfAddress{
      */
     private Date updateTime;
 
+//    public String getDeliveryName() {
+//        if (lastName != null) {
+//            deliveryName += lastName;
+//        }
+//        return deliveryName;
+//    }
+
 
+//    public String getAddressDetail() {
+//        StringBuffer sbuf = new StringBuffer();
+//        if (country != null) {
+//            sbuf.append(country);
+//        }
+//        if (province != null) {
+//            sbuf.append(province);
+//        }
+//        if (city != null) {
+//            sbuf.append(city);
+//        }
+//        if (address1 != null) {
+//            sbuf.append(address1);
+//        }
+//        if (address2 != null) {
+//            sbuf.append(address2);
+//        }
+//        return sbuf.toString();
+//    }
 }