From 86742ab07570133a0e87a6243d1196b355d42fc5 Mon Sep 17 00:00:00 2001 From: guohb Date: Wed, 27 Mar 2024 17:18:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E4=BD=93=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/TrainingExperienceMapper.java | 2 ++ .../mapper/TrainingExperienceMapper.xml | 22 ++++++++++++------- .../cool/store/entity/LeaseBaseInfoDO.java | 5 +++-- .../service/TrainingExperienceService.java | 2 ++ .../impl/TrainingExperienceServiceImpl.java | 6 +++++ .../webb/PCTrainingExperienceController.java | 7 ++++++ 6 files changed, 34 insertions(+), 10 deletions(-) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/TrainingExperienceMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/TrainingExperienceMapper.java index 77ad4c206..d687794de 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/TrainingExperienceMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/TrainingExperienceMapper.java @@ -14,4 +14,6 @@ public interface TrainingExperienceMapper { void updateStatus(@Param("lineId") Long lineId, @Param("status") Integer status, @Param("abandonCause") String abandonCause); + + LeaseBaseInfoDO selectByLineId(@Param("lineId") Long lineId); } diff --git a/coolstore-partner-dao/src/main/resources/mapper/TrainingExperienceMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/TrainingExperienceMapper.xml index cf14ebb24..5c35fed7e 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/TrainingExperienceMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/TrainingExperienceMapper.xml @@ -42,14 +42,14 @@ abandon_cause, - #{request.partnerId}, - #{request.lineId}, - #{request.storeName}, - #{request.storeId}, - #{request.experienceStartTime}, - #{request.experienceEndTime}, - #{request.experienceStatus}, - #{request.abandonCause}, + #{entity.partnerId}, + #{entity.lineId}, + #{entity.storeName}, + #{entity.storeId}, + #{entity.experienceStartTime}, + #{entity.experienceEndTime}, + #{entity.experienceStatus}, + #{entity.abandonCause}, @@ -60,6 +60,12 @@ abandon_cause=#{abandonCause} where line_id = #{lineId} + \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/LeaseBaseInfoDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/LeaseBaseInfoDO.java index 212b07ccd..7887400fa 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/LeaseBaseInfoDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/LeaseBaseInfoDO.java @@ -1,5 +1,6 @@ package com.cool.store.entity; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; @@ -19,9 +20,9 @@ public class LeaseBaseInfoDO { private Date experienceStartTime; private Date experienceEndTime; - +@ApiModelProperty("体验状态 0完成 1放弃") private Integer experienceStatus; - +@ApiModelProperty("放弃原因") private String abandonCause; private Date createTime; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/TrainingExperienceService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/TrainingExperienceService.java index 574e3d9dd..886287d38 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/TrainingExperienceService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/TrainingExperienceService.java @@ -1,5 +1,6 @@ package com.cool.store.service; +import com.cool.store.entity.LeaseBaseInfoDO; import com.cool.store.request.TrainingExperienceDistributionRequest; public interface TrainingExperienceService { @@ -18,4 +19,5 @@ public interface TrainingExperienceService { */ void experienceStatusChange(Long lineId, Integer status, String abandonCause); + LeaseBaseInfoDO getTrainingExperience(Long lineId); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java index 579b87de4..cf62fe7b1 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java @@ -56,4 +56,10 @@ public class TrainingExperienceServiceImpl implements TrainingExperienceService } } + + @Override + public LeaseBaseInfoDO getTrainingExperience(Long lineId) { + LeaseBaseInfoDO leaseBaseInfoDO = trainingExperienceMapper.selectByLineId(lineId); + return leaseBaseInfoDO; + } } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTrainingExperienceController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTrainingExperienceController.java index dacaaf3cd..bb261653b 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTrainingExperienceController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTrainingExperienceController.java @@ -1,5 +1,6 @@ package com.cool.store.controller.webb; +import com.cool.store.entity.LeaseBaseInfoDO; import com.cool.store.enums.ExperienceStatusEnum; import com.cool.store.request.TrainingExperienceDistributionRequest; import com.cool.store.response.ResponseResult; @@ -28,4 +29,10 @@ public class PCTrainingExperienceController { return ResponseResult.success(trainingExperienceService.distribution(request)); } + @ApiOperation("查询实训体验") + @GetMapping("/get") + public ResponseResult getTrainingExperience(@RequestParam("lineId") Long lineId) { + return ResponseResult.success(trainingExperienceService.getTrainingExperience(lineId)); + } + }