1、增加钱包结算

2、增加代码注释

citu-module-pay/citu-module-pay-api/src/main/java/com/citu/module/pay/api/wallet/PayWalletApi.java

@@ -0,0 +1,25 @@
+package com.citu.module.pay.api.wallet;
+
+import com.citu.framework.common.pojo.CommonResult;
+import com.citu.module.pay.api.transfer.dto.PayTransferCreateReqDTO;
+import com.citu.module.pay.api.wallet.dto.PayWalletAddBalanceDTO;
+import com.citu.module.pay.enums.ApiConstants;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import javax.validation.Valid;
+
+@FeignClient(name = ApiConstants.NAME)
+@Tag(name = "RPC 服务 - 钱包")
+public interface PayWalletApi {
+
+
+    String PREFIX = ApiConstants.PREFIX + "/wallet";
+
+    @PostMapping(PREFIX + "/add-balance")
+    @Operation(summary = "增加钱包余额")
+    CommonResult<Boolean> addWalletBalance(@Valid @RequestBody PayWalletAddBalanceDTO reqDTO);
+}

citu-module-pay/citu-module-pay-api/src/main/java/com/citu/module/pay/api/wallet/dto/PayWalletAddBalanceDTO.java

@@ -0,0 +1,31 @@
+package com.citu.module.pay.api.wallet.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
+/**
+ * 钱包余额增加 Request DTO
+ **/
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class PayWalletAddBalanceDTO {
+
+    @NotNull(message = "用户id不能为空")
+    private Long userId;
+
+    @NotEmpty(message = "业务id不能为空")
+    private String bizId;
+
+    @NotNull(message = "业务类型不能为空")
+    private Integer bizType;
+
+    @NotNull(message = "金额不能为空")
+    private Integer price;
+}

citu-module-pay/citu-module-pay-api/src/main/java/com/citu/module/pay/enums/wallet/PayWalletBizTypeEnum.java

@@ -18,7 +18,15 @@ public enum PayWalletBizTypeEnum implements IntArrayValuable {
     RECHARGE(1, "充值"),
     RECHARGE_REFUND(2, "充值退款"),
     PAYMENT(3, "支付"),
-    PAYMENT_REFUND(4, "支付退款");
+    PAYMENT_REFUND(4, "支付退款"),
+
+
+    PLATFORM_COMMISSION(20, "平台抽成"),
+    RECOMMENDED_POSITIONS(21, "推荐职位"),
+    DELIVERY_PERSON(22, "投递人"),
+    GIFT(23, "赠与"),
+    NOT_RECOMMENDED(24,"无推荐人,推荐人佣金给到平台")
+    ;
 
     // TODO 后续增加
 
@@ -37,4 +45,21 @@ public enum PayWalletBizTypeEnum implements IntArrayValuable {
     public int[] array() {
          return ARRAYS;
     }
+
+
+    /**
+     * 根据业务分类获取枚举
+     *
+     * @param type 业务分类
+     * @return 枚举
+     */
+    public static PayWalletBizTypeEnum getByType(Integer type) {
+        for (PayWalletBizTypeEnum bizTypeEnum : PayWalletBizTypeEnum.values()) {
+            if (bizTypeEnum.getType().equals(type)) {
+                return bizTypeEnum;
+            }
+        }
+        return null;
+    }
+
 }

citu-module-pay/citu-module-pay-biz/src/main/java/com/citu/module/pay/api/wallet/PayWalletApiImpl.java

@@ -0,0 +1,37 @@
+package com.citu.module.pay.api.wallet;
+
+import com.citu.framework.common.pojo.CommonResult;
+import com.citu.module.pay.api.wallet.dto.PayWalletAddBalanceDTO;
+import com.citu.module.pay.dal.dataobject.wallet.PayWalletDO;
+import com.citu.module.pay.enums.wallet.PayWalletBizTypeEnum;
+import com.citu.module.pay.service.wallet.PayWalletService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+import static com.citu.framework.common.enums.UserTypeEnum.MEMBER;
+
+/**
+ * 钱包 API 实现类
+ *
+ * @author Rayson
+ */
+@RestController // 提供 RESTful API 接口，给 Feign 调用
+@Validated
+public class PayWalletApiImpl implements PayWalletApi {
+
+    @Resource
+    private PayWalletService payWalletService;
+
+    @Override
+    public CommonResult<Boolean> addWalletBalance(PayWalletAddBalanceDTO reqDTO) {
+        PayWalletDO payWalletDO = payWalletService.getOrCreateWallet(reqDTO.getUserId(), MEMBER.getValue());
+        payWalletService.addWalletBalance(payWalletDO.getId(),
+                reqDTO.getBizId(),
+                PayWalletBizTypeEnum.getByType(reqDTO.getBizType()),
+                reqDTO.getPrice()
+        );
+        return CommonResult.success(true);
+    }
+}

menduner/menduner-system-api/src/main/java/com/citu/module/menduner/system/enums/account/BalanceBizTypeEnum.java

@@ -1,54 +0,0 @@
-package com.citu.module.menduner.system.enums.account;
-
-import cn.hutool.core.util.EnumUtil;
-import com.citu.framework.common.core.IntArrayValuable;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.Objects;
-
-/**
- * 余额的业务类型枚举
- *
- * @author Rayson
- */
-@AllArgsConstructor
-@Getter
-public enum BalanceBizTypeEnum {
-
-    RECHARGE(1, "充值", "充值获得 {} 余额", true),
-    ADMIN(2, "管理员修改", "管理员修改 {} 余额", true),
-    PUBLISH(3, "职位发布", "发布职位,扣除 {} 余额", false),
-    PLATFORM_COMMISSION(4, "平台抽成", "平台抽取 {} ", true),
-    RECOMMENDED_POSITIONS(5, "推荐职位", "推荐职位,获得 {}", true),
-    DELIVERY_PERSON(6, "投递人", "投递人,获得 {}", true),
-    GIFT(7, "赠与", "赠与,获得 {}", true),
-    NOT_RECOMMENDED(8,"无推荐人,推荐人佣金给到平台","推荐职位,获得 {}",true),
-
-    ;
-
-
-    /**
-     * 类型
-     */
-    private final Integer type;
-    /**
-     * 名字
-     */
-    private final String name;
-    /**
-     * 描述
-     */
-    private final String description;
-    /**
-     * 是否为扣减积分
-     */
-    private final boolean add;
-
-    public static BalanceBizTypeEnum from(Integer type) {
-        return EnumUtil.getBy(BalanceBizTypeEnum.class,
-                e -> Objects.equals(type, e.getType()));
-    }
-
-
-}

menduner/menduner-system-api/src/main/java/com/citu/module/menduner/system/enums/eduexp/CurrencyTypeEnum.java

@@ -1,13 +0,0 @@
-package com.citu.module.menduner.system.enums.eduexp;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * 货币类型 (0人民币 1美元 2欧元)
- **/
-@Getter
-@AllArgsConstructor
-public enum CurrencyTypeEnum {
-
-}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/api/account/UserAccountApiImpl.java

@@ -3,7 +3,6 @@ package com.citu.module.menduner.system.api.account;
 import com.citu.framework.common.pojo.CommonResult;
 import com.citu.module.menduner.system.dal.dataobject.user.UserAccountDO;
 import com.citu.module.menduner.system.enums.MathOperationEnum;
-import com.citu.module.menduner.system.enums.account.BalanceBizTypeEnum;
 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;
@@ -11,7 +10,6 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 import static com.citu.framework.common.pojo.CommonResult.success;

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/job/JobAdvertisedController.java

@@ -6,6 +6,7 @@ import com.citu.framework.common.pojo.CommonResult;
 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.dict.core.DictFrameworkUtils;
 import com.citu.framework.excel.core.util.ExcelUtils;
 import com.citu.module.menduner.system.controller.base.job.JobAdvertisedPageReqVO;
 import com.citu.module.menduner.system.controller.base.job.JobAdvertisedReqVO;
@@ -100,4 +101,12 @@ public class JobAdvertisedController {
                 BeanUtils.toBean(list, JobAdvertisedRespVO.class));
     }
 
+    @GetMapping("/sync/graph")
+    @Operation(summary = "同步知识图谱数据")
+    public CommonResult<Boolean> syncGraph() {
+        // 获取字典
+        // DictFrameworkUtils.getDictDataLabel();
+        return success(true);
+    }
+
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/workexp/WorkExpDO.java

@@ -2,7 +2,6 @@ package com.citu.module.menduner.system.dal.dataobject.workexp;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.citu.framework.tenant.core.db.TenantBaseDO;
-import com.citu.module.menduner.system.enums.eduexp.CurrencyTypeEnum;
 import com.citu.module.menduner.system.enums.eduexp.PayTypeEnum;
 import lombok.*;
 

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

@@ -16,6 +16,9 @@ import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseAddre
 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.dal.dataobject.job.JobAdvertisedDO;
+import com.citu.module.menduner.system.dal.dataobject.person.PersonEnterpriseSubscribeDO;
+import com.citu.module.menduner.system.dal.dataobject.person.PersonJobFavoriteDO;
 import com.citu.module.menduner.system.enums.MendunerStatusEnum;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.util.StringUtils;
@@ -45,6 +48,7 @@ public interface EnterpriseMapper extends BaseMapperX<EnterpriseDO> {
                 .orderByDesc(EnterpriseDO::getId));
     }
 
+    /** 分页查询企业信息,返回详细的企业信息 **/
     default PageResult<EnterpriseDetailRespVO> page(EnterprisePageReqVO reqVO) {
         MPJLambdaWrapperX<EnterpriseDO> query = new MPJLambdaWrapperX<>();
         query.selectAll(EnterpriseDO.class);
@@ -63,6 +67,7 @@ public interface EnterpriseMapper extends BaseMapperX<EnterpriseDO> {
         return selectJoinPage(reqVO, EnterpriseDetailRespVO.class, query);
     }
 
+    /** 根据企业id获取企业信息,返回详细的企业信息 **/
     default EnterpriseDetailRespVO get(Long id) {
         MPJLambdaWrapperX<EnterpriseDO> query = new MPJLambdaWrapperX<>();
         query.selectAll(EnterpriseDO.class);
@@ -72,19 +77,25 @@ public interface EnterpriseMapper extends BaseMapperX<EnterpriseDO> {
         return selectJoinOne(EnterpriseDetailRespVO.class, query);
     }
 
+    /** 分页查询企业信息,返回简易的企业信息 **/
     default PageResult<EnterpriseBaseSimpleRespVO> selectPage(PageParam pageParam) {
         MPJLambdaWrapperX<EnterpriseDO> query = new MPJLambdaWrapperX<>();
         query.selectAll(EnterpriseDO.class);
         return selectJoinPage(pageParam, EnterpriseBaseSimpleRespVO.class, query);
     }
 
-    default PageResult<EnterpriseBaseSimpleRespVO> selectByIdListPage(PageParam pageParam, List<Long> ids) {
+    /** 根据用户id查询收藏的企业 **/
+    default PageResult<EnterpriseBaseSimpleRespVO> selectSubscribePage(PageParam pageParam, Long userId) {
         MPJLambdaWrapperX<EnterpriseDO> query = new MPJLambdaWrapperX<>();
         query.selectAll(EnterpriseDO.class);
-        query.in(EnterpriseDO::getId, ids);
+        query.innerJoin(PersonEnterpriseSubscribeDO.class,
+                PersonEnterpriseSubscribeDO::getEnterpriseId, EnterpriseDO::getId);
+        query.eq(PersonEnterpriseSubscribeDO::getUserId, userId);
+        query.orderByDesc(PersonEnterpriseSubscribeDO::getUpdateTime);
         return selectJoinPage(pageParam, EnterpriseBaseSimpleRespVO.class, query);
     }
 
+     /** 根据查询条件搜索企业信息,返回简易的企业信息 **/
     default PageResult<EnterpriseBaseSimpleRespVO> search(AppEnterpriseSearchPageReqVO reqVO) {
         MPJLambdaWrapperX<EnterpriseDO> query = new MPJLambdaWrapperX<>();
         query.selectAll(EnterpriseDO.class);
@@ -115,16 +126,19 @@ public interface EnterpriseMapper extends BaseMapperX<EnterpriseDO> {
         return selectJoinPage(reqVO, EnterpriseBaseSimpleRespVO.class, query);
     }
 
+    /** 根据查询条件查询企业信息,返回企业信息 **/
     default List<EnterpriseDO> selectList(EnterpriseListReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<EnterpriseDO>()
                 .likeIfPresent(EnterpriseDO::getName, reqVO.getName())
                 .eqIfPresent(EnterpriseDO::getStatus, reqVO.getStatus()));
     }
 
+    /** 根据父级id查询下级企业信息,返回企业信息 **/
     default List<EnterpriseDO> selectListByParentId(Collection<Long> parentIds) {
         return selectList(EnterpriseDO::getParentId, parentIds);
     }
 
+    /** 根据名称模糊搜索正常状态的企业信息,返回企业信息 **/
     default List<CommonRespVO> searchByName(String name) {
         MPJLambdaWrapperX<EnterpriseDO> wrapper = new MPJLambdaWrapperX<>();
         wrapper.selectAs(EnterpriseDO::getId, "`key`");
@@ -134,7 +148,7 @@ public interface EnterpriseMapper extends BaseMapperX<EnterpriseDO> {
         return selectJoinList(CommonRespVO.class, wrapper);
     }
 
-
+    /** 根据企业id查询正常状态的企业信息,返回企业信息 **/
     default EnterpriseDO selectListById(Long id) {
         return selectOne(new LambdaQueryWrapperX<EnterpriseDO>()
                 .eq(EnterpriseDO::getId, id)

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

@@ -31,13 +31,14 @@ public interface EnterprisePostMapper extends BaseMapperX<EnterprisePostDO> {
                 .orderByDesc(EnterprisePostDO::getSort));
     }
 
+    /** 根据企业id查询企业岗位,返回企业岗位信息 **/
     default List<EnterprisePostDO> selectListByEnterpriseId(Long enterpriseId) {
         return selectList(new LambdaQueryWrapperX<EnterprisePostDO>()
                 .eqIfPresent(EnterprisePostDO::getEnterpriseId, enterpriseId)
                 .eqIfPresent(EnterprisePostDO::getStatus, MendunerStatusEnum.ENABLE.getStatus())
         );
     }
-
+    /** 根据企业id和查询条件查询企业岗位,返回企业岗位信息 **/
     default PageResult<AppRecruitEnterprisePostRespVO> page(EnterprisePostPageReqVO reqVO, Long enterpriseId) {
         return selectJoinPage(reqVO, AppRecruitEnterprisePostRespVO.class,
                 new MPJLambdaWrapperX<EnterprisePostDO>()

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

@@ -28,6 +28,7 @@ public interface EnterpriseRegisterMapper extends BaseMapperX<EnterpriseRegister
                 .orderByDesc(EnterpriseRegisterDO::getUpdateTime));
     }
 
+    /** 根据用户id查询申请的企业注册,返回最新的一条 **/
     default EnterpriseRegisterDO selectByUserId(Long userId) {
         LambdaQueryWrapperX<EnterpriseRegisterDO> queryWrapper = new LambdaQueryWrapperX<>();
         queryWrapper.eq(EnterpriseRegisterDO::getUserId, userId);
@@ -35,6 +36,7 @@ public interface EnterpriseRegisterMapper extends BaseMapperX<EnterpriseRegister
         return selectOne(queryWrapper);
     }
 
+    /** 根据用户id和状态统计企业注册申请数量 **/
     default Long selectCountByUserIdAndStatus(Long userId, String status) {
         return selectCount(new LambdaQueryWrapperX<EnterpriseRegisterDO>()
                 .eq(EnterpriseRegisterDO::getUserId, userId)

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

@@ -14,7 +14,6 @@ import com.citu.module.menduner.system.controller.base.contact.EnterpriseUserSum
 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.EnterpriseUserBindReqVO;
-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;
@@ -45,7 +44,8 @@ public interface EnterpriseUserBindMapper extends BaseMapperX<EnterpriseUserBind
                 .orderByDesc(EnterpriseUserBindDO::getId));
     }
 
-    default  List<EnterpriseUserBindDO> list(EnterpriseUserBindReqVO reqVO) {
+    /** 根据查询条件查询企业用户列表 **/
+    default List<EnterpriseUserBindDO> list(EnterpriseUserBindReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<EnterpriseUserBindDO>()
                 .eqIfPresent(EnterpriseUserBindDO::getEnterpriseId, reqVO.getEnterpriseId())
                 .eqIfPresent(EnterpriseUserBindDO::getUserId, reqVO.getUserId())
@@ -59,6 +59,7 @@ public interface EnterpriseUserBindMapper extends BaseMapperX<EnterpriseUserBind
 
     }
 
+    /** 根据查询条件分页查询企业用户列表,返回企业用户详情信息 **/
     default PageResult<EnterpriseUserBindDetailRespVO> page(EnterpriseUserBindPageReqVO reqVO) {
         MPJLambdaWrapperX<EnterpriseUserBindDO> wrapper = new MPJLambdaWrapperX<>();
         wrapper.selectAll(EnterpriseUserBindDO.class);
@@ -76,6 +77,7 @@ public interface EnterpriseUserBindMapper extends BaseMapperX<EnterpriseUserBind
 
     }
 
+    /** 根据id查询企业用户 **/
     default EnterpriseUserBindDetailRespVO get(Long id) {
         MPJLambdaWrapperX<EnterpriseUserBindDO> wrapper = new MPJLambdaWrapperX<>();
         wrapper.selectAll(EnterpriseUserBindDO.class);
@@ -88,6 +90,7 @@ public interface EnterpriseUserBindMapper extends BaseMapperX<EnterpriseUserBind
 
     }
 
+    /** 根据用户id查询企业用户集合 **/
     default List<EnterpriseUserBindDO> selectListByUserId(Long userId) {
         return selectList(new LambdaQueryWrapperX<EnterpriseUserBindDO>()
                 .eqIfPresent(EnterpriseUserBindDO::getUserId, userId)
@@ -95,12 +98,8 @@ public interface EnterpriseUserBindMapper extends BaseMapperX<EnterpriseUserBind
         );
     }
 
-    default EnterpriseUserBindDO selectByUserId(Long userId) {
-        return selectOne(new LambdaQueryWrapperX<EnterpriseUserBindDO>()
-                .eqIfPresent(EnterpriseUserBindDO::getUserId, userId)
-                .eqIfPresent(EnterpriseUserBindDO::getStatus, MendunerStatusEnum.ENABLE.getStatus()));
-    }
 
+    /** 根据企业id和用户id查询企业用户信息 **/
     default EnterpriseUserBindDO selectByEnterpriseIdAndUserId(Long enterpriseId, Long userId) {
         return selectOne(new LambdaQueryWrapperX<EnterpriseUserBindDO>()
                 .eqIfPresent(EnterpriseUserBindDO::getEnterpriseId, enterpriseId)
@@ -108,6 +107,7 @@ public interface EnterpriseUserBindMapper extends BaseMapperX<EnterpriseUserBind
         );
     }
 
+    /** 根据企业id和id查询企业用户信息 **/
     default EnterpriseUserBindDO selectByEnterpriseIdAndId(Long enterpriseId, Long id) {
         return selectOne(new LambdaQueryWrapperX<EnterpriseUserBindDO>()
                 .eqIfPresent(EnterpriseUserBindDO::getEnterpriseId, enterpriseId)
@@ -115,6 +115,7 @@ public interface EnterpriseUserBindMapper extends BaseMapperX<EnterpriseUserBind
         );
     }
 
+    /** 根据企业id和岗位id查询企业用户信息 **/
     default List<EnterpriseUserBindDO> selectByEnterpriseIdAndPostId(Long enterpriseId, Long postId) {
         return selectList(new LambdaQueryWrapperX<EnterpriseUserBindDO>()
                 .eqIfPresent(EnterpriseUserBindDO::getEnterpriseId, enterpriseId)
@@ -123,6 +124,7 @@ public interface EnterpriseUserBindMapper extends BaseMapperX<EnterpriseUserBind
     }
 
 
+    /** 招聘端 - 根据企业id和查询条件查询企业用户信息 **/
     default PageResult<AppRecruitUserRespVO> selectPage(AppRecruitUserPageReqVO reqVO, Long enterpriseId) {
         MPJLambdaWrapperX<EnterpriseUserBindDO> wrapper = new MPJLambdaWrapperX<>();
         wrapper.selectAll(EnterpriseUserBindDO.class);
@@ -149,7 +151,7 @@ public interface EnterpriseUserBindMapper extends BaseMapperX<EnterpriseUserBind
         return selectJoinPage(reqVO, AppRecruitUserRespVO.class, wrapper);
     }
 
-
+    /** 招聘端 - 根据企业id和用户id查询企业用户信息 **/
     default AppRecruitEnterpriseUserRespVO selectEnterpriseUser(Long enterpriseId, Long userId) {
         MPJLambdaWrapperX<EnterpriseUserBindDO> wrapper = new MPJLambdaWrapperX<>();
         wrapper.selectAll(EnterpriseUserBindDO.class);
@@ -168,6 +170,8 @@ public interface EnterpriseUserBindMapper extends BaseMapperX<EnterpriseUserBind
     }
 
 
+
+    /** 根据企业id和用户id查询企业用户概要信息 **/
     default EnterpriseUserSummaryRespVO selectUserSummary(Long enterpriseId, Long userId) {
         MPJLambdaWrapperX<EnterpriseUserBindDO> wrapper = new MPJLambdaWrapperX<>();
         wrapper.selectAssociation(EnterpriseUserBindDO.class, EnterpriseUserSummaryRespVO::getContact);
@@ -188,6 +192,7 @@ public interface EnterpriseUserBindMapper extends BaseMapperX<EnterpriseUserBind
     }
 
 
+    /** 根据企业id和用户id查询企业用户信息 **/
     default UserInfoRespDTO selectUserInfo(Long enterpriseId, Long userId) {
         MPJLambdaWrapperX<EnterpriseUserBindDO> wrapper = new MPJLambdaWrapperX<>();
         wrapper.selectAsClass(EnterpriseUserBindDO.class, UserInfoRespDTO.class);

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/invite/EnterpriseInviteRecordMapper.java

@@ -36,7 +36,7 @@ public interface EnterpriseInviteRecordMapper extends BaseMapperX<EnterpriseInvi
 
 
     /**
-     * 企业邀请记录分页查询
+     * 招聘端 - 企业邀请记录分页查询
      */
     default PageResult<AppRecruitEnterpriseInviteRecordRespVO> page(
             AppRecruitEnterpriseInviteRecordPageReqVO reqVO,

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/job/JobAdvertisedMapper.java

@@ -23,6 +23,8 @@ import com.citu.module.menduner.system.dal.dataobject.area.AreaDO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseDO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseUserBindDO;
 import com.citu.module.menduner.system.dal.dataobject.job.JobAdvertisedDO;
+import com.citu.module.menduner.system.dal.dataobject.job.JobCvRelDO;
+import com.citu.module.menduner.system.dal.dataobject.person.PersonJobFavoriteDO;
 import com.citu.module.menduner.system.dal.dataobject.position.PositionDO;
 import com.citu.module.menduner.system.dal.dataobject.visits.MdeVisitsDO;
 import com.citu.module.menduner.system.enums.MendunerStatusEnum;
@@ -59,6 +61,7 @@ public interface JobAdvertisedMapper extends BaseMapperX<JobAdvertisedDO> {
                 .orderByDesc(JobAdvertisedDO::getId));
     }
 
+    /** 根据查询条件查询职位信息 **/
     default List<JobAdvertisedDO> list(JobAdvertisedReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<JobAdvertisedDO>()
                 .inIfPresent(JobAdvertisedDO::getId, reqVO.getId())
@@ -75,12 +78,14 @@ public interface JobAdvertisedMapper extends BaseMapperX<JobAdvertisedDO> {
                 .orderByDesc(JobAdvertisedDO::getId));
     }
 
+    /** 根据企业id查询正常状态的职位数量 **/
     default Long countByEnterpriseId(Long enterpriseId) {
         return selectCount(new LambdaQueryWrapperX<JobAdvertisedDO>()
                 .eq(JobAdvertisedDO::getEnterpriseId, enterpriseId)
                 .eq(JobAdvertisedDO::getStatus, MendunerStatusEnum.ENABLE.getStatus()));
     }
 
+    /** 根据企业id查询正常状态和没有过期的职位信息 **/
     default List<JobAdvertisedDO> selectByEnterpriseIdAndNotExpireTime(Long enterpriseId) {
         LambdaQueryWrapperX<JobAdvertisedDO> query = new LambdaQueryWrapperX<>();
         query.eq(JobAdvertisedDO::getEnterpriseId, enterpriseId);
@@ -88,7 +93,7 @@ public interface JobAdvertisedMapper extends BaseMapperX<JobAdvertisedDO> {
         return selectList(query);
     }
 
-
+    /** 求职端 - 根据查询条件分页查询正常状态和没有过期的职位信息 **/
     default PageResult<AppJobAdvertisedHomeRespVO> selectPage(AppJobAdvertisedPageReqVO reqVO) {
         MPJLambdaWrapperX<JobAdvertisedDO> query = new MPJLambdaWrapperX<>();
         query.selectAll(JobAdvertisedDO.class);
@@ -156,17 +161,36 @@ public interface JobAdvertisedMapper extends BaseMapperX<JobAdvertisedDO> {
 
     }
 
-    default PageResult<AppJobAdvertisedRespVO> selectByIdListPage(PageParam pageParam, List<Long> ids) {
+    /** 根据用户id 查询收藏的职位信息 **/
+    default PageResult<AppJobAdvertisedRespVO> selectFavoriteJobPage(PageParam pageParam,Long userId) {
         MPJLambdaWrapperX<JobAdvertisedDO> query = new MPJLambdaWrapperX<>();
         query.selectAssociation(JobAdvertisedDO.class, AppJobAdvertisedRespVO::getJob);
         query.selectAssociation(EnterpriseDO.class, AppJobAdvertisedRespVO::getEnterprise);
+
+        query.innerJoin(PersonJobFavoriteDO.class,PersonJobFavoriteDO::getJobId, JobAdvertisedDO::getId);
+        query.innerJoin(EnterpriseDO.class, EnterpriseDO::getId, JobAdvertisedDO::getEnterpriseId);
+        query.eq(PersonJobFavoriteDO::getUserId, userId);
+
+        query.orderByDesc(PersonJobFavoriteDO::getUpdateTime);
+        return selectJoinPage(pageParam, AppJobAdvertisedRespVO.class, query);
+    }
+
+    /** 根据用户id 查询投递的职位信息 **/
+    default PageResult<AppJobAdvertisedRespVO> selectCvRelJobPage(PageParam pageParam,Long userId) {
+        MPJLambdaWrapperX<JobAdvertisedDO> query = new MPJLambdaWrapperX<>();
+        query.selectAssociation(JobAdvertisedDO.class, AppJobAdvertisedRespVO::getJob);
+        query.selectAssociation(EnterpriseDO.class, AppJobAdvertisedRespVO::getEnterprise);
+
+        query.innerJoin(JobCvRelDO.class,JobCvRelDO::getJobId, JobAdvertisedDO::getId);
         query.innerJoin(EnterpriseDO.class, EnterpriseDO::getId, JobAdvertisedDO::getEnterpriseId);
-        query.in(JobAdvertisedDO::getId, ids);
+        query.eq(JobCvRelDO::getUserId, userId);
+
         query.orderByDesc(JobAdvertisedDO::getUpdateTime);
         return selectJoinPage(pageParam, AppJobAdvertisedRespVO.class, query);
     }
 
 
+    /** 根据企业id集合查询企业数据 **/
     default List<JobAdvertisedDO> selectByEnterpriseIdList(List<Long> ids) {
         LambdaQueryWrapper<JobAdvertisedDO> query = new LambdaQueryWrapperX<JobAdvertisedDO>();
         query.in(JobAdvertisedDO::getEnterpriseId, ids);
@@ -175,6 +199,7 @@ public interface JobAdvertisedMapper extends BaseMapperX<JobAdvertisedDO> {
     }
 
 
+    /** 根据查询条件、企业id、用户id 分页查询职位信息 **/
     default PageResult<JobAdvertisedDO> selectPage(AppRecruitJobPageReqVO reqVO, Long enterpriseId, Long userId) {
         LambdaQueryWrapper<JobAdvertisedDO> query = new LambdaQueryWrapperX<JobAdvertisedDO>()
                 .eqIfPresent(JobAdvertisedDO::getAreaId, reqVO.getAreaId())
@@ -194,6 +219,12 @@ public interface JobAdvertisedMapper extends BaseMapperX<JobAdvertisedDO> {
         return selectPage(reqVO, query);
     }
 
+    /**
+     * 招聘端 - 根据企业id、用户id查询职位列表,返回简易的职位信息
+     *
+     * @param enterpriseId 企业id
+     * @param userId       用户id
+     **/
     default List<AppRecruitJobSimpleRespVO> list(Long enterpriseId, Long userId) {
         MPJLambdaWrapperX<JobAdvertisedDO> query = new MPJLambdaWrapperX<>();
         query.selectAll(JobAdvertisedDO.class);
@@ -263,6 +294,13 @@ public interface JobAdvertisedMapper extends BaseMapperX<JobAdvertisedDO> {
         return Long.valueOf(result.get("num").toString());
     }
 
+    /**
+     * 招聘端 - 查询职位发布数量明细
+     *
+     * @param reqVO     公共条件
+     * @param startTime 开始时间
+     * @param endTime   结束时间
+     **/
    default PageResult<RecruitJobAnalysisRespVO> getJobNum(
            RecruitAnalysisReqVO reqVO, LocalDateTime startTime, LocalDateTime endTime) {
        MPJLambdaWrapperX<JobAdvertisedDO> query = new MPJLambdaWrapperX<>();
@@ -282,6 +320,7 @@ public interface JobAdvertisedMapper extends BaseMapperX<JobAdvertisedDO> {
     }
 
 
+    /** 根据查询条件、企业id、用户id 查询excel导出的数据结果 **/
     default PageResult<AppRecruitJobExportRespVO> page(AppRecruitJobPageReqVO reqVO, Long enterpriseId, Long userId) {
         MPJLambdaWrapperX<JobAdvertisedDO> query = new MPJLambdaWrapperX<>();
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/framework/rpc/config/RpcConfiguration.java

@@ -2,6 +2,7 @@ package com.citu.module.menduner.system.framework.rpc.config;
 
 import com.citu.module.pay.api.order.PayOrderApi;
 import com.citu.module.pay.api.refund.PayRefundApi;
+import com.citu.module.pay.api.wallet.PayWalletApi;
 import com.citu.module.system.api.logger.LoginLogApi;
 import com.citu.module.system.api.sms.SmsCodeApi;
 import com.citu.module.system.api.social.SocialClientApi;
@@ -16,7 +17,8 @@ import org.springframework.context.annotation.Configuration;
         SocialUserApi.class,
         SocialClientApi.class,
         PayOrderApi.class,
-        PayRefundApi.class
+        PayRefundApi.class,
+        PayWalletApi.class
 })
 public class RpcConfiguration {
 }

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

@@ -78,13 +78,6 @@ public interface EnterpriseUserBindService {
      */
     EnterpriseUserBindDetailRespVO get(Long id);
 
-    /**
-     * 获得企业登录用户
-     *
-     * @param userId 用户编号
-     * @return 企业登录用户
-     */
-    EnterpriseUserBindDO getEnterpriseUserBindById(Long userId);
 
 
     /**

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

@@ -119,10 +119,7 @@ public class EnterpriseUserBindServiceImpl implements EnterpriseUserBindService
         return enterpriseUserBindMapper.get(id);
     }
 
-    @Override
-    public EnterpriseUserBindDO getEnterpriseUserBindById(Long userId) {
-        return enterpriseUserBindMapper.selectByUserId(userId);
-    }
+
 
     @Override
     @DSTransactional // 单机+多数据源方案，使用 @DSTransactional 保证本地事务，以及数据源的切换

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/interview/InterviewInviteServiceImpl.java

@@ -28,6 +28,9 @@ import com.citu.module.menduner.system.service.enterprise.bind.EnterpriseUserBin
 import com.citu.module.menduner.system.service.hire.HireCommissionRatioService;
 import com.citu.module.menduner.system.service.job.JobCvRelService;
 import com.citu.module.menduner.system.service.record.UserAccountRecordService;
+import com.citu.module.pay.api.wallet.PayWalletApi;
+import com.citu.module.pay.api.wallet.dto.PayWalletAddBalanceDTO;
+import com.citu.module.pay.enums.wallet.PayWalletBizTypeEnum;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
@@ -56,6 +59,9 @@ public class InterviewInviteServiceImpl implements InterviewInviteService {
     @Resource
     private EnterpriseUserBindService userBindService;
 
+    @Resource
+    private PayWalletApi walletApi;
+
     @Resource
     private HireCommissionRatioService ratioService;
 
@@ -300,35 +306,35 @@ public class InterviewInviteServiceImpl implements InterviewInviteService {
     @Override
     @DSTransactional
     public void settlement(Long id) {
-        throw exception(INTERVIEW_INVITE_STATUS_NOT_SETTLEMENT);
-
-//        InterviewInviteDO interviewInvite = validateInterviewInviteExists(id);
-//
-//        checkStatusIsCompleted(interviewInvite);
-//
-//        if (!interviewInvite.getConversationStatus()
-//                .equals(ConversationStatusEnum.ENTRY.getStatus())) {
-//            // 不是已入职状态
-//            throw exception(INTERVIEW_INVITE_STATUS_NOT_ENTRY);
-//        }
-//        // 标记为结算
-//        interviewInvite.setConversationStatus(ConversationStatusEnum.SETTLEMENT.getStatus());
-//        mapper.updateById(interviewInvite);
-//
-//        // 获取 面试的求职者投递的简历信息
-//        JobCvRelDO cv = jobCvRelService
-//                .selectByUserIdAndJobId(interviewInvite.getUserId(), interviewInvite.getJobId());
-//
-//        // 猎头、 推荐人、投递人
-//        // 获取比例配置
-//        HireCommissionRatioDO ratio = ratioService.get();
-//
-//        JobAdvertisedDO job = jobAdvertisedMapper.selectById(cv.getJobId());
-//
-//        if (null != job.getHirePrice()) {
-//            // 余额结算
-//            priceSettlement(job, ratio, cv);
-//        }
+//        throw exception(INTERVIEW_INVITE_STATUS_NOT_SETTLEMENT);
+
+        InterviewInviteDO interviewInvite = validateInterviewInviteExists(id);
+
+        checkStatusIsCompleted(interviewInvite);
+
+        if (!interviewInvite.getConversationStatus()
+                .equals(ConversationStatusEnum.ENTRY.getStatus())) {
+            // 不是已入职状态
+            throw exception(INTERVIEW_INVITE_STATUS_NOT_ENTRY);
+        }
+        // 标记为结算
+        interviewInvite.setConversationStatus(ConversationStatusEnum.SETTLEMENT.getStatus());
+        mapper.updateById(interviewInvite);
+
+        // 获取 面试的求职者投递的简历信息
+        JobCvRelDO cv = jobCvRelService
+                .selectByUserIdAndJobId(interviewInvite.getUserId(), interviewInvite.getJobId());
+
+        // 猎头、 推荐人、投递人
+        // 获取比例配置
+        HireCommissionRatioDO ratio = ratioService.get();
+
+        JobAdvertisedDO job = jobAdvertisedMapper.selectById(cv.getJobId());
+
+        if (null != job.getHirePrice()) {
+            // 余额结算
+            priceSettlement(job, ratio, cv);
+        }
 
         //TODO 发送推送消息
     }
@@ -353,51 +359,48 @@ public class InterviewInviteServiceImpl implements InterviewInviteService {
 
         // 猎头 （平台自己）
         if (headhuntPrice > 0) {
-//            userAccountRecordService.createBalanceRecord(
-//                    1L,
-//                    BalanceBizTypeEnum.PLATFORM_COMMISSION.getName(),
-//                    MathOperationEnum.ADD,
-//                    headhuntPrice,
-//                    BalanceBizTypeEnum.PLATFORM_COMMISSION,
-//                    String.valueOf(job.getId())
-//            );
+            walletApi.addWalletBalance(PayWalletAddBalanceDTO.builder()
+                            .userId(0L)
+                            .bizId(job.getId().toString())
+                            .price(Math.toIntExact(headhuntPrice))
+                            .bizType(PayWalletBizTypeEnum.PLATFORM_COMMISSION.getType())
+                    .build()
+            );
         }
 
         // 如果推荐人ID为空，则将推荐人的佣金也给到猎头
         if (null == cv.getRecommendUserId()) {
-//            userAccountRecordService.createBalanceRecord(
-//                    1L,
-//                    BalanceBizTypeEnum.NOT_RECOMMENDED.getName(),
-//                    MathOperationEnum.ADD,
-//                    recommendPrice,
-//                    BalanceBizTypeEnum.NOT_RECOMMENDED,
-//                    String.valueOf(job.getId())
-//            );
+            walletApi.addWalletBalance(PayWalletAddBalanceDTO.builder()
+                    .userId(0L)
+                    .bizId(job.getId().toString())
+                    .price(Math.toIntExact(recommendPrice))
+                    .bizType(PayWalletBizTypeEnum.NOT_RECOMMENDED.getType())
+                    .build()
+            );
         }
 
         // 推荐人
         if (headhuntPrice > 0
                 && null != cv.getRecommendUserId()) {
-//            userAccountRecordService.createBalanceRecord(
-//                    cv.getRecommendUserId(),
-//                    BalanceBizTypeEnum.RECOMMENDED_POSITIONS.getName(),
-//                    MathOperationEnum.ADD,
-//                    recommendPrice,
-//                    BalanceBizTypeEnum.RECOMMENDED_POSITIONS,
-//                    String.valueOf(job.getId())
-//            );
+            walletApi.addWalletBalance(PayWalletAddBalanceDTO.builder()
+                    .userId(cv.getRecommendUserId())
+                    .bizId(job.getId().toString())
+                    .price(Math.toIntExact(recommendPrice))
+                    .bizType(PayWalletBizTypeEnum.RECOMMENDED_POSITIONS.getType())
+                    .build()
+            );
         }
 
         // 投递人
         if (headhuntPrice > 0) {
-//            userAccountRecordService.createBalanceRecord(
-//                    cv.getUserId(),
-//                    BalanceBizTypeEnum.DELIVERY_PERSON.getName(),
-//                    MathOperationEnum.ADD,
-//                    cvPrice,
-//                    BalanceBizTypeEnum.DELIVERY_PERSON,
-//                    String.valueOf(job.getId())
-//            );
+
+            walletApi.addWalletBalance(PayWalletAddBalanceDTO.builder()
+                    .userId(cv.getUserId())
+                    .bizId(job.getId().toString())
+                    .price(Math.toIntExact(cvPrice))
+                    .bizType(PayWalletBizTypeEnum.DELIVERY_PERSON.getType())
+                    .build()
+            );
         }
     }
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/job/JobIntegrationServiceImpl.java

@@ -93,8 +93,8 @@ public class JobIntegrationServiceImpl implements JobIntegrationService {
     private ElasticsearchRestTemplate elasticsearchTemplate;
 
 
-    public PageResult<AppJobAdvertisedRespVO> getJobByIdList(PageParam page, List<Long> ids) {
-        PageResult<AppJobAdvertisedRespVO> result = jobAdvertisedMapper.selectByIdListPage(page, ids);
+    /** 包装职位发布联系人 **/
+    public PageResult<AppJobAdvertisedRespVO> packContact(PageResult<AppJobAdvertisedRespVO> result) {
         for (AppJobAdvertisedRespVO respVO : result.getList()) {
             // 获取职位发布人
             EnterpriseUserContactRespVO contactRespVO = userBindService
@@ -109,56 +109,21 @@ public class JobIntegrationServiceImpl implements JobIntegrationService {
     public PageResult<AppJobAdvertisedRespVO> getJobCvPage(PageParam page) {
         // 获取已投递的职位
         Long userId = LoginUserContext.getUserId();
-
-        // 查询投递的简历
-        JobCvRelPageReqVO relPageReqVO = new JobCvRelPageReqVO();
-        relPageReqVO.setPageNo(page.getPageNo());
-        relPageReqVO.setPageSize(page.getPageSize());
-        relPageReqVO.setUserId(userId);
-        PageResult<JobCvRelDO> result = jobCvRelMapper.selectPage(relPageReqVO);
-        if (CollUtil.isEmpty(result.getList())) {
-            return PageResult.empty();
-        }
-        // 查询招聘职位等信息
-        List<Long> ids = result.getList().stream().map(JobCvRelDO::getJobId).collect(Collectors.toList());
-        return getJobByIdList(page, ids);
+        PageResult<AppJobAdvertisedRespVO> result = jobAdvertisedMapper.selectCvRelJobPage(page, userId);
+        return packContact( result);
     }
 
     @Override
     public PageResult<AppJobAdvertisedRespVO> getJobFavoritePage(PageParam page) {
         Long userId = LoginUserContext.getUserId();
-        PersonJobFavoritePageReqVO pageReqVO = new PersonJobFavoritePageReqVO();
-        pageReqVO.setPageNo(page.getPageNo());
-        pageReqVO.setPageSize(page.getPageSize());
-        pageReqVO.setUserId(userId);
-        PageResult<PersonJobFavoriteDO> result =
-                personJobFavoriteService.getPersonJobFavoritePage(pageReqVO);
-        if (CollUtil.isEmpty(result.getList())) {
-            return PageResult.empty();
-        }
-        // 查询招聘职位等信息
-        List<Long> ids = result.getList()
-                .stream().map(PersonJobFavoriteDO::getJobId).collect(Collectors.toList());
-
-        return getJobByIdList(page, ids);
+        PageResult<AppJobAdvertisedRespVO> result = jobAdvertisedMapper.selectFavoriteJobPage(page, userId);
+        return packContact(result);
     }
 
     @Override
     public PageResult<EnterpriseBaseSimpleRespVO> getEnterpriseSubscribePage(PageParam page) {
         Long userId = LoginUserContext.getUserId();
-        PersonEnterpriseSubscribePageReqVO pageReqVO = new PersonEnterpriseSubscribePageReqVO();
-        pageReqVO.setPageNo(page.getPageNo());
-        pageReqVO.setPageSize(page.getPageSize());
-        pageReqVO.setUserId(userId);
-        PageResult<PersonEnterpriseSubscribeDO> result =
-                personEnterpriseSubscribeService.getPersonEnterpriseSubscribePage(pageReqVO);
-        if (CollUtil.isEmpty(result.getList())) {
-            return PageResult.empty();
-        }
-        // 查询招聘职位等信息
-        List<Long> ids = result.getList()
-                .stream().map(PersonEnterpriseSubscribeDO::getEnterpriseId).collect(Collectors.toList());
-        return enterpriseMapper.selectByIdListPage(page, ids);
+        return enterpriseMapper.selectSubscribePage(page,userId);
     }
 
     @Override

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/record/UserAccountRecordService.java

@@ -5,10 +5,8 @@ import com.citu.framework.common.pojo.PageResult;
 import com.citu.module.menduner.system.controller.base.account.record.UserAccountRecordPageReqVO;
 import com.citu.module.menduner.system.dal.dataobject.record.UserAccountRecordDO;
 import com.citu.module.menduner.system.enums.MathOperationEnum;
-import com.citu.module.menduner.system.enums.account.BalanceBizTypeEnum;
 import com.citu.module.menduner.system.enums.account.PointBizTypeEnum;
 
-import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/record/UserAccountRecordServiceImpl.java

@@ -12,7 +12,6 @@ import com.citu.module.menduner.system.dal.dataobject.user.UserAccountDO;
 import com.citu.module.menduner.system.dal.mysql.record.UserAccountRecordMapper;
 import com.citu.module.menduner.system.enums.MathOperationEnum;
 import com.citu.module.menduner.system.enums.account.AccountRecordTypeEnum;
-import com.citu.module.menduner.system.enums.account.BalanceBizTypeEnum;
 import com.citu.module.menduner.system.enums.account.PointBizTypeEnum;
 import com.citu.module.menduner.system.service.user.UserAccountService;
 import lombok.extern.slf4j.Slf4j;
@@ -20,10 +19,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
-import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
-import static com.citu.module.menduner.system.enums.ErrorCodeConstants.USER_BALANCE_NOT_ENOUGH;
 import static com.citu.module.menduner.system.enums.ErrorCodeConstants.USER_POINT_NOT_ENOUGH;