Merge #37 into master from cc_20251208_visit

feat:拜访字段调整 * cc_20251208_visit: (19 commits squashed) - feat:拜访记录 - fix:拜访详情接口新增字段 - fix:新增状态转义字段 - fix:惩处单查询提供惩处待处理、惩处已处理状态筛选 - fix - fix:管理员能查看所有加盟商 - fix:去掉部分字段非空校验 - fix:空校验 - Merge branch 'master' into cc_20251208_visit # Conflicts: #	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java #	coolstore-partner-dao/src/main/java/com/cool/store/dao/store/StoreMasterSignerInfoDAO.java #	coolstore-partner-service/src/main/java/com/cool/store/service/impl/UserAuthMappingServiceImpl.java - fix - fix:拜访记录失效延时消息 - fix:拜访记录统计 - fix:拜访记录统计新增筛选条件 - fix:字段转义 - feat:拜访调整 - feat:拜访调整_过滤我的 - feat:拜访调整_过滤我的 - feat:拜访字段调整 - feat:拜访字段调整 Signed-off-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com> Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com> CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/37
2026-02-02 09:56:33 +00:00
parent 88e7d99f85
commit 83fcb84f9d
37 changed files with 1821 additions and 1 deletions
--- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/VisitRecordController.java
+++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/VisitRecordController.java
@@ -0,0 +1,103 @@
+package com.cool.store.controller.webb;
+
+import com.cool.store.context.CurrentUserHolder;
+import com.cool.store.request.visit.*;
+import com.cool.store.response.ResponseResult;
+import com.cool.store.service.visit.VisitRecordService;
+import com.cool.store.vo.visit.*;
+import com.github.pagehelper.PageInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * <p>
+ * 拜访记录 前端控制器
+ * </p>
+ *
+ * @author wangff
+ * @since 2025/12/9
+ */
+@Api(tags = "拜访记录")
+@RestController
+@RequestMapping("/pc/visit/record")
+@RequiredArgsConstructor
+public class VisitRecordController {
+    
+    private final VisitRecordService visitRecordService;
+
+    @ApiOperation("签到")
+    @PostMapping("/signIn")
+    public ResponseResult<String> signIn(@RequestBody @Validated VisitSignInRequest request) {
+        return ResponseResult.success(visitRecordService.signIn(request));
+    }
+
+    @ApiOperation("签退")
+    @PostMapping("/signOut")
+    public ResponseResult<String> signOut(@RequestBody @Validated VisitSignOutRequest request) {
+        return ResponseResult.success(visitRecordService.signOut(request));
+    }
+
+    @ApiOperation("编辑拜访记录")
+    @PostMapping("/editRecord")
+    public ResponseResult<Boolean> editRecord(@RequestBody @Validated VisitEditRequest request) {
+        return ResponseResult.success(visitRecordService.editRecord(request));
+    }
+
+    @ApiOperation("拜访加盟商列表")
+    @PostMapping("/partnerList")
+    public ResponseResult<PageInfo<VisitPartnerListVO>> visitPartnerList(@RequestBody VisitPartnerQueryRequest request) {
+        return ResponseResult.success(visitRecordService.visitPartnerList(request));
+    }
+
+    @ApiOperation("我的拜访加盟商列表")
+    @PostMapping("/personPartnerList")
+    public ResponseResult<PageInfo<VisitPartnerListVO>> personVisitPartnerList(@RequestBody VisitPartnerQueryRequest request) {
+        request.setUserId(CurrentUserHolder.getUserId());
+        return ResponseResult.success(visitRecordService.visitPartnerList(request));
+    }
+
+    @ApiOperation("查询拜访记录简单信息（h5使用）")
+    @PostMapping("/simpleList")
+    public ResponseResult<PageInfo<VisitRecordSimpleListVO>> recordSimpleList(@RequestBody VisitRecordSimpleQueryRequest request) {
+        request.setUserId(CurrentUserHolder.getUserId());
+        return ResponseResult.success(visitRecordService.recordSimpleList(request));
+    }
+
+    @ApiOperation("我的查询拜访记录简单信息（h5使用）")
+    @PostMapping("/personSimpleList")
+    public ResponseResult<PageInfo<VisitRecordSimpleListVO>> personRecordSimpleList(@RequestBody VisitRecordSimpleQueryRequest request) {
+        request.setUserId(CurrentUserHolder.getUserId());
+        return ResponseResult.success(visitRecordService.recordSimpleList(request));
+    }
+
+    @ApiOperation("获取拜访记录详情")
+    @GetMapping("/detail")
+    @ApiImplicitParam(name = "id", value = "拜访记录id", required = true, dataType = "Long", paramType = "query")
+    public ResponseResult<VisitRecordDetailVO> getDetail(@NotNull(message = "拜访记录id不能为空") Long id) {
+        return ResponseResult.success(visitRecordService.getDetail(id));
+    }
+
+    @ApiOperation("取消拜访")
+    @PostMapping("/cancel")
+    public ResponseResult<Boolean> cancelVisit(@RequestBody @Validated VisitCancelRequest request) {
+        return ResponseResult.success(visitRecordService.cancelVisit(request));
+    }
+
+    @ApiOperation("获取拜访记录列表")
+    @PostMapping("/list")
+    public ResponseResult<PageInfo<VisitRecordListVO>> recordList(@RequestBody VisitRecordQueryRequest request) {
+        return ResponseResult.success(visitRecordService.recordList(request));
+    }
+
+    @ApiOperation("拜访记录状态统计")
+    @PostMapping("/countStatusStatistics")
+    public ResponseResult<VisitRecordStatusStatisticsVO> countStatusStatistics(@RequestBody VisitRecordQueryRequest request) {
+        return ResponseResult.success(visitRecordService.countStatusStatistics(request));
+    }
+}