diff --git a/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml index 5ef66649c..c75fa88dd 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml @@ -8,7 +8,6 @@ - @@ -25,7 +24,7 @@ - id, user_id, name, remark, mobile, email, org_email, main_admin, is_admin, unionid, + id, user_id, name, remark, mobile, email, main_admin, is_admin, unionid, avatar, jobnumber, is_leader, is_leader_in_depts, face_url, user_status, create_time, third_oa_unique_flag diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/EnterpriseUserDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/EnterpriseUserDO.java index 741639b1b..2513a7a13 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/EnterpriseUserDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/EnterpriseUserDO.java @@ -36,9 +36,6 @@ public class EnterpriseUserDO implements Serializable { @ApiModelProperty("员工的电子邮箱") private String email; - @ApiModelProperty("员工的企业邮箱") - private String orgEmail; - @ApiModelProperty("是否是主管理员,0:否,1:是") private Boolean mainAdmin; diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCThirdApiController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCThirdApiController.java new file mode 100644 index 000000000..faa1b3300 --- /dev/null +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCThirdApiController.java @@ -0,0 +1,35 @@ +package com.cool.store.controller.webb; + +import com.cool.store.request.oppty.OpportunityListRequest; +import com.cool.store.response.ResponseResult; +import com.cool.store.response.oppty.OpportunityInfoPageResponse; +import com.cool.store.service.ThirdOpportunityService; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +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; + +import javax.annotation.Resource; +import javax.validation.Valid; + +/** + * @Author suzhuhong + * @Date 2025/4/2 19:48 + * @Version 1.0 + */ +@Slf4j +@RestController +@RequestMapping("/pc/third/api") +public class PCThirdApiController { + + @Resource + ThirdOpportunityService thirdOpportunityService; + + @PostMapping("/list") + @ApiOperation("PC 机会点列表/我的机会点") + public ResponseResult listOpportunities(@Valid @RequestBody OpportunityListRequest request) { + return ResponseResult.success(thirdOpportunityService.listOpportunities(request)); + } +} diff --git a/coolstore-partner-web/src/main/resources/application-online.properties b/coolstore-partner-web/src/main/resources/application-online.properties index 6e3873ca5..3bc06c68e 100644 --- a/coolstore-partner-web/src/main/resources/application-online.properties +++ b/coolstore-partner-web/src/main/resources/application-online.properties @@ -1,6 +1,5 @@ - #mysql config -default.datasource.url=jdbc:mysql://store10-coolcollege.mysql.rds.aliyuncs.com:3306/coolcollege_intelligent_10027?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&failOverReadOnly=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true +default.datasource.url=jdbc:mysql://store10-coolstore.mysql.rds.aliyuncs.com:3306/coolcollege_intelligent_10027?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&failOverReadOnly=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true default.datasource.username=coolstore default.datasource.password=CSCErYcXniNYm7bT