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-08 19:28:21 +08:00
parent 3abec41269 313326a5a0
commit e2ce15f05d
22 changed files with 334 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,7 +20,7 @@ import javax.annotation.Resource;
@Slf4j
public class KdzApiController {
String allowEnterpriseId = "45f92210375346858b6b6694967f44de,e17cd2dc350541df8a8b0af9bd27f77d";
String allowEnterpriseId = "45f92210375346858b6b6694967f44de,e17cd2dc350541df8a8b0af9bd27f77d,28c20a7b42b94171acb1ab3f631d69e1,9ee7b8b48e2447f9a2075b5a46e94d08";
@Resource
KdzApiService kdzApiService;

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

@@ -1,5 +1,6 @@
package com.cool.store.controller.webb;
import com.cool.store.request.FranchiseeSaveRequest;
import com.cool.store.request.InitiatingRequest;
import com.cool.store.response.InitiatingResponse;
import com.cool.store.response.ResponseResult;
@@ -36,5 +37,13 @@ public class PCIntentAgreementController {
return ResponseResult.success(intentAgreementService.initiating(request));
}
@PostMapping(path = "/franchisee/save")
@ApiOperation("kdz -> xfsg 加盟商新增")
public ResponseResult<InitiatingResponse> save(@RequestBody FranchiseeSaveRequest request) {
return ResponseResult.success(intentAgreementService.save(request));
}
}

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

@@ -40,5 +40,10 @@ public class RegionController {
return ResponseResult.success(regionService.listByThirdRegionType(parentId, thirdRegionType));
}
@ApiOperation("获取所属战区")
@GetMapping("/getBelongWarRegionName")
public ResponseResult<String> getBelongWarRegionName(@RequestParam(value = "regionId", required = true) Long regionId) {
return ResponseResult.success(regionService.getBelongWarRegionName(regionId));
}
}

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

@@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
import java.util.Map;
/**
* @ClassName UserAuthMappingController
@@ -41,4 +42,11 @@ public class UserAuthMappingController {
return ResponseResult.success(userAuthMappingService.listWantShopAreaIdByUserId(userId));
}
@ApiOperation("找角色下的人")
@GetMapping("/getUserIdByRoleIdAndRegionId")
public ResponseResult<Map<String, List<String>>> getUserIdByRoleIdAndRegionId(@RequestParam(value = "roleIds", required = true) List<String> roleIds,
@RequestParam(value = "regionId", required = true) Long regionId) {
return ResponseResult.success(userAuthMappingService.getUserIdByRoleIdAndRegionId(roleIds, regionId));
}
}