feat: 新增地址管理模块

guzijian
1 parent 9c55c468
Showing 12 changed files with 123 additions and 50 deletions
trash-garbage/src/main/java/com/trash/garbage/controller/GarbageUserController.java
trash-garbage/src/main/java/com/trash/garbage/global/GlobalStatus.java
trash-garbage/src/main/java/com/trash/garbage/global/Result.java
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarAddress.java
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarUser.java
trash-garbage/src/main/java/com/trash/garbage/pojo/dto/AddressDto.java
trash-garbage/src/main/java/com/trash/garbage/pojo/dto/LoginDto.java
trash-garbage/src/main/java/com/trash/garbage/service/GarUserService.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarUserServiceImpl.java
trash-garbage/src/main/java/com/trash/garbage/utils/ValidateCodeUtil.java
trash-garbage/src/main/resources/application-dev.yml
trash-garbage/src/main/resources/mapper/GarAddressMapper.xml
@@ -9,6 +9,7 @@ import com.trash.garbage.service.GarUserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import java.util.List;
@@ -50,13 +51,29 @@ public class GarbageUserController {
     @ApiOperation("用户接口-获取用户地址")
     @GetMapping("/query/address/{type}")
-    public Result<List<GarAddress>> queryAddress(@PathVariable("type") String type){
+    public Result<List<GarAddress>> queryAddress(@PathVariable("type") String type) {
         return Result.OK(garUserService.queryAddress(type));
     }
     @ApiOperation("用户接口-新增地址")
     @PostMapping("/save/address")
-    public Result<String> saveAddress(@RequestBody AddressDto dto){
-        return Result.OK(garUserService.saveAddress(dto));
+    public Result<String> saveAddress(@Validated @RequestBody AddressDto dto) {
+        return Result.OK(null, garUserService.saveAddress(dto));
     }
+
+
+    @ApiOperation("用户接口-编辑地址")
+    @PostMapping("/update/address")
+    public Result<String> updateAddress(@Validated @RequestBody AddressDto dto) {
+        return Result.OK(null, garUserService.updateAddress(dto));
+    }
+
+
+    @ApiOperation("用户接口-删除地址")
+    @DeleteMapping("/delete/address/{addressId}")
+    public Result<String> deleteAddress(@PathVariable("addressId") String addressId) {
+        return Result.OK(null, garUserService.deleteAddress(addressId));
+    }
+
+
 }
@@ -51,8 +51,7 @@ public class GlobalStatus {
      */
     public enum GarAddressStatus {
         NORMAL_ADDRESS(0,"地址"),
-        DEFAULT_ADDRESS(1,"默认地址"),
-        CURRENT_ADDRESS(2,"当前选中地址");
+        CURRENT_ADDRESS(1,"当前地址");
         GarAddressStatus(Integer status,String description){
             this.status = status;
             this.description = description;
@@ -39,15 +39,6 @@ public class Result&lt;T extends Object&gt; {
         return r;
     }
-    public static <T> Result<T> OK(ResultCode code,T data){
-        Result r = new Result();
-        r.setSuccess(true);
-        r.setCode(code.getCode());
-        r.setMsg("部分成功");
-        r.setData(data);
-        return r;
-    }
-
     /** 成功静态方法 */
     public static <T> Result<T> OK(T data) {
         Result r = new Result();
@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
@@ -24,11 +25,12 @@ public class GarAddress implements Serializable {
      * 地址id
      */
     @TableId
-    private Long garAddressId;
+    private String garAddressId;
     /**
      * 用户id
      */
+    @TableField(select = false)
     private String garUserId;
     /**
@@ -44,13 +46,15 @@ public class GarAddress implements Serializable {
     /**
      * 创建时间
      */
-    @TableField(fill = FieldFill.INSERT)
+    @TableField(fill = FieldFill.INSERT, select = false)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:dd")
     private Date garCreateTime;
     /**
      * 修改时间
      */
-    @TableField(fill = FieldFill.INSERT_UPDATE)
+    @TableField(fill = FieldFill.INSERT_UPDATE, select = false)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:dd")
     private Date garUpdateTime;
     /**
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.trash.garbage.security.UserAbstract;
 import lombok.Data;
@@ -53,12 +54,14 @@ public class GarUser extends UserAbstract implements Serializable {
      */
     @TableField(fill = FieldFill.INSERT)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:dd")
     private Date garCreateTime;
     /**
      * 修改时间
      */
     @TableField(fill = FieldFill.INSERT_UPDATE)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:dd")
     private Date garUpdateTime;
     /**
@@ -2,14 +2,24 @@ package com.trash.garbage.pojo.dto;
 import lombok.Data;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
 /**
  * @author 20412
  */
 @Data
 public class AddressDto {
-    private String address;
-    private String details;
-    private String contactName;
-    private String contactTel;
-    private Integer defaultFlag;
+    private String garAddressId;
+    @NotBlank(message = "所在地区不能为空")
+    private String addressArea;
+    @NotBlank(message = "详细地址不能为空")
+    private String addressDetail;
+    @NotBlank(message = "联系人不能为空")
+    private String contactPerson;
+    @NotBlank(message = "联系电话不能为空")
+    private String contactIphoneNumber;
+    @NotNull(message = "defaultFlag不能为空")
+    private Boolean defaultFlag;
 }
@@ -13,7 +13,7 @@ public class LoginDto {
     @ApiModelProperty(value = "登录vo-手机号")
     private String tel;
     @ApiModelProperty(value = "登录vo-验证码")
-    private Integer code;
+    private String code;
     @ApiModelProperty(value = "登录vo-用户昵称")
     private String nickname;
     @ApiModelProperty(value = "登录vo-wxCode")
@@ -23,4 +23,8 @@ public interface GarUserService extends IService&lt;GarUser&gt; {
     List<GarAddress> queryAddress(String type);
     String saveAddress(AddressDto dto);
+
+    String updateAddress(AddressDto dto);
+
+    String deleteAddress(String addressId);
 }
@@ -4,6 +4,7 @@ import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.aliyuncs.exceptions.ClientException;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.trash.garbage.config.WxConfig;
 import com.trash.garbage.custom.BizException;
@@ -33,6 +34,7 @@ import javax.crypto.Cipher;
 import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
 import java.security.spec.AlgorithmParameterSpec;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
@@ -77,8 +79,8 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
             }
         }
         // 验证码验证
-        Integer code = (Integer) redisUtils.get(GlobalRedisProperties.REDIS_USER_CODE.getValue() + user.getTel());
-        if (!code.equals(user.getCode())) {
+        String code = (String) redisUtils.get(GlobalRedisProperties.REDIS_USER_CODE.getValue() + user.getTel());
+        if (user.getCode() == null || !user.getCode().equals(code)) {
             throw new BizException(ResultCode.CODE_400, "验证码错误！！");
         }
         // 封装成authentication对象
@@ -98,7 +100,7 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
     @Override
     public void sendVerify(String tel) throws ClientException {
         //随机生成6位数字验证码
-        Integer validateCode = ValidateCodeUtil.generatorCode(4);
+        String validateCode = ValidateCodeUtil.generatorCode(4);
         //给用户发送验证码
 //        SMSUtils.sendMessage("", tel, validateCode.toString(), "");
         // 保存redis
@@ -115,29 +117,72 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
         String garUserId = userCustom.getUser().getGarUserId();
         LambdaQueryWrapper<GarAddress> qw = new LambdaQueryWrapper<>();
         qw.eq(GarAddress::getGarUserId, garUserId);
-        List<GarAddress> addressList = garAddressService.list(qw);
         if (GlobalStatus.QUERY_ADDRESS_TYPE_CURRENT.equals(type)) {
-            for (GarAddress garAddress : addressList) {
-                if (GlobalStatus.GarAddressStatus.CURRENT_ADDRESS.getValue().equals(garAddress.getGarUserDefault())) {
-                    return Arrays.asList(garAddress);
-                }
-            }
+            qw.eq(GarAddress::getGarUserDefault, GlobalStatus.GarAddressStatus.CURRENT_ADDRESS.getValue());
+            GarAddress one = garAddressService.getOne(qw);
+            return Arrays.asList(one);
         }
-        return addressList;
+        return garAddressService.list(qw);
     }
     @Override
     public String saveAddress(AddressDto dto) {
         UserCustom userCustom = SecurityUtil.getUserCustom();
-        GarAddress garAddress = new GarAddress();
-        garAddress.setGarUserId(userCustom.getUser().getGarUserId());
-        garAddress.setGarUserAddress(dto.getAddress());
-        garAddress.setGarUserDefault(dto.getDefaultFlag());
-        garAddress.setGarUserContactName(dto.getContactName());
-        garAddress.setGarUserContactTel(dto.getContactTel());
-        garAddress.setGarRemark(dto.getDetails());
-        garAddressService.save(garAddress);
-        return "新增地址成功";
+        // 限制地址数
+        LambdaQueryWrapper<GarAddress> qw = new LambdaQueryWrapper<>();
+        qw.eq(GarAddress::getGarUserId, userCustom.getUser().getGarUserId());
+        List<GarAddress> list = garAddressService.list(qw);
+        if (list.size() > 19) {
+            throw new BizException(ResultCode.CODE_201, "新增地址数已达上线，请删除地址后新增地址或编辑已有地址！");
+        }
+        GarAddress address = new GarAddress();
+        address.setGarUserId(userCustom.getUser().getGarUserId());
+        address.setGarUserAddress(dto.getAddressArea());
+        address.setGarUserDefault(dto.getDefaultFlag() ? GlobalStatus.GarAddressStatus.CURRENT_ADDRESS.getValue() : GlobalStatus.GarAddressStatus.NORMAL_ADDRESS.getValue());
+        address.setGarUserContactName(dto.getContactPerson());
+        address.setGarUserContactTel(dto.getContactIphoneNumber());
+        address.setGarRemark(dto.getAddressDetail());
+        handleCurrentAddress(address);
+        garAddressService.save(address);
+        return "新增地址成功!";
+    }
+
+    @Override
+    public String updateAddress(AddressDto dto) {
+        GarAddress address = new GarAddress();
+        String userId = SecurityUtil.getUserCustom().getUser().getGarUserId();
+        address.setGarAddressId(dto.getGarAddressId());
+        address.setGarUserId(userId);
+        address.setGarUserAddress(dto.getAddressArea());
+        address.setGarRemark(dto.getAddressDetail());
+        address.setGarUserDefault(dto.getDefaultFlag() ? GlobalStatus.GarAddressStatus.CURRENT_ADDRESS.getValue() : GlobalStatus.GarAddressStatus.NORMAL_ADDRESS.getValue());
+        handleCurrentAddress(address);
+        address.setGarUserContactName(dto.getContactPerson());
+        address.setGarUserContactTel(dto.getContactIphoneNumber());
+        LambdaUpdateWrapper<GarAddress> up = new LambdaUpdateWrapper<>();
+        up.eq(GarAddress::getGarUserId, address.getGarUserId())
+                .eq(GarAddress::getGarAddressId, address.getGarAddressId());
+        garAddressService.update(address, up);
+        return "地址修改成功！";
+    }
+
+    private void handleCurrentAddress(GarAddress address) {
+        if (address.getGarUserDefault().equals(GlobalStatus.GarAddressStatus.CURRENT_ADDRESS.getValue())) {
+            LambdaUpdateWrapper<GarAddress> wrapper = new LambdaUpdateWrapper<>();
+            wrapper.eq(GarAddress::getGarUserId, address.getGarUserId())
+                    .set(GarAddress::getGarUserDefault, GlobalStatus.GarAddressStatus.NORMAL_ADDRESS.getValue());
+            garAddressService.update(wrapper);
+        }
+    }
+
+    @Override
+    public String deleteAddress(String addressId) {
+        String garUserId = SecurityUtil.getUserCustom().getUser().getGarUserId();
+        LambdaQueryWrapper<GarAddress> qw = new LambdaQueryWrapper<>();
+        qw.eq(GarAddress::getGarUserId, garUserId)
+                .eq(GarAddress::getGarAddressId, addressId);
+        garAddressService.remove(qw);
+        return "删除成功！";
     }
@@ -3,11 +3,11 @@ package com.trash.garbage.utils;
 import java.util.Random;
 public class ValidateCodeUtil {
-    public static Integer generatorCode(int bit){
-        int code = 0;
+    public static String generatorCode(int bit){
+        StringBuilder code = new StringBuilder();
         for (int i = 0; i < bit; i++) {
-            code = code * 10 + new Random().nextInt(10);
+            code = code.append(new Random().nextInt(10));
         }
-        return code;
+        return code.toString();
     }
 }
@@ -71,9 +71,9 @@ spring:
         # #连接池最大阻塞等待时间（使用负值表示没有限制）
         max-wait: -1ms
     #返回json的全局时间格式
-    jackson:
-      date-format: yyyy-MM-dd HH:mm:ss
-      time-zone: GMT+8
+  jackson:
+    date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: GMT+8
 # mybaits 配置
 mybatis-plus:
@@ -5,7 +5,7 @@
 <mapper namespace="com.trash.garbage.mapper.GarAddressMapper">
     <resultMap id="BaseResultMap" type="com.trash.garbage.pojo.domain.GarAddress">
-            <id property="garAddressId" column="gar_address_id" jdbcType="BIGINT"/>
+            <id property="garAddressId" column="gar_address_id" jdbcType="VARCHAR"/>
             <result property="garUserId" column="gar_user_id" jdbcType="VARCHAR"/>
             <result property="garUserAddress" column="gar_user_address" jdbcType="VARCHAR"/>
             <result property="garUserDefault" column="gar_user_default" jdbcType="TINYINT"/>