更新0711

# Conflicts:
#	dl-module-base/src/main/java/cn/iocoder/yudao/module/company/service/impl/CompanyServiceImpl.java

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;
+
+
     /**
      *  距离
      */

dl-module-base/src/main/java/cn/iocoder/yudao/module/company/service/CompanyService.java

@@ -63,27 +63,19 @@ public interface CompanyService extends IService<Company> {
     /**
      * 通过服务名称查能提供服务的企业 分页
      *
-     * @param company 企业对象，主要是serverCodes
      * @author 小李
      * @date 14:09 2024/9/23
+     * @param company 企业对象，主要是serverCodes
      **/
     IPage<Company> getCompanyPageByServer(Company company, Page<Company> 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和系统编码查询企业信息
-     *
-     * @param tenantId 租户ID
-     * @param systemCode 系统编码
-     * @return
-     */
-    CompanyRespVO getCompanyByTenantIdAndSystemCode(Long tenantId, String systemCode);
 }

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,18 +220,15 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
         return result;
     }
 
-    /**
-     * 通过租户ID和系统编码查询企业信息
-     *
-     * @param tenantId   租户ID
-     * @param systemCode 系统编码
-     * @return
-     */
     @Override
-    public CompanyRespVO getCompanyByTenantIdAndSystemCode(Long tenantId, String systemCode) {
+    @TenantIgnore
-        return BeanUtil.copyProperties(baseMapper.selectOne(Wrappers.<Company>lambdaQuery()
+    public Company getCompanyByTenantIdAndSystemCode(String tenantId, String systemCode) {
-                .eq(Company::getTenantId, tenantId)
+        LambdaQueryWrapper<Company> queryWrapper = new LambdaQueryWrapper<Company>()
-                .like(ObjectUtil.isNotEmpty(systemCode), Company::getServiceCodes, systemCode)),
+                .eq(TenantBaseDO::getTenantId, tenantId)
-                CompanyRespVO.class);
+                .like(Company::getServiceCodes, systemCode)
+                .orderByDesc(BaseDO::getCreateTime);
+
+        List<Company> list = this.list(queryWrapper);
+        return list.isEmpty() ? null : list.get(0);
     }
 }

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppInspectionOrderServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.iocoder.yudao.framework.security.core.LoginUser;
 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
+import cn.iocoder.yudao.module.company.entity.Company;
 import cn.iocoder.yudao.module.company.service.CompanyService;
 import cn.iocoder.yudao.module.company.vo.CompanyRespVO;
 import cn.iocoder.yudao.module.partner.entity.PartnerWorker;
@@ -68,7 +69,7 @@ public class AppInspectionOrderServiceImpl extends ServiceImpl<OrderInfoMapper,
             return null;
         }
         // 通过订单租户id 查询商家信息
-        CompanyRespVO partners = companyService.getCompanyByTenantIdAndSystemCode(orderInfo.getTenantId(), "jiance");
+        Company partners = companyService.getCompanyByTenantIdAndSystemCode(orderInfo.getTenantId().toString(), "jiance");
         OrderAppDetail  orderDetail =new OrderAppDetail();
         orderDetail.setOrderStatus(orderInfo.getOrderStatus());
         orderDetail.setGoodsId(orderInfo.getGoodsId());