修改了城市管理相关的接口

nightFragrance-admin/pom.xml

@@ -49,6 +49,11 @@
             <artifactId>nightFragrance-framework</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>nightFragrance-common</artifactId>
+        </dependency>
+
         <!-- 定时任务-->
         <dependency>
             <groupId>com.ruoyi</groupId>
@@ -68,6 +73,12 @@
             <scope>compile</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 
     <build>

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

@@ -104,7 +104,6 @@ public class MaTechnicianController extends BaseController {
      */
     @ApiOperation(value = "商户手机号密码登录", notes = "商户手机号密码登录")
     @PostMapping(value = "/clientLogin")
-    @Transactional
     public R<WxLoginUser> login(@RequestBody ThirdPartyLoginsVo thirdPartyLoginsVo) throws Exception {
         // 校验手机号是否为空
         if (StringUtils.isBlank(thirdPartyLoginsVo.getPhone())) {
@@ -449,28 +448,6 @@ public class MaTechnicianController extends BaseController {
         }
     }
 
-
-    /**
-     * 后台审核商户端我的资料修改
-     *
-     * @param merchantId
-     * @param req
-     * @return
-     */
-    @PutMapping("/profile/audit/{merchantId}")
-    @ApiOperation("后台审核商户端我的资料修改")
-    @PreAuthorize("@ss.hasPermi('technician:technician:edit')")
-    @Log(title = "商户我的资料审核", businessType = BusinessType.UPDATE)
-    public R<Void> auditMerchantProfile(@PathVariable("merchantId") Integer merchantId, @Valid @RequestBody MerchantProfileAuditDTO req) {
-        try {
-            LoginUser loginUser = getLoginUser();
-            return toR(maTechnicianService.auditMerchantProfile(merchantId, req, loginUser));
-        } catch (Exception e) {
-            log.error("后台审核商户端我的资料修改失败", e);
-            return R.fail(e.getMessage());
-        }
-    }
-
     @PreAuthorize("@ss.hasPermi('technician:technician:list')")
     @GetMapping("/list")
     public R<TableDataInfo> list(MaTechnician maTechnician) {
@@ -622,14 +599,13 @@ public class MaTechnicianController extends BaseController {
      * @return R<Void> 结果
      */
     @ApiOperation("商户申请入驻审核")
-    @PreAuthorize("@ss.hasPermi('technician:technician:edit')")
     @Log(title = "商户申请入驻审核", businessType = BusinessType.UPDATE)
     @PutMapping("/merchant/audit/{id}/applySubmit")
-    public R<Void> applyMerchantAudit(@PathVariable("id") Integer id, @RequestBody MaTechnicianAuditSubmitDTO dto) {
+    public R<Void> applyMerchantAudit(@PathVariable("id") Integer id, @Valid @RequestBody MerchantProfileAuditDTO dto) {
         try {
             log.info("商户申请入驻申请请求参数：{}", JSON.toJSONString(dto));
             LoginUser loginUser = getLoginUser();
-            return toR(maTechnicianService.applyMerchantAudit(id, dto, loginUser));
+            return toR(maTechnicianService.auditMerchantProfile(id, dto, loginUser));
         } catch (Exception e) {
             e.printStackTrace();
             throw new RuntimeException(e);

nightFragrance-massage/src/main/java/com/ylx/massage/controller/CityOperationApplicationController.java

@@ -3,17 +3,21 @@ package com.ylx.massage.controller;
 
 
 import cn.hutool.core.collection.CollectionUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ylx.common.core.domain.R;
+import com.ylx.common.utils.SecurityUtils;
 import com.ylx.massage.domain.Area;
 import com.ylx.massage.domain.CityOperationApplication;
 import com.ylx.massage.service.CityOperationApplicationService;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import java.io.Serializable;
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -24,6 +28,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("cityOperationApplication")
+@Slf4j
 public class CityOperationApplicationController {
     /**
      * 服务对象
@@ -55,15 +60,26 @@ public class CityOperationApplicationController {
     }
 
     /**
-     * 新增数据
+     * 申请开通新城市
      *
      * @param cityOperationApplication 实体对象
-     * @return 新增结果
+     * @return R 新增结果
      */
     @PostMapping("/saveCity")
     public R insert(@RequestBody CityOperationApplication cityOperationApplication) {
-        return R.ok(this.cityOperationApplicationService.save(cityOperationApplication));
+        try {
+            log.info("申请开通新城市: {}", JSON.toJSONString(cityOperationApplication));
+            // 获取当前登录的用户
+            String nickName = SecurityUtils.getWxLoginUser().getCNickName();
+            cityOperationApplication.setCreateBy(nickName);
+            cityOperationApplication.setCreateTime(LocalDateTime.now());
+            return R.ok(cityOperationApplicationService.save(cityOperationApplication));
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new RuntimeException(e);
+        }
     }
+
     /**
      * 根据商户ID查询城市管理列表
      * @param merchantId
@@ -71,14 +87,19 @@ public class CityOperationApplicationController {
      */
     @GetMapping("/getCityList")
     @ApiOperation("根据商户ID查询城市管理列表")
-    public R getCityList(@RequestParam String merchantId) {
-        LambdaQueryWrapper<CityOperationApplication> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(CityOperationApplication::getMerchantId, merchantId);
-        List<CityOperationApplication> list = this.cityOperationApplicationService.list(queryWrapper);
-        if (CollectionUtil.isEmpty(list)) {
-            return R.fail("未找到此数据");
+    public R getCityList(@RequestParam Integer merchantId) {
+        try {
+            LambdaQueryWrapper<CityOperationApplication> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(CityOperationApplication::getMerchantId, merchantId);
+            List<CityOperationApplication> list = cityOperationApplicationService.list(queryWrapper);
+            if (CollectionUtil.isEmpty(list)) {
+                return R.fail("未找到此数据");
+            }
+            return R.ok(list);
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new RuntimeException(e);
         }
-        return R.ok(list);
     }
 
 

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

@@ -68,6 +68,12 @@ public class CityOperationApplication implements Serializable {
     @TableField("operation_center_name")
     private String operationCenterName;
 
+    /**
+     * 申请原因。
+     */
+    @TableField("apply_reason")
+    private String applyReason;
+
     /**
      * 实际审批通过时间。
      */

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

@@ -120,71 +120,12 @@ public class MaTechnician extends BaseEntity {
     @TableField("te_project")
     private String teProject;
 
-//    /**
-//     * 生活照
-//     */
-//    @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("promo_video")
-//    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;
 
     /**
      * 身份证过期日期
@@ -200,21 +141,39 @@ public class MaTechnician extends BaseEntity {
     @TableField("te_brief")
     private String teBrief;
 
+    /**
+     * 待审核昵称
+     */
     @TableField("pending_te_nick_name")
     private String pendingTeNickName;
 
+    /**
+     * 昵称资料审核状态：0-审核中，1-审核通过，2-审核驳回
+     */
     @TableField("te_nick_name_audit_status")
     private Integer teNickNameAuditStatus;
 
+    /**
+     * 昵称资料审核备注
+     */
     @TableField("te_nick_name_audit_remark")
     private String teNickNameAuditRemark;
 
+    /**
+     * 待审核简介
+     */
     @TableField("pending_te_brief")
     private String pendingTeBrief;
 
+    /**
+     * 简介资料审核状态：0-审核中，1-审核通过，2-审核驳回
+     */
     @TableField("te_brief_audit_status")
     private Integer teBriefAuditStatus;
 
+    /**
+     * 简介资料审核备注
+     */
     @TableField("te_brief_audit_remark")
     private String teBriefAuditRemark;
 

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

@@ -73,7 +73,7 @@ public class MerchantApplyFile implements Serializable {
     private String applyBatchNo;
 
     /**
-     * 审核状态:1-审核通过,2-审核未通过
+     * 审核状态(0-审核中，1-审核通过，2-审核驳回)
      */
     private Integer auditStatus;
 

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

@@ -7,18 +7,29 @@ import java.time.LocalDate;
 
 @Data
 public class MerchantProfileAuditDTO {
-
     /**
-     * 2-审核通过 3-审核驳回
+     * 审核状态：2-审核通过，3-审核驳回
      */
     @NotNull(message = "审核状态不能为空")
     private Integer auditStatus;
 
+    /**
+     * 身份证到期日期
+     */
     private LocalDate idCardExpirationDate;
 
+    /**
+     * 健康证到期日期
+     */
     private LocalDate healthCertificateExpirationDate;
 
+    /**
+     * 从业资格证到期日期
+     */
     private LocalDate qualificationCertificateExpirationDate;
 
+    /**
+     * 审核备注
+     */
     private String auditRemark;
 }

nightFragrance-massage/src/main/java/com/ylx/massage/service/IMaTechnicianService.java

@@ -114,11 +114,6 @@ public interface IMaTechnicianService extends IService<MaTechnician> {
      */
     int submitMerchantAudit(Integer id, MaTechnicianAuditSubmitDTO dto, LoginUser loginUser);
 
-    /**
-     * 商户申请入驻提交审核
-     */
-    int applyMerchantAudit(Integer id, MaTechnicianAuditSubmitDTO dto, LoginUser loginUser);
-
     /**
      * 后台待审核页面审核通过商户。
      *
@@ -215,6 +210,14 @@ public interface IMaTechnicianService extends IService<MaTechnician> {
 
     void submitMerchantProfile(MerchantProfileSubmitDTO dto);
 
+    /**
+     * 商户申请入驻审核
+     *
+     * @param merchantId
+     * @param dto
+     * @param loginUser
+     * @return int
+     */
     int auditMerchantProfile(Integer merchantId, MerchantProfileAuditDTO dto, LoginUser loginUser);
 
     /**

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

@@ -364,32 +364,39 @@ public class MaTechnicianServiceImpl extends ServiceImpl<MaTechnicianMapper, MaT
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int auditMerchantProfile(Integer merchantId, MerchantProfileAuditDTO dto, LoginUser loginUser) {
+        // 检查merchantId是否为空
+        if (merchantId == null) {
+            throw new ServiceException("商户ID不能为空");
+        }
+        // 检查dto参数是否为空
+        if (dto == null) {
+            throw new ServiceException("审核参数不能为空");
+        }
+        // 检查商户是否存在
         MaTechnician merchant = getExistingMerchant(merchantId);
-        if (dto != null && (AUDIT_APPROVED == dto.getAuditStatus() || AUDIT_REJECTED == dto.getAuditStatus())) {
+        if (merchant == null) {
+            throw new ServiceException("商户不存在");
+        }
+        if ((AUDIT_APPROVED == dto.getAuditStatus() || AUDIT_REJECTED == dto.getAuditStatus())) {
             String profileAuditRemark = dto.getAuditRemark() == null ? "" : dto.getAuditRemark().trim();
             if (AUDIT_REJECTED == dto.getAuditStatus() && StringUtils.isBlank(profileAuditRemark)) {
                 throw new ServiceException("审核驳回时审核备注不能为空");
             }
             if (AUDIT_APPROVED == dto.getAuditStatus()) {
                 checkProfileAuditExpirationDates(dto);
+                // 审核通过所有待审核资料
                 return approveAllPendingProfile(merchant, dto, profileAuditRemark, loginUser);
             }
+            // 审核驳回所有待审核资料
             return rejectAllPendingProfile(merchant, profileAuditRemark, loginUser);
         }
-        if (dto == null) {
-            throw new ServiceException("审核参数不能为空");
-        }
-        checkEnumValue(dto.getAuditStatus(), "审核状态", PROFILE_AUDIT_APPROVED, PROFILE_AUDIT_REJECTED);
-        String auditRemark = dto.getAuditRemark() == null ? "" : dto.getAuditRemark().trim();
-        if (PROFILE_AUDIT_REJECTED == dto.getAuditStatus() && StringUtils.isBlank(auditRemark)) {
-            throw new ServiceException("审核驳回时审核备注不能为空");
-        }
-        if (PROFILE_AUDIT_APPROVED == dto.getAuditStatus() || PROFILE_AUDIT_REJECTED == dto.getAuditStatus()) {
-            throw new ServiceException("审核状态请使用2-审核通过或3-审核驳回");
-        }
-        throw new ServiceException("审核资料类型不正确");
+        return 0;
     }
 
+    /**
+     * 检查审核通过时，是否填写了身份证到期日期、健康证到期日期、从业资格证到期日期
+     * @param dto
+     */
     private void checkProfileAuditExpirationDates(MerchantProfileAuditDTO dto) {
         if (dto.getIdCardExpirationDate() == null
                 || dto.getHealthCertificateExpirationDate() == null
@@ -398,6 +405,15 @@ public class MaTechnicianServiceImpl extends ServiceImpl<MaTechnicianMapper, MaT
         }
     }
 
+    /**
+     * 审核通过所有待审核资料
+     *
+     * @param merchant
+     * @param dto
+     * @param auditRemark
+     * @param loginUser
+     * @return int
+     */
     private int approveAllPendingProfile(MaTechnician merchant, MerchantProfileAuditDTO dto, String auditRemark, LoginUser loginUser) {
         List<MerchantApplyFile> pendingFiles = listPendingProfileFiles(merchant.getId());
         boolean hasPendingText = hasPendingProfileText(merchant);
@@ -408,9 +424,21 @@ public class MaTechnicianServiceImpl extends ServiceImpl<MaTechnicianMapper, MaT
         if (!CollectionUtils.isEmpty(pendingFiles)) {
             rows += approvePendingProfileFiles(merchant.getId(), pendingFiles, auditRemark, loginUser);
         }
+        //同时修改ma_technician表的审核状态
+        LambdaUpdateWrapper<MaTechnician> updateWrapper = new LambdaUpdateWrapper<MaTechnician>();
+        updateWrapper.eq(MaTechnician::getId, merchant.getId()).set(MaTechnician::getAuditStatus, dto.getAuditStatus());
+        rows += maTechnicianMapper.update(null, updateWrapper);
         return rows;
     }
 
+    /**
+     * 审核驳回所有待审核资料
+     *
+     * @param merchant
+     * @param auditRemark
+     * @param loginUser
+     * @return int
+     */
     private int rejectAllPendingProfile(MaTechnician merchant, String auditRemark, LoginUser loginUser) {
         List<MerchantApplyFile> pendingFiles = listPendingProfileFiles(merchant.getId());
         boolean hasPendingText = hasPendingProfileText(merchant);
@@ -424,21 +452,45 @@ public class MaTechnicianServiceImpl extends ServiceImpl<MaTechnicianMapper, MaT
         if (!CollectionUtils.isEmpty(pendingFiles)) {
             rows += rejectPendingProfileFiles(merchant.getId(), auditRemark, loginUser);
         }
+        //同时修改ma_technician表的审核状态
+        LambdaUpdateWrapper<MaTechnician> updateWrapper = new LambdaUpdateWrapper<MaTechnician>();
+        updateWrapper.eq(MaTechnician::getId, merchant.getId()).set(MaTechnician::getAuditStatus, AUDIT_REJECTED);
+        rows += maTechnicianMapper.update(null, updateWrapper);
         return rows;
     }
 
+    /**
+     * 检查商户是否有待审核资料(昵称或简介)
+     *
+     * @param merchant
+     * @return boolean
+     */
     private boolean hasPendingProfileText(MaTechnician merchant) {
         return Integer.valueOf(PROFILE_AUDIT_PENDING).equals(merchant.getTeNickNameAuditStatus())
                 || Integer.valueOf(PROFILE_AUDIT_PENDING).equals(merchant.getTeBriefAuditStatus());
     }
 
+    /**
+     * 获取待审核的申请入驻文件资料
+     *
+     * @param merchantId
+     * @return List<MerchantApplyFile>
+     */
     private List<MerchantApplyFile> listPendingProfileFiles(Integer merchantId) {
         LambdaQueryWrapper<MerchantApplyFile> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(MerchantApplyFile::getMerchantId, merchantId)
-                .eq(MerchantApplyFile::getAuditStatus, PROFILE_AUDIT_PENDING);
+        queryWrapper.eq(MerchantApplyFile::getMerchantId, merchantId).eq(MerchantApplyFile::getAuditStatus, PROFILE_AUDIT_PENDING);
         return merchantApplyFileMapper.selectList(queryWrapper);
     }
 
+    /**
+     * 审核通过所有待审核资料(昵称或简介)
+     *
+     * @param merchant
+     * @param dto
+     * @param auditRemark
+     * @param loginUser
+     * @return int
+     */
     private int approveProfileTechnicianInfo(MaTechnician merchant, MerchantProfileAuditDTO dto, String auditRemark, LoginUser loginUser) {
         LambdaUpdateWrapper<MaTechnician> updateWrapper = Wrappers.lambdaUpdate();
         updateWrapper.eq(MaTechnician::getId, merchant.getId())
@@ -447,12 +499,15 @@ public class MaTechnicianServiceImpl extends ServiceImpl<MaTechnicianMapper, MaT
                 .set(MaTechnician::getQualificationCertificateExpirationDate, dto.getQualificationCertificateExpirationDate())
                 .set(MaTechnician::getUpdateBy, getAuditUserName(loginUser))
                 .set(MaTechnician::getUpdateTime, DateUtils.getNowDate());
+
+        // 审核通过昵称
         if (Integer.valueOf(PROFILE_AUDIT_PENDING).equals(merchant.getTeNickNameAuditStatus())) {
             updateWrapper.set(MaTechnician::getTeNickName, merchant.getPendingTeNickName())
                     .set(MaTechnician::getPendingTeNickName, null)
                     .set(MaTechnician::getTeNickNameAuditStatus, PROFILE_AUDIT_APPROVED)
                     .set(MaTechnician::getTeNickNameAuditRemark, auditRemark);
         }
+        // 审核通过简介
         if (Integer.valueOf(PROFILE_AUDIT_PENDING).equals(merchant.getTeBriefAuditStatus())) {
             updateWrapper.set(MaTechnician::getTeBrief, merchant.getPendingTeBrief())
                     .set(MaTechnician::getPendingTeBrief, null)
@@ -478,6 +533,15 @@ public class MaTechnicianServiceImpl extends ServiceImpl<MaTechnicianMapper, MaT
         return maTechnicianMapper.update(null, updateWrapper);
     }
 
+    /**
+     * 审核通过所有待审核文件资料
+     *
+     * @param merchantId
+     * @param pendingFiles
+     * @param auditRemark
+     * @param loginUser
+     * @return int
+     */
     private int approvePendingProfileFiles(Integer merchantId, List<MerchantApplyFile> pendingFiles, String auditRemark, LoginUser loginUser) {
         Set<String> fileTypes = pendingFiles.stream()
                 .map(MerchantApplyFile::getFileType)
@@ -517,6 +581,12 @@ public class MaTechnicianServiceImpl extends ServiceImpl<MaTechnicianMapper, MaT
         return merchantApplyFileMapper.update(null, auditWrapper);
     }
 
+    /**
+     * 获取存在的商户信息
+     *
+     * @param merchantId
+     * @return MaTechnician
+     */
     private MaTechnician getExistingMerchant(Integer merchantId) {
         if (merchantId == null) {
             throw new ServiceException("商户ID不能为空");
@@ -1174,65 +1244,6 @@ public class MaTechnicianServiceImpl extends ServiceImpl<MaTechnicianMapper, MaT
         return rows;
     }
 
-    /**
-     * 商户申请入驻提交审核
-     *
-     * @param id
-     * @param dto
-     * @param loginUser
-     * @return int
-     */
-    @Override
-    public int applyMerchantAudit(Integer id, MaTechnicianAuditSubmitDTO dto, LoginUser loginUser) {
-        if (id == null) {
-            throw new ServiceException("商户ID不能为空");
-        }
-        if (dto == null) {
-            throw new ServiceException("审核参数不能为空");
-        }
-        checkEnumValue(dto.getAuditStatus(), "审核意见", AUDIT_APPROVED, AUDIT_REJECTED);
-        String auditRemark = dto.getAuditRemark() == null ? "" : dto.getAuditRemark().trim();
-        if (dto.getAuditStatus() == AUDIT_REJECTED && StringUtils.isBlank(auditRemark)) {
-            throw new ServiceException("审核驳回时审核备注不能为空");
-        }
-        // 审核通过时，身份证到期日期、健康证到期日期、资格证到期日期不能为空
-        if (dto.getAuditStatus() == AUDIT_APPROVED && (dto.getIdCardExpirationDate() == null || dto.getHealthCertificateExpirationDate() == null || dto.getQualificationCertificateExpirationDate() == null)) {
-            throw new ServiceException("审核通过时，身份证到期日期、健康证到期日期、资格证到期日期不能为空");
-        }
-        if (auditRemark.length() > AUDIT_REMARK_MAX_LENGTH) {
-            throw new ServiceException("审核备注长度不能超过" + AUDIT_REMARK_MAX_LENGTH + "个字符");
-        }
-
-        MaTechnician existsMerchant = maTechnicianMapper.selectMerchantById(id);
-        if (existsMerchant == null || !NOT_DELETED.equals(existsMerchant.getIsDelete())) {
-            throw new ServiceException("商户不存在或已删除");
-        }
-        Integer currentAuditStatus = existsMerchant.getAuditStatus();
-        if (currentAuditStatus == null || (currentAuditStatus != 1)) {
-            throw new ServiceException("当前商户申请入驻已审核，不用重复审核");
-        }
-
-        MaTechnician maTechnician = new MaTechnician();
-        maTechnician.setId(id);
-        //设置审核状态
-        maTechnician.setAuditStatus(dto.getAuditStatus());
-        maTechnician.setIdCardExpirationDate(dto.getIdCardExpirationDate());
-        maTechnician.setHealthCertificateExpirationDate(dto.getHealthCertificateExpirationDate());
-        maTechnician.setQualificationCertificateExpirationDate(dto.getQualificationCertificateExpirationDate());
-        maTechnician.setAuditRemark(auditRemark);
-        maTechnician.setApproveTime(DateUtils.getNowDate());
-        if (loginUser != null && loginUser.getUser() != null) {
-            maTechnician.setUpdateBy(loginUser.getUser().getUserName());
-        }
-        maTechnician.setUpdateTime(DateUtils.getNowDate());
-
-        int rows = maTechnicianMapper.submitMerchantAuditById(maTechnician);
-        if (rows <= 0) {
-            throw new ServiceException("商户申请入驻审核失败");
-        }
-        return rows;
-    }
-
     /**
      * 后台查询商户证照
      *