fix:用户中心.收货地址调整MDB存储及MQ

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamAddressesVo.java

 package com.liquidnet.service.adam.dto.vo;
 
+import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.SensitizeUtil;
 import com.liquidnet.service.adam.entity.AdamAddresses;
 import io.swagger.annotations.ApiModel;
@@ -12,6 +13,8 @@ public class AdamAddressesVo implements java.io.Serializable, Cloneable {
     private static final long serialVersionUID = -3096308044365829079L;
     @ApiModelProperty(position = 10, value = "收获地址ID[64]")
     private String addressesId;
+    @ApiModelProperty(position = 11, value = "用户ID[64]")
+    private String uid;
     @ApiModelProperty(position = 11, value = "姓名[30]")
     private String name;
     @ApiModelProperty(position = 12, value = "手机号[11]")
@@ -24,8 +27,13 @@ public class AdamAddressesVo implements java.io.Serializable, Cloneable {
     private String county;
     @ApiModelProperty(position = 16, value = "详细地址[100]")
     private String address;
-    @ApiModelProperty(position = 18, value = "是否为默认:0-否,1-是")
+    @ApiModelProperty(position = 17, value = "是否为默认:0-否,1-是")
     private Boolean isDefault;
+    @ApiModelProperty(position = 18, value = "状态:0-INIT,1-NORMAL,2-INVALID")
+    private Integer state;
+    private String createdAt;
+    private String updatedAt;
+    private String deletedAt;
 
     private static final AdamAddressesVo obj = new AdamAddressesVo();
 
@@ -41,6 +49,7 @@ public class AdamAddressesVo implements java.io.Serializable, Cloneable {
     public AdamAddressesVo copy(AdamAddresses source) {
         if (null == source) return this;
         this.setAddressesId(source.getAddressesId());
+        this.setUid(source.getUid());
         this.setName(source.getName());
         this.setPhone(SensitizeUtil.custom(source.getPhone(), 3, 4));
         this.setProvince(source.getProvince());
@@ -48,6 +57,10 @@ public class AdamAddressesVo implements java.io.Serializable, Cloneable {
         this.setCounty(source.getCounty());
         this.setAddress(source.getAddress());
         this.setIsDefault(source.getIsDefault());
+        this.setState(source.getState());
+        this.setCreatedAt(DateUtil.Formatter.yyyyMMddHHmmssTrim.format(source.getCreatedAt()));
+        this.setUpdatedAt(DateUtil.Formatter.yyyyMMddHHmmssTrim.format(source.getUpdatedAt()));
+        this.setDeletedAt(DateUtil.Formatter.yyyyMMddHHmmssTrim.format(source.getDeletedAt()));
         return this;
     }
 }

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/IAdamAddressesService.java

 package com.liquidnet.service.adam.service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.liquidnet.service.adam.dto.AdamAddressesParam;
 import com.liquidnet.service.adam.dto.vo.AdamAddressesVo;
-import com.liquidnet.service.adam.entity.AdamAddresses;
-
-import java.util.List;
 
 /**
  * <p>
@@ -14,17 +11,13 @@ import java.util.List;
  * @author liquidnet
  * @since 2021-05-11
  */
-public interface IAdamAddressesService extends IService<AdamAddresses> {
-
-    void add(AdamAddresses adamAddresses);
-
-//    List<AdamAddresses> queryByUid(String uid);
+public interface IAdamAddressesService {
 
-//    AdamAddresses query(String uid, String addressesId);
+    String add(AdamAddressesParam parameter);
 
     void def(String uid, String addressesId);
 
-    void edit(AdamAddresses info);
+    void edit(AdamAddressesParam parameter);
 
     void remove(String uid, String addressesId);
 

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/IAdamRdmService.java

 package com.liquidnet.service.adam.service;
 
 import com.liquidnet.service.adam.dto.vo.*;
-import com.liquidnet.service.adam.entity.AdamAddresses;
 import com.liquidnet.service.adam.entity.AdamEnters;
 
 import java.util.List;
@@ -47,11 +46,11 @@ public interface IAdamRdmService {
 
     void delEntersByUid(String uid);
 
-    boolean setAddressesByUid(String uid, List<AdamAddresses> list);
+    boolean setAddressesByUid(String uid, List<AdamAddressesVo> list);
 
-    List<AdamAddresses> getAddressesByUid(String uid);
+    List<AdamAddressesVo> getAddressesByUid(String uid);
 
-    AdamAddresses getAddressesByUidAddressesId(String uid, String addressesId);
+    AdamAddressesVo getAddressesByUidAddressesId(String uid, String addressesId);
 
     void delAddressesByUid(String uid);
 

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamAddressesController.java

@@ -3,27 +3,22 @@ package com.liquidnet.service.adam.controller;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import com.liquidnet.commons.lang.util.CurrentUtil;
-import com.liquidnet.commons.lang.util.IDGenerator;
-import com.liquidnet.service.adam.entity.AdamAddresses;
+import com.liquidnet.service.adam.dto.AdamAddressesParam;
+import com.liquidnet.service.adam.dto.vo.AdamAddressesVo;
 import com.liquidnet.service.adam.service.IAdamAddressesService;
 import com.liquidnet.service.adam.service.IAdamRdmService;
 import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.ResponseDto;
-import com.liquidnet.service.adam.dto.AdamAddressesParam;
-import com.liquidnet.service.adam.dto.vo.AdamAddressesVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -49,33 +44,15 @@ public class AdamAddressesController {
     @ApiOperationSupport(order = 1)
     @ApiOperation(value = "添加收获地址")
     @PostMapping("add")
-    public ResponseDto<Object> add(@RequestBody @Valid AdamAddressesParam parameter) {
-        String currentUid = CurrentUtil.getCurrentUid();
-
-        AdamAddresses adamAddresses = new AdamAddresses();
-        BeanUtils.copyProperties(parameter, adamAddresses);
-        adamAddresses.setUid(currentUid);
-        adamAddresses.setAddressesId(String.valueOf(IDGenerator.nextSnowId()));
-        adamAddresses.setCreatedAt(LocalDateTime.now());
-        adamAddresses.setState(1);
-
-        adamAddressesService.add(adamAddresses);
-
-        return ResponseDto.success(adamAddresses.getAddressesId());
+    public ResponseDto<Object> add(@Valid @RequestBody AdamAddressesParam parameter) {
+        return ResponseDto.success(adamAddressesService.add(parameter));
     }
 
     @ApiOperationSupport(order = 2)
     @ApiOperation(value = "收获地址列表")
     @GetMapping("list")
     public ResponseDto<List<AdamAddressesVo>> list() {
-        String currentUid = CurrentUtil.getCurrentUid();
-
-        List<AdamAddressesVo> voList = new ArrayList<>();
-        adamRdmService.getAddressesByUid(currentUid).forEach(i -> {
-            voList.add(AdamAddressesVo.getNew().copy(i));
-        });
-
-        return ResponseDto.success(voList);
+        return ResponseDto.success(adamRdmService.getAddressesByUid(CurrentUtil.getCurrentUid()));
     }
 
     @ApiOperationSupport(order = 3)
@@ -84,10 +61,10 @@ public class AdamAddressesController {
     public ResponseDto<Object> def(@NotBlank @PathVariable String addrId) {
         String currentUid = CurrentUtil.getCurrentUid();
 
-        AdamAddresses addresses = adamRdmService.getAddressesByUidAddressesId(currentUid, addrId);
-        if (null == addresses) return ResponseDto.failure(ErrorMapping.get("10106"));
+        AdamAddressesVo vo = adamRdmService.getAddressesByUidAddressesId(currentUid, addrId);
+        if (null == vo) return ResponseDto.failure(ErrorMapping.get("10106"));
 
-        if (!addresses.getIsDefault()) adamAddressesService.def(currentUid, addrId);
+        if (!vo.getIsDefault()) adamAddressesService.def(currentUid, addrId);
 
         return ResponseDto.success();
     }
@@ -99,16 +76,7 @@ public class AdamAddressesController {
         if (StringUtils.isBlank(parameter.getAddressesId())) {
             return ResponseDto.failure(ErrorMapping.get("10016"));
         }
-        String currentUid = CurrentUtil.getCurrentUid();
-
-        AdamAddresses updateInfo = new AdamAddresses();
-        BeanUtils.copyProperties(parameter, updateInfo);
-        updateInfo.setUpdatedAt(LocalDateTime.now());
-        updateInfo.setUid(currentUid);
-        updateInfo.setState(1);
-
-        adamAddressesService.edit(updateInfo);
-
+        adamAddressesService.edit(parameter);
         return ResponseDto.success();
     }
 
@@ -116,11 +84,10 @@ public class AdamAddressesController {
     @ApiOperation(value = "删除收获地址")
     @PostMapping("del/{addrId}")
     public ResponseDto<Object> del(@NotBlank @PathVariable String addrId) {
-
         String currentUid = CurrentUtil.getCurrentUid();
 
-        AdamAddresses addresses = adamRdmService.getAddressesByUidAddressesId(currentUid, addrId);
-        if (null == addresses) return ResponseDto.failure(ErrorMapping.get("10106"));
+        AdamAddressesVo vo = adamRdmService.getAddressesByUidAddressesId(currentUid, addrId);
+        if (null == vo) return ResponseDto.failure(ErrorMapping.get("10106"));
 
         adamAddressesService.remove(currentUid, addrId);
         return ResponseDto.success();
@@ -130,10 +97,9 @@ public class AdamAddressesController {
     @ApiOperation(value = "收货地址详情")
     @PostMapping("query/{id}")
     public ResponseDto<AdamAddressesVo> query(@NotBlank @PathVariable(name = "id") String addrId,
-                                              @NotBlank @RequestParam(required = false) String uid) {
-        AdamAddresses addresses = adamRdmService.getAddressesByUidAddressesId(StringUtils.isBlank(uid) ? CurrentUtil.getCurrentUid() : uid, addrId);
-
-        return null == addresses ? ResponseDto.failure(ErrorMapping.get(10105)) : ResponseDto.success(AdamAddressesVo.getNew().copy(addresses));
+                                              @RequestParam(required = false) String uid) {
+        AdamAddressesVo vo = adamRdmService.getAddressesByUidAddressesId(StringUtils.isBlank(uid) ? CurrentUtil.getCurrentUid() : uid, addrId);
+        return null == vo ? ResponseDto.failure(ErrorMapping.get("10106")) : ResponseDto.success(vo);
     }
 
     @ApiOperationSupport(order = 7)

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamRdmServiceImpl.java

@@ -3,7 +3,6 @@ package com.liquidnet.service.adam.service.impl;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.service.adam.constant.AdamRedisConst;
 import com.liquidnet.service.adam.dto.vo.*;
-import com.liquidnet.service.adam.entity.AdamAddresses;
 import com.liquidnet.service.adam.entity.AdamEnters;
 import com.liquidnet.service.adam.service.IAdamRdmService;
 import lombok.extern.slf4j.Slf4j;
@@ -167,17 +166,17 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
     }
 
     @Override
-    public boolean setAddressesByUid(String uid, List<AdamAddresses> list) {
+    public boolean setAddressesByUid(String uid, List<AdamAddressesVo> list) {
         return redisUtil.set(AdamRedisConst.INFO_ADDRESSES.concat(uid), list);
     }
 
     @Override
-    public List<AdamAddresses> getAddressesByUid(String uid) {
+    public List<AdamAddressesVo> getAddressesByUid(String uid) {
         String rk = AdamRedisConst.INFO_ADDRESSES.concat(uid);
-        List<AdamAddresses> list = (List<AdamAddresses>) redisUtil.get(rk);
+        List<AdamAddressesVo> list = (List<AdamAddressesVo>) redisUtil.get(rk);
         if (CollectionUtils.isEmpty(list)) {
             list = mongoTemplate.find(Query.query(Criteria.where("uid").is(uid).and("state").is(1)),
-                    AdamAddresses.class, AdamAddresses.class.getSimpleName());
+                    AdamAddressesVo.class, AdamAddressesVo.class.getSimpleName());
 
             if (!CollectionUtils.isEmpty(list)) redisUtil.set(rk, list);
         }
@@ -185,12 +184,8 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
     }
 
     @Override
-    public AdamAddresses getAddressesByUidAddressesId(String uid, String addressesId) {
-        List<AdamAddresses> list = this.getAddressesByUid(uid);
-        if (!CollectionUtils.isEmpty(list))
-            for (AdamAddresses r : list)
-                if (addressesId.equals(r.getAddressesId())) return r;
-        return null;
+    public AdamAddressesVo getAddressesByUidAddressesId(String uid, String addressesId) {
+        return this.getAddressesByUid(uid).stream().filter(r -> r.getAddressesId().equals(addressesId)).findAny().orElse(null);
     }
 
     @Override

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/resources/sqlmap.properties

@@ -13,10 +13,10 @@ adam_third_party.add=INSERT INTO adam_third_party (`uid`, open_id, avatar, nickn
 adam_third_party.unbind=UPDATE adam_third_party SET `state`=2, updated_at=? WHERE `uid`=? AND platform=? AND `state`=1
 
 # ----------------------------------------------------
-adam_addresses.add=
-adam_addresses.edit=
-adam_addresses.update.is_default=UPDATE adam_addresses set is_default=?, updated_at=? where addresses_id=? 
-adam_addresses.remove=UPDATE adam_addresses SET `state`=2, updated_at=?, deleted_at=? where addresses_id=? 
+adam_addresses.add=INSERT INTO adam_addresses (addresses_id, `uid`, `name`, phone, province, city, county, address, is_default, `state`, created_at) VALUES (?,?,?,?,?,?,?,?,?,?,?) 
+adam_addresses.edit=UPDATE adam_addresses SET `name`=?, phone=?, province=?, city=?, county=?, address=?, updated_at=? WHERE addresses_id=? 
+adam_addresses.update.is_default=UPDATE adam_addresses SET is_default=?, updated_at=? where addresses_id=? 
+adam_addresses.remove=UPDATE adam_addresses SET is_default=0, `state`=2, updated_at=?, deleted_at=? where addresses_id=? 
 
 # ----------------------------------------------------
 adam_enters.add=INSERT INTO adam_enters (enters_id, `uid`, `type`,`name`, mobile, id_card, is_default, `state`, created_at, updated_at, deleted_at, `comment`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?)