From bd8412d1c8d9571ef1af4734462cbf9b00bc111d Mon Sep 17 00:00:00 2001 From: dzq Date: Mon, 1 Dec 2025 10:48:27 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E4=BC=81=E4=B8=9A=E5=BE=AE=E4=BF=A1):=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A0=B9=E6=8D=AEcorpid=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增QyAuthCorpBasicInfoDTO用于返回企业基本信息 - 在AuthCorpInfoApplicationService中添加getCorpBasicInfoByCorpid方法 - 在QyAuthCorpInfoController中新增/basicInfo接口 - 优化ShopController中日期工具类的导入方式 --- .../qywx/QyAuthCorpInfoController.java | 9 +++++ .../admin/controller/shop/ShopController.java | 4 +- .../AuthCorpInfoApplicationService.java | 14 +++++++ .../dto/QyAuthCorpBasicInfoDTO.java | 37 +++++++++++++++++++ 4 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 agileboot-domain/src/main/java/com/agileboot/domain/qywx/authCorpInfo/dto/QyAuthCorpBasicInfoDTO.java diff --git a/agileboot-admin/src/main/java/com/agileboot/admin/controller/qywx/QyAuthCorpInfoController.java b/agileboot-admin/src/main/java/com/agileboot/admin/controller/qywx/QyAuthCorpInfoController.java index e6c8cff..5c8549a 100644 --- a/agileboot-admin/src/main/java/com/agileboot/admin/controller/qywx/QyAuthCorpInfoController.java +++ b/agileboot-admin/src/main/java/com/agileboot/admin/controller/qywx/QyAuthCorpInfoController.java @@ -10,6 +10,7 @@ import com.agileboot.domain.qywx.authCorpInfo.AuthCorpInfoApplicationService; import com.agileboot.domain.qywx.authCorpInfo.command.AddAuthCorpInfoCommand; import com.agileboot.domain.qywx.authCorpInfo.command.UpdateAuthCorpInfoCommand; import com.agileboot.domain.qywx.authCorpInfo.db.QyAuthCorpInfoEntity; +import com.agileboot.domain.qywx.authCorpInfo.dto.QyAuthCorpBasicInfoDTO; import com.agileboot.domain.qywx.authCorpInfo.dto.QyAuthCorpInfoDTO; import com.agileboot.domain.qywx.authCorpInfo.query.SearchQyAuthCorpInfoQuery; import io.swagger.v3.oas.annotations.Operation; @@ -24,6 +25,7 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; @RestController @@ -65,4 +67,11 @@ public class QyAuthCorpInfoController extends BaseController { authCorpInfoApplicationService.deleteAuthCorpInfo(new BulkOperationCommand<>(ids)); return ResponseDTO.ok(); } + + @Operation(summary = "根据corpid查询企业基本信息") + @GetMapping("/basicInfo") + public ResponseDTO getBasicInfoByCorpid(@RequestParam @NotNull String corpid) { + QyAuthCorpBasicInfoDTO basicInfo = authCorpInfoApplicationService.getCorpBasicInfoByCorpid(corpid); + return ResponseDTO.ok(basicInfo); + } } \ No newline at end of file diff --git a/agileboot-admin/src/main/java/com/agileboot/admin/controller/shop/ShopController.java b/agileboot-admin/src/main/java/com/agileboot/admin/controller/shop/ShopController.java index 6268608..2143d55 100644 --- a/agileboot-admin/src/main/java/com/agileboot/admin/controller/shop/ShopController.java +++ b/agileboot-admin/src/main/java/com/agileboot/admin/controller/shop/ShopController.java @@ -22,6 +22,8 @@ import com.agileboot.domain.shop.shop.db.ShopEntity; import com.agileboot.domain.shop.shop.dto.ShopDTO; import com.agileboot.domain.shop.shop.dto.StatsDTO; import com.agileboot.domain.shop.shop.query.SearchShopQuery; + +import cn.hutool.core.date.DateUtil; import io.swagger.v3.oas.annotations.Operation; import java.math.BigDecimal; @@ -91,7 +93,7 @@ public class ShopController extends BaseController { // 格式化每个订单商品的创建时间（HH:mm:ss格式） todayLatestOrderGoodsDTOS.forEach(dto -> { if (dto.getCreateTime() != null) { - dto.setCreateTimeStr(cn.hutool.core.date.DateUtil.format(dto.getCreateTime(), "HH:mm:ss")); + dto.setCreateTimeStr(DateUtil.format(dto.getCreateTime(), "HH:mm:ss")); } }); // 设置今日最新订单商品列表到统计DTO diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/qywx/authCorpInfo/AuthCorpInfoApplicationService.java b/agileboot-domain/src/main/java/com/agileboot/domain/qywx/authCorpInfo/AuthCorpInfoApplicationService.java index c96a69c..30cf736 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/qywx/authCorpInfo/AuthCorpInfoApplicationService.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/qywx/authCorpInfo/AuthCorpInfoApplicationService.java @@ -6,6 +6,7 @@ import com.agileboot.domain.qywx.authCorpInfo.command.AddAuthCorpInfoCommand; import com.agileboot.domain.qywx.authCorpInfo.command.UpdateAuthCorpInfoCommand; import com.agileboot.domain.qywx.authCorpInfo.db.QyAuthCorpInfoEntity; import com.agileboot.domain.qywx.authCorpInfo.db.QyAuthCorpInfoService; +import com.agileboot.domain.qywx.authCorpInfo.dto.QyAuthCorpBasicInfoDTO; import com.agileboot.domain.qywx.authCorpInfo.dto.QyAuthCorpInfoDTO; import com.agileboot.domain.qywx.authCorpInfo.model.AuthCorpInfoModel; import com.agileboot.domain.qywx.authCorpInfo.model.AuthCorpInfoModelFactory; @@ -62,4 +63,17 @@ public class AuthCorpInfoApplicationService { public QyAuthCorpInfoEntity selectByCorpid(String corpid) { return authCorpInfoService.selectByCorpid(corpid); } + + /** + * 根据corpid查询企业基本信息 + * @param corpid 企业微信ID + * @return 企业基本信息DTO + */ + public QyAuthCorpBasicInfoDTO getCorpBasicInfoByCorpid(String corpid) { + QyAuthCorpInfoEntity entity = authCorpInfoService.selectByCorpid(corpid); + if (entity == null) { + return null; + } + return new QyAuthCorpBasicInfoDTO(entity); + } } \ No newline at end of file diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/qywx/authCorpInfo/dto/QyAuthCorpBasicInfoDTO.java b/agileboot-domain/src/main/java/com/agileboot/domain/qywx/authCorpInfo/dto/QyAuthCorpBasicInfoDTO.java new file mode 100644 index 0000000..9bc9772 --- /dev/null +++ b/agileboot-domain/src/main/java/com/agileboot/domain/qywx/authCorpInfo/dto/QyAuthCorpBasicInfoDTO.java @@ -0,0 +1,37 @@ +package com.agileboot.domain.qywx.authCorpInfo.dto; + +import org.springframework.beans.BeanUtils; + +import com.agileboot.domain.qywx.authCorpInfo.db.QyAuthCorpInfoEntity; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +/** + * 企业授权基本信息DTO + * 用于根据corpid查询企业基本信息 + */ +@Data +@Schema(description = "企业授权基本信息") +public class QyAuthCorpBasicInfoDTO { + + public QyAuthCorpBasicInfoDTO(QyAuthCorpInfoEntity entity) { + if (entity != null) { + BeanUtils.copyProperties(entity, this); + } + } + + @Schema(description = "授权方企业方形头像") + private String corpSquareLogoUrl; + + @Schema(description = "授权方企业名称") + private String corpName; + + @Schema(description = "授权方企业全称") + private String corpFullName; + + @Schema(description = "企业所属行业") + private String corpIndustry; + + @Schema(description = "企业所属子行业") + private String corpSubIndustry; +}