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

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

@@ -0,0 +1,40 @@
+package com.cool.store.controller.webb;
+
+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.service.ApplyLicenseService;
+import com.cool.store.vo.OpenAcceptanceInfoListVO;
+import com.github.pagehelper.PageInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+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 javax.annotation.Resource;
+
+@RestController
+@RequestMapping("/pc/license")
+@Api(tags = "PC证照审核")
+@Slf4j
+public class PCApplyLicenseController {
+
+    @Resource
+    ApplyLicenseService applyLicenseService;
+
+    @GetMapping(path = "/licenseList")
+    @ApiOperation("证照审批列表")
+    public ResponseResult<PageInfo<LicenseListResponse>> licenseList(LicenseListRequest request) {
+        return ResponseResult.success(applyLicenseService.licenseList(request));
+    }
+
+    @ApiOperation("证照办理数据回显")
+    @GetMapping("/default/get")
+    public ResponseResult getDefault(@RequestParam("shopId") Long shopId) {
+        return ResponseResult.success(applyLicenseService.getDefault(shopId));
+    }
+}

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

@@ -210,6 +210,8 @@ public class PointController {
     @ApiOperation("租赁合同审核")
     @PostMapping("/auditRentContract")
     public ResponseResult<Integer> auditRentContract(@RequestBody @Validated AuditRentContractRequest request) {
+        request.setOperateUserId(CurrentUserHolder.getUserId());
+        request.setOperateUserName(CurrentUserHolder.getUser().getName());
         return ResponseResult.success(pointService.auditRentContract(request));
     }
 

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

@@ -1,31 +1,39 @@
 package com.cool.store.controller.webc;
 
-import com.cool.store.entity.BankdocDO;
-import com.cool.store.request.BranchBankPageRequest;
+import com.cool.store.request.SubmitLicenseRequest;
 import com.cool.store.response.ResponseResult;
-import com.github.pagehelper.PageInfo;
+import com.cool.store.service.ApplyLicenseService;
 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.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
 
 /**
  * 证照办理
  */
 @RestController
 @RequestMapping("/mini/license")
-@Api(tags = "证照办理")
+@Api(tags = "移动端证照办理")
 @Slf4j
 public class ApplyLicenseController {
 
 
+    @Resource
+    ApplyLicenseService applyLicenseService;
+
     @ApiOperation("证照办理提交")
     @PostMapping("/submit")
-    public ResponseResult submitLicense() {
-        return ResponseResult.success();
+    public ResponseResult submitLicense(@RequestBody SubmitLicenseRequest request) {
+        return ResponseResult.success(applyLicenseService.submitLicense(request));
     }
+
+
+    @ApiOperation("证照办理数据回显")
+    @GetMapping("/default/get")
+    public ResponseResult getDefault(@RequestParam("shopId") Long shopId) {
+        return ResponseResult.success(applyLicenseService.getDefault(shopId));
+    }
+
 }