Merge remote-tracking branch 'origin/point_dev' into point_dev

nightFragrance-massage/src/main/java/com/ylx/massage/domain/TAddress.java

@@ -63,9 +63,9 @@ public class TAddress extends Model<TAddress> {
     private Integer userType;
 
     /**
-     * 地址类型 1：默认地址 2：虚拟地址
+     * 地址类型 0:普通地址 1：默认地址 2：虚拟地址
      */
-    @ApiModelProperty("地址类型 1：默认地址 2：虚拟地址")
+    @ApiModelProperty("地址类型 0:普通地址 1：默认地址 2：虚拟地址")
     private Integer type;
 
     /**

nightFragrance-massage/src/main/java/com/ylx/massage/service/impl/TAddressServiceImpl.java

@@ -33,6 +33,7 @@ public class TAddressServiceImpl extends ServiceImpl<TAddressMapper, TAddress> i
         if (StringUtils.isBlank(tAddress.getOpenid())) {
             throw new RuntimeException("openid不能为空");
         }
+        // 查询默认地址
         TAddress oldAddress = this.getByOpenId(tAddress.getOpenid());
         if (oldAddress != null) {
             oldAddress.setType(0);