修改bug

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

@@ -63,10 +63,10 @@ public class AlarmController {
     private LambdaQueryWrapper<Alarm> buildAlarmQueryWrapper(Alarm alarm) {
         LambdaQueryWrapper<Alarm> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(null != alarm.getAlarmStatus(), Alarm::getAlarmStatus, alarm.getAlarmStatus())
-                .like(StringUtils.isNotBlank(alarm.getMerchantName()), Alarm::getMerchantName, alarm.getMerchantName())
+                /*.like(StringUtils.isNotBlank(alarm.getMerchantName()), Alarm::getMerchantName, alarm.getMerchantName())
                 .like(StringUtils.isNotBlank(alarm.getMerchantNickName()), Alarm::getMerchantNickName, alarm.getMerchantNickName())
                 .eq(null != alarm.getMerchantSex(), Alarm::getMerchantSex, alarm.getMerchantSex())
-                .like(StringUtils.isNotBlank(alarm.getMerchantPhone()), Alarm::getMerchantPhone, alarm.getMerchantPhone())
+                .like(StringUtils.isNotBlank(alarm.getMerchantPhone()), Alarm::getMerchantPhone, alarm.getMerchantPhone())*/
                 .ge(StringUtils.isNotBlank(alarm.getBeginTime()), Alarm::getCreateTime, normalizeBeginTime(alarm.getBeginTime()))
                 .le(StringUtils.isNotBlank(alarm.getEndTime()), Alarm::getCreateTime, normalizeEndTime(alarm.getEndTime()))
                 .orderByDesc(Alarm::getCreateTime);

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

@@ -1,5 +1,6 @@
 package com.ylx.web.controller.massage;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -788,58 +789,83 @@ public class MaTechnicianController extends BaseController {
      * 重新申请开通新服务
      *
      * @param req
-     * @return
+     * @return R<?>
      */
     @PostMapping("/updateApply")
     @ApiOperation("重新申请开通新服务")
     public R<?> updateApply(@RequestBody MaProjectUpdateDto req) {
-        if (StringUtils.isNotEmpty(req.getProjectId()) && StringUtils.isNotEmpty(req.getApplyReason())) {
-            LambdaUpdateWrapper<MaProject> updateWrapper = new LambdaUpdateWrapper<>();
-            updateWrapper.eq(MaProject::getId, req.getProjectId());
-            updateWrapper.set(MaProject::getApplyReason, req.getApplyReason());
-            updateWrapper.set(MaProject::getAuditStatus, 0);
-            maProjectService.update(updateWrapper);
+        try {
+            if (req.getProjectId() != null && StringUtils.isNotBlank(req.getApplyReason())) {
+                LambdaUpdateWrapper<MaProject> updateWrapper = new LambdaUpdateWrapper<>();
+                updateWrapper.eq(MaProject::getProjectId, req.getProjectId());
+                updateWrapper.set(MaProject::getApplyReason, req.getApplyReason());
+                updateWrapper.set(MaProject::getAuditStatus, 0);
+                // 更新申请时间
+                updateWrapper.set(MaProject::getApplyTime, new Date());
+                maProjectService.update(updateWrapper);
+            }
+            return R.ok("重新申请成功,提交到审核阶段");
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new RuntimeException(e);
         }
-        return R.ok("重新申请成功,提交到审核阶段");
-
     }
 
     /**
      * 申请下架,删除服务项目,编辑售价价格
      *
      * @param req
-     * @return
+     * @return R<?>
      */
     @PostMapping("/updateMaProject")
     @ApiOperation("申请下架,删除服务项目,编辑售价价格")
     public R<?> updateMaProject(@RequestBody MaProjectUpdateDto req) {
         String message = "";
-        if (StringUtils.isNotEmpty(req.getProjectId())) {
-            if (req.getIsDelete()) {
-                LambdaUpdateWrapper<MaProject> updateWrapper = new LambdaUpdateWrapper<>();
-                updateWrapper.eq(MaProject::getProjectId, req.getProjectId());
-                updateWrapper.set(MaProject::getIsDelete, 1);
-                maProjectService.update(updateWrapper);
+        if (req.getProjectId() != null) {
+            // 删除项目
+            if (req.getIsDelete() != null && req.getIsDelete() == true) {
+                LambdaQueryWrapper<MaProject> queryWrapper = new LambdaQueryWrapper<>();
+                queryWrapper.eq(MaProject::getProjectId, req.getProjectId());
+                maProjectService.remove(queryWrapper);
                 message = "删除成功";
+                return R.ok(message);
             }
-            if (req.getIsPass()) {
+            // 下架项目
+            if (req.getIsPass() != null && req.getIsPass() == true) {
+                //判断当前项目是否已开通
+                LambdaQueryWrapper<MaProject> queryWrapper = new LambdaQueryWrapper<>();
+                queryWrapper.eq(MaProject::getProjectId, req.getProjectId());
+                queryWrapper.eq(MaProject::getAuditStatus, 1);
+                MaProject one = maProjectService.getOne(queryWrapper);
+                if (one == null) {
+                    return R.fail("项目未开通,不能下架");
+                }
                 LambdaUpdateWrapper<MaProject> updateWrapper = new LambdaUpdateWrapper<>();
                 updateWrapper.eq(MaProject::getId, req.getProjectId());
                 updateWrapper.set(MaProject::getProjectIsEnable, 1);
                 maProjectService.update(updateWrapper);
                 message = "申请下架成功";
+                return R.ok(message);
             }
+            // 修改价格
             if (req.getProjectCurrentPrice() != null) {
-
+                //判断当前项目是否已开通
+                LambdaQueryWrapper<MaProject> queryWrapper = new LambdaQueryWrapper<>();
+                queryWrapper.eq(MaProject::getProjectId, req.getProjectId());
+                queryWrapper.eq(MaProject::getAuditStatus, 1);
+                MaProject one = maProjectService.getOne(queryWrapper);
+                if (one == null) {
+                    return R.fail("项目未开通,不能修改价格");
+                }
                 LambdaUpdateWrapper<MaProject> updateWrapper = new LambdaUpdateWrapper<>();
                 updateWrapper.eq(MaProject::getId, req.getProjectId());
                 updateWrapper.set(MaProject::getProjectCurrentPrice, req.getProjectCurrentPrice());
                 maProjectService.update(updateWrapper);
                 message = "修改价格完成";
-
+                return R.ok(message);
             }
         }
-        return R.ok(message);
+        return R.fail("项目ID不能为空");
     }
 
     /**

nightFragrance-common/pom.xml

@@ -195,6 +195,12 @@
             <artifactId>spring-test</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-configuration-processor</artifactId>

nightFragrance-common/src/main/java/com/ylx/common/utils/ServletUtils.java

@@ -98,6 +98,32 @@ public class ServletUtils {
         return getRequestAttributes().getRequest();
     }
 
+    /**
+     * 获取当前项目访问根路径。
+     *
+     * @return 当前项目访问根路径，例如：http://192.168.1.190:8087
+     */
+    public static String getProjectAccessPath() {
+        HttpServletRequest request = getRequest();
+        String scheme = request.getScheme();
+        int port = request.getServerPort();
+        String contextPath = request.getContextPath();
+        StringBuilder accessPath = new StringBuilder();
+        accessPath.append(scheme).append("://").append(request.getServerName());
+        if (!isDefaultPort(scheme, port)) {
+            accessPath.append(":").append(port);
+        }
+        if (StringUtils.isNotEmpty(contextPath) && !"/".equals(contextPath)) {
+            accessPath.append(contextPath);
+        }
+        return accessPath.toString();
+    }
+
+    private static boolean isDefaultPort(String scheme, int port) {
+        return ("http".equalsIgnoreCase(scheme) && port == 80)
+                || ("https".equalsIgnoreCase(scheme) && port == 443);
+    }
+
     /**
      * 获取response
      */

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

@@ -117,7 +117,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/getTechnicianInfo","/technician/technician/getSkillList","/technician/technician/getTechnicianList",
+                ,"/technician/technician/getTechnician" ,"/technician/technician/getTechnicianInfo","/technician/technician/getTechnicianList",
                         "/technician/technician/apply","/technician/technician/resetPassword",
                        "/customer/banner/page","/customer/service/category/**").permitAll()
                 // 静态资源，可匿名访问

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

@@ -34,7 +34,12 @@ public class Alarm implements Serializable {
     private String id;
 
     /**
-     * 关联订单编号。
+     * 关联订单ID。
+     */
+    private Long orderId;
+
+    /**
+     * 关联订单编号
      */
     @ApiModelProperty("订单编号")
     private String orderNo;
@@ -45,35 +50,6 @@ public class Alarm implements Serializable {
     @ApiModelProperty("商户id")
     private String merchantId;
 
-    /**
-     * 发起告警的商户姓名。
-     */
-    @ApiModelProperty("商户姓名")
-    private String merchantName;
-
-    /**
-     * 发起告警的商户昵称。
-     */
-    @ApiModelProperty("商户昵称")
-    private String merchantNickName;
-
-    /**
-     * 商户性别，0表示女，1表示男。
-     */
-    @ApiModelProperty("商户性别：0女 1男")
-    private Integer merchantSex;
-
-    /**
-     * 商户形象照地址。
-     */
-    @ApiModelProperty("商户形象照")
-    private String merchantAvatar;
-
-    /**
-     * 商户联系电话。
-     */
-    @ApiModelProperty("商户电话")
-    private String merchantPhone;
 
     /**
      * 告警发生地点。
@@ -88,9 +64,9 @@ public class Alarm implements Serializable {
     private Integer alarmStatus;
 
     /**
-     * 告警备注或处理说明。
+     * 处理结果
      */
-    @ApiModelProperty("备注")
+    @ApiModelProperty("处理结果")
     private String note;
 
     /**

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

@@ -13,6 +13,7 @@ import io.swagger.annotations.ApiModelProperty;
 import com.ylx.common.annotation.Excel;
 import com.ylx.common.core.domain.BaseEntity;
 import lombok.Data;
+
 import java.util.Date;
 
 /**
@@ -131,14 +132,18 @@ public class MaProject implements Serializable {
     @Excel(name = "项目详情图")
     @ApiModelProperty("项目详情图")
     private String projectDetailImage;
-    /** 开通理由 */
+    /**
+     * 开通理由
+     */
     @Excel(name = "开通理由")
     @ApiModelProperty("开通理由")
-    private String   applyReason;
-    /** 开通理由 */
+    private String applyReason;
+    /**
+     * 开通理由
+     */
     @Excel(name = "驳回原因")
     @ApiModelProperty("驳回原因")
-    private String   reason;
+    private String reason;
     /**
      * 是否启用(0否1是)
      */
@@ -153,15 +158,21 @@ public class MaProject implements Serializable {
     @ApiModelProperty("审核状态：0-待审核，1-审核通过，2-审核驳回")
     private Integer auditStatus;
 
-    /** 申请时间 */
+    /**
+     * 申请时间
+     */
     @Excel(name = "申请时间")
     @ApiModelProperty("申请时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date applyTime;
 
-    /** 审批时间 */
+    /**
+     * 审批时间
+     */
     @Excel(name = "审批时间")
     @ApiModelProperty("申请时间")
-    private Date  approveTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date approveTime;
 
     /**
      * 创建人

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

@@ -10,25 +10,30 @@ import java.util.List;
 @Data
 public class MaProjectUpdateDto {
     /**
-     * 商家id
+     * 商户ID
      */
-    private Long merchantId;
+    private Integer merchantId;
+
     /**
-     * 项目id列表
+     * 项目id
      */
-    private String projectId;
+    private Integer projectId;
+
     /**
      * 申请理由
      */
     private String applyReason;
+
     /**
      * 是否下架
      */
     private Boolean isPass;
+
     /**
      * 是否删除
      */
     private Boolean isDelete;
+
     /**
      * 我的售价
      */

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

@@ -12,16 +12,28 @@ import java.util.List;
 @ApiModel(value = "ContractRecordVO", description = "商户合同记录")
 public class ContractRecordVO {
 
+    /**
+     * 合同签订时间。
+     */
     @ApiModelProperty("合同签订时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date signTime;
 
+    /**
+     * 签订人姓名。
+     */
     @ApiModelProperty("签订人姓名")
     private String signerName;
 
+    /**
+     * 商户ID。
+     */
     @ApiModelProperty("商户ID")
     private Integer merchantId;
 
+    /**
+     * 合同文件列表。
+     */
     @ApiModelProperty("合同文件列表")
     private List<ContractFileVO> file;
 
@@ -29,12 +41,21 @@ public class ContractRecordVO {
     @ApiModel(value = "ContractFileVO", description = "商户合同文件")
     public static class ContractFileVO {
 
+        /**
+         * 合同记录ID。
+         */
         @ApiModelProperty("合同记录ID")
         private Long id;
 
+        /**
+         * 合同名称。
+         */
         @ApiModelProperty("合同名称")
         private String contractName;
 
+        /**
+         * 上传文件URL。
+         */
         @ApiModelProperty("上传文件URL")
         private String fileUrl;
     }

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

@@ -24,8 +24,7 @@ import com.ylx.project.domain.bookMerchant.vo.BookMerchantVO;
  * @author ylx
  * @date 2024-03-20
  */
-public interface IMaProjectService extends IService<MaProject>
-{
+public interface IMaProjectService extends IService<MaProject> {
     /**
      * 查询服务项目
      *
@@ -46,7 +45,7 @@ public interface IMaProjectService extends IService<MaProject>
      * 查询技能审核列表
      *
      * @param page 分页参数
-     * @param dto 查询条件
+     * @param dto  查询条件
      * @return 技能审核分页列表
      */
     Page<MaProjectAuditListVO> selectProjectAuditList(Page<MaProjectAuditListVO> page,
@@ -64,8 +63,8 @@ public interface IMaProjectService extends IService<MaProject>
      * 审核商户申请开通的项目
      *
      * @param projectAuditId 技能审核记录ID
-     * @param dto 审核提交参数
-     * @param loginUser 当前登录用户
+     * @param dto            审核提交参数
+     * @param loginUser      当前登录用户
      * @return 影响行数
      */
     int submitProjectAudit(Long projectAuditId, MaProjectAuditSubmitDTO dto, LoginUser loginUser);
@@ -102,7 +101,7 @@ public interface IMaProjectService extends IService<MaProject>
      */
     public int deleteMaProjectById(Long id);
 
-    Page<MassageProjectRecommendVo> getMassageProjectRecommend(Page<MassageProjectRecommendVo> page,String cityCode);
+    Page<MassageProjectRecommendVo> getMassageProjectRecommend(Page<MassageProjectRecommendVo> page, String cityCode);
 
     Page<MassageAllMerchantsVo> getMassageAllMerchants(Page<MassageAllMerchantsVo> page, MassageAllMerchantsDto dto);
 

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

@@ -316,7 +316,7 @@ public interface IMaTechnicianService extends IService<MaTechnician> {
      * 查询商户合同记录信息
      *
      * @param userId
-     * @return
+     * @return ContractRecordVO
      */
     ContractRecordVO getContractRecords(Long userId);
 

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

@@ -86,11 +86,11 @@ public class AlarmServiceImpl extends BaseServiceImpl<AlarmMapper, Alarm> implem
 
         Alarm alarm = new Alarm();
         alarm.setMerchantId(merchantId.toString());
-        alarm.setMerchantName(maTechnician.getTeName());
+        /*alarm.setMerchantName(maTechnician.getTeName());
         alarm.setMerchantNickName(maTechnician.getTeNickName());
         alarm.setMerchantAvatar(maTechnician.getTeAvatar());
         alarm.setMerchantPhone(maTechnician.getTePhone());
-        alarm.setMerchantSex(maTechnician.getTeSex());
+        alarm.setMerchantSex(maTechnician.getTeSex());*/
         alarm.setAddress(order.getContactAddressInfo());
         alarm.setOrderNo(order.getOrderNo());
         alarm.setIsDelete(NOT_DELETE);

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

@@ -14,6 +14,7 @@ import com.ylx.common.core.domain.model.LoginUser;
 import com.ylx.common.exception.ServiceException;
 import com.ylx.common.utils.DateUtils;
 import com.ylx.common.utils.DistanceUtil;
+import com.ylx.common.utils.ServletUtils;
 import com.ylx.common.utils.StringUtils;
 import com.ylx.fareSetting.service.IMaProjectFareSettingService;
 import com.ylx.massage.domain.*;
@@ -1764,7 +1765,7 @@ public class MaTechnicianServiceImpl extends ServiceImpl<MaTechnicianMapper, MaT
      * 查询商户合同记录信息
      *
      * @param userId
-     * @return
+     * @return ContractRecordVO
      */
     @Override
     public ContractRecordVO getContractRecords(Long userId) {
@@ -1783,12 +1784,6 @@ public class MaTechnicianServiceImpl extends ServiceImpl<MaTechnicianMapper, MaT
                 .filter(record -> record.getContractName() != null && seen.add(record.getContractName()))
                 .collect(Collectors.toList());
 
-        if (CollectionUtils.isEmpty(contractRecordList)) {
-            result.setMerchantId(userId == null ? null : userId.intValue());
-            result.setFile(Collections.emptyList());
-            return result;
-        }
-
         ContractRecord firstRecord = contractRecordList.get(0);
         result.setSignTime(firstRecord.getSignTime());
         result.setSignerName(firstRecord.getSignerName());
@@ -1799,11 +1794,19 @@ public class MaTechnicianServiceImpl extends ServiceImpl<MaTechnicianMapper, MaT
         return result;
     }
 
+    /**
+     * 构建合同文件VO
+     * @param record
+     * @return ContractFileVO.Contract
+     */
     private ContractRecordVO.ContractFileVO buildContractFileVO(ContractRecord record) {
         ContractRecordVO.ContractFileVO fileVO = new ContractRecordVO.ContractFileVO();
         fileVO.setId(record.getId());
         fileVO.setContractName(record.getContractName());
-        fileVO.setFileUrl(record.getFileUrl());
+        // 获取当前项目的访问路径
+        String contextPath = ServletUtils.getProjectAccessPath();
+        String fileUrl = contextPath + record.getFileUrl();
+        fileVO.setFileUrl(fileUrl);
         return fileVO;
     }