liude 11 месяцев назад
Родитель
Сommit
ea10f041c5

+ 8 - 0
vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/UserReceiveAddressClient.java

@@ -53,4 +53,12 @@ public interface UserReceiveAddressClient {
      */
     @PutMapping("/userReceiveAddress/delete")
     void delete(@RequestParam("id") Long id);
+
+    /**
+     * 用户常用地址详情
+     *
+     * @param id    用户常用地址主键
+     */
+    @GetMapping("/userReceiveAddress/queryById")
+    UserReceiveAddressDTO queryById(@RequestParam("id") Long id) ;
 }

+ 1 - 1
vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/dto/UserReceiveAddressDTO.java

@@ -42,7 +42,7 @@ public class UserReceiveAddressDTO implements Serializable {
     /**
      * 是否为默认地址 0-否 1-是
      */
-    private String defaultStatus;
+    private boolean defaultStatus;
 
     /**
      * 邮政编码

+ 1 - 1
vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/param/UserReceiveAddressModifyParam.java

@@ -32,7 +32,7 @@ public class UserReceiveAddressModifyParam implements Serializable {
     /**
      * 是否为默认地址 0-否 1-是
      */
-    private String defaultStatus;
+    private boolean defaultStatus = true;
 
     /**
      * 邮政编码

+ 10 - 0
vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/controller/UserReceiveAddressController.java

@@ -70,4 +70,14 @@ public class UserReceiveAddressController {
         this.userReceiveAddressService.delete(id);
     }
 
+    /**
+     * 用户常用地址详情
+     *
+     * @param id    用户常用地址主键
+     */
+    @PutMapping("/userReceiveAddress/queryById")
+    public UserReceiveAddressDTO queryById(@RequestParam("id") Long id) {
+       return this.userReceiveAddressService.queryById(id);
+    }
+
 }

+ 1 - 1
vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/entity/UserReceiveAddress.java

@@ -45,7 +45,7 @@ public class UserReceiveAddress implements Entity<Long> {
     /**
      * 是否为默认地址
      */
-    private String defaultStatus;
+    private boolean defaultStatus;
 
     /**
      * 邮政编码

+ 7 - 0
vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/UserReceiveAddressService.java

@@ -43,4 +43,11 @@ public interface UserReceiveAddressService
      * @param id
      */
     void delete(Long id);
+
+    /**
+     * 查询用户常用地址详情
+     *
+     * @return 用户常用地址信息
+     */
+    UserReceiveAddressDTO queryById(Long id);
 }

+ 8 - 4
vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/UserReceiveAddressServiceImpl.java

@@ -44,13 +44,13 @@ public class UserReceiveAddressServiceImpl extends ServiceImpl<UserReceiveAddres
         UserReceiveAddress userReceiveAddress = AssertUtils.available(this.getById(id), "该常用地址不存在");
         UserReceiveAddressCopier.INSTANCE.copying(param,userReceiveAddress);
         userReceiveAddress.setUpdateTime(new Date());
-        if ("1".equals(param.getDefaultStatus())){
+        if (param.isDefaultStatus()){
             UserReceiveAddress receiveAddress = this.lambdaQuery()
                     .eq(UserReceiveAddress::getUserId,userId)
-                    .eq(UserReceiveAddress::getDefaultStatus,"1")
+                    .eq(UserReceiveAddress::isDefaultStatus,true)
                     .one();
             if (null != receiveAddress){
-                receiveAddress.setDefaultStatus("0");
+                receiveAddress.setDefaultStatus(false);
                 this.updateById(receiveAddress);
             }
         }
@@ -62,7 +62,7 @@ public class UserReceiveAddressServiceImpl extends ServiceImpl<UserReceiveAddres
         Long userId = SessionContextHolder.getId();
         List<UserReceiveAddress> list = this.lambdaQuery()
                 .eq(UserReceiveAddress::getUserId,userId)
-                .orderByDesc(UserReceiveAddress::getDefaultStatus)
+                .orderByDesc(UserReceiveAddress::isDefaultStatus)
                 .orderByDesc(UserReceiveAddress::getUpdateTime)
                 .orderByDesc(UserReceiveAddress::getCreateTime)
                 .list();
@@ -75,4 +75,8 @@ public class UserReceiveAddressServiceImpl extends ServiceImpl<UserReceiveAddres
         AssertUtils.available(this.getById(id), "该常用地址不存在");
         this.baseMapper.deleteById(id);
     }
+    @Override
+    public UserReceiveAddressDTO queryById(Long id){
+        return UserReceiveAddressCopier.INSTANCE.copying(this.baseMapper.selectById(id));
+    }
 }