diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/company/entity/Company.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/company/entity/Company.java index f0553cf6..c5713122 100644 --- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/company/entity/Company.java +++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/company/entity/Company.java @@ -136,6 +136,27 @@ public class Company extends TenantBaseDO { */ private BigDecimal lat; + /** + * 小程序app_id + */ + private String appId; + + /** + * 微信商户号 + */ + private String mchId; + + /** + * 微信支付密钥 + */ + private String privateKeyStr; + + /** + * 回调地址 + */ + private String notifyUrl; + + /** * 距离 */ diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/company/service/CompanyService.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/company/service/CompanyService.java index b0221b1c..9471aa4d 100644 --- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/company/service/CompanyService.java +++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/company/service/CompanyService.java @@ -63,20 +63,23 @@ public interface CompanyService extends IService { /** * 通过服务名称查能提供服务的企业 分页 * - * @param company 企业对象,主要是serverCodes * @author 小李 * @date 14:09 2024/9/23 + * @param company 企业对象,主要是serverCodes **/ IPage getCompanyPageByServer(Company company, Page page); /** * 查企业能提供的业务 * - * @param id 企业ID * @author 小李 * @date 10:21 2024/9/24 + * @param id 企业ID **/ CompanyToServerVO getCompanyServerById(String id); + Company getCompanyByTenantIdAndSystemCode(String tenantId, String systemCode); + + /** * 通过租户ID和系统编码查询企业信息 diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/company/service/impl/CompanyServiceImpl.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/company/service/impl/CompanyServiceImpl.java index 52395486..8e0582e0 100644 --- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/company/service/impl/CompanyServiceImpl.java +++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/company/service/impl/CompanyServiceImpl.java @@ -6,6 +6,9 @@ import cn.hutool.core.util.StrUtil; import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; import cn.iocoder.yudao.framework.common.exception.ErrorCode; import cn.iocoder.yudao.framework.common.exception.ServiceException; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore; +import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO; import cn.iocoder.yudao.module.app.company.vo.CompanyToServerVO; import cn.iocoder.yudao.module.company.entity.Company; import cn.iocoder.yudao.module.company.vo.CompanyRespVO; @@ -19,6 +22,7 @@ import cn.iocoder.yudao.module.system.api.user.AdminUserApi; import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; import cn.iocoder.yudao.module.system.api.user.dto.UserDTO; import com.baomidou.dynamic.datasource.annotation.DSTransactional; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import cn.iocoder.yudao.module.company.vo.CompanyReqVO; @@ -216,6 +220,18 @@ public class CompanyServiceImpl extends ServiceImpl impl return result; } + @Override + @TenantIgnore + public Company getCompanyByTenantIdAndSystemCode(String tenantId, String systemCode) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() + .eq(TenantBaseDO::getTenantId, tenantId) + .like(Company::getServiceCodes, systemCode) + .orderByDesc(BaseDO::getCreateTime); + + List list = this.list(queryWrapper); + return list.isEmpty() ? null : list.get(0); + } + /** * 通过租户ID和系统编码查询企业信息 *