1、解决已知bug

citu-module-pay/citu-module-pay-biz/src/main/java/com/citu/module/pay/controller/admin/currency/PayCurrencyRechargeController.java

@@ -5,6 +5,7 @@ import com.citu.framework.common.pojo.CommonResult;
 import com.citu.framework.common.pojo.PageResult;
 import com.citu.module.pay.api.notify.dto.PayOrderNotifyReqDTO;
 import com.citu.module.pay.api.notify.dto.PayRefundNotifyReqDTO;
+import com.citu.module.pay.controller.admin.currency.vo.recharge.PayCurrencyRechargeCombinationPageReqVO;
 import com.citu.module.pay.controller.admin.currency.vo.recharge.PayCurrencyRechargePageReqVO;
 import com.citu.module.pay.controller.admin.currency.vo.recharge.PayCurrencyRechargeRespVO;
 import com.citu.module.pay.convert.currency.PayCurrencyRechargeConvert;
@@ -74,7 +75,7 @@ public class PayCurrencyRechargeController {
     @Operation(summary = "获得货币账户充值记录分页")
     @PreAuthorize("@ss.hasPermission('pay:currency-recharge:query')")
     public CommonResult<PageResult<PayCurrencyRechargeRespVO>> getCurrencyRechargePage(
-            @Valid PayCurrencyRechargePageReqVO pageReqVO) {
+            @Valid PayCurrencyRechargeCombinationPageReqVO pageReqVO) {
         PageResult<PayCurrencyRechargeDO> pageResult = currencyRechargeService
                 .getCurrencyRechargePackagePage(pageReqVO);
         if (CollUtil.isEmpty(pageResult.getList())) {

citu-module-pay/citu-module-pay-biz/src/main/java/com/citu/module/pay/controller/admin/currency/vo/recharge/PayCurrencyRechargeCombinationPageReqVO.java

@@ -0,0 +1,22 @@
+package com.citu.module.pay.controller.admin.currency.vo.recharge;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Schema(description = "管理后台 - 货币账户充值记录组合分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class PayCurrencyRechargeCombinationPageReqVO extends PayCurrencyRechargePageReqVO {
+
+    @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    private Long userId;
+
+    @Schema(description = "数据id", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    private Long dataId;
+
+}

citu-module-pay/citu-module-pay-biz/src/main/java/com/citu/module/pay/controller/admin/wallet/PayWalletRechargeController.java

@@ -1,8 +1,19 @@
 package com.citu.module.pay.controller.admin.wallet;
 
+import cn.hutool.core.collection.CollUtil;
+import com.citu.framework.common.enums.UserTypeEnum;
 import com.citu.framework.common.pojo.CommonResult;
+import com.citu.framework.common.pojo.PageParam;
+import com.citu.framework.common.pojo.PageResult;
 import com.citu.module.pay.api.notify.dto.PayOrderNotifyReqDTO;
 import com.citu.module.pay.api.notify.dto.PayRefundNotifyReqDTO;
+import com.citu.module.pay.controller.admin.wallet.vo.recharge.PayWalletRechargeCombinationPageReqVO;
+import com.citu.module.pay.controller.admin.wallet.vo.recharge.PayWalletRechargeRespVO;
+import com.citu.module.pay.controller.app.wallet.vo.recharge.AppPayWalletRechargeRespVO;
+import com.citu.module.pay.convert.wallet.PayWalletRechargeConvert;
+import com.citu.module.pay.dal.dataobject.order.PayOrderDO;
+import com.citu.module.pay.dal.dataobject.wallet.PayWalletRechargeDO;
+import com.citu.module.pay.service.order.PayOrderService;
 import com.citu.module.pay.service.wallet.PayWalletRechargeService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -15,8 +26,12 @@ import javax.annotation.Resource;
 import javax.annotation.security.PermitAll;
 import javax.validation.Valid;
 
+import java.util.List;
+
 import static com.citu.framework.common.pojo.CommonResult.success;
+import static com.citu.framework.common.util.collection.CollectionUtils.convertList;
 import static com.citu.framework.common.util.servlet.ServletUtils.getClientIP;
+import static com.citu.framework.web.core.util.WebFrameworkUtils.getLoginUserId;
 
 @Tag(name = "管理后台 - 钱包充值")
 @RestController
@@ -28,6 +43,9 @@ public class PayWalletRechargeController {
     @Resource
     private PayWalletRechargeService walletRechargeService;
 
+    @Resource
+    private PayOrderService payOrderService;
+
     @PostMapping("/update-paid")
     @Operation(summary = "更新钱包充值为已充值") // 由 pay-module 支付服务，进行回调，可见 PayNotifyJob
     @PermitAll // 无需登录， 内部校验实现
@@ -55,4 +73,18 @@ public class PayWalletRechargeController {
         return success(true);
     }
 
+    @GetMapping("/page")
+    @Operation(summary = "获得钱包充值记录分页")
+    public CommonResult<PageResult<PayWalletRechargeRespVO>> page
+            (@Valid PayWalletRechargeCombinationPageReqVO reqVO) {
+        PageResult<PayWalletRechargeDO> pageResult = walletRechargeService.page(reqVO);
+        if (CollUtil.isEmpty(pageResult.getList())) {
+            return success(PageResult.empty(pageResult.getTotal()));
+        }
+        // 拼接数据
+        List<PayOrderDO> payOrderList = payOrderService.getOrderList(
+                convertList(pageResult.getList(), PayWalletRechargeDO::getPayOrderId));
+        return success(PayWalletRechargeConvert.INSTANCE.convertPage2(pageResult, payOrderList));
+    }
+
 }

citu-module-pay/citu-module-pay-biz/src/main/java/com/citu/module/pay/controller/admin/wallet/vo/recharge/PayWalletRechargeCombinationPageReqVO.java

@@ -0,0 +1,27 @@
+package com.citu.module.pay.controller.admin.wallet.vo.recharge;
+
+
+import com.citu.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+@Schema(description = "管理后台 - 充值记录分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class PayWalletRechargeCombinationPageReqVO extends PageParam {
+
+    @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    private Long userId;
+
+    @Schema(description = "钱包编号")
+    private Long walletId;
+
+    @Schema(description = "用户类型")
+    private Integer userType;
+
+    @Schema(description = "是否支付")
+    private Boolean payStatus;
+}

citu-module-pay/citu-module-pay-biz/src/main/java/com/citu/module/pay/controller/admin/wallet/vo/recharge/PayWalletRechargeRespVO.java

@@ -0,0 +1,45 @@
+package com.citu.module.pay.controller.admin.wallet.vo.recharge;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "用户 APP - 钱包充值记录 Resp VO")
+@Data
+public class PayWalletRechargeRespVO {
+
+    @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    private Long id;
+
+    @Schema(description = "用户实际到账余额", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
+    private Integer totalPrice;
+
+    @Schema(description = "实际支付金额", requiredMode = Schema.RequiredMode.REQUIRED, example = "20")
+    private Integer payPrice;
+
+    @Schema(description = "钱包赠送金额", requiredMode = Schema.RequiredMode.REQUIRED, example = "80")
+    private Integer bonusPrice;
+
+    @Schema(description = "支付成功的支付渠道", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String payChannelCode;
+
+    @Schema(description = "支付渠道名", example = "微信小程序支付")
+    private String payChannelName;
+
+    @Schema(description = "支付订单编号", requiredMode = Schema.RequiredMode.REQUIRED)
+    private Long payOrderId;
+
+    @Schema(description = "支付成功的外部订单号", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String payOrderChannelOrderNo; // 从 PayOrderDO 的 channelOrderNo 字段
+
+    @Schema(description = "订单支付时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    private LocalDateTime payTime;
+
+    @Schema(description = "是否已支付", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
+    private Boolean payStatus;
+
+    @Schema(description = "退款状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
+    private Integer refundStatus;
+
+}

citu-module-pay/citu-module-pay-biz/src/main/java/com/citu/module/pay/controller/app/wallet/vo/recharge/AppPayWalletRechargeRespVO.java

@@ -36,6 +36,9 @@ public class AppPayWalletRechargeRespVO {
     @Schema(description = "订单支付时间", requiredMode = Schema.RequiredMode.REQUIRED)
     private LocalDateTime payTime;
 
+    @Schema(description = "是否已支付", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
+    private Boolean payStatus;
+
     @Schema(description = "退款状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
     private Integer refundStatus;
 

citu-module-pay/citu-module-pay-biz/src/main/java/com/citu/module/pay/convert/wallet/PayWalletRechargeConvert.java

@@ -5,6 +5,7 @@ import com.citu.framework.common.util.collection.CollectionUtils;
 import com.citu.framework.common.util.collection.MapUtils;
 import com.citu.framework.common.util.object.BeanUtils;
 import com.citu.framework.dict.core.DictFrameworkUtils;
+import com.citu.module.pay.controller.admin.wallet.vo.recharge.PayWalletRechargeRespVO;
 import com.citu.module.pay.controller.app.wallet.vo.recharge.AppPayWalletRechargeCreateRespVO;
 import com.citu.module.pay.controller.app.wallet.vo.recharge.AppPayWalletRechargeRespVO;
 import com.citu.module.pay.dal.dataobject.order.PayOrderDO;
@@ -13,6 +14,7 @@ import com.citu.module.pay.enums.DictTypeConstants;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.factory.Mappers;
+import org.springframework.util.StringUtils;
 
 import java.util.List;
 import java.util.Map;
@@ -32,8 +34,25 @@ public interface PayWalletRechargeConvert {
         PageResult<AppPayWalletRechargeRespVO> voPageResult = BeanUtils.toBean(pageResult, AppPayWalletRechargeRespVO.class);
         Map<Long, PayOrderDO> payOrderMap = CollectionUtils.convertMap(payOrderList, PayOrderDO::getId);
         voPageResult.getList().forEach(recharge -> {
-            recharge.setPayChannelName(DictFrameworkUtils.getDictDataLabel(
-                    DictTypeConstants.CHANNEL_CODE, recharge.getPayChannelCode()));
+            if (StringUtils.hasText(recharge.getPayChannelCode())) {
+                recharge.setPayChannelName(DictFrameworkUtils.getDictDataLabel(
+                        DictTypeConstants.CHANNEL_CODE, recharge.getPayChannelCode()));
+            }
+            MapUtils.findAndThen(payOrderMap, recharge.getPayOrderId(),
+                    order -> recharge.setPayOrderChannelOrderNo(order.getChannelOrderNo()));
+        });
+        return voPageResult;
+    }
+
+    default PageResult<PayWalletRechargeRespVO> convertPage2(PageResult<PayWalletRechargeDO> pageResult,
+                                                             List<PayOrderDO> payOrderList) {
+        PageResult<PayWalletRechargeRespVO> voPageResult = BeanUtils.toBean(pageResult, PayWalletRechargeRespVO.class);
+        Map<Long, PayOrderDO> payOrderMap = CollectionUtils.convertMap(payOrderList, PayOrderDO::getId);
+        voPageResult.getList().forEach(recharge -> {
+            if (StringUtils.hasText(recharge.getPayChannelCode())) {
+                recharge.setPayChannelName(DictFrameworkUtils.getDictDataLabel(
+                        DictTypeConstants.CHANNEL_CODE, recharge.getPayChannelCode()));
+            }
             MapUtils.findAndThen(payOrderMap, recharge.getPayOrderId(),
                     order -> recharge.setPayOrderChannelOrderNo(order.getChannelOrderNo()));
         });

citu-module-pay/citu-module-pay-biz/src/main/java/com/citu/module/pay/dal/mysql/wallet/PayWalletRechargeMapper.java

@@ -4,6 +4,7 @@ import com.citu.framework.common.pojo.PageParam;
 import com.citu.framework.common.pojo.PageResult;
 import com.citu.framework.mybatis.core.mapper.BaseMapperX;
 import com.citu.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.citu.module.pay.controller.admin.wallet.vo.recharge.PayWalletRechargeCombinationPageReqVO;
 import com.citu.module.pay.dal.dataobject.wallet.PayWalletRechargeDO;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -27,4 +28,11 @@ public interface PayWalletRechargeMapper extends BaseMapperX<PayWalletRechargeDO
                 .orderByDesc(PayWalletRechargeDO::getId));
     }
 
+    default PageResult<PayWalletRechargeDO> selectPage(PayWalletRechargeCombinationPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<PayWalletRechargeDO>()
+                .eqIfPresent(PayWalletRechargeDO::getWalletId, reqVO.getWalletId())
+                .eqIfPresent(PayWalletRechargeDO::getPayStatus, reqVO.getPayStatus())
+                .orderByDesc(PayWalletRechargeDO::getId));
+    }
+
 }

citu-module-pay/citu-module-pay-biz/src/main/java/com/citu/module/pay/service/currency/PayCurrencyRechargeService.java

@@ -2,6 +2,7 @@ package com.citu.module.pay.service.currency;
 
 import com.citu.framework.common.pojo.PageParam;
 import com.citu.framework.common.pojo.PageResult;
+import com.citu.module.pay.controller.admin.currency.vo.recharge.PayCurrencyRechargeCombinationPageReqVO;
 import com.citu.module.pay.controller.admin.currency.vo.recharge.PayCurrencyRechargePageReqVO;
 import com.citu.module.pay.controller.app.currency.vo.recharge.AppPayCurrencyRechargeCreateReqVO;
 import com.citu.module.pay.dal.dataobject.currency.PayCurrencyRechargeDO;
@@ -60,7 +61,7 @@ public interface PayCurrencyRechargeService {
      * @param reqVO    查询条件
      * @return 货币账户充值记录分页
      */
-    PageResult<PayCurrencyRechargeDO> getCurrencyRechargePackagePage(PayCurrencyRechargePageReqVO reqVO);
+    PageResult<PayCurrencyRechargeDO> getCurrencyRechargePackagePage(PayCurrencyRechargeCombinationPageReqVO reqVO);
 
     /**
      * 更新货币账户充值成功

citu-module-pay/citu-module-pay-biz/src/main/java/com/citu/module/pay/service/currency/PayCurrencyRechargeServiceImpl.java

@@ -3,11 +3,13 @@ package com.citu.module.pay.service.currency;
 import cn.hutool.core.date.LocalDateTimeUtil;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.extra.spring.SpringUtil;
+import com.citu.framework.common.enums.UserTypeEnum;
 import com.citu.framework.common.pojo.PageParam;
 import com.citu.framework.common.pojo.PageResult;
 import com.citu.framework.pay.core.enums.refund.PayRefundStatusRespEnum;
 import com.citu.module.pay.api.order.dto.PayOrderCreateReqDTO;
 import com.citu.module.pay.api.refund.dto.PayRefundCreateReqDTO;
+import com.citu.module.pay.controller.admin.currency.vo.recharge.PayCurrencyRechargeCombinationPageReqVO;
 import com.citu.module.pay.controller.admin.currency.vo.recharge.PayCurrencyRechargePageReqVO;
 import com.citu.module.pay.controller.app.currency.vo.recharge.AppPayCurrencyRechargeCreateReqVO;
 import com.citu.module.pay.convert.currency.PayCurrencyRechargeConvert;
@@ -39,6 +41,7 @@ import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exce
 import static com.citu.framework.common.util.date.LocalDateTimeUtils.addTime;
 import static com.citu.framework.common.util.json.JsonUtils.toJsonString;
 import static com.citu.framework.common.util.number.MoneyUtils.fenToYuanStr;
+import static com.citu.framework.web.core.util.WebFrameworkUtils.getLoginUserType;
 import static com.citu.module.pay.enums.ErrorCodeConstants.*;
 import static com.citu.module.pay.enums.MessageTemplateConstants.WXA_WALLET_RECHARGER_PAID;
 import static com.citu.module.pay.enums.refund.PayRefundStatusEnum.*;
@@ -146,7 +149,14 @@ public class PayCurrencyRechargeServiceImpl implements PayCurrencyRechargeServic
     }
 
     @Override
-    public PageResult<PayCurrencyRechargeDO> getCurrencyRechargePackagePage(PayCurrencyRechargePageReqVO reqVO) {
+    public PageResult<PayCurrencyRechargeDO> getCurrencyRechargePackagePage(PayCurrencyRechargeCombinationPageReqVO reqVO) {
+        if (null != reqVO.getUserId() && null != reqVO.getDataId()) {
+            return getCurrencyRechargePackagePage(
+                    reqVO.getDataId(),
+                    reqVO.getUserId(),
+                    UserTypeEnum.MEMBER.getValue(),
+                    reqVO);
+        }
         return currencyRechargeMapper.selectPage(reqVO);
     }
 

citu-module-pay/citu-module-pay-biz/src/main/java/com/citu/module/pay/service/currency/PayCurrencyService.java

@@ -32,7 +32,7 @@ public interface PayCurrencyService {
     PayCurrencyDO getCurrency(Long currencyId);
 
     /**
-     * 获得会员货币账户分页
+     * 获得货币账户分页
      *
      * @param pageReqVO 分页查询
      * @return 会员货币账户分页

citu-module-pay/citu-module-pay-biz/src/main/java/com/citu/module/pay/service/wallet/PayWalletRechargeService.java

@@ -2,6 +2,7 @@ package com.citu.module.pay.service.wallet;
 
 import com.citu.framework.common.pojo.PageParam;
 import com.citu.framework.common.pojo.PageResult;
+import com.citu.module.pay.controller.admin.wallet.vo.recharge.PayWalletRechargeCombinationPageReqVO;
 import com.citu.module.pay.controller.app.wallet.vo.recharge.AppPayWalletRechargeCreateReqVO;
 import com.citu.module.pay.dal.dataobject.wallet.PayWalletRechargeDO;
 
@@ -36,6 +37,14 @@ public interface PayWalletRechargeService {
     PageResult<PayWalletRechargeDO> getWalletRechargePackagePage(Long userId, Integer userType,
                                                                  PageParam pageReqVO, Boolean payStatus);
 
+    /**
+     * 获得钱包充值记录分页
+     *
+     * @param reqVO 查询条件
+     * @return 钱包充值记录分页
+     */
+    PageResult<PayWalletRechargeDO> page(PayWalletRechargeCombinationPageReqVO reqVO);
+
     /**
      * 更新钱包充值成功
      *

citu-module-pay/citu-module-pay-biz/src/main/java/com/citu/module/pay/service/wallet/PayWalletRechargeServiceImpl.java

@@ -3,11 +3,13 @@ package com.citu.module.pay.service.wallet;
 import cn.hutool.core.date.LocalDateTimeUtil;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.extra.spring.SpringUtil;
+import com.citu.framework.common.enums.UserTypeEnum;
 import com.citu.framework.common.pojo.PageParam;
 import com.citu.framework.common.pojo.PageResult;
 import com.citu.framework.pay.core.enums.refund.PayRefundStatusRespEnum;
 import com.citu.module.pay.api.order.dto.PayOrderCreateReqDTO;
 import com.citu.module.pay.api.refund.dto.PayRefundCreateReqDTO;
+import com.citu.module.pay.controller.admin.wallet.vo.recharge.PayWalletRechargeCombinationPageReqVO;
 import com.citu.module.pay.controller.app.wallet.vo.recharge.AppPayWalletRechargeCreateReqVO;
 import com.citu.module.pay.dal.dataobject.order.PayOrderDO;
 import com.citu.module.pay.dal.dataobject.refund.PayRefundDO;
@@ -57,7 +59,8 @@ public class PayWalletRechargeServiceImpl implements PayWalletRechargeService {
     private static final Long WALLET_PAY_APP_ID = 8L;
 
     private static final String WALLET_RECHARGE_ORDER_SUBJECT = "钱包余额充值";
-
+    @Resource
+    public SocialClientApi socialClientApi;
     @Resource
     private PayWalletRechargeMapper walletRechargeMapper;
     @Resource
@@ -68,8 +71,6 @@ public class PayWalletRechargeServiceImpl implements PayWalletRechargeService {
     private PayRefundService payRefundService;
     @Resource
     private PayWalletRechargePackageService payWalletRechargePackageService;
-    @Resource
-    public SocialClientApi socialClientApi;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -110,6 +111,15 @@ public class PayWalletRechargeServiceImpl implements PayWalletRechargeService {
         return walletRechargeMapper.selectPage(pageReqVO, wallet.getId(), payStatus);
     }
 
+    @Override
+    public PageResult<PayWalletRechargeDO> page(PayWalletRechargeCombinationPageReqVO reqVO) {
+        if (null != reqVO.getUserId() ) {
+            PayWalletDO wallet = payWalletService.getOrCreateWallet(reqVO.getUserId(), UserTypeEnum.MEMBER.getValue());
+            reqVO.setWalletId(wallet.getId());
+        }
+        return walletRechargeMapper.selectPage(reqVO);
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void updateWalletRechargerPaid(Long id, Long payOrderId) {

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/enterprise/EnterpriseController.java

@@ -63,17 +63,17 @@ public class EnterpriseController {
     @Operation(summary = "获得企业信息")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('menduner:system:enterprise:query')")
-    public CommonResult<EnterpriseRespVO> getEnterprise(@RequestParam("id") Long id) {
-        EnterpriseDO enterprise = enterpriseService.getEnterprise(id);
-        return success(BeanUtils.toBean(enterprise, EnterpriseRespVO.class));
+    public CommonResult<EnterpriseDetailRespVO> getEnterprise(@RequestParam("id") Long id) {
+        EnterpriseDetailRespVO enterprise = enterpriseService.get(id);
+        return success(enterprise);
     }
 
     @GetMapping("/page")
     @Operation(summary = "获得企业信息分页")
     @PreAuthorize("@ss.hasPermission('menduner:system:enterprise:query')")
-    public CommonResult<PageResult<EnterpriseRespVO>> getEnterprisePage(@Valid EnterprisePageReqVO pageReqVO) {
-        PageResult<EnterpriseDO> pageResult = enterpriseService.getEnterprisePage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, EnterpriseRespVO.class));
+    public CommonResult<PageResult<EnterpriseDetailRespVO>> getEnterprisePage(@Valid EnterprisePageReqVO pageReqVO) {
+        PageResult<EnterpriseDetailRespVO> pageResult = enterpriseService.page(pageReqVO);
+        return success(pageResult);
     }
 
     @GetMapping("/export-excel")

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/enterprise/EnterpriseUserBindController.java

@@ -6,6 +6,7 @@ import com.citu.framework.common.pojo.PageParam;
 import com.citu.framework.common.pojo.PageResult;
 import com.citu.framework.common.util.object.BeanUtils;
 import com.citu.framework.excel.core.util.ExcelUtils;
+import com.citu.module.menduner.system.controller.base.enterprise.bind.EnterpriseUserBindDetailRespVO;
 import com.citu.module.menduner.system.controller.base.enterprise.bind.EnterpriseUserBindPageReqVO;
 import com.citu.module.menduner.system.controller.base.enterprise.bind.EnterpriseUserBindRespVO;
 import com.citu.module.menduner.system.controller.base.enterprise.bind.EnterpriseUserBindSaveReqVO;
@@ -64,17 +65,18 @@ public class EnterpriseUserBindController {
     @Operation(summary = "获得企业登录用户")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('menduner:system:enterprise-user-bind:query')")
-    public CommonResult<EnterpriseUserBindRespVO> getEnterpriseUserBind(@RequestParam("id") Long id) {
-        EnterpriseUserBindDO enterpriseUserBind = enterpriseUserBindService.getEnterpriseUserBind(id);
-        return success(BeanUtils.toBean(enterpriseUserBind, EnterpriseUserBindRespVO.class));
+    public CommonResult<EnterpriseUserBindDetailRespVO> getEnterpriseUserBind(@RequestParam("id") Long id) {
+        EnterpriseUserBindDetailRespVO enterpriseUserBind = enterpriseUserBindService.get(id);
+        return success(enterpriseUserBind);
     }
 
     @GetMapping("/page")
     @Operation(summary = "获得企业登录用户分页")
     @PreAuthorize("@ss.hasPermission('menduner:system:enterprise-user-bind:query')")
-    public CommonResult<PageResult<EnterpriseUserBindRespVO>> getEnterpriseUserBindPage(@Valid EnterpriseUserBindPageReqVO pageReqVO) {
-        PageResult<EnterpriseUserBindDO> pageResult = enterpriseUserBindService.getEnterpriseUserBindPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, EnterpriseUserBindRespVO.class));
+    public CommonResult<PageResult<EnterpriseUserBindDetailRespVO>> getEnterpriseUserBindPage
+            (@Valid EnterpriseUserBindPageReqVO pageReqVO) {
+        PageResult<EnterpriseUserBindDetailRespVO> pageResult = enterpriseUserBindService.page(pageReqVO);
+        return success(pageResult);
     }
 
     @GetMapping("/export-excel")

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/person/PersonEnterpriseSubscribeController.java

@@ -29,7 +29,7 @@ import static com.citu.framework.common.pojo.CommonResult.success;
 
 @Tag(name = "管理后台 - 人才-企业关注订阅")
 @RestController
-@RequestMapping("/menduner.system/person-enterprise-subscribe")
+@RequestMapping("/menduner/system/person-enterprise-subscribe")
 @Validated
 public class PersonEnterpriseSubscribeController {
 
@@ -69,6 +69,14 @@ public class PersonEnterpriseSubscribeController {
         return success(BeanUtils.toBean(personEnterpriseSubscribe, PersonEnterpriseSubscribeRespVO.class));
     }
 
+    @GetMapping("/count")
+    @Operation(summary = "根据用户编号获取企业关注订阅数量")
+    @Parameter(name = "userId", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('menduner:system:person-enterprise-subscribe:query')")
+    public CommonResult<Long> countByUserId(@RequestParam("userId") Long userId) {
+        return success(personEnterpriseSubscribeService.countByUserId(userId));
+    }
+
     @GetMapping("/page")
     @Operation(summary = "获得人才-企业关注订阅分页")
     @PreAuthorize("@ss.hasPermission('menduner:system:person-enterprise-subscribe:query')")

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/person/PersonJobFavoriteController.java

@@ -69,6 +69,15 @@ public class PersonJobFavoriteController {
         return success(BeanUtils.toBean(personJobFavorite, PersonJobFavoriteRespVO.class));
     }
 
+    @GetMapping("/count")
+    @Operation(summary = "根据用户编号获取招聘职位收藏数量")
+    @Parameter(name = "userId", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('menduner:system:person-job-favorite:query')")
+    public CommonResult<Long> countByUserId(@RequestParam("userId") Long userId) {
+        return success(personJobFavoriteService.countByUserId(userId));
+    }
+
+
     @GetMapping("/page")
     @Operation(summary = "获得人才-招聘职位收藏分页")
     @PreAuthorize("@ss.hasPermission('menduner:system:person-job-favorite:query')")

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/user/UserAccountController.java

@@ -11,12 +11,15 @@ import com.citu.module.menduner.system.controller.admin.user.vo.UserAccountPageR
 import com.citu.module.menduner.system.controller.base.account.AccountPointUpdateReqVO;
 import com.citu.module.menduner.system.controller.base.user.account.UserAccountPageReqVO;
 import com.citu.module.menduner.system.controller.base.user.account.UserAccountRespVO;
+import com.citu.module.menduner.system.controller.base.workexp.WorkExpRespVO;
 import com.citu.module.menduner.system.dal.dataobject.user.UserAccountDO;
+import com.citu.module.menduner.system.dal.dataobject.workexp.WorkExpDO;
 import com.citu.module.menduner.system.enums.MathOperationEnum;
 import com.citu.module.menduner.system.enums.account.PointBizTypeEnum;
 import com.citu.module.menduner.system.service.record.UserAccountRecordService;
 import com.citu.module.menduner.system.service.user.UserAccountService;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
@@ -79,5 +82,13 @@ public class UserAccountController {
         return success(true);
     }
 
+    @GetMapping("/get")
+    @Operation(summary = "获取用户账户")
+    @Parameter(name = "userId", description = "用户编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('menduner:system:user-account:query')")
+    public CommonResult<UserAccountDO> get(@RequestParam("userId") Long userId) {
+        return success(userAccountService.get(userId));
+    }
+
 
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/enterprise/bind/EnterpriseUserBindDetailRespVO.java

@@ -0,0 +1,26 @@
+package com.citu.module.menduner.system.controller.base.enterprise.bind;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.citu.framework.excel.core.annotations.DictFormat;
+import com.citu.framework.excel.core.convert.DictConvert;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+import static com.citu.module.menduner.system.enums.DictTypeConstants.MENDUNER_STATUS;
+import static com.citu.module.menduner.system.enums.DictTypeConstants.USER_TYPE;
+
+@Schema(description = "企业登录用户详情 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class EnterpriseUserBindDetailRespVO extends EnterpriseUserBindRespVO{
+
+    @Schema(description = "企业姓名", example = "616")
+    private String enterpriseName;
+
+    @Schema(description = "岗位名称", example = "23317")
+    private String postName;
+
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/enterprise/vo/EnterpriseDetailRespVO.java

@@ -0,0 +1,16 @@
+package com.citu.module.menduner.system.controller.base.enterprise.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "企业信息详情 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class EnterpriseDetailRespVO extends EnterpriseRespVO {
+
+    @Schema(description = "所在行业", example = "16657")
+    private String industryName;
+
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/enterprise/vo/EnterprisePageReqVO.java

@@ -46,8 +46,4 @@ public class EnterprisePageReqVO extends PageParam {
     @Schema(description = "帐号状态（0正常 1停用）")
     private String status;
 
-    @Schema(description = "创建时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] createTime;
-
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/enterprise/EnterpriseMapper.java

@@ -1,7 +1,6 @@
 package com.citu.module.menduner.system.dal.mysql.enterprise;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.StrUtil;
 import com.citu.framework.common.pojo.PageParam;
 import com.citu.framework.common.pojo.PageResult;
 import com.citu.framework.mybatis.core.mapper.BaseMapperX;
@@ -10,18 +9,19 @@ import com.citu.framework.mybatis.core.query.MPJLambdaWrapperX;
 import com.citu.module.menduner.system.controller.app.jobhunt.enterprise.vo.AppEnterpriseSearchPageReqVO;
 import com.citu.module.menduner.system.controller.base.CommonRespVO;
 import com.citu.module.menduner.system.controller.base.enterprise.vo.EnterpriseBaseSimpleRespVO;
+import com.citu.module.menduner.system.controller.base.enterprise.vo.EnterpriseDetailRespVO;
 import com.citu.module.menduner.system.controller.base.enterprise.vo.EnterpriseListReqVO;
 import com.citu.module.menduner.system.controller.base.enterprise.vo.EnterprisePageReqVO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseAddressDO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseBusinessDO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseDO;
+import com.citu.module.menduner.system.dal.dataobject.industry.IndustryDO;
 import com.citu.module.menduner.system.enums.MendunerStatusEnum;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.util.StringUtils;
 
 import java.util.Collection;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * 企业信息 Mapper
@@ -33,6 +33,8 @@ public interface EnterpriseMapper extends BaseMapperX<EnterpriseDO> {
 
     default PageResult<EnterpriseDO> selectPage(EnterprisePageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<EnterpriseDO>()
+                .eqIfPresent(EnterpriseDO::getParentId, reqVO.getParentId())
+                .eqIfPresent(EnterpriseDO::getStatus, reqVO.getStatus())
                 .likeIfPresent(EnterpriseDO::getName, reqVO.getName())
                 .likeIfPresent(EnterpriseDO::getAnotherName, reqVO.getAnotherName())
                 .likeIfPresent(EnterpriseDO::getContact, reqVO.getContact())
@@ -40,10 +42,36 @@ public interface EnterpriseMapper extends BaseMapperX<EnterpriseDO> {
                 .eqIfPresent(EnterpriseDO::getIndustryId, reqVO.getIndustryId())
                 .eqIfPresent(EnterpriseDO::getFinancingStatus, reqVO.getFinancingStatus())
                 .eqIfPresent(EnterpriseDO::getScale, reqVO.getScale())
-                .betweenIfPresent(EnterpriseDO::getCreateTime, reqVO.getCreateTime())
                 .orderByDesc(EnterpriseDO::getId));
     }
 
+    default PageResult<EnterpriseDetailRespVO> page(EnterprisePageReqVO reqVO) {
+        MPJLambdaWrapperX<EnterpriseDO> query = new MPJLambdaWrapperX<>();
+        query.selectAll(EnterpriseDO.class);
+        query.selectAs(IndustryDO::getNameCn, EnterpriseDetailRespVO::getIndustryName);
+        query.leftJoin(IndustryDO.class, IndustryDO::getId, EnterpriseDO::getIndustryId);
+        query.eqIfPresent(EnterpriseDO::getParentId, reqVO.getParentId());
+        query.eqIfPresent(EnterpriseDO::getStatus, reqVO.getStatus());
+        query.likeIfPresent(EnterpriseDO::getName, reqVO.getName());
+        query.likeIfPresent(EnterpriseDO::getAnotherName, reqVO.getAnotherName());
+        query.likeIfPresent(EnterpriseDO::getContact, reqVO.getContact());
+        query.likeIfPresent(EnterpriseDO::getPhone, reqVO.getPhone());
+        query.eqIfPresent(EnterpriseDO::getIndustryId, reqVO.getIndustryId());
+        query.eqIfPresent(EnterpriseDO::getFinancingStatus, reqVO.getFinancingStatus());
+        query.eqIfPresent(EnterpriseDO::getScale, reqVO.getScale());
+        query.orderByDesc(EnterpriseDO::getId);
+        return selectJoinPage(reqVO, EnterpriseDetailRespVO.class, query);
+    }
+
+    default EnterpriseDetailRespVO get(Long id) {
+        MPJLambdaWrapperX<EnterpriseDO> query = new MPJLambdaWrapperX<>();
+        query.selectAll(EnterpriseDO.class);
+        query.selectAs(IndustryDO::getNameCn, EnterpriseDetailRespVO::getIndustryName);
+        query.leftJoin(IndustryDO.class, IndustryDO::getId, EnterpriseDO::getIndustryId);
+        query.eq(EnterpriseDO::getId, id);
+        return selectJoinOne(EnterpriseDetailRespVO.class, query);
+    }
+
     default PageResult<EnterpriseBaseSimpleRespVO> selectPage(PageParam pageParam) {
         MPJLambdaWrapperX<EnterpriseDO> query = new MPJLambdaWrapperX<>();
         query.selectAll(EnterpriseDO.class);
@@ -69,7 +97,7 @@ public interface EnterpriseMapper extends BaseMapperX<EnterpriseDO> {
             );
         }
 
-        if(CollUtil.isNotEmpty(reqVO.getAreaIds())) {
+        if (CollUtil.isNotEmpty(reqVO.getAreaIds())) {
             query.leftJoin(EnterpriseAddressDO.class, EnterpriseAddressDO::getEnterpriseId, EnterpriseDO::getId,
                     wrapper -> wrapper.in(EnterpriseAddressDO::getAreaId, reqVO.getAreaIds())
             );

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/enterprise/EnterprisePostMapper.java

@@ -28,7 +28,7 @@ public interface EnterprisePostMapper extends BaseMapperX<EnterprisePostDO> {
                 .likeIfPresent(EnterprisePostDO::getNameEn, reqVO.getNameEn())
                 .eqIfPresent(EnterprisePostDO::getStatus, reqVO.getStatus())
                 .betweenIfPresent(EnterprisePostDO::getCreateTime, reqVO.getCreateTime())
-                .orderByDesc(EnterprisePostDO::getId));
+                .orderByDesc(EnterprisePostDO::getSort));
     }
 
     default List<EnterprisePostDO> selectListByEnterpriseId(Long enterpriseId) {

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/enterprise/EnterpriseUserBindMapper.java

@@ -11,7 +11,9 @@ import com.citu.module.menduner.system.controller.app.recruit.user.vo.AppRecruit
 import com.citu.module.menduner.system.controller.app.recruit.user.vo.AppRecruitUserPageReqVO;
 import com.citu.module.menduner.system.controller.app.recruit.user.vo.AppRecruitUserRespVO;
 import com.citu.module.menduner.system.controller.base.contact.EnterpriseUserSummaryRespVO;
+import com.citu.module.menduner.system.controller.base.enterprise.bind.EnterpriseUserBindDetailRespVO;
 import com.citu.module.menduner.system.controller.base.enterprise.bind.EnterpriseUserBindPageReqVO;
+import com.citu.module.menduner.system.controller.base.enterprise.vo.EnterpriseDetailRespVO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseDO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterprisePostDO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseUserBindDO;
@@ -38,6 +40,35 @@ public interface EnterpriseUserBindMapper extends BaseMapperX<EnterpriseUserBind
                 .orderByDesc(EnterpriseUserBindDO::getId));
     }
 
+    default PageResult<EnterpriseUserBindDetailRespVO> page(EnterpriseUserBindPageReqVO reqVO) {
+        MPJLambdaWrapperX<EnterpriseUserBindDO> wrapper = new MPJLambdaWrapperX<>();
+        wrapper.selectAll(EnterpriseUserBindDO.class);
+        wrapper.selectAs(EnterpriseDO::getName, EnterpriseUserBindDetailRespVO::getEnterpriseName);
+        wrapper.selectAs(EnterprisePostDO::getNameCn, EnterpriseUserBindDetailRespVO::getPostName);
+        wrapper.innerJoin(EnterpriseDO.class, EnterpriseDO::getId, EnterpriseUserBindDO::getEnterpriseId);
+        wrapper.leftJoin(EnterprisePostDO.class, EnterprisePostDO::getId, EnterpriseUserBindDO::getPostId);
+        wrapper.eqIfPresent(EnterpriseUserBindDO::getEnterpriseId, reqVO.getEnterpriseId());
+        wrapper.eqIfPresent(EnterpriseUserBindDO::getUserId, reqVO.getUserId());
+        wrapper.eqIfPresent(EnterpriseUserBindDO::getStatus, reqVO.getStatus());
+        wrapper.eqIfPresent(EnterpriseUserBindDO::getLoginIp, reqVO.getLoginIp());
+        wrapper.betweenIfPresent(EnterpriseUserBindDO::getCreateTime, reqVO.getCreateTime());
+        wrapper.orderByDesc(EnterpriseUserBindDO::getId);
+        return selectJoinPage(reqVO, EnterpriseUserBindDetailRespVO.class, wrapper);
+
+    }
+
+    default EnterpriseUserBindDetailRespVO get(Long id) {
+        MPJLambdaWrapperX<EnterpriseUserBindDO> wrapper = new MPJLambdaWrapperX<>();
+        wrapper.selectAll(EnterpriseUserBindDO.class);
+        wrapper.selectAs(EnterpriseDO::getName, EnterpriseUserBindDetailRespVO::getEnterpriseName);
+        wrapper.selectAs(EnterprisePostDO::getNameCn, EnterpriseUserBindDetailRespVO::getPostName);
+        wrapper.innerJoin(EnterpriseDO.class, EnterpriseDO::getId, EnterpriseUserBindDO::getEnterpriseId);
+        wrapper.leftJoin(EnterprisePostDO.class, EnterprisePostDO::getId, EnterpriseUserBindDO::getPostId);
+        wrapper.eq(EnterpriseUserBindDO::getId, id);
+        return selectJoinOne(EnterpriseUserBindDetailRespVO.class, wrapper);
+
+    }
+
     default List<EnterpriseUserBindDO> selectListByUserId(Long userId) {
         return selectList(new LambdaQueryWrapperX<EnterpriseUserBindDO>()
                 .eqIfPresent(EnterpriseUserBindDO::getUserId, userId)

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/person/PersonInfoMapper.java

@@ -6,6 +6,7 @@ import com.citu.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.citu.module.menduner.system.controller.base.person.info.PersonInfoPageReqVO;
 import com.citu.module.menduner.system.dal.dataobject.person.PersonInfoDO;
 import org.apache.ibatis.annotations.Mapper;
+import org.springframework.util.StringUtils;
 
 /**
  * 人才信息-人才档案 Mapper
@@ -17,19 +18,19 @@ public interface PersonInfoMapper extends BaseMapperX<PersonInfoDO> {
 
     default PageResult<PersonInfoDO> selectPage(PersonInfoPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<PersonInfoDO>()
-                .eqIfPresent(PersonInfoDO::getUserId, reqVO.getUserId())
                 .likeRightIfPresent(PersonInfoDO::getName, reqVO.getName())
                 .eqIfPresent(PersonInfoDO::getSex, reqVO.getSex())
-                .eqIfPresent(PersonInfoDO::getAvatar, reqVO.getAvatar())
                 .likeRightIfPresent(PersonInfoDO::getPhone, reqVO.getPhone())
                 .likeRightIfPresent(PersonInfoDO::getEmail, reqVO.getEmail())
                 .eqIfPresent(PersonInfoDO::getWxCode, reqVO.getWxCode())
-                .eqIfPresent(PersonInfoDO::getBirthday, reqVO.getBirthday())
                 .eqIfPresent(PersonInfoDO::getMaritalStatus, reqVO.getMaritalStatus())
                 .eqIfPresent(PersonInfoDO::getAreaId, reqVO.getAreaId())
                 .eqIfPresent(PersonInfoDO::getJobType, reqVO.getJobType())
                 .eqIfPresent(PersonInfoDO::getJobStatus, reqVO.getJobStatus())
+                .eqIfPresent(PersonInfoDO::getEduType, reqVO.getEduType())
+                .eqIfPresent(PersonInfoDO::getExpType, reqVO.getExpType())
                 .betweenIfPresent(PersonInfoDO::getCreateTime, reqVO.getCreateTime())
+                .like(null!=reqVO.getUserId(),PersonInfoDO::getUserId, String.valueOf(reqVO.getUserId()))
                 .orderByDesc(PersonInfoDO::getId));
     }
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/EnterpriseService.java

@@ -3,14 +3,11 @@ package com.citu.module.menduner.system.service.enterprise;
 import com.citu.framework.common.pojo.PageParam;
 import com.citu.framework.common.pojo.PageResult;
 import com.citu.module.menduner.system.controller.app.recruit.enterprise.vo.*;
-import com.citu.module.menduner.system.controller.base.enterprise.vo.EnterpriseListReqVO;
-import com.citu.module.menduner.system.controller.base.enterprise.vo.EnterprisePageReqVO;
-import com.citu.module.menduner.system.controller.base.enterprise.vo.EnterpriseSaveReqVO;
+import com.citu.module.menduner.system.controller.base.enterprise.vo.*;
 import com.citu.module.menduner.system.controller.base.CommonRespVO;
 import com.citu.module.menduner.system.controller.app.jobhunt.enterprise.vo.AppEnterpriseClickReqVO;
 import com.citu.module.menduner.system.controller.app.jobhunt.enterprise.vo.AppEnterpriseDetailRespVO;
 import com.citu.module.menduner.system.controller.app.jobhunt.enterprise.vo.AppEnterpriseSearchPageReqVO;
-import com.citu.module.menduner.system.controller.base.enterprise.vo.EnterpriseBaseSimpleRespVO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseDO;
 
 import javax.validation.Valid;
@@ -62,6 +59,22 @@ public interface EnterpriseService {
      */
     PageResult<EnterpriseDO> getEnterprisePage(EnterprisePageReqVO pageReqVO);
 
+    /**
+     * 获得企业信息详情分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 企业信息分页
+     */
+    PageResult<EnterpriseDetailRespVO> page(EnterprisePageReqVO pageReqVO);
+
+    /**
+     * 获得企业信息详情
+     *
+     * @param id 编号
+     * @return 企业信息
+     */
+    EnterpriseDetailRespVO get(Long id);
+
     /**
      * 获得所有子企业，从缓存中
      *

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/EnterpriseServiceImpl.java

@@ -11,11 +11,8 @@ import com.citu.module.menduner.system.controller.app.jobhunt.enterprise.vo.AppE
 import com.citu.module.menduner.system.controller.app.jobhunt.enterprise.vo.AppEnterpriseDetailRespVO;
 import com.citu.module.menduner.system.controller.app.jobhunt.enterprise.vo.AppEnterpriseSearchPageReqVO;
 import com.citu.module.menduner.system.controller.app.recruit.enterprise.vo.*;
-import com.citu.module.menduner.system.controller.base.enterprise.vo.EnterpriseBaseSimpleRespVO;
+import com.citu.module.menduner.system.controller.base.enterprise.vo.*;
 import com.citu.module.menduner.system.controller.base.CommonRespVO;
-import com.citu.module.menduner.system.controller.base.enterprise.vo.EnterpriseListReqVO;
-import com.citu.module.menduner.system.controller.base.enterprise.vo.EnterprisePageReqVO;
-import com.citu.module.menduner.system.controller.base.enterprise.vo.EnterpriseSaveReqVO;
 import com.citu.module.menduner.system.convert.EnterpriseConvert;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseAddressDO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseBusinessDO;
@@ -128,6 +125,16 @@ public class EnterpriseServiceImpl implements EnterpriseService {
         return enterpriseMapper.selectPage(pageReqVO);
     }
 
+    @Override
+    public PageResult<EnterpriseDetailRespVO> page(EnterprisePageReqVO pageReqVO) {
+        return enterpriseMapper.page(pageReqVO);
+    }
+
+    @Override
+    public EnterpriseDetailRespVO get(Long id) {
+        return enterpriseMapper.get(id);
+    }
+
     @Override
     @DataPermission(enable = false) // 禁用数据权限，避免建立不正确的缓存
     @Cacheable(cacheNames = RedisKeyConstants.ENTERPRISE_CHILDREN_IDS, key = "#id",unless = "#result == null")

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/bind/EnterpriseUserBindService.java

@@ -8,6 +8,7 @@ import com.citu.module.menduner.system.controller.app.recruit.user.vo.AppRecruit
 import com.citu.module.menduner.system.controller.app.recruit.user.vo.AppRecruitUserSaveReqVO;
 import com.citu.module.menduner.system.controller.base.contact.EnterpriseUserContactRespVO;
 import com.citu.module.menduner.system.controller.base.contact.EnterpriseUserSummaryRespVO;
+import com.citu.module.menduner.system.controller.base.enterprise.bind.EnterpriseUserBindDetailRespVO;
 import com.citu.module.menduner.system.controller.base.enterprise.bind.EnterpriseUserBindPageReqVO;
 import com.citu.module.menduner.system.controller.base.enterprise.bind.EnterpriseUserBindSaveReqVO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseUserBindDO;
@@ -60,6 +61,22 @@ public interface EnterpriseUserBindService {
      */
     PageResult<EnterpriseUserBindDO> getEnterpriseUserBindPage(EnterpriseUserBindPageReqVO pageReqVO);
 
+    /**
+     * 获得企业登录用户详情分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 企业登录用户分页
+     */
+    PageResult<EnterpriseUserBindDetailRespVO> page(EnterpriseUserBindPageReqVO pageReqVO);
+
+    /**
+     * 获得企业登录用户详情
+     *
+     * @param id 编号
+     * @return 企业登录用户
+     */
+    EnterpriseUserBindDetailRespVO get(Long id);
+
     /**
      * 获得企业登录用户
      *

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/bind/EnterpriseUserBindServiceImpl.java

@@ -13,6 +13,7 @@ import com.citu.module.menduner.system.controller.app.recruit.user.vo.AppRecruit
 import com.citu.module.menduner.system.controller.app.recruit.user.vo.AppRecruitUserSaveReqVO;
 import com.citu.module.menduner.system.controller.base.contact.EnterpriseUserContactRespVO;
 import com.citu.module.menduner.system.controller.base.contact.EnterpriseUserSummaryRespVO;
+import com.citu.module.menduner.system.controller.base.enterprise.bind.EnterpriseUserBindDetailRespVO;
 import com.citu.module.menduner.system.controller.base.enterprise.bind.EnterpriseUserBindPageReqVO;
 import com.citu.module.menduner.system.controller.base.enterprise.bind.EnterpriseUserBindSaveReqVO;
 import com.citu.module.menduner.system.convert.EnterpriseConvert;
@@ -107,6 +108,16 @@ public class EnterpriseUserBindServiceImpl implements EnterpriseUserBindService
         return enterpriseUserBindMapper.selectPage(pageReqVO);
     }
 
+    @Override
+    public PageResult<EnterpriseUserBindDetailRespVO> page(EnterpriseUserBindPageReqVO pageReqVO) {
+        return enterpriseUserBindMapper.page(pageReqVO);
+    }
+
+    @Override
+    public EnterpriseUserBindDetailRespVO get(Long id) {
+        return enterpriseUserBindMapper.get(id);
+    }
+
     @Override
     public EnterpriseUserBindDO getEnterpriseUserBindById(Long userId) {
         return enterpriseUserBindMapper.selectByUserId(userId);

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/person/favorite/PersonJobFavoriteService.java

@@ -53,6 +53,13 @@ public interface PersonJobFavoriteService {
      */
     PageResult<PersonJobFavoriteDO> getPersonJobFavoritePage(PersonJobFavoritePageReqVO pageReqVO);
 
+    /**
+     * 获取用户收藏职位数量
+     *
+     * @return 收藏职位数量
+     */
+    Long countByUserId(Long userId);
+
     /**
      * 效验是否收藏该职位
      *

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/person/favorite/PersonJobFavoriteServiceImpl.java

@@ -84,6 +84,12 @@ public class PersonJobFavoriteServiceImpl implements PersonJobFavoriteService {
         return null != personJobFavoriteMapper.selectByUserIdAndJobId(userId, jobId);
     }
 
+    @Override
+    public Long countByUserId(Long userId) {
+        return personJobFavoriteMapper.selectCount(
+                PersonJobFavoriteDO::getUserId, userId);
+    }
+
     @Override
     public Long countByUserId() {
         return personJobFavoriteMapper.selectCount(

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/person/subscribe/PersonEnterpriseSubscribeService.java

@@ -68,6 +68,13 @@ public interface PersonEnterpriseSubscribeService {
      */
     Long countByUserId();
 
+    /**
+     * 获取用户订阅的企业数量
+     *
+     * @return 收藏职位数量
+     */
+    Long countByUserId(Long userId);
+
     /**
      * 用户订阅企业
      *

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/person/subscribe/PersonEnterpriseSubscribeServiceImpl.java

@@ -88,6 +88,12 @@ public class PersonEnterpriseSubscribeServiceImpl implements PersonEnterpriseSub
                 PersonEnterpriseSubscribeDO::getUserId, LoginUserContext.getUserId());
     }
 
+    @Override
+    public Long countByUserId(Long userId) {
+        return personEnterpriseSubscribeMapper.selectCount(
+                PersonEnterpriseSubscribeDO::getUserId, userId);
+    }
+
     @Override
     @DSTransactional // 单机+多数据源方案，使用 @DSTransactional 保证本地事务，以及数据源的切换
     public Boolean subscribe(PersonEnterpriseSubscribeReqVO reqVO) {

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/user/UserAccountService.java

@@ -47,6 +47,12 @@ public interface UserAccountService {
      */
     UserAccountDO createUserAccountIfAbsent(Long userId);
 
+    /**
+     * 获取用户账户信息
+     *
+     * @return 账户对象
+     */
+    UserAccountDO get(Long userId);
     // ========== 求职端 ==========
 
     /**

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/user/UserAccountServiceImpl.java

@@ -62,6 +62,11 @@ public class UserAccountServiceImpl implements UserAccountService {
         return entity;
     }
 
+    @Override
+    public UserAccountDO get(Long userId) {
+        return userAccountMapper.selectByUserId(userId);
+    }
+
     @Override
     public UserAccountDO get() {
         return createUserAccountIfAbsent(LoginUserContext.getUserId());

menduner/menduner-system-biz/src/test/java/com/citu/module/menduner/system/service/enterprise/EnterpriseServiceImplTest.java

@@ -139,7 +139,6 @@ public class EnterpriseServiceImplTest extends BaseDbUnitTest {
         reqVO.setIndustryId(null);
         reqVO.setFinancingStatus(null);
         reqVO.setScale(null);
-        reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
 
         // 调用
         PageResult<EnterpriseDO> pageResult = enterpriseService.getEnterprisePage(reqVO);