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

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

Browse Source
This commit is contained in:
苏竹红
2024-04-11 17:24:00 +08:00
parent 4133f0e398 f1c01fe7c1
commit 02e2b94599
45 changed files with 1192 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,7 +31,7 @@ public class KdzApiController {
@RequestBody XfsgOpenApiRequest request) {
log.info("auditResult requestBody :{}", JSONObject.toJSONString(request));
if(!verifyMD5(request,eid)){
return ResponseResult.fail(ErrorCodeEnum.PARAMS_VALIDATE_ERROR);
return ResponseResult.fail(ErrorCodeEnum.VERIFY_MD5_FALSE);
}
if(eid == null || request.getBizContent() == null){
return ResponseResult.fail(ErrorCodeEnum.PARAMS_VALIDATE_ERROR);
@@ -46,11 +46,8 @@ public class KdzApiController {
//用户唯一标识id
sb.append("timestamp=").append(request.getTimestamp()).append("&");
//企业唯一标识enterpriseId
sb.append("enterpriseId=").append(eid).append("&");
sb.append("bizContent=").append(request.getBizContent());
sb.append("enterpriseId=").append(eid);
String md5 = EncryptUtil.xfsgMd5(sb.toString());
return md5.equals(request.getSign());
}

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

@@ -7,6 +7,7 @@ import com.cool.store.entity.*;
import com.cool.store.enums.MessageEnum;
import com.cool.store.mapper.HyOpenAreaInfoMapper;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.ShopService;
import com.cool.store.service.impl.CommonService;
import com.cool.store.utils.poi.ExcelUtil;
import lombok.extern.slf4j.Slf4j;
@@ -26,6 +27,10 @@ public class PCTestController {
@Resource
private CommonService commonService;
@Resource
private LineInfoDAO lineInfoDAO;
@Resource
private ShopService shopService;
@GetMapping("/sendMessage")
@@ -33,4 +38,11 @@ public class PCTestController {
commonService.sendMessage(Arrays.asList("123836131931284423"), 1L, MessageEnum.MESSAGE_1, "张三", "浙江-杭州");
return ResponseResult.success(Boolean.FALSE);
}
@GetMapping("/initShop")
public ResponseResult<Boolean> initShop(@RequestParam("lineId")Long lineId){
LineInfoDO lineInfo = lineInfoDAO.getLineInfo(lineId);
shopService.initShop(lineInfo);
return ResponseResult.success(Boolean.FALSE);
}
}

75
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/ShopPointController.java → coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PointController.java
View File

@@ -1,11 +1,14 @@
package com.cool.store.controller.webb;
import com.cool.store.context.CurrentUserHolder;
import com.cool.store.enums.point.ShopSubStageStatusEnum;
import com.cool.store.request.*;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.ShopPointService;
import com.cool.store.service.PointService;
import com.cool.store.vo.LinePointBaseInfoVO;
import com.cool.store.vo.point.*;
import com.cool.store.vo.shop.ShopStageVO;
import com.cool.store.vo.shop.ShopSubStageVO;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -24,159 +27,171 @@ import java.util.List;
@Api(tags = "铺位")
@RestController
@RequestMapping("/pc/point")
public class ShopPointController {
public class PointController {
@Resource
private ShopPointService shopPointService;
private PointService pointService;
@ApiOperation("新增铺位")
@PostMapping("/add")
public ResponseResult<Long> addPointDetailInfo(@RequestBody @Validated AddPointDetailRequest shopPointDetailRequest) {
return ResponseResult.success(shopPointService.addPointDetailInfo(shopPointDetailRequest, CurrentUserHolder.getUserId()));
return ResponseResult.success(pointService.addPointDetailInfo(shopPointDetailRequest, CurrentUserHolder.getUserId()));
}
@ApiOperation("铺位详情")
@GetMapping("/detail")
public ResponseResult<PointDetailVO> getPointDetailInfo(@RequestParam("pointId")Long pointId) {
return ResponseResult.success(shopPointService.getPointDetailInfo(pointId));
return ResponseResult.success(pointService.getPointDetailInfo(pointId));
}
@ApiOperation("完善铺位")
@PostMapping("/update")
public ResponseResult<Integer> updatePointDetailInfo(@RequestBody @Validated UpdatePointDetailRequest shopPointDetailRequest) {
return ResponseResult.success(shopPointService.updatePointDetailInfo(shopPointDetailRequest));
return ResponseResult.success(pointService.updatePointDetailInfo(shopPointDetailRequest));
}
@ApiOperation("生成评估报告")
@GetMapping("/generateEvaluationReport")
@PostMapping("/generateEvaluationReport")
public ResponseResult<Integer> generateEvaluationReport(@RequestBody PointIdRequest request) {
return ResponseResult.success(shopPointService.generateEvaluationReport(request.getPointId()));
return ResponseResult.success(pointService.generateEvaluationReport(request.getPointId()));
}
@ApiOperation("铺位失效")
@PostMapping("/invalid")
public ResponseResult<Integer> pointInvalid(@RequestBody PointIdRequest request) {
return ResponseResult.success(shopPointService.pointInvalid(request.getPointId()));
return ResponseResult.success(pointService.pointInvalid(request.getPointId()));
}
@ApiOperation("铺位解绑")
@PostMapping("/unbind")
public ResponseResult<Integer> pointUnbind(@RequestBody PointIdRequest request) {
return ResponseResult.success(shopPointService.pointUnbind(request.getPointId()));
return ResponseResult.success(pointService.pointUnbind(request.getPointId()));
}
@ApiOperation("配置评估报告")
@ApiOperation("配置高德评估报告")
@PostMapping("/addMapEvaluationReport")
public ResponseResult<Integer> addMapEvaluationReport(@RequestBody AddMapEvaluationReportRequest request) {
return ResponseResult.success(shopPointService.addMapEvaluationReport(request));
return ResponseResult.success(pointService.addMapEvaluationReport(request));
}
@ApiOperation("提交审批")
@ApiOperation("选址人员提交审批")
@PostMapping("/submitAudit")
public ResponseResult<Integer> submitAudit(@RequestBody @Validated SubmitPointAuditRequest request) {
return ResponseResult.success(shopPointService.submitAudit(request));
return ResponseResult.success(pointService.submitAudit(request));
}
@ApiOperation("选址审批设置")
@PostMapping("/auditSetting")
public ResponseResult<Integer> auditSetting(@RequestBody AuditSettingRequest request) {
return ResponseResult.success(shopPointService.auditSetting(request));
return ResponseResult.success(pointService.auditSetting(request));
}
@ApiOperation("获取选址审批设置")
@GetMapping("/getAuditSetting")
public ResponseResult<AuditSettingVO> getAuditSetting() {
return ResponseResult.success(shopPointService.getAuditSetting());
return ResponseResult.success(pointService.getAuditSetting());
}
@ApiOperation("获取催办用户列表")
@GetMapping("/getTodoUserList")
public ResponseResult<List<String>> getTodoUserList(@RequestParam("pointId")Long pointId) {
return ResponseResult.success(shopPointService.getTodoUserList(pointId));
return ResponseResult.success(pointService.getTodoUserList(pointId));
}
@ApiOperation("营运人员审批")
@PostMapping("/operationUserAudit")
public ResponseResult<Integer> operationUserAudit(@RequestBody @Validated OperationAuditRequest request) {
return ResponseResult.success(shopPointService.operationUserAudit(CurrentUserHolder.getUserId(), request));
return ResponseResult.success(pointService.operationUserAudit(CurrentUserHolder.getUserId(), request));
}
@ApiOperation("审批(排除第二级审批)")
@PostMapping("/audit")
public ResponseResult<Integer> audit(@RequestBody PointAuditRequest request) {
return ResponseResult.success(shopPointService.audit(CurrentUserHolder.getUserId(), request));
return ResponseResult.success(pointService.audit(CurrentUserHolder.getUserId(), request));
}
@ApiOperation("铺位转让")
@PostMapping("/turnDevelopmentManager")
public ResponseResult<Integer> turnDevelopmentManager(@RequestBody @Validated TurnDevelopmentManagerRequest request) {
return ResponseResult.success(shopPointService.turnDevelopmentManager(request));
return ResponseResult.success(pointService.turnDevelopmentManager(request));
}
@ApiOperation("获取我负责的加盟商列表")
@PostMapping("/getLinePage")
public ResponseResult<PageInfo<LinePointBaseInfoVO>> getLinePage(@RequestBody PointLinePageRequest request) {
request.setDevelopmentManager(CurrentUserHolder.getUserId());
return ResponseResult.success(shopPointService.getLinePage(request));
return ResponseResult.success(pointService.getLinePage(request));
}
@ApiOperation("首页我的数据")
@GetMapping("/getMyData")
public ResponseResult<PointHomePageDataVO> getMyPointData() {
return ResponseResult.success(shopPointService.getMyPointData(CurrentUserHolder.getUserId()));
return ResponseResult.success(pointService.getMyPointData(CurrentUserHolder.getUserId()));
}
@ApiOperation("我的铺位-已入库/暂未入库")
@PostMapping("/getMyPointPage")
public ResponseResult<PageInfo<PointPageVO>> getMyPointPage(@RequestBody @Validated PointPageRequest request) {
request.setDevelopmentManager(CurrentUserHolder.getUserId());
return ResponseResult.success(shopPointService.getMyPointPage(request));
return ResponseResult.success(pointService.getMyPointPage(request));
}
@ApiOperation("获取单个铺位审批记录")
@GetMapping("/getAuditRecord")
public ResponseResult<List<PointAuditRecordVO>> getPointAllAuditRecord(@RequestParam("pointId")Long pointId) {
return ResponseResult.success(shopPointService.getPointAllAuditRecord(pointId));
return ResponseResult.success(pointService.getPointAllAuditRecord(pointId));
}
@ApiOperation("获取加盟商的推荐铺位列表")
@GetMapping("/getLineRecommendPointList")
public ResponseResult<List<PointRecommendPageVO>> getLineRecommendPointList(@RequestParam("lineId")Long lineId) {
return ResponseResult.success(shopPointService.getLineRecommendPointList(lineId));
return ResponseResult.success(pointService.getLineRecommendPointList(lineId));
}
@ApiOperation("选址人员获取可推荐铺位列表")
@PostMapping("/getRecommendPointList")
public ResponseResult<PageInfo<PointPageVO>> getRecommendPointList(@RequestBody @Validated RecommendPointPageRequest request) {
request.setDevelopmentManager(CurrentUserHolder.getUserId());
return ResponseResult.success(shopPointService.getRecommendPointList(request));
return ResponseResult.success(pointService.getRecommendPointList(request));
}
@ApiOperation("加盟商详情推送铺位")
@PostMapping("/lineRecommendPoint")
public ResponseResult<Integer> lineRecommendPoint(@RequestBody @Validated LineRecommendPointRequest request) {
request.setDevelopmentManager(CurrentUserHolder.getUserId());
return ResponseResult.success(shopPointService.lineRecommendPoint(request));
return ResponseResult.success(pointService.lineRecommendPoint(request));
}
@ApiOperation("铺位详情推送加盟商")
@PostMapping("/pointRecommendLine")
public ResponseResult<Integer> pointRecommendLine(@RequestBody @Validated PointRecommendLineRequest request) {
request.setDevelopmentManager(CurrentUserHolder.getUserId());
return ResponseResult.success(shopPointService.pointRecommendLine(request));
return ResponseResult.success(pointService.pointRecommendLine(request));
}
@ApiOperation("选址人员转让加盟商")
@PostMapping("/turnLine")
public ResponseResult<Integer> turnLine(@RequestBody @Validated TurnLineRequest request) {
return ResponseResult.success(shopPointService.turnLine(request));
return ResponseResult.success(pointService.turnLine(request));
}
@ApiOperation("修改意向开店数量")
@PostMapping("/updateWantShopNum")
public ResponseResult<Integer> updateWantShopNum(@RequestBody @Validated UpdateWantShopNumRequest request) {
return ResponseResult.success(shopPointService.updateWantShopNum(request));
return ResponseResult.success(pointService.updateWantShopNum(request));
}
@ApiOperation("获取阶段/子阶段/子阶段状态枚举")
@GetMapping("/getShopSubStageStatusEnum")
public ResponseResult<List<ShopStageVO>> getShopSubStageStatusEnum() {
return ResponseResult.success(ShopStageVO.getShopStageList());
}
@ApiOperation("获取待办列表")
@PostMapping("/getTodoList")
public ResponseResult<PageInfo<PointPageVO>> getTodoList(@RequestBody PointTodoPageRequest request) {
request.setDevelopmentManager(CurrentUserHolder.getUserId());
return ResponseResult.success(pointService.getTodoList(request));
}
}