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-04-23 19:12:35 +08:00
parent 3227a1a754 3fb02f4bc1
commit b500a94d61
64 changed files with 2721 additions and 146 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/KdzApiController.java
View File

@@ -3,6 +3,7 @@ package com.cool.store.controller.webb;
import com.alibaba.fastjson.JSONObject;
import com.cool.store.enums.ErrorCodeEnum;
import com.cool.store.request.AuditResultRequest;
import com.cool.store.request.SysBuildResultRequest;
import com.cool.store.request.XfsgOpenApiRequest;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.KdzApiService;
@@ -25,7 +26,7 @@ public class KdzApiController {
@Resource
KdzApiService kdzApiService;
@ApiOperation("意向加盟合同审核结果")
@ApiOperation("审核结果")
@PostMapping("/audit/result")
public ResponseResult<Boolean> auditResult(@PathVariable(value = "enterprise-id") String eid,
@RequestBody XfsgOpenApiRequest request) {
@@ -41,6 +42,8 @@ public class KdzApiController {
return ResponseResult.success(kdzApiService.auditResult(auditResultRequest));
}
public static boolean verifyMD5(XfsgOpenApiRequest request, String eid){
//签名
StringBuffer sb = new StringBuffer();

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

@@ -62,9 +62,16 @@ public class LineInfoController {
@ApiOperation("公海线索")
@PostMapping("/getPublicLineList")
public ResponseResult<PageInfo<PublicLineListVO>> getTeamLineList(@RequestBody PublicLineListRequest publicLineListRequest) {
public ResponseResult<PageInfo<PublicLineListVO>> getPublicLineList(@RequestBody PublicLineListRequest publicLineListRequest) {
LoginUserInfo user = CurrentUserHolder.getUser();
return ResponseResult.success(lineService.getPublicLineList(publicLineListRequest,user));
return ResponseResult.success(lineService.getPublicLineList(publicLineListRequest,user,Boolean.TRUE));
}
@ApiOperation("待分配线索")
@PostMapping("/getAssignedLineList")
public ResponseResult<PageInfo<PublicLineListVO>> getAssignedLineList(@RequestBody PublicLineListRequest publicLineListRequest) {
LoginUserInfo user = CurrentUserHolder.getUser();
return ResponseResult.success(lineService.getPublicLineList(publicLineListRequest,user,Boolean.FALSE));
}
@ApiOperation("我负责的加盟商")

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

@@ -46,7 +46,7 @@ public class PointController {
@ApiOperation("完善铺位")
@PostMapping("/update")
public ResponseResult<Integer> updatePointDetailInfo(@RequestBody @Validated UpdatePointDetailRequest shopPointDetailRequest) {
public ResponseResult<Long> updatePointDetailInfo(@RequestBody @Validated UpdatePointDetailRequest shopPointDetailRequest) {
return ResponseResult.success(pointService.updatePointDetailInfo(shopPointDetailRequest));
}

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

@@ -0,0 +1,39 @@
package com.cool.store.controller.webb;
import com.cool.store.request.SysStoreAppRequest;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.SysStoreAppService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.Map;
@RestController
@RequestMapping("/pc/sysStore")
@Api(tags = "系统建店")
@Slf4j
public class SysStoreAppController {
@Resource
private SysStoreAppService sysStoreAppService;
@PostMapping(path = "/submit")
@ApiOperation("提交(更新) 系统建店申请")
public ResponseResult submitSysBuildStore(@RequestBody SysStoreAppRequest request) {
return sysStoreAppService.submitSysBuildStore(request);
}
@GetMapping(path = "/default/get")
@ApiOperation("获取系统建店默认值")
public ResponseResult getDefaultValueSysBuildStore(@RequestParam("lineId") Long lineId,
@RequestParam("shopId") Long shopId) {
return ResponseResult.success(sysStoreAppService.getDefaultValueSysBuildStore(lineId,shopId));
}
}

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

@@ -0,0 +1,31 @@
package com.cool.store.controller.webc;
import com.cool.store.entity.BankdocDO;
import com.cool.store.request.BranchBankPageRequest;
import com.cool.store.response.ResponseResult;
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.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* 证照办理
*/
@RestController
@RequestMapping("/mini/license")
@Api(tags = "证照办理")
@Slf4j
public class ApplyLicenseController {
@ApiOperation("证照办理提交")
@PostMapping("/submit")
public ResponseResult submitLicense() {
return ResponseResult.success();
}
}

4
coolstore-partner-web/src/main/resources/application-ab.properties
View File

@@ -60,8 +60,8 @@ trtc.sdkAppId=1600026212
trtc.secretKey=e036b654c665f649f053a01ff6f5652a826980027be298d4d49949f6e26434a5
trtc.video.callback.secretKey=ur4wq2iFbRI03Q35
weixin.appId=wx085c84fe42691bf1
weixin.appSecret=58e89c9ec4ade1d094bbe21836a19ec4
weixin.appId=wx997f2206e276e513
weixin.appSecret=2ddea4374abeace05e83c948392c2952
weixin.index.url=pages/index/index
signKey=77fea013c3a6459685b83c21a2fc3411

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

@@ -49,8 +49,8 @@ trtc.sdkAppId=1600026212
trtc.secretKey=e036b654c665f649f053a01ff6f5652a826980027be298d4d49949f6e26434a5
trtc.video.callback.secretKey=ur4wq2iFbRI03Q35
weixin.appId=wx085c84fe42691bf1
weixin.appSecret=58e89c9ec4ade1d094bbe21836a19ec4
weixin.appId=wx997f2206e276e513
weixin.appSecret=2ddea4374abeace05e83c948392c2952
weixin.index.url=pages/index/index
signKey=77fea013c3a6459685b83c21a2fc3411

2
coolstore-partner-web/src/main/resources/application-online.properties
View File

@@ -61,7 +61,7 @@ trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219
trtc.video.callback.secretKey=1ECEAD34DBD84E838BF07FC7360EA4D8
weixin.appId=wx997f2206e276e513
weixin.appSecret=90a51574dde00480316f81a552e6b5cb
weixin.appSecret=2ddea4374abeace05e83c948392c2952
weixin.index.url=pages/index/index
signKey=77fea013c3a6459685b83c21a2fc3411

4
coolstore-partner-web/src/main/resources/application-test.properties
View File

@@ -60,8 +60,8 @@ trtc.sdkAppId=1600026212
trtc.secretKey=e036b654c665f649f053a01ff6f5652a826980027be298d4d49949f6e26434a5
trtc.video.callback.secretKey=ur4wq2iFbRI03Q35
weixin.appId=wx085c84fe42691bf1
weixin.appSecret=58e89c9ec4ade1d094bbe21836a19ec4
weixin.appId=wx997f2206e276e513
weixin.appSecret=2ddea4374abeace05e83c948392c2952
weixin.index.url=pages/index/index
signKey=77fea013c3a6459685b83c21a2fc3411