地址优化

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

@@ -40,21 +40,21 @@ public class AddressController extends Controller {
         String userId = user.userId();
         if (address == null)
             return new Result(e.getCode(), e.getDesc());
-        if (address.getAddressDetail() == null || address.getAddressDetail().trim().isEmpty())
-            return new Result(e.getCode(), "Address is required");
-        if (address.getDeliveryName() == null || address.getDeliveryName().trim().isEmpty())
-            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().trim(), userId))
-            return new Result(e.getCode(), "Address already existed");
+//        if (address.getAddress1() == null || address.getAddress1().trim().isEmpty())
+//            return new Result(e.getCode(), "Address is required");
+//        if (address.getDeliveryName() == null || address.getDeliveryName().trim().isEmpty())
+//            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.getAddress1().trim(), userId))
+//            return new Result(e.getCode(), "Address already existed");
 
 
         //客户新增第一条地址，设置为默认
 //        if (!repository.existsByUserId(userId)) {
 //            address.setDefaultFlag(1);
 //        }
-        address.setAddressDetail(address.getAddressDetail().trim());
+//        address.setAddress1(address.getAddress1().trim());
         address.setUserId(userId);
         address.setCreateTime(new Date());
         address.setAddressId(uid());
@@ -66,7 +66,7 @@ public class AddressController extends Controller {
 //        user.setAddress(address);
 //        userRepository.save(user);
 
-//        configDefaultAddress(save.getAddressId());
+        configDefaultAddress(save.getAddressId());
 
         return new Result<>(save);
     }
@@ -87,20 +87,20 @@ public class AddressController extends Controller {
         String userId = user.userId();
         if (address == null)
             return new Result(e.getCode(), e.getDesc());
-        if (address.getAddressDetail() == null || address.getAddressDetail().trim().isEmpty())
-            return new Result(e.getCode(), "Address is required");
-        if (address.getDeliveryName() == null || address.getDeliveryName().trim().isEmpty())
-            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 (address.getAddress1() == null || address.getAddress1().trim().isEmpty())
+//            return new Result(e.getCode(), "Address is required");
+//        if (address.getDeliveryName() == null || address.getDeliveryName().trim().isEmpty())
+//            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.existsByAddressDetailAndUserIdAndAddressIdIsNot(address.getAddressDetail().trim(), userId, addressId))
             return new Result(e.getCode(), "Address already existed");
 
-        address.setAddressDetail(address.getAddressDetail().trim());
+//        address.setAddress1(address.getAddress1().trim());
         address.setAddressId(addressId);
         address.setUpdateTime(new Date());
-        address.setUserId(userId);
+//        address.setUserId(userId);
         return new Result<>(repository.save(address));
     }
 
@@ -132,6 +132,7 @@ public class AddressController extends Controller {
             TbCfUserInfo user = this.user.user();
 
 
+            System.out.println("address:"+address);
             repository.resetToDefault(user.getUserId());
 
             address.setDefaultFlag(StateConstant.VALID);
@@ -150,8 +151,8 @@ public class AddressController extends Controller {
 
     @GetMapping(value = "/default")
     public Result getDefaultAddress() {
-        TbCfAddress address = user.user().getAddress();
-
+//        TbCfAddress address = user.user().getAddress();
+        TbCfAddress address = repository.findFirstByUserIdAndDefaultFlag(user.userId(), StateConstant.VALID);
         return new Result<>(address, address == null ? ResultCodeEnum.SERVICE_ERROR.getCode() : ResultCodeEnum.SUCCESS.getCode(), "");
     }
 }

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

@@ -278,16 +278,16 @@ public class AuthController extends Controller {
 
             //Check if email exists
             if (byEmail || byEmail2) {
-                return new Result(ResultCodeEnum.VALIDATE_ERROR.getCode(), "Error: Email is already in use!");
+                return new Result(ResultCodeEnum.VALIDATE_ERROR.getCode(), "This email address has been registered, please Login");
             }
 
 
             //signUpRequest.setFirebaseUid(email);
-            signUpRequest.setAccount(email);
 
             signUpRequest.setUserId(IdUtil.createIdbyUUID());
 
             fillUserNecessayInfo(signUpRequest, request);
+            signUpRequest.setAccount(email);
 
             signUpRequest.setPassword(encoder.encode(password));
 
@@ -376,16 +376,16 @@ public class AuthController extends Controller {
             boolean byEmail2 = userRepository.existsByAccount(phone);
 
             if (byEmail || byEmail2) {
-                return new Result(ResultCodeEnum.VALIDATE_ERROR.getCode(), "Error: Phone is already in use!");
+                return new Result(ResultCodeEnum.VALIDATE_ERROR.getCode(), "This phone number has been registered, please Login");
             }
 
 
             //signUpRequest.setFirebaseUid(phone);
-            signUpRequest.setAccount(phone);
 
             signUpRequest.setUserId(IdUtil.createIdbyUUID());
 
             fillUserNecessayInfo(signUpRequest, request);
+            signUpRequest.setAccount(phone);
 
             signUpRequest.setPassword(encoder.encode(password));
 
@@ -425,7 +425,11 @@ public class AuthController extends Controller {
 //        }
 
         // Check if firebase token is valid
+        logger.info("从firebase中获取的user:" + user);
 
+        if (user.getPhone() != null) {
+            user.setAccount(user.getPhone());
+        }
         boolean isTokenValid = user.getToken() != null && validateFirebaseToken(user.getToken());
 
 
@@ -626,7 +630,7 @@ public class AuthController extends Controller {
 
     //fill basic information for new user
     private void fillUserNecessayInfo(TbCfUserInfo tbCfUserInfoVo, HttpServletRequest request) throws IOException {
-        RestTemplate restTemplate = new RestTemplate();
+//        RestTemplate restTemplate = new RestTemplate();
         if (tbCfUserInfoVo.getAvatar() == null) tbCfUserInfoVo.setAvatar(domainProperties.getProperty("user.avatar"));
 //        ResponseEntity forEntity2 = restTemplate.getForEntity("http://admin.afrieshop.com/api/upload/getRealIp", String.class);
 //        System.err.println(forEntity2.getBody());

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

@@ -575,13 +575,13 @@ public class OrderController extends Controller {
         comment.setUser(user);
         comment.setId(IdUtil.createIdbyUUID());
         comment.setDelFlag(0);
-        comment.setLikeNum(0L);
+//        comment.setLikeNum(0L);
         comment.setCreateTime(new Date());
         comment.setUpdateTime(new Date());
-        comment.setType(0);
-        if (!StringUtils.isBlank(comment.getUrls())) {
-            comment.setType(1);
-        }
+//        comment.setType(0);
+//        if (!StringUtils.isBlank(comment.getUrls())) {
+//            comment.setType(1);
+//        }
 
         TbCfItemComment save = commentRepository.save(comment);
         return new Result<>(save, "Comment on success!");

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

@@ -65,7 +65,7 @@ public class StripeController extends Controller {
 
     @PostMapping("/payment")
     public Result payment(@RequestParam Map<String, Object> params) throws StripeException {
-        Result result = new Result();
+        Result result = new Result(ResultCodeEnum.ORDER_PAY_ERROR.getCode(),ResultCodeEnum.ORDER_PAY_ERROR.getDesc());
         logger.info("stripe支付开始~~~");
         try {
             String orderId = (String) params.get("orderId");
@@ -78,16 +78,17 @@ public class StripeController extends Controller {
                 logger.info("token不能为空");
                 return result;
             }
-            boolean payed = false;
+//            boolean payed = false;
             Optional<TbCfOrder> byId = orderRepository.findById(orderId);
             if (byId.isPresent()) {
-                payed = true;
+//                payed = true;
                 TbCfOrder order = byId.get();
                 BigDecimal orderPrice = order.getRealityPay();
                 BigDecimal magnification = new BigDecimal("100");
                 BigDecimal price = orderPrice.multiply(magnification);
                 //支付业务
                 Charge charge = StripePay.createCharge(price.longValue(), SECRET_KEY, token);
+                logger.info("支付信息 %s:"+charge);
                 if ("succeeded".equals(charge.getStatus())) {
                     logger.info("stripe支付,订单[" + orderId + "]支付成功~");
                     //支付成功
@@ -102,17 +103,21 @@ public class StripeController extends Controller {
 
                     logger.info("佣金明细----->>>订单号=" + orderId + "user=" + order.getUserId() + "price=" + order.getItemsPrice());
                     saveNetworkMarketing(bonus, order.getUserId());
+                    result.setCode(ResultCodeEnum.SUCCESS.getCode());
+                    result.setMessage(ResultCodeEnum.SUCCESS.getDesc());
                 }
             }
 
-            if (!payed) {
-                result.setCode(ResultCodeEnum.ORDER_PAY_ERROR.getCode());
-                result.setMessage(ResultCodeEnum.ORDER_PAY_ERROR.getDesc());
-                logger.info("stripe支付,订单[" + orderId + "]支付失败~");
-            }
+//            if (!payed) {
+//                result.setCode(ResultCodeEnum.ORDER_PAY_ERROR.getCode());
+//                result.setMessage(ResultCodeEnum.ORDER_PAY_ERROR.getDesc());
+//                logger.info("stripe支付,订单[" + orderId + "]支付失败~");
+//            }
 
         } catch (Exception e) {
             logger.error("stripe支付，发生异常：" + e.toString());
+
+
         }
         return result;
     }

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

@@ -15,7 +15,7 @@ import java.util.*;
 /**
  * @Auther: wudepeng
  * @Date: 2020/11/26
- * @Description:
+ * @Description:条目管理
  */
 @RestController
 @RequestMapping("/term")

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

 package com.example.afrishop_v3.models;
 
+import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 import org.hibernate.annotations.DynamicUpdate;
 
+import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import java.io.Serializable;
@@ -17,14 +19,11 @@ import java.util.Date;
  * @date 2019-08-16 15:51:16
  */
 @Entity
-@Setter
-@Getter
+@Data
 @DynamicUpdate
 public class TbCfAddress{
 
-    /**
-     * 地址id
-     */
+
     @Id
     private String addressId;
     /**
@@ -32,14 +31,18 @@ public class TbCfAddress{
      */
     private String userId;
     /**
-     * 收货人
+     * 姓
      */
-    private String deliveryName;
+    @Column(name = "first_name")
+    private String  deliveryName;
+    /**
+     * 名
+     */
+    private String lastName;
     /**
      * 联系电话
      */
     private String phone;
-
     /**
      * 邮箱
      */
@@ -49,252 +52,38 @@ public class TbCfAddress{
      */
     private Integer defaultFlag;
     /**
-     * 地址详情
+     * 地址详情1
      */
+    @Column(name = "address1")
     private String addressDetail;
     /**
-     * 所在国家code
-     */
-    private String addressCountryCode;
-    /**
-     * 所在国家
-     */
-    private String addressCountryName;
-    /**
-     * 所在州code
-     */
-    private String addressStateCode;
-    /**
-     * 所在州
+     * 地址详情2
      */
-    private String addressStateName;
+    private String address2;
     /**
-     * 所在区code
+     * 国家
      */
-    private String addressAreaCode;
+    private String country;
     /**
-     * 所在区
+     * 省
      */
-    private String addressAreaName;
+    private String province;
     /**
-     * 标签code
+     * 市
      */
-    private String labelCode;
+    private String city;
     /**
-     * Phone code
+     * 邮编
      */
-    private String isoCode;
+    private String zipCode;
     /**
      * 创建时间
      */
     private Date createTime;
     /**
-     * 修改时间
+     * 更新时间
      */
     private Date updateTime;
 
-    /**
-     * 设置：地址id
-     */
-    public void setAddressId(String addressId) {
-        this.addressId = addressId;
-    }
 
-    /**
-     * 获取：地址id
-     */
-    public String getAddressId() {
-        return addressId;
-    }
-    /**
-     * 设置：用户id
-     */
-    public void setUserId(String userId) {
-        this.userId = userId;
-    }
-
-    /**
-     * 获取：用户id
-     */
-    public String getUserId() {
-        return userId;
-    }
-    /**
-     * 设置：收货人
-     */
-    public void setDeliveryName(String deliveryName) {
-        this.deliveryName = deliveryName;
-    }
-
-    /**
-     * 获取：收货人
-     */
-    public String getDeliveryName() {
-        return deliveryName;
-    }
-    /**
-     * 设置：联系电话
-     */
-    public void setPhone(String phone) {
-        this.phone = phone;
-    }
-
-    /**
-     * 获取：联系电话
-     */
-    public String getPhone() {
-        return phone;
-    }
-
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
-
-    /**
-     * 设置：是否为默认地址
-     */
-    public void setDefaultFlag(Integer defaultFlag) {
-        this.defaultFlag = defaultFlag;
-    }
-
-    /**
-     * 获取：是否为默认地址
-     */
-    public Integer getDefaultFlag() {
-        return defaultFlag;
-    }
-    /**
-     * 设置：地址详情
-     */
-    public void setAddressDetail(String addressDetail) {
-        this.addressDetail = addressDetail;
-    }
-
-    /**
-     * 获取：地址详情
-     */
-    public String getAddressDetail() {
-        return addressDetail;
-    }
-    /**
-     * 设置：所在国家code
-     */
-    public void setAddressCountryCode(String addressCountryCode) {
-        this.addressCountryCode = addressCountryCode;
-    }
-
-    /**
-     * 获取：所在国家code
-     */
-    public String getAddressCountryCode() {
-        return addressCountryCode;
-    }
-    /**
-     * 设置：所在国家
-     */
-    public void setAddressCountryName(String addressCountryName) {
-        this.addressCountryName = addressCountryName;
-    }
-
-    /**
-     * 获取：所在国家
-     */
-    public String getAddressCountryName() {
-        return addressCountryName;
-    }
-    /**
-     * 设置：所在州code
-     */
-    public void setAddressStateCode(String addressStateCode) {
-        this.addressStateCode = addressStateCode;
-    }
-
-    /**
-     * 获取：所在州code
-     */
-    public String getAddressStateCode() {
-        return addressStateCode;
-    }
-    /**
-     * 设置：所在州
-     */
-    public void setAddressStateName(String addressStateName) {
-        this.addressStateName = addressStateName;
-    }
-
-    /**
-     * 获取：所在州
-     */
-    public String getAddressStateName() {
-        return addressStateName;
-    }
-    /**
-     * 设置：所在区code
-     */
-    public void setAddressAreaCode(String addressAreaCode) {
-        this.addressAreaCode = addressAreaCode;
-    }
-
-    /**
-     * 获取：所在区code
-     */
-    public String getAddressAreaCode() {
-        return addressAreaCode;
-    }
-    /**
-     * 设置：所在区
-     */
-    public void setAddressAreaName(String addressAreaName) {
-        this.addressAreaName = addressAreaName;
-    }
-
-    /**
-     * 获取：所在区
-     */
-    public String getAddressAreaName() {
-        return addressAreaName;
-    }
-    /**
-     * 设置：标签code
-     */
-    public void setLabelCode(String labelCode) {
-        this.labelCode = labelCode;
-    }
-
-    /**
-     * 获取：标签code
-     */
-    public String getLabelCode() {
-        return labelCode;
-    }
-    /**
-     * 设置：创建时间
-     */
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    /**
-     * 获取：创建时间
-     */
-    public Date getCreateTime() {
-        return createTime;
-    }
-    /**
-     * 设置：修改时间
-     */
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    /**
-     * 获取：修改时间
-     */
-    public Date getUpdateTime() {
-        return updateTime;
-    }
 }

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

@@ -70,7 +70,7 @@ public class TbCfItemComment{
     /**
      * 点赞人数
      */
-    private Long likeNum;
+//    private Long likeNum;
     /**
      * 删除标志 0：正常 1：已删除
      */
@@ -90,8 +90,8 @@ public class TbCfItemComment{
     @Transient
     private String avatar;
 
-    private String orderNo;
-    private String itemName;
+//    private String orderNo;
+//    private String itemName;
 
     @Transient
     private boolean isLike;
@@ -115,21 +115,21 @@ public class TbCfItemComment{
         this.userName = userName;
     }
 
-    public String getOrderNo() {
-        return orderNo;
-    }
-
-    public void setOrderNo(String orderNo) {
-        this.orderNo = orderNo;
-    }
-
-    public String getItemName() {
-        return itemName;
-    }
-
-    public void setItemName(String itemName) {
-        this.itemName = itemName;
-    }
+//    public String getOrderNo() {
+//        return orderNo;
+//    }
+//
+//    public void setOrderNo(String orderNo) {
+//        this.orderNo = orderNo;
+//    }
+//
+//    public String getItemName() {
+//        return itemName;
+//    }
+//
+//    public void setItemName(String itemName) {
+//        this.itemName = itemName;
+//    }
     /**
      * 设置：商品评论ID
      */
@@ -292,19 +292,19 @@ public class TbCfItemComment{
         return itemReview;
     }
 
-    /**
-     * 设置：点赞人数
-     */
-    public void setLikeNum(Long likeNum) {
-        this.likeNum = likeNum;
-    }
-
-    /**
-     * 获取：点赞人数
-     */
-    public Long getLikeNum() {
-        return likeNum;
-    }
+//    /**
+//     * 设置：点赞人数
+//     */
+//    public void setLikeNum(Long likeNum) {
+//        this.likeNum = likeNum;
+//    }
+//
+//    /**
+//     * 获取：点赞人数
+//     */
+//    public Long getLikeNum() {
+//        return likeNum;
+//    }
 
     /**
      * 设置：删除标志 0：正常 1：已删除

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

@@ -23,4 +23,8 @@ public interface TbCfAddressRepository extends PagingAndSortingRepository<TbCfAd
     boolean existsByAddressDetailAndUserIdAndAddressIdIsNot(String addressDetail, String userId, String addressId);
 
     boolean existsByUserId(String userId);
+
+    TbCfAddress findFirstByUserIdAndDefaultFlag(String userId,Integer flag);
+
+
 }

src/main/java/com/example/afrishop_v3/security/WebSecurityConfig.java

@@ -71,7 +71,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
                 "/goodsType/**", "/home/**", "/spider/**", "/store/**", "/shopify/**", "/community/**", "/version/**",
                 "/flutterwave/notify/**", "/dpo/notify/**", "/advertisement/**", "/website/**", "/paypal/**", "/discover/bonus/**",
                 "/problem/**", "/cube/**", "/activity/**", "/attributes/**", "/stripe/**", "/coupon/**", "/logistics/freeShippingThreshold",
-                "/visit/**", "/search/**", "/country/**").permitAll()
+                "/visit/**", "/search/**", "/country/**", "/term/**").permitAll()
                 .antMatchers("/api/test/**").permitAll()
                 .anyRequest().authenticated();