地址唯一

mall-service/src/main/java/com/txz/mall/controller/UserAddressController.java

@@ -45,6 +45,9 @@ public class UserAddressController {
             userAddress.setCreateTime(new Date());
             userAddress.setCreateUserId(userAddress.getUid());
             userAddressService.save(userAddress);
+            if (userAddress.getIsDefault() == 1) {
+                checkOnlyAddress(userAddress, userAddress.getId());
+            }
         } catch (Exception e) {
             log.error("新增对象操作异常e:{}", e);
             return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
@@ -83,6 +86,9 @@ public class UserAddressController {
             userAddress.setUpdateTime(new Date());
 //    		userAddress.setUpdateUserId(userId);
             userAddressService.update(userAddress);
+            if (userAddress.getIsDefault() == 1) {
+                checkOnlyAddress(userAddress, userAddress.getId());
+            }
         } catch (Exception e) {
             log.error("更新对象操作异常e:{}", e);
             return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
@@ -115,6 +121,9 @@ public class UserAddressController {
         Example.Criteria criteria = condition.createCriteria();
         criteria.andEqualTo("isDelete", 0);
         condition.setOrderByClause("create_time DESC");
+        if (userAddress.getUid() != null) {
+            criteria.andEqualTo("uid", userAddress.getUid());
+        }
         PageInfo pageInfo = null;
         try {
             List<UserAddress> list = userAddressService.findByCondition(condition);
@@ -144,16 +153,7 @@ public class UserAddressController {
             if (address == null) {
                 return Result.fail(ResultCode.OBJECT_IS_NULL);
             }
-            Condition condition = new Condition(userAddress.getClass());
-            Example.Criteria criteria = condition.createCriteria();
-            criteria.andEqualTo("isDelete", 0);
-            criteria.andEqualTo("uid", address.getUid());
-            criteria.andNotEqualTo("id", id);
-            List<UserAddress> list = userAddressService.findByCondition(condition);
-            for (UserAddress ua : list) {
-                ua.setIsDefault(0);
-                userAddressService.update(ua);
-            }
+            checkOnlyAddress(address, id);
         } catch (Exception e) {
             log.error("更新对象操作异常e:{}", e);
             return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
@@ -170,4 +170,17 @@ public class UserAddressController {
         UserAddress userAddress = userAddressService.getDefaultByUid(uid);
         return Result.success(userAddress);
     }
+
+    private void checkOnlyAddress(UserAddress userAddress, Long defaultId) {
+        Condition condition = new Condition(UserAddress.class);
+        Example.Criteria criteria = condition.createCriteria();
+        criteria.andEqualTo("isDelete", 0);
+        criteria.andEqualTo("uid", userAddress.getUid());
+        criteria.andNotEqualTo("id", defaultId);
+        List<UserAddress> list = userAddressService.findByCondition(condition);
+        for (UserAddress ua : list) {
+            ua.setIsDefault(0);
+            userAddressService.update(ua);
+        }
+    }
 }

mall-service/src/main/java/com/txz/mall/model/UserAddress.java

@@ -47,19 +47,18 @@ public class UserAddress {
     @ApiModelProperty(value = "收货人所在市")
     private String city;
 
-    /**
-     * 城市id
-     */
-    @ApiModelProperty(value = "城市id")
-    @Column(name = "city_id")
-    private Long cityId;
-
     /**
      * 收货人所在区
      */
     @ApiModelProperty(value = "收货人所在区")
     private String district;
 
+    /**
+     * 街道
+     */
+    @ApiModelProperty(value = "街道")
+    private String street;
+
     /**
      * 收货人详细地址
      */
@@ -115,309 +114,5 @@ public class UserAddress {
     @Column(name = "is_delete")
     private Integer isDelete;
 
-    /**
-     * 获取用户地址id
-     *
-     * @return id - 用户地址id
-     */
-    public Long getId() {
-        return id;
-    }
-
-    /**
-     * 设置用户地址id
-     *
-     * @param id 用户地址id
-     */
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    /**
-     * 获取用户id
-     *
-     * @return uid - 用户id
-     */
-    public Long getUid() {
-        return uid;
-    }
-
-    /**
-     * 设置用户id
-     *
-     * @param uid 用户id
-     */
-    public void setUid(Long uid) {
-        this.uid = uid;
-    }
-
-    /**
-     * 获取收货人姓名
-     *
-     * @return real_name - 收货人姓名
-     */
-    public String getRealName() {
-        return realName;
-    }
-
-    /**
-     * 设置收货人姓名
-     *
-     * @param realName 收货人姓名
-     */
-    public void setRealName(String realName) {
-        this.realName = realName;
-    }
-
-    /**
-     * 获取收货人电话
-     *
-     * @return phone - 收货人电话
-     */
-    public String getPhone() {
-        return phone;
-    }
-
-    /**
-     * 设置收货人电话
-     *
-     * @param phone 收货人电话
-     */
-    public void setPhone(String phone) {
-        this.phone = phone;
-    }
-
-    /**
-     * 获取收货人所在省
-     *
-     * @return province - 收货人所在省
-     */
-    public String getProvince() {
-        return province;
-    }
-
-    /**
-     * 设置收货人所在省
-     *
-     * @param province 收货人所在省
-     */
-    public void setProvince(String province) {
-        this.province = province;
-    }
-
-    /**
-     * 获取收货人所在市
-     *
-     * @return city - 收货人所在市
-     */
-    public String getCity() {
-        return city;
-    }
-
-    /**
-     * 设置收货人所在市
-     *
-     * @param city 收货人所在市
-     */
-    public void setCity(String city) {
-        this.city = city;
-    }
-
-    /**
-     * 获取城市id
-     *
-     * @return city_id - 城市id
-     */
-    public Long getCityId() {
-        return cityId;
-    }
-
-    /**
-     * 设置城市id
-     *
-     * @param cityId 城市id
-     */
-    public void setCityId(Long cityId) {
-        this.cityId = cityId;
-    }
-
-    /**
-     * 获取收货人所在区
-     *
-     * @return district - 收货人所在区
-     */
-    public String getDistrict() {
-        return district;
-    }
-
-    /**
-     * 设置收货人所在区
-     *
-     * @param district 收货人所在区
-     */
-    public void setDistrict(String district) {
-        this.district = district;
-    }
-
-    /**
-     * 获取收货人详细地址
-     *
-     * @return detail - 收货人详细地址
-     */
-    public String getDetail() {
-        return detail;
-    }
-
-    /**
-     * 设置收货人详细地址
-     *
-     * @param detail 收货人详细地址
-     */
-    public void setDetail(String detail) {
-        this.detail = detail;
-    }
-
-    /**
-     * 获取经度
-     *
-     * @return longitude - 经度
-     */
-    public String getLongitude() {
-        return longitude;
-    }
-
-    /**
-     * 设置经度
-     *
-     * @param longitude 经度
-     */
-    public void setLongitude(String longitude) {
-        this.longitude = longitude;
-    }
-
-    /**
-     * 获取纬度
-     *
-     * @return latitude - 纬度
-     */
-    public String getLatitude() {
-        return latitude;
-    }
-
-    /**
-     * 设置纬度
-     *
-     * @param latitude 纬度
-     */
-    public void setLatitude(String latitude) {
-        this.latitude = latitude;
-    }
-
-    /**
-     * 获取是否默认
-     *
-     * @return is_default - 是否默认
-     */
-    public Integer getIsDefault() {
-        return isDefault;
-    }
-
-    /**
-     * 设置是否默认
-     *
-     * @param isDefault 是否默认
-     */
-    public void setIsDefault(Integer isDefault) {
-        this.isDefault = isDefault;
-    }
-
-    /**
-     * 获取创建时间
-     *
-     * @return create_time - 创建时间
-     */
-    public Date getCreateTime() {
-        return createTime;
-    }
 
-    /**
-     * 设置创建时间
-     *
-     * @param createTime 创建时间
-     */
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    /**
-     * 获取更新时间
-     *
-     * @return update_time - 更新时间
-     */
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    /**
-     * 设置更新时间
-     *
-     * @param updateTime 更新时间
-     */
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    /**
-     * 获取创建人id
-     *
-     * @return create_user_id - 创建人id
-     */
-    public Long getCreateUserId() {
-        return createUserId;
-    }
-
-    /**
-     * 设置创建人id
-     *
-     * @param createUserId 创建人id
-     */
-    public void setCreateUserId(Long createUserId) {
-        this.createUserId = createUserId;
-    }
-
-    /**
-     * 获取更新人id
-     *
-     * @return update_user_id - 更新人id
-     */
-    public Long getUpdateUserId() {
-        return updateUserId;
-    }
-
-    /**
-     * 设置更新人id
-     *
-     * @param updateUserId 更新人id
-     */
-    public void setUpdateUserId(Long updateUserId) {
-        this.updateUserId = updateUserId;
-    }
-
-    /**
-     * 获取是否删除
-     *
-     * @return is_delete - 是否删除
-     */
-    public Integer getIsDelete() {
-        return isDelete;
-    }
-
-    /**
-     * 设置是否删除
-     *
-     * @param isDelete 是否删除
-     */
-    public void setIsDelete(Integer isDelete) {
-        this.isDelete = isDelete;
-    }
 }

mall-service/src/main/java/vo/StorePinkDetailVO.java

@@ -33,6 +33,9 @@ public class StorePinkDetailVO implements Serializable {
     @ApiModelProperty(value = "购买总金额")
     private BigDecimal totalPrice;
 
+    @ApiModelProperty(value = "人数")
+    private Integer people;
+
     @ApiModelProperty(value = "用户昵称")
     private String nickname;
 

mall-service/src/main/resources/mapper/UserAddressMapper.xml

@@ -11,8 +11,8 @@
         <result column="phone" jdbcType="VARCHAR" property="phone"/>
         <result column="province" jdbcType="VARCHAR" property="province"/>
         <result column="city" jdbcType="VARCHAR" property="city"/>
-        <result column="city_id" jdbcType="BIGINT" property="cityId"/>
         <result column="district" jdbcType="VARCHAR" property="district"/>
+        <result column="street" jdbcType="VARCHAR" property="street"/>
         <result column="detail" jdbcType="VARCHAR" property="detail"/>
         <result column="longitude" jdbcType="VARCHAR" property="longitude"/>
         <result column="latitude" jdbcType="VARCHAR" property="latitude"/>