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

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

Browse Source 
# Conflicts:
#	coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java
This commit is contained in:
zhangchenbiao
2023-05-31 16:48:35 +08:00
parent 5070f52076 4ffa65d58d
commit c43388af90
13 changed files with 462 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-webc/src/main/java/com/cool/store/controller/OpenAreaController.java
View File

@@ -4,6 +4,7 @@ import com.cool.store.response.ResponseResult;
import com.cool.store.vo.OpenAreaVO;
import com.cool.store.vo.OpenProvinceVO;
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;
@@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*;
@RestController
@RequestMapping({"/v1/partnerManage/{enterpriseId}/openArea" })
@Slf4j
@Api(tags = "开发区域城市")
public class OpenAreaController {

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

@@ -7,7 +7,9 @@ import com.cool.store.response.ResponseResult;
import com.cool.store.vo.OpenAreaVO;
import com.cool.store.vo.PartnerLineDetailVO;
import com.cool.store.vo.PartnerLineInfoVO;
import com.cool.store.vo.PartnerSummaryInfoVO;
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;
@@ -22,6 +24,7 @@ import org.springframework.web.bind.annotation.*;
@RestController
@RequestMapping({"/v1/partnerManage/{enterpriseId}/partner" })
@Slf4j
@Api(tags = "加盟商信息")
public class PartnerController {
@@ -120,6 +123,19 @@ public class PartnerController {
}
@GetMapping(path = "/queryPartnerIntentInfo")
@ApiOperation("查看意向申请书")
@ApiImplicitParams({
@ApiImplicitParam(name = "lineId", value = "线索ID", required = false),
})
public ResponseResult<PartnerSummaryInfoVO> queryPartnerIntentInfo(@PathVariable(value = "enterprise-id", required = false) String enterpriseId,
@RequestParam(value = "lineId",required = false)Long lineId){
return ResponseResult.success();
}