Merge remote-tracking branch 'origin/master'

jiangping

2025-05-21 702a936a613cc16d1aeb0b2326cd795e0e8ecefd

Merge remote-tracking branch 'origin/master'

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/VisitorWebController.java

@@ -118,11 +118,11 @@
     */
    @ApiOperation("取消预约")
    @GetMapping("/visitsSelfCancel")
    public ApiResponse visitsSelfCancel(@RequestParam Integer visitId,@RequestParam Integer memberId){
    public ApiResponse visitsSelfCancel(@RequestParam Integer visitId,Integer memberId,@RequestParam String openid){
        if(Objects.isNull(memberId)){
            memberId = Constants.ZERO;
        }
        visitsService.visitsSelfCancel(visitId,memberId);
        visitsService.visitsSelfCancel(visitId,memberId,openid);
        return ApiResponse.success(null);
    }


 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/VisitsService.java

@@ -146,7 +146,7 @@
     * 处理待审核、审核中、已审核的数据取消业务
     * 2025年3月25日14:10:10
      */
    void  visitsSelfCancel(Integer visitId,Integer memberId);
    void  visitsSelfCancel(Integer visitId,Integer memberId,String openid);
    void  visitsCancel(Integer visitId,LoginUserInfo loginUserInfo);
    void resetPassword(ResetPasswordDTO resetPasswordDTO);


 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java

@@ -1598,7 +1598,7 @@


    @Override
    public void  visitsSelfCancel(Integer visitId,Integer memberId){
    public void  visitsSelfCancel(Integer visitId,Integer memberId,String openid){
        Visits visits = visitsMapper.selectById(visitId);
        if(Objects.isNull(visits)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
@@ -1606,6 +1606,9 @@
        if(!(Constants.equalsInteger(memberId,visits.getMemberId()))){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"无此操作权限");
        }
        if(!StringUtils.equals(openid,visits.getOpenid())){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"无此操作权限");
        }
        this.visitsCancelBiz(visits);
    }