广誉源-商户端-实体类修改

nightFragrance-common/src/main/java/com/ylx/common/core/domain/model/aliyun/SendSmsEnum.java

@@ -7,7 +7,7 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum SendSmsEnum {
 
-    SMS_220650023("SMS_220650023", "山西掌柜鼎科技", "验证码短信");
+    SMS_220650024("SMS_220650024", "广誉源", "验证码短信");
 
     private final String code;
 

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

@@ -23,7 +23,10 @@ public class MaProject extends BaseEntity
     /** id */
     @ApiModelProperty("id")
     private Long id;
-
+    /** 项目ID */
+    @Excel(name = "项目ID")
+    @ApiModelProperty("项目ID")
+    private String  projectId;
     /** 项目名称 */
     @Excel(name = "项目名称")
     @ApiModelProperty("项目名称")
@@ -49,15 +52,34 @@ public class MaProject extends BaseEntity
     @ApiModelProperty("项目原价")
     private BigDecimal projectOriginalPrice;
 
-    /** 项目现价 */
-    @Excel(name = "项目现价")
-    @ApiModelProperty("项目现价")
+
+    /** 项目价格上限 */
+    @Excel(name = "项目价格上限")
+    @ApiModelProperty("项目价格上限")
+    private BigDecimal projectMaxPrice;
+
+    /** 项目价格下限 */
+    @Excel(name = "项目价格下限")
+    @ApiModelProperty("项目价格下限")
+    private BigDecimal projectLowestPrice;
+
+    /** 我的售价 */
+    @Excel(name = "我的售价")
+    @ApiModelProperty("我的售价")
     private BigDecimal projectCurrentPrice;
+    /** 商户手机号 */
+    @Excel(name = "商户手机号")
+    @ApiModelProperty("商户手机号")
+    private String merchantPhone;
 
     /** 项目主图 */
     @Excel(name = "项目主图")
     @ApiModelProperty("项目主图")
     private String projectMasterImage;
+    /** 商户类型：0-上门按摩，1-同城陪玩 */
+    @Excel(name = "商户类型：0-上门按摩，1-同城陪玩")
+    @ApiModelProperty("商户类型：0-上门按摩，1-同城陪玩")
+    private String merchantType;
 
     /** 项目详情图 */
     @Excel(name = "项目详情图")
@@ -68,7 +90,10 @@ public class MaProject extends BaseEntity
     @Excel(name = "是否启用(0否1是)")
     @ApiModelProperty("是否启用(0否1是)")
     private Long projectIsEnable;
-
+    /** 商户ID */
+    @Excel(name = "商户ID")
+    @ApiModelProperty("商户ID")
+    private String  userId;
     /** 创建人 */
     @Excel(name = "创建人")
     @ApiModelProperty("创建人")

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

@@ -1,248 +1,175 @@
 package com.ylx.massage.domain;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
 import com.ylx.common.annotation.Excel;
 import com.ylx.common.core.domain.BaseEntity;
 
+import java.math.BigInteger;
+import java.util.Date;
+
 /**
  * 技师对象 ma_technician
  *
  * @author ylx
  * @date 2024-03-22
  */
-public class MaTechnician extends BaseEntity {
+
+@Data
+@TableName("ma_technician")
+@Accessors(chain = true)
+public class MaTechnician extends BaseEntity
+{
     private static final long serialVersionUID = 1L;
 
-    /**
-     * id
-     */
-    private Long id;
+    /** id */
+    @TableId(type = IdType.ASSIGN_ID)
+    private String id;
 
-    /**
-     * 姓名
-     */
+    /** 姓名 */
+    @TableField("te_name")
     @Excel(name = "姓名")
     private String teName;
-
+    /** 昵称 */
+    @Excel(name = "昵称")
+    @TableField("te_nick_name")
+    private String teNickName;
     /**
-     * 性别(0女1男)
+     * 微信小程序登录会话密钥
      */
-    @Excel(name = "性别(0女1男)")
-    private Long teSex;
-
+    @TableField("c_session_key")
+    @ApiModelProperty("微信小程序登录会话密钥")
+    private String cSessionKey;
+    /** 密码 */
+    @Excel(name = "密码")
+    @TableField("te_pass_word")
+    private String tePassword;
     /**
-     * 电话
+     * 用户的openId
      */
+    @TableField("c_openid")
+    @ApiModelProperty("用户的openId")
+    private String cOpenid;
+    /** 性别(0女1男) */
+    @Excel(name = "性别(0女1男)")
+    @TableField("te_sex")
+    private Integer teSex;
+
+    /** 电话 */
     @Excel(name = "电话")
+    @TableField("te_phone")
     private String tePhone;
 
-    /**
-     * 地址
-     */
-    @Excel(name = "地址")
+    /** 合作意向城市 */
+    @Excel(name = "合作意向城市")
+    @TableField("te_address")
     private String teAddress;
 
-    /**
-     * 年龄
-     */
+    /** 年龄 */
     @Excel(name = "年龄")
-    private Long teAge;
+    @TableField("te_age")
+    private Integer teAge;
 
-    /**
-     * 头像
-     */
+    /** 头像 */
     @Excel(name = "头像")
+    @TableField("te_avatar")
     private String teAvatar;
-
-    /**
-     * 生活照
-     */
+    /** 开通服务：1-上门按摩 2-同城玩乐 */
+    @Excel(name = "开通服务：1-上门按摩 2-同城玩乐")
+    @TableField("openService")
+    private Integer openService;
+    /** 生活照 */
     @Excel(name = "生活照")
+    @TableField("life_photos")
     private String lifePhotos;
 
-    /**
-     * 简介
-     */
+    /** 形象照 */
+    @Excel(name = "形象照")
+    @TableField("avatar")
+    private String avatar;
+
+    /** 身份证 */
+    @Excel(name = "身份证")
+    @TableField("id_card")
+    private String idCard;
+
+    /** 健康证 */
+    @Excel(name = "健康证")
+    @TableField("health_certificate")
+    private String healthCertificate;
+
+    /** 从业资格证 */
+    @Excel(name = "从业资格证")
+    @TableField("qualification_certificate")
+    private String qualificationCertificate;
+
+    /** 无犯罪证明 */
+    @Excel(name = "无犯罪证明")
+    @TableField("no_crime_record")
+    private String noCrimeRecord;
+    /** 宣传视频 */
+    @Excel(name = "宣传视频")
+    @TableField("c_mr_address_id")
+    private String  promoVideo;
+    /** 承诺书 */
+    @Excel(name = "承诺书")
+    @TableField("commitment_pdf")
+    private String commitmentPdf;
+    /** 承诺录音 */
+    @Excel(name = "承诺录音")
+    @TableField("commitment_audio")
+    private String commitmentAudio;
+    /** 承诺录像 */
+    @Excel(name = "承诺录像")
+    @TableField("commitment_video")
+    private String commitmentVideo;
+
+    /** 简介 */
     @Excel(name = "简介")
+    @TableField("te_brief")
     private String teBrief;
 
-    /**
-     * 服务状态(0服务中,1可服务)
-     */
+    /** 服务状态(0服务中,1可服务) */
     @Excel(name = "服务状态(0服务中,1可服务)")
-    private Long serviceState;
-
-    /**
-     * 是否在岗(0否1是)
-     */
-    @Excel(name = "是否在岗(0否1是)")
-    private Long postState;
-
-    /**
-     * 是否启用(0否1是)
-     */
+    private Integer serviceState;
+    /** 上岗状态 （-1：未上岗 0：已上岗 1：已申请） */
+    @Excel(name = "上岗状态 （-1：未上岗 0：已上岗 1：已申请）")
+    private Integer  nsStatus2;
+    /** 商户管理状态: 0-正常, 1-限制接单, 2-冻结, 3-注销 */
+    @Excel(name = "商户管理状态: 0-正常, 1-限制接单, 2-冻结, 3-注销")
+    private String  merchantStatus;
+    /** 商户状态(0休息中1在线接单) */
+    @Excel(name = "商户状态(0休息中1在线接单)")
+    private Integer postState;
+    /** 商户类型（0：真实商户 1：虚拟商户） */
+    @Excel(name = "商户类型（0：真实商户 1：虚拟商户）")
+    private Integer  techType;
+    /** 是否启用(0否1是) */
     @Excel(name = "是否启用(0否1是)")
-    private Long teIsEnable;
-
-    /**
-     * 创建人
-     */
+    private Integer teIsEnable;
+    /** 审核状态：-1-申请入住,0-待入驻，1-待审核，2-审核通过，3-审核驳回*/
+    @Excel(name = "审核状态：-1-申请入住,0-待入驻，1-待审核，2-审核通过，3-审核驳回")
+    private Integer auditStatus;
+    /** 审批时间 */
+    @Excel(name = "审批时间")
+    private Date approveTime;
+    /** 创建人 */
     @Excel(name = "创建人")
     private Long createUser;
 
-    /**
-     * 修改人
-     */
+    /** 修改人 */
     @Excel(name = "修改人")
     private Long updateUser;
 
-    /**
-     * 是否删除(0否1是)
-     */
+    /** 是否删除(0否1是) */
     @Excel(name = "是否删除(0否1是)")
     private Long isDelete;
 
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setTeName(String teName) {
-        this.teName = teName;
-    }
-
-    public String getTeName() {
-        return teName;
-    }
-
-    public void setTeSex(Long teSex) {
-        this.teSex = teSex;
-    }
 
-    public Long getTeSex() {
-        return teSex;
-    }
 
-    public void setTePhone(String tePhone) {
-        this.tePhone = tePhone;
-    }
-
-    public String getTePhone() {
-        return tePhone;
-    }
-
-    public void setTeAddress(String teAddress) {
-        this.teAddress = teAddress;
-    }
-
-    public String getTeAddress() {
-        return teAddress;
-    }
-
-    public void setTeAge(Long teAge) {
-        this.teAge = teAge;
-    }
-
-    public Long getTeAge() {
-        return teAge;
-    }
-
-    public void setTeAvatar(String teAvatar) {
-        this.teAvatar = teAvatar;
-    }
-
-    public String getTeAvatar() {
-        return teAvatar;
-    }
-
-    public void setLifePhotos(String lifePhotos) {
-        this.lifePhotos = lifePhotos;
-    }
-
-    public String getLifePhotos() {
-        return lifePhotos;
-    }
-
-    public void setTeBrief(String teBrief) {
-        this.teBrief = teBrief;
-    }
-
-    public String getTeBrief() {
-        return teBrief;
-    }
-
-    public void setServiceState(Long serviceState) {
-        this.serviceState = serviceState;
-    }
-
-    public Long getServiceState() {
-        return serviceState;
-    }
-
-    public void setPostState(Long postState) {
-        this.postState = postState;
-    }
-
-    public Long getPostState() {
-        return postState;
-    }
-
-    public void setTeIsEnable(Long teIsEnable) {
-        this.teIsEnable = teIsEnable;
-    }
-
-    public Long getTeIsEnable() {
-        return teIsEnable;
-    }
-
-    public void setCreateUser(Long createUser) {
-        this.createUser = createUser;
-    }
-
-    public Long getCreateUser() {
-        return createUser;
-    }
-
-    public void setUpdateUser(Long updateUser) {
-        this.updateUser = updateUser;
-    }
-
-    public Long getUpdateUser() {
-        return updateUser;
-    }
-
-    public void setIsDelete(Long isDelete) {
-        this.isDelete = isDelete;
-    }
-
-    public Long getIsDelete() {
-        return isDelete;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
-                .append("teName", getTeName())
-                .append("teSex", getTeSex())
-                .append("tePhone", getTePhone())
-                .append("teAddress", getTeAddress())
-                .append("teAge", getTeAge())
-                .append("teAvatar", getTeAvatar())
-                .append("lifePhotos", getLifePhotos())
-                .append("teBrief", getTeBrief())
-                .append("serviceState", getServiceState())
-                .append("postState", getPostState())
-                .append("teIsEnable", getTeIsEnable())
-                .append("createUser", getCreateUser())
-                .append("updateUser", getUpdateUser())
-                .append("createTime", getCreateTime())
-                .append("updateTime", getUpdateTime())
-                .append("isDelete", getIsDelete())
-                .toString();
-    }
 }

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

@@ -84,6 +84,13 @@ public class TWxUser implements Serializable {
     @ApiModelProperty("昵称")
     private String cNickName;
 
+    /**
+     * 密码
+     */
+    @TableField("c_password")
+    @ApiModelProperty("密码")
+    private String cPassword;
+
     /**
      * 消费金额
      */

nightFragrance-massage/src/main/java/com/ylx/massage/domain/vo/Result.java

@@ -0,0 +1,198 @@
+package com.ylx.massage.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.ylx.massage.constant.CommonConstant;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ *   接口返回数据格式
+ * @author scott
+ * @email jeecgos@163.com
+ * @date  2019年1月19日
+ */
+@Data
+@ApiModel(value="接口返回对象", description="接口返回对象")
+public class Result<T> implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 成功标志
+     */
+    @ApiModelProperty(value = "成功标志")
+    private boolean success = true;
+
+    /**
+     * 返回处理消息
+     */
+    @ApiModelProperty(value = "返回处理消息")
+    private String message = "";
+
+    /**
+     * 返回代码
+     */
+    @ApiModelProperty(value = "返回代码")
+    private Integer code = 0;
+
+    /**
+     * 返回数据对象 data
+     */
+    @ApiModelProperty(value = "返回数据对象")
+    private T result;
+
+    /**
+     * 时间戳
+     */
+    @ApiModelProperty(value = "时间戳")
+    private long timestamp = System.currentTimeMillis();
+
+    public Result() {
+    }
+
+    /**
+     * 兼容VUE3版token失效不跳转登录页面
+     * @param code
+     * @param message
+     */
+    public Result(Integer code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+
+    public Result<T> success(String message) {
+        this.message = message;
+        this.code = CommonConstant.SC_OK_200;
+        this.success = true;
+        return this;
+    }
+
+    public static<T> Result<T> ok() {
+        Result<T> r = new Result<T>();
+        r.setSuccess(true);
+        r.setCode(CommonConstant.SC_OK_200);
+        return r;
+    }
+
+    public static<T> Result<T> ok(String msg) {
+        Result<T> r = new Result<T>();
+        r.setSuccess(true);
+        r.setCode(CommonConstant.SC_OK_200);
+        //Result OK(String msg)方法会造成兼容性问题 issues/I4IP3D
+        r.setResult((T) msg);
+        r.setMessage(msg);
+        return r;
+    }
+
+    public static<T> Result<T> ok(T data) {
+        Result<T> r = new Result<T>();
+        r.setSuccess(true);
+        r.setCode(CommonConstant.SC_OK_200);
+        r.setResult(data);
+        return r;
+    }
+
+    public static<T> Result<T> OK() {
+        Result<T> r = new Result<T>();
+        r.setSuccess(true);
+        r.setCode(CommonConstant.SC_OK_200);
+        return r;
+    }
+
+    /**
+     * 此方法是为了兼容升级所创建
+     *
+     * @param msg
+     * @param <T>
+     * @return
+     */
+    public static<T> Result<T> OK(String msg) {
+        Result<T> r = new Result<T>();
+        r.setSuccess(true);
+        r.setCode(CommonConstant.SC_OK_200);
+        r.setMessage(msg);
+        //Result OK(String msg)方法会造成兼容性问题 issues/I4IP3D
+        r.setResult((T) msg);
+        return r;
+    }
+
+    public static<T> Result<T> OK(String msg,boolean success) {
+        Result<T> r = new Result<T>();
+        r.setSuccess(success);
+        r.setCode(CommonConstant.SC_OK_200);
+        r.setMessage(msg);
+        r.setResult((T) msg);
+        return r;
+    }
+
+    public static<T> Result<T> OK(T data) {
+        Result<T> r = new Result<T>();
+        r.setSuccess(true);
+        r.setCode(CommonConstant.SC_OK_200);
+        r.setResult(data);
+        return r;
+    }
+
+    public static<T> Result<T> OK(String msg, T data) {
+        Result<T> r = new Result<T>();
+        r.setSuccess(true);
+        r.setCode(CommonConstant.SC_OK_200);
+        r.setMessage(msg);
+        r.setResult(data);
+        return r;
+    }
+
+    public static <T> Result<T> ok(String msg, T data) {
+        Result<T> r = new Result<>();
+        r.setMessage(msg) ;
+        r.setResult(data);
+        return r;
+    }
+
+    public static<T> Result<T> error(String msg, T data) {
+        Result<T> r = new Result<T>();
+        r.setSuccess(false);
+        r.setCode(CommonConstant.SC_INTERNAL_SERVER_ERROR_500);
+        r.setMessage(msg);
+        r.setResult(data);
+        return r;
+    }
+
+    public static<T> Result<T> error(String msg) {
+        return error(CommonConstant.SC_INTERNAL_SERVER_ERROR_500, msg);
+    }
+
+    public static<T> Result<T> error(int code, String msg) {
+        Result<T> r = new Result<T>();
+        r.setCode(code);
+        r.setMessage(msg);
+        r.setSuccess(false);
+        return r;
+    }
+
+    public Result<T> errorNew(int code, String msg) {
+        this.message = msg;
+        this.code = code;
+        this.success = false;
+        return this;
+    }
+
+    public Result<T> error500(String message) {
+        this.message = message;
+        this.code = CommonConstant.SC_INTERNAL_SERVER_ERROR_500;
+        this.success = false;
+        return this;
+    }
+
+    /**
+     * 无权限访问返回结果
+     */
+    public static<T> Result<T> noauth(String msg) {
+        return error(CommonConstant.SC_JEECG_NO_AUTHZ, msg);
+    }
+
+    @JsonIgnore
+    private String onlTable;
+}

nightFragrance-massage/src/main/java/com/ylx/massage/domain/vo/ThirdPartyLoginsVo.java

@@ -0,0 +1,22 @@
+package com.ylx.massage.domain.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+@Data
+public class ThirdPartyLoginsVo implements Serializable {
+    @ApiModelProperty(value = "用户手机号")
+    private String phone;
+
+    @ApiModelProperty(value = "用户类型 1-用户 2-商户")
+    private String userType;
+    @ApiModelProperty(value = "是否开启验证码登录 true-是 false-否")
+    private Boolean codeSwitch;
+    @ApiModelProperty(value = "验证码")
+    private String phoneMsg;
+
+    @ApiModelProperty(value = "密码")
+    private String passWord;
+
+}