From b9daf945312cd00ddf45aba1762649aa71aadeb5 Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Tue, 1 Apr 2025 20:00:06 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=8D=E7=94=A8?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/EnterpriseUserMapper.xml | 3 +-- .../src/main/java/com/cool/store/entity/EnterpriseUserDO.java | 3 --- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml index 349a94f84..9e266e988 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; From 24fcb6334f9d6786799b28cae7dbea314024163f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Wed, 2 Apr 2025 19:49:29 +0800 Subject: [PATCH 2/5] =?UTF-8?q?feat:=E5=A4=96=E9=83=A8=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=8E=A5=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/webb/PCThirdApiController.java | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCThirdApiController.java 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)); + } +} From 456cbcd9adc10cf261f8efab42474c2ac6e2060d Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Thu, 3 Apr 2025 11:37:57 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-online.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-web/src/main/resources/application-online.properties b/coolstore-partner-web/src/main/resources/application-online.properties index 6e3873ca5..358e6531e 100644 --- a/coolstore-partner-web/src/main/resources/application-online.properties +++ b/coolstore-partner-web/src/main/resources/application-online.properties @@ -1,6 +1,6 @@ #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 From ef1f966332eb7597f8912b4f9fead928d78771c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Thu, 3 Apr 2025 05:05:29 +0000 Subject: [PATCH 4/5] Update application-online.properties --- .../src/main/resources/application-online.properties | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/coolstore-partner-web/src/main/resources/application-online.properties b/coolstore-partner-web/src/main/resources/application-online.properties index 358e6531e..634230383 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-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.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.username=coolstore default.datasource.password=CSCErYcXniNYm7bT From b111d1dfe7b4aa657c8ce562a9c2cb5a7080f688 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Thu, 3 Apr 2025 05:47:37 +0000 Subject: [PATCH 5/5] Update application-online.properties --- .../src/main/resources/application-online.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-web/src/main/resources/application-online.properties b/coolstore-partner-web/src/main/resources/application-online.properties index 634230383..3bc06c68e 100644 --- a/coolstore-partner-web/src/main/resources/application-online.properties +++ b/coolstore-partner-web/src/main/resources/application-online.properties @@ -1,5 +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