修改bug

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

@@ -137,7 +137,7 @@ public class MaTechnicianController extends BaseController {
      * 商户登录接口
      *
      * @param thirdPartyLoginsVo
-     * @return
+     * @return Result<WxLoginUser>
      */
     @ApiOperation(value = "商户登录", notes = "商户登录")
     @PostMapping(value = "/clientLogin")
@@ -154,11 +154,10 @@ public class MaTechnicianController extends BaseController {
         // 校验用户是否存在且有效
         LambdaQueryWrapper<MaTechnician> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(MaTechnician::getTePhone, thirdPartyLoginsVo.getPhone());
-        MaTechnician maTechnician = maTechnicianService.getBaseMapper().selectOne(queryWrapper);
+        MaTechnician maTechnician = maTechnicianService.getOne(queryWrapper);
         // 校验用户是否有效
         if (ObjectUtils.isEmpty(maTechnician)) {
             return result.error500("商户不存在,请先注册");
-
         }
 
         if (thirdPartyLoginsVo.getCodeSwitch()) {
@@ -250,35 +249,44 @@ public class MaTechnicianController extends BaseController {
 
     /**
      * 商户入驻申请接口
+     *
+     * @param req
+     * @return Result<?>
      */
     @PostMapping("/apply")
     @ApiOperation("商户入驻申请接口")
     public Result<?> apply(@RequestBody MaTechnicianAppAddVo req) {
-        // 1. 基础参数校验
-        if (StringUtils.isAnyBlank(req.getTeName(), req.getTePhone(),  req.getAvatar())) {
-            return Result.error("必填项不能为空");
-        }
-        //校验性别不能为空
-        if (Objects.isNull(req.getTeSex())) {
-            return Result.error("性别不能为空");
-        }
-        // 短信验证
-        String msg = redisTemplate.opsForValue().get(PHONE_THREEUSERPARTCLIENT_CODE_KEY + req.getTePhone());
-        if (StringUtils.isEmpty(msg)) {
-            return Result.error("验证码已失效");
-        }
-        if (msg != null && msg.startsWith("\"") && msg.endsWith("\"")) {
-            msg = msg.substring(1, msg.length() - 1);
-        }
-        if (!req.getPhoneMsg().equals(msg)) {
-            return Result.error("短信验证码不正确");
-        }
-        if (StringUtils.isNotEmpty(req.getPhoneImgMsg())) {
-            validateCaptcha(req.getTeName(), req.getPhoneImgMsg(), req.getUuid());
+        try {
+            // 1. 基础参数校验
+            if (StringUtils.isAnyBlank(req.getTeName(), req.getTePhone(),  req.getAvatar())) {
+                return Result.error("必填项不能为空");
+            }
+            //校验性别不能为空
+            if (Objects.isNull(req.getTeSex())) {
+                return Result.error("性别不能为空");
+            }
+            // 短信验证
+            String msg = redisTemplate.opsForValue().get(PHONE_THREEUSERPARTCLIENT_CODE_KEY + req.getTePhone());
+            log.info("短信验证码的值：{}", msg);
+            /*if (StringUtils.isEmpty(msg)) {
+                return Result.error("验证码已失效");
+            }
+            if (msg != null && msg.startsWith("\"") && msg.endsWith("\"")) {
+                msg = msg.substring(1, msg.length() - 1);
+            }
+            if (!req.getPhoneMsg().equals(msg)) {
+                return Result.error("短信验证码不正确");
+            }*/
+            if (StringUtils.isNotEmpty(req.getPhoneImgMsg())) {
+                validateCaptcha(req.getTeName(), req.getPhoneImgMsg(), req.getUuid());
+            }
+            // 2. 调用业务层处理入驻申请
+            maTechnicianService.apply(req);
+            return Result.ok("提交成功，进入审核流程");
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new RuntimeException(e);
         }
-        // 2. 调用业务层处理入驻申请
-        maTechnicianService.apply(req);
-        return Result.ok("提交成功，进入审核流程");
     }
 
     /**
@@ -310,12 +318,18 @@ public class MaTechnicianController extends BaseController {
      * 申请技师文件
      *
      * @param req
+     * @return Result<?>
      */
     @PostMapping("/applyFile")
     @ApiOperation("申请技师文件")
     public Result applyFile(@RequestBody MerchantApplyFileRequestDto req) {
-        maTechnicianService.applyFile(req);
-        return Result.ok("上传成功");
+        try {
+            maTechnicianService.applyFile(req);
+            return Result.ok("上传成功");
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new RuntimeException(e);
+        }
     }
 
     /**

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

@@ -73,6 +73,7 @@ public class WeSqController extends BaseController {
     private IMaTechnicianService maTechnicianService;
     @Autowired
     private WxMaService wxMaService;
+
     /**
      * 通过微信code获取token和userInfo
      *
@@ -148,12 +149,11 @@ public class WeSqController extends BaseController {
      */
     @GetMapping("/getTechnicianToken")
     @ResponseBody
-    //@Log(title = "公众号网页登录", businessType = BusinessType.OTHER)
     public R<WxLoginUser> getTechnicianToken(@RequestParam String code) {
         // 发送get请求获取 AccessToken
         try {
             Map<?, ?> result = weChatUtil.getAccessToken(code);
-           log.info("result的值：{}", result);
+            log.info("result的值：{}", result);
             String accessToken = result.get(ACCESS_TOKEN).toString();
             log.info("accessToken的值：{}", accessToken);
             String refreshToken = result.get(REFRESH_TOKEN).toString();
@@ -162,13 +162,13 @@ public class WeSqController extends BaseController {
 //            // 如果用户是第一次进行微信公众号授权
 //            // 进行这一步时用户应点击了同意授权按钮
             String userInfoJsom = weChatUtil.getUserInfo(accessToken, openid);
+            log.info("用户信息的json字符串：{}", userInfoJsom);
 //            // 解析JSON数据
-           JSONObject jsonObject = new JSONObject(userInfoJsom);
+            JSONObject jsonObject = new JSONObject(userInfoJsom);
             //log.info("公众号网页登录：{}", jsonObject);
             String nickName = jsonObject.get("nickname").toString();
             String avatarUrl = jsonObject.get("headimgurl").toString();
 
-
             // 将用户信息保存到数据库中
             LambdaQueryWrapper<MaTechnician> objectLambdaQueryWrapper = new LambdaQueryWrapper<>();
             objectLambdaQueryWrapper.eq(MaTechnician::getCOpenid, openid);
@@ -178,13 +178,10 @@ public class WeSqController extends BaseController {
                     user = new MaTechnician();
                     user.setCOpenid(openid);
                     user.setTeNickName(nickName);
-                    user.setCSessionKey(refreshToken);
                     user.setAuditStatus(-1);
                     user.setCreateBy(nickName);
                     user.setUpdateBy(nickName);
                     maTechnicianService.save(user);
-                    //异步 添加新人优惠卷
-                    //                threadPoolTaskExecutor.submit(() -> couponReceiveService.submit(new CouponReceive().setOpenid(finalUser.getcOpenid()).setCouponId("1")));
                 }
             }
             WxLoginUser wxUser = new WxLoginUser();

nightFragrance-framework/src/main/java/com/ylx/framework/config/SecurityConfig.java

@@ -116,7 +116,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
                         "/wx/pay/query/order/{outTradeNo}","/api/products/**","/api/user/point/**","/userCenter/userApp/queryBind","/weChat/uuidLogin","/couponReceive/getShareVolutionDetail",
                         "/userCenter/ugit credential rejectserApp/bind/update","/serviceCategory/h5List","/api/lbt/v1/select","/sq/getTechnicianToken"
                         ,"/technician/technician/clientLogin","/technician/technician/wait/list","/technician/technician/getServiceCategoryList"
-                ,"/technician/technician/getTechnician" ,"/technician/technician/getSkillList","/technician/technician/getTechnicianList"
+                ,"/technician/technician/getTechnician" ,"/technician/technician/getSkillList","/technician/technician/getTechnicianList","/technician/technician/apply"
                        ).permitAll()
                 // 静态资源，可匿名访问
                 .antMatchers(HttpMethod.GET, "/", "/*.txt", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()

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

@@ -1,17 +1,18 @@
 package com.ylx.massage.domain;
 
-import java.time.LocalDateTime;
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+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 com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.models.auth.In;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * 城市管理表(CityOperationApplication)表实体类
@@ -24,96 +25,98 @@ import java.io.Serializable;
 @Accessors(chain = true)
 @TableName(value = "city_operation_application", autoResultMap = true)
 public class CityOperationApplication implements Serializable {
-    //主键ID
+
+    /**
+     * 主键ID。
+     */
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
+
     /**
-     * 省级行政区编码 (如: 110000)
+     * 省级行政区编码，如：110000。
      */
     @TableField("province_code")
     private String provinceCode;
 
     /**
-     * 省级行政区名称 (如: 北京市)
+     * 省级行政区名称，如：北京市。
      */
     @TableField("province_name")
     private String provinceName;
 
     /**
-     * 地级市编码 (如: 110100)
+     * 地级市编码，如：110100。
      */
     @TableField("city_code")
     private String cityCode;
 
     /**
-     * 地级市名称 (如: 北京市)
+     * 地级市名称，如：北京市。
      */
     @TableField("city_name")
     private String cityName;
 
     /**
-     * 区/县编码 (如: 110101)
+     * 运营中心ID。
      */
-    @TableField("district_code")
-    private String districtCode;
+    @TableField("operation_center_id")
+    private Integer operationCenterId;
 
     /**
-     * 区/县名称 (如: 东城区)
+     * 运营中心名称。
      */
-    @TableField("district_name")
-    private String districtName;
-
-    //运营中心ID
-    @TableField("operation_center_id")
-    private Integer operationCenterId;
-    //运营中心名称
     @TableField("operation_center_name")
     private String operationCenterName;
-    //实际审批通过时间
+
+    /**
+     * 实际审批通过时间。
+     */
     @TableField("actual_approval_time")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date actualApprovalTime;
-    //申请原因 (限制500字以内)
-    @TableField("apply_reason")
-    private String applyReason;
 
-    //状态 (0:待审核, 1:已通过, 2:已驳回)
+    /**
+     * 状态：0-待审核，1-已通过，2-已驳回。
+     */
     @TableField("status")
     private Integer status;
-    //商户ID
+
+    /**
+     * 商户ID。
+     */
     @TableField("merchant_id")
     private Integer merchantId;
+
     /**
-     * 创建时间
+     * 创建人。
+     */
+    @TableField(value = "create_by")
+    private String createBy;
+
+    /**
+     * 创建时间。
      */
     @TableField(value = "create_time", fill = FieldFill.INSERT)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private LocalDateTime createTime;
 
     /**
-     * 更新时间
+     * 更新时间。
      */
     @TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private LocalDateTime updateTime;
-    /**
-     * 创建时间
-     */
-    @TableField(value = "create_by")
-    private String createBy;
 
     /**
-     * 更新时间
+     * 更新人。
      */
     @TableField(value = "update_by")
     private String updateBy;
 
     /**
-     * 逻辑删除：1已删除 0未删除
+     * 逻辑删除标记：1-已删除，0-未删除。
      */
     @TableField("is_delete")
     private Integer isDelete;
-
-
 }
 

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

@@ -1,9 +1,6 @@
 package com.ylx.massage.domain;
 
-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 com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
@@ -255,9 +252,9 @@ public class MaTechnician extends BaseEntity {
     private Integer teIsEnable;
 
     /**
-     * 审核状态：-1-申请入住,0-待入驻，1-待审核，2-审核通过，3-审核驳回
+     * 审核状态：-1-申请入驻 0-待入驻，1-待审核，2-审核通过，3-审核驳回
      */
-    @Excel(name = "审核状态：-1-申请入住,0-待入驻，1-待审核，2-审核通过，3-审核驳回")
+    @Excel(name = "审核状态：-1-申请入驻 0-待入驻，1-待审核，2-审核通过，3-审核驳回")
     private Integer auditStatus;
 
     /**
@@ -277,6 +274,8 @@ public class MaTechnician extends BaseEntity {
      * 是否删除(0否1是)
      */
     @Excel(name = "是否删除(0否1是)")
+    @TableField("is_delete")
+    @TableLogic
     private Integer isDelete;
 
     /**

nightFragrance-massage/src/main/java/com/ylx/massage/domain/dto/MerchantApplyFileDto.java

@@ -4,18 +4,35 @@ import lombok.Data;
 
 @Data
 public class MerchantApplyFileDto {
-    //商户ID
+
+    /**
+     * 商户ID。
+     */
     private Integer merchantId;
-    //文件类型1-形象照,2-生活照,3-身份证正面
-    // 4-身份证反面 5-手持身份证 6-健康证,
-    // 7-从业资格证,8-无犯罪证明,9-承诺书,10-承诺录音,11-承诺录像,12-其他 默认为:'',
+
+    /**
+     * 文件类型。
+     * 1:形象照 2:生活照 3：宣传视频 4-身份证正面 5-身份证反面 6-手持身份证 7-健康证 8-从业资格证,9-无犯罪证明,10-承诺书,11-承诺录音,12-承诺录像,13-其他
+     */
     private String fileType;
-    //原始文件名
+
+    /**
+     * 原始文件名。
+     */
     private String fileName;
-    //文件访问地址
+
+    /**
+     * 文件访问地址。
+     */
     private String fileUrl;
-    //文件大小，单位字节
+
+    /**
+     * 文件大小，单位字节。
+     */
     private Long fileSize;
-    //文件MIME类型，如 image/jpeg
+
+    /**
+     * 文件 MIME 类型，如 image/jpeg。
+     */
     private String contentType;
 }

nightFragrance-massage/src/main/java/com/ylx/massage/domain/dto/MerchantApplyFileRequestDto.java

@@ -11,6 +11,7 @@ public class MerchantApplyFileRequestDto {
      * 商家信息
      */
     private MaTechnician technician;
+
     /**
      * 申请入驻文件
      */

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

@@ -1,12 +1,9 @@
 package com.ylx.massage.domain.vo;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.ylx.common.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.experimental.Accessors;
 
 import java.math.BigInteger;
 import java.util.ArrayList;
@@ -20,6 +17,7 @@ import java.util.Date;
  */
 @Data
 public class MaTechnicianAppAddVo {
+
     private static final long serialVersionUID = 1L;
 
     /**
@@ -29,31 +27,47 @@ public class MaTechnicianAppAddVo {
     private String id;
 
     /**
-     * 姓名
+     * 商户姓名
      */
     @ApiModelProperty("姓名")
     private String teName;
+
     /**
      * 昵称
      */
     @Excel(name = "昵称")
     private String teNickName;
+
     /**
      * 密码
      */
     @Excel(name = "密码")
     private String tePassword;
+
+    /**
+     * 短信验证码。
+     */
     @ApiModelProperty(value = "验证码")
     private String phoneMsg;
+
+    /**
+     * 图形验证码。
+     */
     @ApiModelProperty(value = "图形验证码")
     private String phoneImgMsg;
+
+    /**
+     * 用户的 openId。
+     */
     @ApiModelProperty("用户的openId")
     @JsonProperty("cOpenid")
     private String cOpenid;
+
     /**
      * 唯一标识
      */
     private String uuid;
+
     /**
      * 性别(0女1男)
      */
@@ -62,10 +76,10 @@ public class MaTechnicianAppAddVo {
     private Integer teSex;
 
     /**
-     * 电话
+     * 商户电话
      */
-    @Excel(name = "电话")
-    @ApiModelProperty("电话")
+    @Excel(name = "商户电话")
+    @ApiModelProperty("商户电话")
     private String tePhone;
 
     /**
@@ -97,10 +111,17 @@ public class MaTechnicianAppAddVo {
      * 区/县名称 (如: 东城区)
      */
     private String districtName;
-    //运营中心ID
+
+    /**
+     * 运营中心ID。
+     */
     private Integer operationCenterId;
-    //运营中心名称
+
+    /**
+     * 运营中心名称。
+     */
     private String operationCenterName;
+
     /**
      * 服务标签（1：按摩推拿 2：陪玩）
      */
@@ -120,8 +141,6 @@ public class MaTechnicianAppAddVo {
     @ApiModelProperty("头像")
     private String teAvatar;
 
-
-
     /**
      * 简介
      */
@@ -135,6 +154,7 @@ public class MaTechnicianAppAddVo {
     @Excel(name = "形象照")
     @ApiModelProperty("形象照")
     private String avatar;
+
 //
 //    /**
 //     * 身份证
@@ -193,12 +213,17 @@ public class MaTechnicianAppAddVo {
     @Excel(name = "审核状态：0-待入驻，1-待审核，2-审核通过，3-审核驳回")
     @ApiModelProperty("审核状态：0-待入驻，1-待审核，2-审核通过，3-审核驳回")
     private int auditStatus;
+
     /**
      * 审批时间
      */
     @Excel(name = "审批时间")
     @ApiModelProperty("审批时间")
     private Date approveTime;
+
+    /**
+     * 项目id集合。
+     */
     @ApiModelProperty("项目id集合")
     private ArrayList<Integer> projectIds;
 

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

@@ -4,19 +4,43 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+
 @Data
 public class ThirdPartyLoginsVo implements Serializable {
+
+    /**
+     * 用户手机号。
+     */
     @ApiModelProperty(value = "用户手机号")
     private String phone;
 
+    /**
+     * 用户类型：1-用户，2-商户。
+     */
     @ApiModelProperty(value = "用户类型 1-用户 2-商户")
     private String userType;
+
+    /**
+     * 是否开启验证码登录：true-是，false-否。
+     */
     @ApiModelProperty(value = "是否开启验证码登录 true-是 false-否")
     private Boolean codeSwitch;
+
+    /**
+     * 短信验证码。
+     */
     @ApiModelProperty(value = "验证码")
     private String phoneMsg;
+
+    /**
+     * 图形验证码。
+     */
     @ApiModelProperty(value = "图形验证码")
     private String phoneImgMsg;
+
+    /**
+     * 登录密码。
+     */
     @ApiModelProperty(value = "密码")
     private String passWord;
 

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

@@ -151,6 +151,7 @@ public class MaTechnicianServiceImpl extends ServiceImpl<MaTechnicianMapper, MaT
         getMaTechnician(req, phone);
         MaTechnician maTechnician = new MaTechnician();
         BeanUtils.copyProperties(req, maTechnician);
+        //通过openid校验商户是否存在
         LambdaQueryWrapper<MaTechnician> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(MaTechnician::getCOpenid, req.getCOpenid());
         MaTechnician maTechnician1 = maTechnicianMapper.selectOne(queryWrapper);
@@ -159,7 +160,6 @@ public class MaTechnicianServiceImpl extends ServiceImpl<MaTechnicianMapper, MaT
         }
         //添加城市管理地址
         insertCity(req, maTechnician1, maTechnician);
-
     }
 
     /**
@@ -176,22 +176,23 @@ public class MaTechnicianServiceImpl extends ServiceImpl<MaTechnicianMapper, MaT
         maTechnician.setTechType(0);
         maTechnician.setCreateBy("admin");
         maTechnician.setAuditStatus(AUDIT_WAIT_ENTER);
+        //密码默认123456
         maTechnician.setTePassword(encoder.encode(PASSWORD));
+
         LambdaUpdateWrapper<MaTechnician> updateWrapper = new LambdaUpdateWrapper<>();
         updateWrapper.eq(MaTechnician::getId, maTechnician1.getId());
         maTechnicianMapper.update(maTechnician, updateWrapper);
+
         CityOperationApplication cityOperationApplication = new CityOperationApplication();
         cityOperationApplication.setMerchantId(maTechnician1.getId());
-        cityOperationApplication.setOperationCenterId(req.getOperationCenterId());
         cityOperationApplication.setProvinceCode(req.getProvinceCode());
         cityOperationApplication.setProvinceName(req.getProvinceName());
         cityOperationApplication.setCityCode(req.getCityCode());
         cityOperationApplication.setCityName(req.getCityName());
-        cityOperationApplication.setDistrictCode(req.getDistrictCode());
-        cityOperationApplication.setDistrictName(req.getDistrictName());
+        cityOperationApplication.setOperationCenterId(req.getOperationCenterId());
         cityOperationApplication.setOperationCenterName(req.getOperationCenterName());
         cityOperationApplication.setCreateBy(maTechnician1.getId().toString());
-        cityOperationApplication.setUpdateBy(maTechnician1.getId().toString());
+        cityOperationApplication.setCreateTime(LocalDateTime.now());
         cityOperationApplicationMapper.insert(cityOperationApplication);
     }
 
@@ -246,7 +247,6 @@ public class MaTechnicianServiceImpl extends ServiceImpl<MaTechnicianMapper, MaT
         // 2. 判断手机号是否已存在
         LambdaQueryWrapper<MaTechnician> queryPhoneWrapper = new LambdaQueryWrapper<>();
         queryPhoneWrapper.eq(MaTechnician::getTePhone, phone);
-        queryPhoneWrapper.eq(MaTechnician::getIsDelete, 0);
         MaTechnician maTechnicianPhone = maTechnicianMapper.selectOne(queryPhoneWrapper);
         if (maTechnicianPhone != null) {
             throw new RuntimeException("手机号已存在，请更换手机号");
@@ -254,26 +254,23 @@ public class MaTechnicianServiceImpl extends ServiceImpl<MaTechnicianMapper, MaT
         //3、判断手机号是否已绑定其他用户
         LambdaQueryWrapper<MaTechnician> queryTePhoneWrapper = new LambdaQueryWrapper<>();
         queryTePhoneWrapper.eq(MaTechnician::getTePhone, phone);
-        queryTePhoneWrapper.eq(MaTechnician::getIsDelete, 0);
         queryTePhoneWrapper.eq(MaTechnician::getAuditStatus, 2);
         MaTechnician maTechnicianTePhone = maTechnicianMapper.selectOne(queryTePhoneWrapper);
         if (maTechnicianTePhone != null) {
             throw new RuntimeException("手机号已被其他用户绑定，请更换手机号");
         }
-
     }
 
     /**
      * 判断当前用户是否已入驻
      *
-     * @return
+     * @param req
+     * @return MaTechnician
      */
     private MaTechnician getMaTechnician(MaTechnicianAppAddVo req) {
         LambdaQueryWrapper<MaTechnician> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(MaTechnician::getTePhone, req.getTePhone());
-        queryWrapper.eq(MaTechnician::getIsDelete, 0);
         queryWrapper.eq(MaTechnician::getAuditStatus, 2);
-        //queryWrapper.eq(MaTechnician::getOpenService, req.getOpenService());
         queryWrapper.eq(MaTechnician::getServiceTag, req.getServiceTag());
         MaTechnician userProfile = maTechnicianMapper.selectOne(queryWrapper);
         return userProfile;

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

@@ -185,4 +185,14 @@ public class AdminOrderPageVO {
      */
     @ApiModelProperty("服务分类名称")
     private String categoryName;
+
+    /**
+     * 商户纬度
+     */
+    private BigDecimal merchantLatitude;
+
+    /**
+     * 商户经度
+     */
+    private BigDecimal merchantLongitude;
 }

nightFragrance-massage/src/main/resources/mapper/order/AdminOrderMapper.xml

@@ -25,7 +25,9 @@
             COALESCE(mt.te_nick_name, o.merchant_nick_name) AS merchantNickName,
             mt.te_phone AS merchantPhone,
             p.category_id AS categoryId,
-            sc.name AS categoryName
+            sc.name AS categoryName,
+            o.merchant_latitude as merchantLatitude,
+            o.merchant_longitude as merchantLongitude
         FROM t_order o
         LEFT JOIN t_wx_user u ON u.id = CAST(o.user_id AS CHAR) AND u.is_delete = 0
         LEFT JOIN ma_technician mt ON mt.id = o.merchant_id AND mt.is_delete = 0