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

Merge branch 'master' into cc_20250211_v2.6

Browse Source 
# Conflicts:
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java
This commit is contained in:
shuo.wang
2025-02-14 16:18:00 +08:00
parent 212a1b6c1c 0a8951dab4
commit 71db4d6e6e
105 changed files with 3388 additions and 1274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,29 +39,6 @@ public class DeskController {
return ResponseResult.success(deskService.intendPendingList(pageNumber,pageSize,userInfo.getUserId()));
}
@ApiOperation("待处理-邀约面谈")
@GetMapping("/interviewPendingList")
public ResponseResult<PageInfo<InterviewPendingVO>> interviewPendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber,
@RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize) {
LoginUserInfo userInfo = CurrentUserHolder.getUser();
return ResponseResult.success(deskService.interviewPendingList(pageNumber,pageSize,userInfo.getUserId()));
}
@ApiOperation("待处理-一审")
@GetMapping("/firstInterviewPendingList")
public ResponseResult<PageInfo<InterviewPendingVO>> firstInterviewPendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber,
@RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize) {
LoginUserInfo userInfo = CurrentUserHolder.getUser();
return ResponseResult.success(deskService.firstInterviewPendingList(pageNumber,pageSize,userInfo));
}
@ApiOperation("待处理-二审")
@GetMapping("/secondInterviewPendingList")
public ResponseResult<PageInfo<InterviewPendingVO>> secondInterviewPendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber,
@RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize) {
LoginUserInfo userInfo = CurrentUserHolder.getUser();
return ResponseResult.success(deskService.secondInterviewPendingList(pageNumber,pageSize,userInfo));
}
@ApiOperation("待处理-缴纳意向金")
@@ -80,13 +57,6 @@ public class DeskController {
return ResponseResult.success(deskService.signingPendingList(pageNumber,pageSize,userInfo));
}
@ApiOperation("待处理-实训体验")
@GetMapping("/storeExperiencePendingList")
public ResponseResult<PageInfo<StoreExperiencePendingVO>> storeExperiencePendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber,
@RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize) {
LoginUserInfo userInfo = CurrentUserHolder.getUser();
return ResponseResult.success(deskService.storeExperiencePendingList(pageNumber,pageSize,userInfo));
}
@ApiOperation("待处理-数据")
@@ -105,13 +75,6 @@ public class DeskController {
return ResponseResult.success(deskService.getInvestmentCount(userInfo));
}
@ApiOperation("待处理-系统建店")
@GetMapping("/systemBuildStorePendingList")
public ResponseResult<PageInfo<PreparationCommonPendingVO>> systemBuildStorePendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber,
@RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize) {
LoginUserInfo userInfo = CurrentUserHolder.getUser();
return ResponseResult.success(deskService.systemBuildStorePendingList(pageNumber,pageSize,userInfo));
}
@ApiOperation("待处理-支付加盟费保证金")
@GetMapping("/payFranchiseFeesPendingList")
public ResponseResult<PageInfo<PreparationCommonPendingVO>> payFranchiseFeesPendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber,
@@ -141,13 +104,6 @@ public class DeskController {
LoginUserInfo userInfo = CurrentUserHolder.getUser();
return ResponseResult.success(deskService.openingAndOperationPlanPendingList(pageNumber,pageSize,userInfo));
}
@ApiOperation("待处理-首批订货清单")
@GetMapping("/firstOrderListPendingList")
public ResponseResult<PageInfo<PreparationCommonPendingVO>> firstOrderListPendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber,
@RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize) {
LoginUserInfo userInfo = CurrentUserHolder.getUser();
return ResponseResult.success(deskService.firstOrderListPendingList(pageNumber,pageSize,userInfo));
}
@ApiOperation("待处理-培训登记")
@GetMapping("/trainListPendingList")

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

@@ -28,10 +28,16 @@ public class ExportController {
private ExportService exportService;
// @PostMapping("/preparationList")
// @ApiOperation("进度管理")
// public ResponseResult preparationList(@RequestBody BranchShopRequest request) {
// return ResponseResult.success(exportService.branchShopList(request, CurrentUserHolder.getUser()));
// }
@PostMapping("/preparationList")
@ApiOperation("进度管理")
public ResponseResult preparationList(@RequestBody PreparationRequest request) {
request.setCurUserId(CurrentUserHolder.getUserId());
return ResponseResult.success(exportService.preparationList(request, CurrentUserHolder.getUser()));
public ResponseResult preparationList(@RequestBody BranchShopRequest request) {
return ResponseResult.success(exportService.branchShopList(request, CurrentUserHolder.getUser()));
}
}

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

@@ -62,10 +62,10 @@ public class LineAuditController {
return ResponseResult.success(bankService.repayment(request));
}
@ApiOperation("结束跟进")
@PostMapping("/close")
public ResponseResult<Boolean> auditClose(@RequestBody AuditCloseRequest request){
return ResponseResult.success(lineFlowService.auditClose(request, CurrentUserHolder.getUser()));
}
// @ApiOperation("结束跟进")
// @PostMapping("/close")
// public ResponseResult<Boolean> auditClose(@RequestBody AuditCloseRequest request){
// return ResponseResult.success(lineFlowService.auditClose(request, CurrentUserHolder.getUser()));
// }
}

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

@@ -9,6 +9,7 @@ import com.cool.store.vo.log.LineFollowLogVO;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.boot.context.properties.bind.DefaultValue;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -29,8 +30,8 @@ public class LineFollowController {
@ApiOperation("跟进日志分页")
@GetMapping("/page")
public ResponseResult<PageInfo<LineFollowLogVO>> getFollowLogPage(Long lineId, Integer pageNum, Integer pageSize){
return ResponseResult.success(lineFollowService.getFollowLogPage(lineId, pageNum, pageSize));
public ResponseResult<PageInfo<LineFollowLogVO>> getFollowLogPage(Long lineId, Integer pageNum, Integer pageSize, @RequestParam(value = "type",defaultValue = "1") Integer type){
return ResponseResult.success(lineFollowService.getFollowLogPage(lineId, pageNum, pageSize,type));
}
@ApiOperation("新增跟进日志")

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

@@ -118,12 +118,14 @@ public class LineInfoController {
@ApiImplicitParams({
@ApiImplicitParam(name = "lineId", value = "线索id", required = true),
@ApiImplicitParam(name = "pageNum", value = "页码", required = true),
@ApiImplicitParam(name = "pageSize", value = "大小", required = true)
@ApiImplicitParam(name = "pageSize", value = "大小", required = true),
@ApiImplicitParam(name = "lineShopType", value = "1-线索，2-门店", required = false)
})
public ResponseResult<PageInfo<TransferLogDTO>> getTransferLogPage(@RequestParam("lineId")Long lineId,
@RequestParam(value = "pageNum" ,defaultValue = "1")Integer pageNum,
@RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize) {
return ResponseResult.success(transferLogService.getTransferLogPage(pageNum,pageSize,lineId));
@RequestParam(value = "pageNum" ,defaultValue = "1")Integer pageNum,
@RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize,
@RequestParam(value = "lineShopType",defaultValue = "1") Integer lineShopType) {
return ResponseResult.success(transferLogService.getTransferLogPage(pageNum,pageSize,lineId,lineShopType));
}
@ApiOperation("查询意向金详情")
@@ -172,5 +174,9 @@ public class LineInfoController {
return ResponseResult.success(linePayService.skipPay(lineId,CurrentUserHolder.getUser()));
}
@ApiOperation("查询加盟商")
@PostMapping("/getLines")
public ResponseResult<PageInfo<LineVO>> getLines(@RequestBody LinesRequest request) {
return ResponseResult.success(lineService.getLines(request));
}
}

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

@@ -1,14 +1,20 @@
package com.cool.store.controller.webb;
import com.cool.store.request.AddShopRequest;
import com.cool.store.request.DeleteShopRequest;
import com.cool.store.request.UpdateShopCodeRequest;
import com.cool.store.context.CurrentUserHolder;
import com.cool.store.dto.TransferLogDTO;
import com.cool.store.request.*;
import com.cool.store.response.BranchShopDetailResponse;
import com.cool.store.response.BranchShopResponse;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.ShopService;
import com.cool.store.service.TransferLogService;
import com.cool.store.vo.shop.MiniShopPageVO;
import com.cool.store.vo.shop.ShopStageInfoVO;
import com.cool.store.vo.shop.StageShopCountVO;
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.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -29,22 +35,24 @@ public class PCShopController {
@Resource
private ShopService shopService;
@Resource
private TransferLogService transferLogService;
@ApiOperation("获取店铺列表")
@GetMapping("/getShopList")
public ResponseResult<List<MiniShopPageVO>> getShopList(@RequestParam("lineId")Long lineId) {
return ResponseResult.success(shopService.getShopList(lineId));
public ResponseResult<List<MiniShopPageVO>> getShopList(@RequestParam("lineId") Long lineId) {
return ResponseResult.success(shopService.getShopList(lineId, CurrentUserHolder.getUserId()));
}
@ApiOperation("获取各个阶段店铺数量")
@GetMapping("/getStageShopCount")
public ResponseResult<StageShopCountVO> getStageShopCount(@RequestParam("lineId")Long lineId) {
public ResponseResult<StageShopCountVO> getStageShopCount(@RequestParam("lineId") Long lineId) {
return ResponseResult.success(shopService.getStageShopCount(lineId));
}
@ApiOperation("获取店铺的阶段信息")
@GetMapping("/getShopStageInfo")
public ResponseResult<List<ShopStageInfoVO>> getShopStageInfo(@RequestParam("shopId")Long shopId, @RequestParam(value = "shopStage", required = false)Integer shopStage) {
public ResponseResult<List<ShopStageInfoVO>> getShopStageInfo(@RequestParam("shopId") Long shopId, @RequestParam(value = "shopStage", required = false) Integer shopStage) {
return ResponseResult.success(shopService.getShopStageInfo(shopId, shopStage));
}
@@ -57,13 +65,64 @@ public class PCShopController {
@ApiOperation("新增店铺")
@PostMapping("/addShop")
public ResponseResult<Long> addShop(@RequestBody @Validated AddShopRequest request) {
request.setUserId(CurrentUserHolder.getUserId());
return ResponseResult.success(shopService.addShop(request));
}
@ApiOperation("修改门店编号和门店名称和门店所属区域")
@PostMapping("/updateShopCode")
public ResponseResult<Integer> updateShopCode(@RequestBody @Validated UpdateShopCodeRequest request) {
return ResponseResult.success(shopService.updateShopCode(request));
return ResponseResult.success(shopService.updateShopCode(request, CurrentUserHolder.getUserId()));
}
@ApiOperation("新建分店")
@PostMapping("/addBranchShop")
public ResponseResult<Long> addBranchShop(@RequestBody @Validated AddBranchShopRequest request) {
String userId = CurrentUserHolder.getUserId();
return ResponseResult.success(shopService.addBranchShop(request, userId));
}
@ApiOperation("开店详情/左边小窗")
@GetMapping("/getBranchShopDetail")
public ResponseResult<BranchShopDetailResponse> getBranchShopDetail(@RequestParam("shopId") Long shopId) {
return ResponseResult.success(shopService.getBranchShopDetail(shopId));
}
@ApiOperation("修改开店详情/左边小窗")
@PostMapping("/updateBranchShopDetail")
public ResponseResult<Integer> updateBranchShopDetail(@RequestBody @Validated BranchShopDetailRequest request) {
String userId = CurrentUserHolder.getUserId();
return ResponseResult.success(shopService.updateBranchShopDetail(request, userId));
}
@ApiOperation("门店转让，修改门店招商专员/督导")
@GetMapping("/updateShopInvestment")
public ResponseResult<Integer> updateShopInvestment(@RequestParam("shopId") Long shopId, @RequestParam("updateUserId") String updateUserId) {
String userId = CurrentUserHolder.getUserId();
return ResponseResult.success(shopService.updateShopInvestment(shopId, updateUserId, userId));
}
@ApiOperation("门店转让记录")
@GetMapping("/getTransferLogPage")
@ApiImplicitParams({
@ApiImplicitParam(name = "lineId", value = "线索id", required = true),
@ApiImplicitParam(name = "pageNum", value = "页码", required = true),
@ApiImplicitParam(name = "pageSize", value = "大小", required = true),
@ApiImplicitParam(name = "lineShopType", value = "1-线索，2-门店", required = true)
})
public ResponseResult<PageInfo<TransferLogDTO>> getTransferLogPage(@RequestParam("lineId") Long lineId,
@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
@RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
@RequestParam(value = "lineShopType", defaultValue = "1") Integer lineShopType) {
return ResponseResult.success(transferLogService.getTransferLogPage(pageNum, pageSize, lineId, lineShopType));
}
@ApiOperation("门店结束跟进")
@GetMapping("/shopClose")
public ResponseResult<Boolean> shopClose(@RequestParam("shopId")Long shopId) {
return ResponseResult.success(shopService.shopClose(shopId));
}
}

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

@@ -2,11 +2,13 @@ package com.cool.store.controller.webb;
import com.alibaba.fastjson.JSONObject;
import com.cool.store.context.CurrentUserHolder;
import com.cool.store.dto.point.ShopPointDTO;
import com.cool.store.request.*;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.PointService;
import com.cool.store.vo.LinePointBaseInfoVO;
import com.cool.store.vo.point.*;
import com.cool.store.vo.shop.ShopPointBaseInfoVO;
import com.cool.store.vo.shop.ShopStageVO;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.Api;
@@ -126,6 +128,14 @@ public class PointController {
return ResponseResult.success(pointService.getLinePage(request));
}
@ApiOperation("查询我负责的门店列表-门店的选址经理是我")
@PostMapping("/getShopPage")
public ResponseResult<PageInfo<ShopPointBaseInfoVO>> getShopPage(@RequestBody PointLinePageRequest request) {
request.setDevelopmentManager(CurrentUserHolder.getUserId());
return ResponseResult.success(pointService.getShopPage(request));
}
@ApiOperation("获取单个加盟商选址数据")
@GetMapping("/getLineInfo")
public ResponseResult<LinePointBaseInfoVO> getLineInfo(@RequestParam("lineId") Long lineId) {
@@ -158,12 +168,20 @@ public class PointController {
return ResponseResult.success(pointService.getPointAllAuditRecord(pointId));
}
@ApiOperation("获取加盟商的推荐铺位列表")
@ApiOperation("获取加盟商的推荐铺位列表-V2.4废弃")
@GetMapping("/getLineRecommendPointList")
@Deprecated
public ResponseResult<List<PointRecommendPageVO>> getLineRecommendPointList(@RequestParam("lineId")Long lineId) {
return ResponseResult.success(pointService.getLineRecommendPointList(lineId));
}
@ApiOperation("获取门店的推荐铺位列表-V2.4新增")
@GetMapping("/getShopRecommendPointList")
public ResponseResult<List<PointRecommendPageVO>> getShopRecommendPointList(@RequestParam("shopId")Long shopId) {
return ResponseResult.success(pointService.getShopRecommendPointList(shopId));
}
@ApiOperation("选址人员获取可推荐铺位列表")
@PostMapping("/getRecommendPointList")
public ResponseResult<PageInfo<PointPageVO>> getRecommendPointList(@RequestBody @Validated RecommendPointPageRequest request) {
@@ -171,21 +189,21 @@ public class PointController {
return ResponseResult.success(pointService.getRecommendPointList(request));
}
@ApiOperation("加盟商详情推送铺位")
@ApiOperation("加盟商详情推送铺位->v2.4 门店详情推荐铺位")
@PostMapping("/lineRecommendPoint")
public ResponseResult<Integer> lineRecommendPoint(@RequestBody @Validated LineRecommendPointRequest request) {
request.setDevelopmentManager(CurrentUserHolder.getUserId());
return ResponseResult.success(pointService.lineRecommendPoint(request));
}
@ApiOperation("铺位详情推送加盟商")
@ApiOperation("铺位详情推送加盟商->v2.4 铺位详情推送门店")
@PostMapping("/pointRecommendLine")
public ResponseResult<Integer> pointRecommendLine(@RequestBody @Validated PointRecommendLineRequest request) {
request.setDevelopmentManager(CurrentUserHolder.getUserId());
return ResponseResult.success(pointService.pointRecommendLine(request));
}
@ApiOperation("选址人员转让加盟商")
@ApiOperation("选址人员转让加盟商->v2.4 选址人员转让门店选址经理")
@PostMapping("/turnLine")
public ResponseResult<Integer> turnLine(@RequestBody @Validated TurnLineRequest request) {
return ResponseResult.success(pointService.turnLine(request));

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

@@ -1,10 +1,13 @@
package com.cool.store.controller.webb;
import com.cool.store.context.CurrentUserHolder;
import com.cool.store.request.BranchShopRequest;
import com.cool.store.request.PreparationRequest;
import com.cool.store.request.TrainingExperienceDistributionRequest;
import com.cool.store.response.BranchShopResponse;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.PreparationService;
import com.cool.store.service.ShopService;
import com.cool.store.service.impl.PreparationServiceImpl;
import com.cool.store.vo.Preparation.PreparationProcessVO;
import com.cool.store.vo.Preparation.PreparationScheduleDetailVO;
@@ -13,6 +16,7 @@ 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.*;
import javax.annotation.Resource;
@@ -31,12 +35,13 @@ public class PreparationController {
@Resource
PreparationService preparationService;
@Resource
ShopService shopService;
@ApiOperation("进度列表")
@PostMapping("/list")
public ResponseResult<PageInfo<PreparationScheduleVO>> distribution(@RequestBody PreparationRequest request) {
request.setCurUserId(CurrentUserHolder.getUserId());
return ResponseResult.success(preparationService.getPreparationSchedule(request));
public ResponseResult<PageInfo<BranchShopResponse>> distribution(@RequestBody @Validated BranchShopRequest request) {
return ResponseResult.success(shopService.getBranchShopList(request,CurrentUserHolder.getUserId()));
}

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

@@ -1,10 +1,12 @@
package com.cool.store.controller.webc;
import com.cool.store.request.LinesRequest;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.LinePayService;
import com.cool.store.service.LineService;
import com.cool.store.vo.IntendProcessTotalVO;
import com.cool.store.vo.LineInfoVO;
import com.cool.store.vo.LineVO;
import com.cool.store.vo.interview.AppointmentTimeVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -12,10 +14,7 @@ import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.format.annotation.DateTimeFormat;
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.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.time.LocalDate;

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

@@ -40,7 +40,7 @@ public class MiniShopController {
@GetMapping("/getShopList")
public ResponseResult<List<MiniShopPageVO>> getShopList() {
Long lineId = PartnerUserHolder.getUser().getLineId();
return ResponseResult.success(shopService.getShopList(lineId));
return ResponseResult.success(shopService.getShopList(lineId,null));
}
@ApiOperation("获取店铺的阶段信息")
@@ -59,8 +59,6 @@ public class MiniShopController {
@ApiOperation("获取推荐给我的铺位")
@PostMapping("/getLineRecommendPointPage")
public ResponseResult<PageInfo<MiniPointPageVO>> getLineRecommendPointPage(@RequestBody MiniPointPageRequest request) {
Long lineId = PartnerUserHolder.getUser().getLineId();
request.setLineId(lineId);
return ResponseResult.success(pointService.getLineRecommendPointPage(request));
}
@@ -82,8 +80,6 @@ public class MiniShopController {
@ApiOperation("拒绝铺位")
@PostMapping("/rejectPoint")
public ResponseResult<Integer> lineRejectPoint(@RequestBody @Validated RejectPointRequest request) {
Long lineId = PartnerUserHolder.getUser().getLineId();
request.setLineId(lineId);
return ResponseResult.success(pointService.lineRejectPoint(request));
}

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

@@ -19,9 +19,7 @@ import com.cool.store.mapper.HyOpenAreaInfoMapper;
import com.cool.store.request.xfsgFirstOrderListRequest;
import com.cool.store.response.ResponseResult;
import com.cool.store.response.xfsgFirstOderListResponse;
import com.cool.store.service.AliyunService;
import com.cool.store.service.CoolStoreStartFlowService;
import com.cool.store.service.RegionService;
import com.cool.store.service.*;
import com.cool.store.utils.poi.ExcelUtil;
import com.cool.store.utils.poi.StringUtils;
import com.cool.store.vo.RegionPathNameVO;
@@ -259,6 +257,18 @@ public class TestController {
}
@Resource
PointService pointService;
@Resource
ShopService shopService;
@GetMapping("/linePointToShopPoint")
public ResponseResult linePointToShopPoint(@RequestParam(value = "shopId",required = false)Long shopId){
return ResponseResult.success(pointService.linePointToShopPoint(shopId));
}
@GetMapping("/dataHandler")
public ResponseResult dataHandler(@RequestParam(value = "lineId",required = false)Long lineId){
return ResponseResult.success(shopService.dataHandler(lineId));
}
}

6
coolstore-partner-web/src/main/resources/application-local.properties
View File

@@ -33,8 +33,8 @@ rocketmq.topic=simple_message
#oss配置
oss.host=https://oss-store.coolcollege.cn/
oss.accessKeyId=LTAI5tRSXy2MrqaaBJ6gReur
oss.accessKeySecret=FFsl8d9batprJ0vXr0k4Y8ada40Wm2
oss.accessKeyId=LTAI5t6Zk3Y3vyrMXC87jGYB
oss.accessKeySecret=6Gw06jtW5xNKWqbhnt1KmVZx1z9Dev
oss.endpoint=oss-cn-hangzhou.aliyuncs.com
oss.bucket=cool-store-hsay
oss.file.dir=partner/171cddee76471740/
@@ -83,5 +83,5 @@ aliyun.sms.accessKeyId=LTAI5tAVZ3r9UtSpLGcmGoQn
aliyun.sms.accessKeySecret=WIMjO4BjVg3YAHwmplq86yOyS2HMpa
aliyun.sms.signName=酷店掌
mybatis.configuration.variables.enterpriseId=28c20a7b42b94171acb1ab3f631d69e1
mybatis.configuration.variables.enterpriseId=5558ce7a3aa84e3590392fcaa8697ffb
enterprise.dingCorpId=ding0006ae30cf81071ea1320dcb25e91351