diff --git a/coolstore-partner-service/coolstore-partner-service.iml b/coolstore-partner-service/coolstore-partner-service.iml
index f7543f465..8b2bb5d5c 100644
--- a/coolstore-partner-service/coolstore-partner-service.iml
+++ b/coolstore-partner-service/coolstore-partner-service.iml
@@ -130,6 +130,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/TestController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/TestController.java
index 2e1798f79..6a4493a0e 100644
--- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/TestController.java
+++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/TestController.java
@@ -1,26 +1,29 @@
package com.cool.store.controller;
import com.alibaba.fastjson.JSONObject;
+import com.cool.store.dao.EnterpriseUserDAO;
import com.cool.store.dto.calendar.CreateCalendarEventDTO;
import com.cool.store.dto.calendar.DeleteCalendarEventDTO;
import com.cool.store.dto.calendar.UpdateCalendarEventDTO;
import com.cool.store.dto.calendar.UserCalendarsEventDTO;
+import com.cool.store.dto.partner.DescribePhoneNumberDTO;
import com.cool.store.dto.response.ResultDTO;
import com.cool.store.entity.HyOpenAreaInfoDO;
import com.cool.store.entity.EnterpriseUserDO;
-import com.cool.store.enums.RocketMqTagEnum;
+import com.cool.store.enums.ErrorCodeEnum;
import com.cool.store.exception.ApiException;
+import com.cool.store.exception.ServiceException;
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.AliyunService;
import com.cool.store.service.EnterpriseSyncService;
import com.cool.store.service.EnterpriseUserService;
-import com.cool.store.utils.UUIDUtils;
+import com.cool.store.vo.cuser.IdentityCardInfoVO;
+import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
@@ -43,9 +46,13 @@ public class TestController {
@Resource
private ISVHttpRequest isvHttpRequest;
@Resource
- HyOpenAreaInfoMapper hyOpenAreaInfoMapper;
+ private HyOpenAreaInfoMapper hyOpenAreaInfoMapper;
@Resource
private EnterpriseSyncService enterpriseSyncService;
+ @Resource
+ private EnterpriseUserDAO enterpriseUserDAO;
+ @Resource
+ private AliyunService aliyunService;
@PostMapping("/post")
public ResponseResult get(@RequestBody List testRequestList){
@@ -186,4 +193,22 @@ public class TestController {
return ResultDTO.successResult(isvHttpRequest.deleteUserCalendarEvent(param));
}
+ @GetMapping("/user/getUserCalendarsEvents")
+ public ResultDTO> getUserCalendarsEvents(@RequestParam("userId") String userId, @RequestParam("startTime") long startTime,
+ @RequestParam("endTime") long endTime) throws ApiException {
+ log.info("getUserCalendarsEvents : corpId:{}, appType:{}, userId:{}, startTime:{}, endTime:{}", userId, startTime, endTime);
+ return ResultDTO.successResult(isvHttpRequest.getUserCalendarsEvents(userId, startTime, endTime));
+ }
+
+ @GetMapping(path = "/getIdentityCardInfo")
+ @ApiOperation("根据身份证正面解析获取数据")
+ public ResponseResult getIdentityCardInfo(@RequestParam(value = "faceImageUrl")String faceImageUrl){
+ try {
+ IdentityCardInfoVO identityCardInfo = aliyunService.getIdentityCardInfo(faceImageUrl);
+ return ResponseResult.success(identityCardInfo);
+ } catch (Exception e) {
+ throw new ServiceException(ErrorCodeEnum.IDENTITY_CARD_PARSE_FAIL);
+ }
+ }
+
}