Merge branch 'dev/feat/partner1.1_20230727' of http://git.hsayi.com:19062/HSAY/hsay-partner into dev/feat/partner1.1_20230727

coolstore-partner-model/src/main/java/com/cool/store/dto/inspection/setting/AddInspectionSettingDTO.java

@@ -0,0 +1,25 @@
+package com.cool.store.dto.inspection.setting;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author zhangchenbiao
+ * @FileName: AddInspectionSettingDTO
+ * @Description: 新增稽核区域设置
+ * @date 2023-07-17 14:40
+ */
+@Data
+public class AddInspectionSettingDTO {
+
+    @ApiModelProperty("区域名称")
+    private String zoneName;
+
+    @ApiModelProperty("稽核人id")
+    private String inspectionUserId;
+
+    @ApiModelProperty("归属地ids")
+    private List<Long> openAreaMappingIds;
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/inspection/setting/DeleteInspectionSettingDTO.java

@@ -0,0 +1,18 @@
+package com.cool.store.dto.inspection.setting;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author zhangchenbiao
+ * @FileName: DeleteInspectionSettingDTO
+ * @Description: 删除稽核区域设置
+ * @date 2023-07-17 14:41
+ */
+@Data
+public class DeleteInspectionSettingDTO {
+
+    @ApiModelProperty("id")
+    private Long inspectionSettingId;
+
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/inspection/setting/UpdateInspectionSettingDTO.java

@@ -0,0 +1,29 @@
+package com.cool.store.dto.inspection.setting;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author zhangchenbiao
+ * @FileName: UpdateInspectionSettingDTO
+ * @Description: 更新稽核区域设置
+ * @date 2023-07-17 14:41
+ */
+@Data
+public class UpdateInspectionSettingDTO {
+
+    @ApiModelProperty("id")
+    private Long inspectionSettingId;
+
+    @ApiModelProperty("区域名称")
+    private String zoneName;
+
+    @ApiModelProperty("稽核人id")
+    private String inspectionUserId;
+
+    @ApiModelProperty("归属地ids")
+    private List<Long> openAreaMappingIds;
+
+}

coolstore-partner-model/src/main/java/com/cool/store/vo/inspection/setting/InspectionSettingDetailVO.java

@@ -0,0 +1,33 @@
+package com.cool.store.vo.inspection.setting;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author zhangchenbiao
+ * @FileName: InspectionSettingPageVO
+ * @Description:
+ * @date 2023-07-17 14:32
+ */
+@Data
+public class InspectionSettingDetailVO {
+
+    @ApiModelProperty("id")
+    private Long inspectionSettingId;
+
+    @ApiModelProperty("区域名称")
+    private String zoneName;
+
+    @ApiModelProperty("稽核人id")
+    private String inspectionUserId;
+
+    @ApiModelProperty("稽核人名称")
+    private String inspectionUsername;
+
+    @ApiModelProperty("归属地ids")
+    private List<Long> openAreaMappingIds;
+
+}

coolstore-partner-model/src/main/java/com/cool/store/vo/inspection/setting/InspectionSettingPageVO.java

@@ -0,0 +1,35 @@
+package com.cool.store.vo.inspection.setting;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author zhangchenbiao
+ * @FileName: InspectionSettingPageVO
+ * @Description:
+ * @date 2023-07-17 14:32
+ */
+@Data
+public class InspectionSettingPageVO {
+
+    @ApiModelProperty("id")
+    private Long inspectionSettingId;
+
+    @ApiModelProperty("区域名称")
+    private String zoneName;
+
+    @ApiModelProperty("稽核人id")
+    private String inspectionUserId;
+
+    @ApiModelProperty("稽核人名称")
+    private String inspectionUsername;
+
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty("更新人名称")
+    private String updateUsername;
+
+}

coolstore-partner-webb/pom.xml

@@ -41,6 +41,7 @@
         </dependency>
     </dependencies>
 
+
     <build>
         <plugins>
             <plugin>

coolstore-partner-webb/src/main/java/com/cool/store/controller/InspectionSettingController.java

@@ -0,0 +1,68 @@
+package com.cool.store.controller;
+
+import com.cool.store.dto.inspection.setting.AddInspectionSettingDTO;
+import com.cool.store.dto.inspection.setting.DeleteInspectionSettingDTO;
+import com.cool.store.dto.inspection.setting.UpdateInspectionSettingDTO;
+import com.cool.store.response.ResponseResult;
+import com.cool.store.vo.inspection.setting.InspectionSettingPageVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author zhangchenbiao
+ * @FileName: InspectionSettingController
+ * @Description:稽核区域设置
+ * @date 2023-07-17 14:29
+ */
+@RestController
+@Slf4j
+@Api(tags = "稽核区域设置")
+public class InspectionSettingController {
+
+    @ApiOperation("稽核区域设置列表")
+    @GetMapping("/inspection/setting/page")
+    public ResponseResult<InspectionSettingPageVO> getInspectionSettingPage(@RequestParam("pageNum")Integer pageNum, @RequestParam("pageSize")Integer pageSize){
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("稽核区域设置详情")
+    @GetMapping("/inspection/setting/detail")
+    public ResponseResult<InspectionSettingPageVO> getInspectionSettingDetail(@RequestParam("inspectionSettingId")Long inspectionSettingId){
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("新增稽核区域设置")
+    @PostMapping("/inspection/setting/add")
+    public ResponseResult<Long> addInspectionSetting(@RequestBody AddInspectionSettingDTO param){
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("编辑稽核区域设置")
+    @PostMapping("/inspection/setting/update")
+    public ResponseResult<Integer> updateInspectionSetting(@RequestBody UpdateInspectionSettingDTO param){
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("删除稽核区域设置")
+    @DeleteMapping("/inspection/setting/delete")
+    public ResponseResult<Integer> deleteInspectionSetting(@RequestBody DeleteInspectionSettingDTO param){
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("查询已经关联的稽核人")
+    @DeleteMapping("/inspection/setting/bind/users")
+    public ResponseResult<List<String>> getBingUser(){
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("查询已经配置的归属地")
+    @DeleteMapping("/inspection/setting/bind/open/area")
+    public ResponseResult<List<Long>> getBingOpenArea(){
+        return ResponseResult.success();
+    }
+
+}