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

Merge #30 into master from cc_20260106_process_change

Browse Source 
fix:加盟合同签约及建店资料修改

* cc_20260106_process_change: (6 commits squashed)

  - fix:加盟合同签约新增财务审批

  - fix:建店资料阶段逻辑修改

  - fix:加盟合同签约待办，财务查看待财务审批的待办

  - feat:城市规划

  - feat:行政区划接口;
    fix:城市规划修改

  - fix:加盟合同签约审批日志逻辑修改

Signed-off-by: 王非凡 <accounts_67eba0c5fee9c49c80c8e2b4@mail.teambition.com>
Reviewed-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/30
This commit is contained in:
王非凡
2026-01-19 09:11:34 +00:00
committed by 正新
parent eb9b8bdf00
commit c28515123a
41 changed files with 1259 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/AdDistrictController.java Normal file
View File

@@ -0,0 +1,36 @@
package com.cool.store.controller.webb;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.ad.AdDistrictService;
import com.cool.store.vo.ad.AdDistrictVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* <p>
* 行政区划 前端控制器
* </p>
*
* @author wangff
* @since 2025/10/14
*/
@Api(tags = "行政区划")
@RestController
@RequestMapping("/pc/ad/district")
@RequiredArgsConstructor
public class AdDistrictController {
private final AdDistrictService adDistrictService;
@ApiOperation("行政区划列表")
@GetMapping("/list")
public ResponseResult<List<AdDistrictVO>> cityList(Long pid) {
return ResponseResult.success(adDistrictService.cityList(pid));
}
}

66
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/CityPlanningController.java Normal file
View File

@@ -0,0 +1,66 @@
package com.cool.store.controller.webb;
import com.cool.store.common.InsertGroup;
import com.cool.store.common.UpdateGroup;
import com.cool.store.request.plan.CityPlanningUpdateRequest;
import com.cool.store.request.plan.CityPlanningQueryRequest;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.plan.CityPlanningService;
import com.cool.store.vo.plan.CityPlanningStatisticsVO;
import com.cool.store.vo.plan.CityPlanningVO;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 城市规划控制器
*/
@Api(tags = "城市规划")
@RestController
@RequestMapping("/pc/cityPlanning")
@RequiredArgsConstructor
public class CityPlanningController {
private final CityPlanningService cityPlanningService;
@ApiOperation("新增城市规划")
@PostMapping("/add")
public ResponseResult<Boolean> add(@RequestBody @Validated(InsertGroup.class) CityPlanningUpdateRequest request) {
return ResponseResult.success(cityPlanningService.add(request));
}
@ApiOperation("编辑城市规划")
@PostMapping("/update")
public ResponseResult<Boolean> update(@RequestBody @Validated(UpdateGroup.class) CityPlanningUpdateRequest request) {
return ResponseResult.success(cityPlanningService.update(request));
}
@ApiOperation("分页查询城市规划")
@PostMapping("/queryPage")
public ResponseResult<PageInfo<CityPlanningVO>> queryPage(@RequestBody CityPlanningQueryRequest request) {
return ResponseResult.success(cityPlanningService.queryPage(request));
}
@ApiOperation("批量删除城市规划")
@PostMapping("/deleteByIds")
public ResponseResult<Boolean> deleteByIds(@RequestBody List<Long> ids) {
return ResponseResult.success(cityPlanningService.deleteByIds(ids));
}
@ApiOperation("规划进度")
@PostMapping("/cityPlanningSchedule")
public ResponseResult<PageInfo<CityPlanningVO>> cityPlanningSchedule(@RequestBody CityPlanningQueryRequest request) {
return ResponseResult.success(cityPlanningService.cityPlanningSchedule(request));
}
@ApiOperation("规划进度总计")
@PostMapping("/cityPlanningStatistics")
public ResponseResult<CityPlanningStatisticsVO> cityPlanningStatistics(@RequestBody CityPlanningQueryRequest request) {
return ResponseResult.success(cityPlanningService.cityPlanningStatistics(request));
}
}

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

@@ -1,5 +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.AuditApproveRequest;
import com.cool.store.request.BuildInformationRequest;
import com.cool.store.response.BuildInformationResponse;
import com.cool.store.response.ResponseResult;
@@ -33,7 +36,8 @@ public class PCBuildInformationController {
@ApiOperation("提交/修改")
@PostMapping("/submitOrUpdate")
public ResponseResult<Integer> submitBuildInformation(@RequestBody @Validated BuildInformationRequest request) {
return ResponseResult.success(buildInformationService.submitOrUpdate(request));
LoginUserInfo user = CurrentUserHolder.getUser();
return ResponseResult.success(buildInformationService.submitOrUpdate(request, user.getUserId(), user.getName()));
}
@ApiOperation("获取加盟类型 1 - 个人加盟 2- 企业加盟")
@@ -42,4 +46,10 @@ public class PCBuildInformationController {
return ResponseResult.success(buildInformationService.getJoinType(lineId));
}
@ApiOperation("建店资料营运顾问审批")
@PostMapping("/operationsConsultantAudit")
public ResponseResult<Boolean> operationsConsultantAudit(@RequestBody @Validated AuditApproveRequest request) {
LoginUserInfo user = CurrentUserHolder.getUser();
return ResponseResult.success(buildInformationService.operationsConsultantAudit(request, user));
}
}

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

@@ -44,6 +44,13 @@ public class PCSignFranchiseController {
return ResponseResult.success(signFranchiseService.auditApprove(request,user));
}
@ApiOperation("加盟合同签约财务审核")
@PostMapping("/audit/finance")
public ResponseResult<Boolean> financeAuditApprove(@RequestBody @Validated AuditApproveRequest request) {
LoginUserInfo user = CurrentUserHolder.getUser();
return ResponseResult.success(signFranchiseService.financeAuditApprove(request,user));
}
@ApiOperation("获取默认值")
@GetMapping("/default/get")
public ResponseResult<AddSignFranchiseResponse> getSignFranchise(@RequestParam("shopId") Long shopId) {

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

@@ -36,7 +36,8 @@ public class MiniBuildInformationController {
@ApiOperation("提交/修改")
@PostMapping("/submitOrUpdate")
public ResponseResult<Integer> submitBuildInformation(@RequestBody @Validated BuildInformationRequest request) {
return ResponseResult.success(buildInformationService.submitOrUpdate(request));
PartnerUserInfoVO user = PartnerUserHolder.getUser();
return ResponseResult.success(buildInformationService.submitOrUpdate(request, user.getPartnerId(), user.getUsername()));
}
@ApiOperation("获取加盟类型 1 - 个人加盟 2- 企业加盟")