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

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

@@ -0,0 +1,39 @@
+package com.cool.store.controller.webb;
+
+import com.cool.store.context.CurrentUserHolder;
+import com.cool.store.context.LoginUserInfo;
+import com.cool.store.response.ResponseResult;
+import com.cool.store.service.AssessmentTemplateService;
+import com.cool.store.vo.AssessmentTemplateVO;
+import com.cool.store.vo.desk.IntendPendingVO;
+import com.github.pagehelper.PageInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @Author suzhuhong
+ * @Date 2024/4/25 11:41
+ * @Version 1.0
+ */
+@Api(tags = "模板列表")
+@RestController
+@RequestMapping("pc/template")
+public class AssessmentTemplateController {
+
+    @Resource
+    AssessmentTemplateService assessmentTemplateService;
+
+    @ApiOperation("检查项模板列表type 0 1 2 3")
+    @GetMapping("/listByType")
+    public ResponseResult<List<AssessmentTemplateVO>> intendPendingList(@RequestParam(value = "type",required = true)Integer type) {
+        return ResponseResult.success(assessmentTemplateService.listByType(type));
+    }
+
+}

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

@@ -4,16 +4,16 @@ import com.cool.store.request.LicenseListRequest;
 import com.cool.store.request.OpenAcceptanceRequest;
 import com.cool.store.response.LicenseListResponse;
 import com.cool.store.response.ResponseResult;
+import com.cool.store.response.SubmitLicenseResponse;
 import com.cool.store.service.ApplyLicenseService;
 import com.cool.store.vo.OpenAcceptanceInfoListVO;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.models.auth.In;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 
@@ -34,7 +34,22 @@ public class PCApplyLicenseController {
 
     @ApiOperation("证照办理数据回显")
     @GetMapping("/default/get")
-    public ResponseResult getDefault(@RequestParam("shopId") Long shopId) {
+    public ResponseResult<SubmitLicenseResponse> getDefault(@RequestParam("shopId") Long shopId) {
         return ResponseResult.success(applyLicenseService.getDefault(shopId));
     }
+
+    /**
+     *
+     * @param id
+     * @param status 0通过 1不通过
+     * @return
+     */
+    @PostMapping(path = "/examine")
+    @ApiOperation("证照审批列表")
+    public ResponseResult licenseExamine(@RequestParam("id") Long shopId,
+                                         @RequestParam("status") Integer status,
+                                         @RequestParam("result") String result) {
+        return ResponseResult.success(applyLicenseService.licenseExamine(shopId,status,result));
+    }
+
 }

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

@@ -0,0 +1,33 @@
+package com.cool.store.controller.webb;
+
+import com.cool.store.request.FranchiseFeeRequest;
+import com.cool.store.request.SubmitLicenseRequest;
+import com.cool.store.response.FranchiseFeeResponse;
+import com.cool.store.response.ResponseResult;
+import com.cool.store.service.FranchiseFeeService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/pc/franchiseFee")
+@Api(tags = "PC加盟费/保证金")
+@Slf4j
+public class PCFranchiseFeeController {
+
+
+    FranchiseFeeService franchiseFeeService;
+
+    @ApiOperation("基本信息提交")
+    @PostMapping("/submit")
+    public ResponseResult submitLicense(@RequestBody FranchiseFeeRequest request) {
+        return ResponseResult.success(franchiseFeeService.submitLicense(request));
+    }
+
+    @ApiOperation("基本信息查询")
+    @GetMapping("/getDetail")
+    public ResponseResult<FranchiseFeeResponse> getDetail(@RequestParam("shopId") Long shopId) {
+        return ResponseResult.success(franchiseFeeService.getDetail(shopId));
+    }
+}

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

@@ -1,5 +1,6 @@
 package com.cool.store.controller.webb;
 
+import com.alibaba.fastjson.JSONObject;
 import com.cool.store.context.CurrentUserHolder;
 import com.cool.store.context.PartnerUserHolder;
 import com.cool.store.request.*;
@@ -11,6 +12,7 @@ import com.cool.store.vo.shop.ShopStageVO;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -23,6 +25,7 @@ import java.util.List;
  * @Description:
  * @date 2024-03-29 15:36
  */
+@Slf4j
 @Api(tags = "选址&铺位")
 @RestController
 @RequestMapping("/pc/point")
@@ -34,6 +37,7 @@ public class PointController {
     @ApiOperation("新增铺位")
     @PostMapping("/add")
     public ResponseResult<Long> addPointDetailInfo(@RequestBody @Validated AddPointDetailRequest shopPointDetailRequest) {
+        log.info("新增铺位：{}", JSONObject.toJSONString(shopPointDetailRequest));
         return ResponseResult.success(pointService.addPointDetailInfo(shopPointDetailRequest, CurrentUserHolder.getUserId()));
     }
 

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

@@ -3,6 +3,7 @@ package com.cool.store.controller.webb;
 
 import com.cool.store.request.SysStoreAppRequest;
 import com.cool.store.response.ResponseResult;
+import com.cool.store.response.SysStoreAppResponse;
 import com.cool.store.service.SysStoreAppService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -14,7 +15,7 @@ import java.util.Map;
 
 @RestController
 @RequestMapping("/pc/sysStore")
-@Api(tags = "系统建店")
+@Api(tags = "PC系统建店")
 @Slf4j
 public class SysStoreAppController {
 
@@ -29,8 +30,8 @@ public class SysStoreAppController {
 
     @GetMapping(path = "/default/get")
     @ApiOperation("获取系统建店默认值")
-    public ResponseResult getDefaultValueSysBuildStore(@RequestParam("lineId") Long lineId,
-                                                       @RequestParam("shopId") Long shopId) {
+    public ResponseResult<SysStoreAppResponse> getDefaultValueSysBuildStore(@RequestParam("lineId") Long lineId,
+                                                                            @RequestParam("shopId") Long shopId) {
         return ResponseResult.success(sysStoreAppService.getDefaultValueSysBuildStore(lineId,shopId));
     }
 

coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniNewStoreOpeningController.java

@@ -0,0 +1,42 @@
+package com.cool.store.controller.webc;
+
+import com.cool.store.response.ResponseResult;
+import com.cool.store.service.NewStoreOpeningService;
+import com.cool.store.vo.NewStoreOpeningVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @Author byd
+ * @Date 2023/6/15 9:49
+ * @Version 1.0
+ */
+@RestController
+@RequestMapping("/mini//newStoreOpening")
+@Api(tags = "mini新店开业")
+public class MiniNewStoreOpeningController {
+
+
+    @Resource
+    NewStoreOpeningService newStoreOpeningService;
+
+
+    @GetMapping(path = "/storeTodoList")
+    @ApiOperation("新店开业待办列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "shopId", value = "店铺id", required = true)
+    })
+    public ResponseResult<List<NewStoreOpeningVO>> storeTodoList(@RequestParam("shopId") Long shopId) {
+        return ResponseResult.success(newStoreOpeningService.storeTodoList(shopId));
+    }
+
+}

coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniOpenAcceptanceInfoController.java

@@ -0,0 +1,49 @@
+package com.cool.store.controller.webc;
+
+import com.cool.store.request.OpenAcceptanceRequest;
+import com.cool.store.response.ResponseResult;
+import com.cool.store.service.OpenAcceptanceInfoService;
+import com.cool.store.vo.OpenAcceptanceInfoListVO;
+import com.cool.store.vo.ShopAcceptanceVO;
+import com.github.pagehelper.PageInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * @Author byd
+ * @Date 2023/6/15 9:49
+ * @Version 1.0
+ */
+@RestController
+@RequestMapping("/mini/openAcceptanceInfo")
+@Api(tags = "mini开业验收")
+public class MiniOpenAcceptanceInfoController {
+
+    @Resource
+    OpenAcceptanceInfoService openAcceptanceInfoService;
+
+    @GetMapping(path = "/openAcceptanceList")
+    @ApiOperation("开业验收列表")
+    public ResponseResult<PageInfo<OpenAcceptanceInfoListVO>> openAcceptanceList(OpenAcceptanceRequest openAcceptanceRequest) {
+        return ResponseResult.success(openAcceptanceInfoService.openAcceptanceList(openAcceptanceRequest));
+    }
+
+    @GetMapping(path = "/acceptanceStageList")
+    @ApiOperation("开业验收阶段结果列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "shopId", value = "店铺id", required = true)
+    })
+    public ResponseResult<ShopAcceptanceVO> acceptanceStageList(@RequestParam("shopId") Long shopId) {
+        return ResponseResult.success(openAcceptanceInfoService.acceptanceStageList(shopId));
+    }
+
+
+}

coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniSysStoreAppController.java

@@ -0,0 +1,35 @@
+package com.cool.store.controller.webc;
+
+import com.cool.store.request.SysStoreAppRequest;
+import com.cool.store.response.ResponseResult;
+import com.cool.store.response.SysStoreAppResponse;
+import com.cool.store.service.SysStoreAppService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+@RestController
+@RequestMapping("/mini/sysStore")
+@Api(tags = "mini系统建店")
+@Slf4j
+public class MiniSysStoreAppController {
+
+    @Resource
+    private SysStoreAppService sysStoreAppService;
+
+    @PostMapping(path = "/submit")
+    @ApiOperation("提交(更新) 系统建店申请")
+    public ResponseResult submitSysBuildStore(@RequestBody SysStoreAppRequest request) {
+        return sysStoreAppService.submitSysBuildStore(request);
+    }
+
+    @GetMapping(path = "/default/get")
+    @ApiOperation("获取系统建店默认值")
+    public ResponseResult<SysStoreAppResponse> getDefaultValueSysBuildStore(@RequestParam("lineId") Long lineId,
+                                                                            @RequestParam("shopId") Long shopId) {
+        return ResponseResult.success(sysStoreAppService.getDefaultValueSysBuildStore(lineId,shopId));
+    }
+}