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/TestController.java
This commit is contained in:
zhangchenbiao
2023-06-08 15:57:58 +08:00
parent 071725fb3d 1fd13c74d4
commit af7188f223
12 changed files with 585 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
coolstore-partner-webb/src/main/java/com/cool/store/controller/TestController.java
View File

@@ -1,19 +1,22 @@
package com.cool.store.controller;
import com.alibaba.fastjson.JSONObject;
import com.cool.store.entity.HyOpenAreaInfoDO;
import com.cool.store.entity.EnterpriseUserDO;
import com.cool.store.enums.RocketMqTagEnum;
import com.cool.store.mapper.HyOpenAreaInfoMapper;
import com.cool.store.http.ISVHttpRequest;
import com.cool.store.mq.producer.SimpleMessageService;
import com.cool.store.request.AllocationInvestmentManagerRequest;
import com.cool.store.request.City;
import com.cool.store.request.TestRequest;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.EnterpriseSyncService;
import com.cool.store.service.EnterpriseUserService;
import com.cool.store.utils.UUIDUtils;
import lombok.extern.slf4j.Slf4j;
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.util.List;
@@ -36,6 +39,8 @@ public class TestController {
@Resource
private ISVHttpRequest isvHttpRequest;
@Resource
HyOpenAreaInfoMapper hyOpenAreaInfoMapper;
@Resource
private EnterpriseSyncService enterpriseSyncService;
@@ -47,6 +52,63 @@ public class TestController {
return ResponseResult.success();
}
@PostMapping("/post")
public ResponseResult<Boolean> get(@RequestBody List<TestRequest> testRequestList){
log.info(JSONObject.toJSONString(testRequestList));
for (TestRequest testRequest:testRequestList) {
//省市区
String name = testRequest.getName();
HyOpenAreaInfoDO hyOpenAreaInfoDO = new HyOpenAreaInfoDO();
String replace = name.replace(" ", "");
hyOpenAreaInfoDO.setAreaName(replace);
String regionPath = "/"+replace+"/";
hyOpenAreaInfoDO.setAreaPath(regionPath);
hyOpenAreaInfoDO.setAreaStatus("open");
hyOpenAreaInfoMapper.insertSelective(hyOpenAreaInfoDO);
Long id = hyOpenAreaInfoDO.getId();
log.info("yuyyyyyyyyyyyyyyyyyyyyy:{}",JSONObject.toJSONString(hyOpenAreaInfoDO));
List<City> city = testRequest.getCity();
for (City c:city) {
String regionPath2 = "";
Long id1 = 0L;
if (c.getName().equals("其他")){
continue;
}
if (c.getName().equals(replace)){
//直辖市
regionPath2 = regionPath;
id1 = id;
}else {
regionPath2 = regionPath +c.getName().replace(" ","")+"/";
hyOpenAreaInfoDO = new HyOpenAreaInfoDO();
hyOpenAreaInfoDO.setAreaName(c.getName().replace(" ",""));
hyOpenAreaInfoDO.setAreaStatus("open");
hyOpenAreaInfoDO.setAreaPath(regionPath2);
hyOpenAreaInfoDO.setParentId(id);
hyOpenAreaInfoMapper.insertSelective(hyOpenAreaInfoDO);
log.info("33333333333333333333333333333333:{}",JSONObject.toJSONString(hyOpenAreaInfoDO));
id1 = hyOpenAreaInfoDO.getId();
}
List<String> area = c.getArea();
for (String c1:area) {
if (c1.equals("其他")){
continue;
}
String regionPath1 = regionPath2 +c1.replace(" ","")+"/";
hyOpenAreaInfoDO = new HyOpenAreaInfoDO();
hyOpenAreaInfoDO.setAreaName(c1.replace(" ",""));
hyOpenAreaInfoDO.setAreaStatus("open");
hyOpenAreaInfoDO.setAreaPath(regionPath1);
hyOpenAreaInfoDO.setParentId(id1);
log.info("hhhhhhhhhhhhhhhhhhhhhhhhhhhh:{}",JSONObject.toJSONString(hyOpenAreaInfoDO));
hyOpenAreaInfoMapper.insertSelective(hyOpenAreaInfoDO);
}
}
}
return ResponseResult.success();
}
@GetMapping("getUserInfo")
public ResponseResult getUserInfo(@RequestParam("userId")String userId){
EnterpriseUserDO enterpriseUser = enterpriseUserService.getUserInfoByUserId(userId);