fix:地址管理

nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/TAddressController.java

@@ -51,13 +51,19 @@ public class TAddressController extends BaseController {
      */
     @ApiOperation("根据OpenId查询用户地址")
     @GetMapping("getByOpenId")
-    public R selectOne(@RequestParam String openId) {
+    public R<List<TAddress>> selectOne(@RequestParam String openId) {
 
         LambdaQueryWrapper<TAddress> objectLambdaQueryWrapper = new LambdaQueryWrapper<>();
         objectLambdaQueryWrapper.eq(TAddress::getOpenid, openId);
         return R.ok(this.tAddressService.list(objectLambdaQueryWrapper));
     }
 
+    @ApiOperation("根据Id查询地址")
+    @GetMapping("getById")
+    public R<TAddress> getById(@RequestParam String id) {
+        return R.ok(this.tAddressService.getById(id));
+    }
+
     /**
      * 新增数据
      *

nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/TLbtController.java

@@ -43,7 +43,7 @@ public class TLbtController {
     @RequestMapping(value = "/getAll", method = RequestMethod.GET)
     public R<List<TLbt>> getAll() {
         QueryWrapper<TLbt> wrapper = new QueryWrapper<>();
-        wrapper.lambda().eq(TLbt::getnDel, MassageConstants.INTEGER_ZERO).orderByAsc(TLbt::getcSort);
+        wrapper.lambda().orderByAsc(TLbt::getcSort);
         List<TLbt> list = lbtService.list(wrapper);
         return R.ok(list);
     }
@@ -79,7 +79,7 @@ public class TLbtController {
 
         LambdaQueryWrapper<TLbt> tLbtLambdaQueryWrapper = new LambdaQueryWrapper<>();
 
-        tLbtLambdaQueryWrapper.eq(TLbt::getnDel, MassageConstants.INTEGER_ZERO).
+        tLbtLambdaQueryWrapper.
                 like(StringUtils.isNotBlank(lbt.getcDescribe()), TLbt::getcDescribe, lbt.getcDescribe());
         // 获取查询返回结果
         Page<TLbt> pageSelect = lbtService.page(page, tLbtLambdaQueryWrapper);

nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/WxController.java

@@ -170,19 +170,6 @@ public class WxController extends BaseController {
 
 
 
-    /**
-     * 更新用户信息
-     *
-     * @param wxUser
-     * @return
-     */
-    @ApiOperation("更新用户信息")
-    @RequestMapping(value = "updateUserInfoMessage", method = RequestMethod.POST)
-    public R updateUserInfoMessage(@RequestBody TWxUser wxUser) {
-        QueryWrapper<TWxUser> wrapper = new QueryWrapper<>();
-        wrapper.lambda().ne(TWxUser::getcOpenid, wxUser.getcOpenid());
-        return R.ok(wxUserService.updateById(wxUser));
-    }
 
 
     /**
@@ -237,7 +224,9 @@ public class WxController extends BaseController {
             String city = userInfo.getCity();
 
             // 将用户信息保存到数据库中
-            TWxUser user = wxUserService.getById(openid);
+            LambdaQueryWrapper<TWxUser> objectLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            objectLambdaQueryWrapper.eq(TWxUser::getcOpenid,openid);
+            TWxUser user = wxUserService.getOne(objectLambdaQueryWrapper);
             if (user == null) {
                 user = new TWxUser();
                 user.setcOpenid(openid);

nightFragrance-admin/src/main/resources/application-dev.yml

@@ -172,6 +172,11 @@ mybatis-plus:
   mapperLocations: classpath*:mapper/**/*Mapper.xml
   # 加载全局的配置文件
   configLocation: classpath:mybatis/mybatis-config.xml
+  global-config:
+    db-config:
+      logic-delete-field: flag # 全局逻辑删除的实体字段名(since 3.3.0,配置后可以忽略不配置步骤2)
+      logic-delete-value: 1 # 逻辑已删除值(默认为 1)
+      logic-not-delete-value: 0 # 逻辑未删除值(默认为 0)
 
 # PageHelper分页插件
 pagehelper:

nightFragrance-framework/src/main/java/com/ylx/framework/web/service/WxTokenService.java

@@ -174,7 +174,6 @@ public class WxTokenService {
         JwtParser jwtParser = parser.setSigningKey(secret);
         Jws<Claims> claimsJws = jwtParser.parseClaimsJws(token);
         Claims body = claimsJws.getBody();
-        System.out.println(body);
         return Jwts.parser()
                 .setSigningKey(secret)
                 .parseClaimsJws(token)

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

@@ -2,6 +2,7 @@ package com.ylx.massage.domain;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -52,6 +53,10 @@ public class TCollect implements Serializable {
     @ApiModelProperty("创建时间")
     private LocalDateTime dtCreateTime;
 
+    @ApiModelProperty("是否删除0否1是")
+    @TableLogic
+    private Integer isDelete;
+
     /**
      * 技师信息
      */

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

@@ -2,6 +2,7 @@ package com.ylx.massage.domain;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -84,6 +85,10 @@ public class TComment implements Serializable {
     @ApiModelProperty("技师姓名")
     private String name;
 
+    @ApiModelProperty("是否删除0否1是")
+    @TableLogic
+    private Integer isDelete;
+
     /**
      * 订单id
      */

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

@@ -1,6 +1,7 @@
 package com.ylx.massage.domain;
 
 
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -32,6 +33,9 @@ public class THighlights extends Model<THighlights> {
     //修改时间
     private Date updateTime;
 
+    @ApiModelProperty("是否删除0否1是")
+    @TableLogic
+    private Integer isDelete;
 
     public String getCId() {
         return cId;

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

@@ -2,6 +2,7 @@ package com.ylx.massage.domain;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -36,6 +37,9 @@ public class TInfo implements Serializable {
     @ApiModelProperty("分销比例%")
     private Integer nBili;
 
+    @ApiModelProperty("是否删除0否1是")
+    @TableLogic
+    private Integer isDelete;
     public String getcId() {
         return cId;
     }

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

@@ -3,6 +3,7 @@ package com.ylx.massage.domain;
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import io.swagger.annotations.ApiModel;
@@ -195,6 +196,9 @@ public class TJs implements Serializable {
     @ApiModelProperty("创建时间")
     private LocalDateTime dtCreateTime;
 
+    @ApiModelProperty("是否删除0否1是")
+    @TableLogic
+    private Integer isDelete;
     /**
      * 收藏人员数量
      */

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

@@ -2,6 +2,7 @@ package com.ylx.massage.domain;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -42,13 +43,6 @@ public class TLbt implements Serializable {
     @ApiModelProperty("图片地址")
     private String cImgUrl;
 
-    /**
-     * 是否删除0否1是
-     */
-    @TableField("n_del")
-    @ApiModelProperty("是否删除0否1是")
-    private Integer nDel;
-
     /**
      * 描述
      */
@@ -63,7 +57,9 @@ public class TLbt implements Serializable {
     @ApiModelProperty("文本内容")
     private String cContent;
 
-
+    @ApiModelProperty("是否删除0否1是")
+    @TableLogic
+    private Integer isDelete;
 
     /**
      * 序号
@@ -89,15 +85,6 @@ public class TLbt implements Serializable {
     }
 
 
-    public Integer getnDel() {
-        return nDel;
-    }
-
-    public void setnDel(Integer nDel) {
-        this.nDel = nDel;
-    }
-
-
     public String getcDescribe() {
         return cDescribe;
     }

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

@@ -3,6 +3,7 @@ package com.ylx.massage.domain;
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import io.swagger.annotations.ApiModel;
@@ -120,6 +121,10 @@ public class TOrder implements Serializable {
     @ApiModelProperty("创建时间")
     private LocalDateTime dtCreateTime;
 
+    @ApiModelProperty("是否删除0否1是")
+    @TableLogic
+    private Integer isDelete;
+
     @TableField(exist = false)
     @ApiModelProperty("技师信息")
     private TJs js;

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

@@ -2,6 +2,7 @@ package com.ylx.massage.domain;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -52,6 +53,10 @@ public class TRecharge implements Serializable {
     @ApiModelProperty("创建时间")
     private LocalDateTime dtCreateTime;
 
+    @ApiModelProperty("是否删除0否1是")
+    @TableLogic
+    private Integer isDelete;
+
     public String getcId() {
         return cId;
     }

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

@@ -2,6 +2,7 @@ package com.ylx.massage.domain;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -90,6 +91,10 @@ public class TTxRecord implements Serializable {
     @ApiModelProperty("创建时间")
     private LocalDateTime dtCreateTime;
 
+    @ApiModelProperty("是否删除0否1是")
+    @TableLogic
+    private Integer isDelete;
+
     public String getcId() {
         return cId;
     }

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

@@ -3,6 +3,7 @@ package com.ylx.massage.domain;
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import io.swagger.annotations.ApiModel;
@@ -26,10 +27,14 @@ public class TWxUser implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+
+    @TableId("id")
+    @ApiModelProperty("微信小程序openId")
+    private String id;
     /**
      * 微信小程序openId
      */
-    @TableId("c_openid")
+    @TableField("c_openid")
     @ApiModelProperty("微信小程序openId")
     private String cOpenid;
 
@@ -124,6 +129,10 @@ public class TWxUser implements Serializable {
     @ApiModelProperty("默认地址")
     private String cMrAddressId;
 
+    @ApiModelProperty("是否删除0否1是")
+    @TableLogic
+    private Integer isDelete;
+
     public String getcOpenid() {
         return cOpenid;
     }

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

@@ -3,6 +3,7 @@ package com.ylx.massage.domain;
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import io.swagger.annotations.ApiModel;
@@ -108,6 +109,10 @@ public class TXiangmu implements Serializable {
     @ApiModelProperty("创建时间")
     private LocalDateTime dtCreateTime;
 
+    @ApiModelProperty("是否删除0否1是")
+    @TableLogic
+    private Integer isDelete;
+
     public String getcId() {
         return cId;
     }

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

@@ -34,9 +34,6 @@ public class TLbtServiceImpl extends ServiceImpl<TLbtMapper, TLbt> implements TL
         if (StringUtils.isBlank(tLbt.getcId())) {
             throw new ServiceException("ID不能为空");
         }
-        TLbt tSpflNew = new TLbt();
-        tSpflNew.setcId(tLbt.getcId());
-        tSpflNew.setnDel(MassageConstants.INTEGER_ONE);
-        return this.updateById(tSpflNew);
+        return this.removeById(tLbt.getcId());
     }
 }