Merge remote-tracking branch 'origin/zzj' into zzj

huanghongfa

2021-08-30 22498e4ff995e9069ad0ed72b2a249172375a714

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActReserveApi.java

@@ -103,12 +103,16 @@
     * @return
     */
    @GetMapping("/detail")
    public R detail(@RequestParam("id") Long id){
    public R detail(@RequestParam("id") Long id,@RequestParam("userId") Long userId,@RequestParam("recordId") Long recordId){
        if(id!=null){
            return R.ok(comActReserveService.getById(id));
            return comActReserveService.getById(id,userId,recordId);
        }
        return R.fail();
    }

    /**
     *
     */

    /**
     * 小程序提交预约/登记
@@ -281,21 +285,7 @@
     */
    @PostMapping("/detailOperation")
    public R reserveOperation(@RequestBody OperationDetailDTO comActReserveOperationRecordDO){
            if(comActReserveOperationRecordDO!=null){
                QueryWrapper<ComActReserveOperationRecordDO> queryWrapper=new QueryWrapper<>();
                if(comActReserveOperationRecordDO.getUserId()!=null){
                    queryWrapper.eq("user_id",comActReserveOperationRecordDO.getUserId());
                }
                if(comActReserveOperationRecordDO.getReserveRecordId()!=null){
                    queryWrapper.eq("reserve_record_id",comActReserveOperationRecordDO.getReserveRecordId());
                }
                if(comActReserveOperationRecordDO.getType()!=null){
                    queryWrapper.eq("type",comActReserveOperationRecordDO.getType());
                }
                queryWrapper.orderByDesc("reserve_time");
                return R.ok(comActReserveOperationRecordService.list(queryWrapper));
            }
        return R.ok();
        return comActReserveOperationRecordService.detailOperationRecord(comActReserveOperationRecordDO);
    }

    /**