suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
bianyadong
2024-05-08 15:58:30 +08:00
parent e86508bd96 6e69e95acd
commit d46eac9f93
23 changed files with 94 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/AuditStatusController.java
View File

@@ -1,6 +1,8 @@
package com.cool.store.controller.webb;
import com.cool.store.context.CurrentUserHolder;
import com.cool.store.context.LoginUserInfo;
import com.cool.store.request.AuditCheckRequest;
import com.cool.store.request.AuditDetailRequest;
import com.cool.store.response.AuditDetailResponse;
@@ -26,7 +28,8 @@ public class AuditStatusController {
@ApiOperation("稽核")
@PostMapping("/check")
public ResponseResult<Boolean> check(@RequestBody AuditCheckRequest request) {
return ResponseResult.success(auditStatusService.audit(request));
LoginUserInfo user = CurrentUserHolder.getUser();
return ResponseResult.success(auditStatusService.audit(request,user));
}
@ApiOperation("查看/稽核按钮")

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

@@ -1,20 +1,20 @@
package com.cool.store.controller.webb;
import com.cool.store.context.CurrentUserHolder;
import com.cool.store.context.LoginUserInfo;
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.service.CoolStoreStartFlowService;
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.apache.ibatis.annotations.Param;
import org.springframework.web.bind.annotation.*;
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;
@@ -29,15 +29,15 @@ public class PCApplyLicenseController {
@GetMapping(path = "/licenseList")
@ApiOperation("证照审批列表")
public ResponseResult<PageInfo<LicenseListResponse>> licenseList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber,
@RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize,
@RequestParam(value = "storeName",required = false)String storeName,
@RequestParam(value = "submitStartTime",required = false)Long submitStartTime,
@RequestParam(value = "submitEndTime",required = false)Long submitEndTime,
@RequestParam(value = "regionId",required = false)String regionId,
@RequestParam(value = "status",required = false)Integer status) {
public ResponseResult<PageInfo<LicenseListResponse>> licenseList(@RequestParam(value = "pageNumber", required = true, defaultValue = "1") Integer pageNumber,
@RequestParam(value = "pageSize", required = true, defaultValue = "10") Integer pageSize,
@RequestParam(value = "storeName", required = false) String storeName,
@RequestParam(value = "submitStartTime", required = false) Long submitStartTime,
@RequestParam(value = "submitEndTime", required = false) Long submitEndTime,
@RequestParam(value = "regionId", required = false) String regionId,
@RequestParam(value = "status", required = false) Integer status) {
LicenseListRequest request =
new LicenseListRequest(pageNumber,pageSize, storeName, submitStartTime, submitEndTime, regionId, status);
new LicenseListRequest(pageNumber, pageSize, storeName, submitStartTime, submitEndTime, regionId, status);
return ResponseResult.success(applyLicenseService.licenseList(request));
}
@@ -48,7 +48,6 @@ public class PCApplyLicenseController {
}
/**
*
* @param
* @param status 0通过 1不通过
* @return
@@ -58,6 +57,7 @@ public class PCApplyLicenseController {
public ResponseResult licenseExamine(@RequestParam("id") Long shopId,
@RequestParam("status") Integer status,
@RequestParam("result") String result) {
return ResponseResult.success(applyLicenseService.licenseExamine(shopId,status,result));
LoginUserInfo user = CurrentUserHolder.getUser();
return ResponseResult.success(applyLicenseService.licenseExamine(shopId, status, result, user));
}
}

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

@@ -1,5 +1,7 @@
package com.cool.store.controller.webb;
import com.cool.store.context.CurrentUserHolder;
import com.cool.store.context.LoginUserInfo;
import com.cool.store.request.AuditFranchiseFeeRequest;
import com.cool.store.request.FranchiseFeeRequest;
import com.cool.store.response.FranchiseFeeResponse;
@@ -38,7 +40,8 @@ public class PCFranchiseFeeController {
@ApiOperation("缴纳加盟费/保证金审核接口")
@PostMapping("/audit")
public ResponseResult auditFranchiseFee(@RequestBody AuditFranchiseFeeRequest request) {
return ResponseResult.success(franchiseFeeService.auditFranchiseFee(request));
LoginUserInfo user = CurrentUserHolder.getUser();
return ResponseResult.success(franchiseFeeService.auditFranchiseFee(request,user));
}
}

5
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCIntentAgreementController.java
View File

@@ -1,5 +1,7 @@
package com.cool.store.controller.webb;
import com.cool.store.context.CurrentUserHolder;
import com.cool.store.context.LoginUserInfo;
import com.cool.store.request.FranchiseeSaveRequest;
import com.cool.store.request.InitiatingRequest;
import com.cool.store.response.InitiatingResponse;
@@ -40,7 +42,8 @@ public class PCIntentAgreementController {
@PostMapping(path = "/franchisee/save")
@ApiOperation("kdz -> xfsg 加盟商新增")
public ResponseResult save(@RequestBody FranchiseeSaveRequest request) {
return intentAgreementService.save(request);
LoginUserInfo user = CurrentUserHolder.getUser();
return intentAgreementService.save(request,user);
}

5
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCSignFranchiseController.java
View File

@@ -1,6 +1,8 @@
package com.cool.store.controller.webb;
import com.cool.store.context.CurrentUserHolder;
import com.cool.store.context.LoginUserInfo;
import com.cool.store.request.AddSignFranchiseRequest;
import com.cool.store.response.AddSignFranchiseResponse;
import com.cool.store.response.ResponseResult;
@@ -21,7 +23,8 @@ public class PCSignFranchiseController {
@ApiOperation("提交(更新)加盟合同签约")
@PostMapping("/submitOrUpdate")
public ResponseResult<Boolean> submitSignFranchise(@RequestBody AddSignFranchiseRequest request) {
return signFranchiseService.submitSignFranchise(request);
LoginUserInfo user = CurrentUserHolder.getUser();
return signFranchiseService.submitSignFranchise(request,user);
}
@ApiOperation("获取默认值")

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

@@ -1,6 +1,8 @@
package com.cool.store.controller.webb;
import com.cool.store.context.CurrentUserHolder;
import com.cool.store.context.LoginUserInfo;
import com.cool.store.request.SysStoreAppRequest;
import com.cool.store.response.ResponseResult;
import com.cool.store.response.SysStoreAppResponse;
@@ -25,14 +27,16 @@ public class SysStoreAppController {
@PostMapping(path = "/submit")
@ApiOperation("提交(更新) 系统建店申请")
public ResponseResult submitSysBuildStore(@RequestBody SysStoreAppRequest request) {
return sysStoreAppService.submitSysBuildStore(request);
LoginUserInfo user = CurrentUserHolder.getUser();
return sysStoreAppService.submitSysBuildStore(request,user);
}
@GetMapping(path = "/default/get")
@ApiOperation("获取系统建店默认值")
public ResponseResult<SysStoreAppResponse> getDefaultValueSysBuildStore(@RequestParam("lineId") Long lineId,
@RequestParam("shopId") Long shopId) {
return ResponseResult.success(sysStoreAppService.getDefaultValueSysBuildStore(lineId,shopId));
LoginUserInfo user = CurrentUserHolder.getUser();
return ResponseResult.success(sysStoreAppService.getDefaultValueSysBuildStore(lineId,shopId,user));
}

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

@@ -1,5 +1,7 @@
package com.cool.store.controller.webc;
import com.cool.store.context.CurrentUserHolder;
import com.cool.store.context.LoginUserInfo;
import com.cool.store.request.SubmitLicenseRequest;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.ApplyLicenseService;
@@ -27,7 +29,8 @@ public class ApplyLicenseController {
@ApiOperation("证照办理提交")
@PostMapping("/submit")
public ResponseResult submitLicense(@RequestBody SubmitLicenseRequest request) {
return ResponseResult.success(applyLicenseService.submitLicense(request));
LoginUserInfo user = CurrentUserHolder.getUser();
return ResponseResult.success(applyLicenseService.submitLicense(request,user));
}
@@ -48,6 +51,7 @@ public class ApplyLicenseController {
public ResponseResult licenseExamine(@RequestParam("id") Long shopId,
@RequestParam("status") Integer status,
@RequestParam("result") String result) {
return ResponseResult.success(applyLicenseService.licenseExamine(shopId,status,result));
LoginUserInfo user = CurrentUserHolder.getUser();
return ResponseResult.success(applyLicenseService.licenseExamine(shopId,status,result,user));
}
}

5
coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniFranchiseFeeController.java
View File

@@ -1,5 +1,7 @@
package com.cool.store.controller.webc;
import com.cool.store.context.CurrentUserHolder;
import com.cool.store.context.LoginUserInfo;
import com.cool.store.request.AuditFranchiseFeeRequest;
import com.cool.store.request.FranchiseFeeRequest;
import com.cool.store.response.FranchiseFeeResponse;
@@ -38,7 +40,8 @@ public class MiniFranchiseFeeController {
@ApiOperation("缴纳加盟费/保证金审核接口")
@PostMapping("/audit")
public ResponseResult auditFranchiseFee(@RequestBody AuditFranchiseFeeRequest request) {
return ResponseResult.success(franchiseFeeService.auditFranchiseFee(request));
LoginUserInfo user = CurrentUserHolder.getUser();
return ResponseResult.success(franchiseFeeService.auditFranchiseFee(request,user));
}
}

5
coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniSignFranchiseController.java
View File

@@ -1,6 +1,8 @@
package com.cool.store.controller.webc;
import com.cool.store.context.CurrentUserHolder;
import com.cool.store.context.LoginUserInfo;
import com.cool.store.request.AddSignFranchiseRequest;
import com.cool.store.response.AddSignFranchiseResponse;
import com.cool.store.response.ResponseResult;
@@ -21,7 +23,8 @@ public class MiniSignFranchiseController {
@ApiOperation("提交(更新)加盟合同签约")
@PostMapping("/submitOrUpdate")
public ResponseResult<Boolean> submitSignFranchise(@RequestBody AddSignFranchiseRequest request) {
return signFranchiseService.submitSignFranchise(request);
LoginUserInfo user = CurrentUserHolder.getUser();
return signFranchiseService.submitSignFranchise(request,user);
}
@ApiOperation("获取默认值")

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

@@ -1,5 +1,7 @@
package com.cool.store.controller.webc;
import com.cool.store.context.CurrentUserHolder;
import com.cool.store.context.LoginUserInfo;
import com.cool.store.request.SysStoreAppRequest;
import com.cool.store.response.ResponseResult;
import com.cool.store.response.SysStoreAppResponse;
@@ -23,13 +25,15 @@ public class MiniSysStoreAppController {
@PostMapping(path = "/submit")
@ApiOperation("提交(更新) 系统建店申请")
public ResponseResult submitSysBuildStore(@RequestBody SysStoreAppRequest request) {
return sysStoreAppService.submitSysBuildStore(request);
LoginUserInfo user = CurrentUserHolder.getUser();
return sysStoreAppService.submitSysBuildStore(request,user);
}
@GetMapping(path = "/default/get")
@ApiOperation("获取系统建店默认值")
public ResponseResult<SysStoreAppResponse> getDefaultValueSysBuildStore(@RequestParam("lineId") Long lineId,
@RequestParam("shopId") Long shopId) {
return ResponseResult.success(sysStoreAppService.getDefaultValueSysBuildStore(lineId,shopId));
LoginUserInfo user = CurrentUserHolder.getUser();
return ResponseResult.success(sysStoreAppService.getDefaultValueSysBuildStore(lineId,shopId,user));
}
}