1、移除企业账户体系

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

@@ -1,6 +1,5 @@
 package com.citu.module.menduner.reward.framework.rpc.config;
 
-import com.citu.module.menduner.system.api.account.EnterpriseAccountApi;
 import com.citu.module.menduner.system.api.url.MendunerSystemUrlApi;
 import com.citu.module.menduner.system.api.account.UserAccountApi;
 import com.citu.module.menduner.system.api.user.UserApi;
@@ -11,7 +10,6 @@ import org.springframework.context.annotation.Configuration;
 @EnableFeignClients(clients = {
         MendunerSystemUrlApi.class,
         UserAccountApi.class,
-        EnterpriseAccountApi.class,
         UserApi.class
 })
 public class RpcConfiguration {

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

@@ -1,87 +0,0 @@
-package com.citu.module.menduner.system.api.account;
-
-import com.citu.framework.common.pojo.CommonResult;
-import com.citu.module.menduner.system.enums.ApiConstants;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.security.PermitAll;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-@FeignClient(name = ApiConstants.NAME)
-@Tag(name = "RPC 服务 - 企业账户")
-public interface EnterpriseAccountApi {
-
-    String PREFIX = ApiConstants.PREFIX + "/enterprise-account";
-
-    @PostMapping(PREFIX + "/create")
-    @Operation(summary = "如果企业账户不存在,则创建")
-    @Parameters({
-            @Parameter(name = "enterpriseId", description = "企业编号", example = "1", required = true),
-            @Parameter(name = "userId", description = "企业编号", example = "1", required = true)
-    })
-    CommonResult<AccountRespDTO> createEnterpriseAccountIfAbsent(
-            @RequestParam("enterpriseId") Long enterpriseId,
-            @RequestParam("userId") Long userId
-    );
-
-
-    @PutMapping(PREFIX + "/point/update")
-    @Operation(summary = "更新企业的积分,则创建")
-    @Parameters({
-            @Parameter(name = "enterpriseId", description = "企业编号", example = "1", required = true),
-            @Parameter(name = "userId", description = "企业编号", example = "2", required = true),
-            @Parameter(name = "point", description = "积分", example = "2", required = true),
-    })
-    CommonResult<Boolean> updatePoint(
-            @RequestParam("enterpriseId") Long enterpriseId,
-            @RequestParam("userId") Long userId,
-            @RequestParam("point") Integer point
-    );
-
-    @PutMapping(PREFIX + "/balance/update")
-    @Operation(summary = "更新企业的余额,则创建")
-    @Parameters({
-            @Parameter(name = "enterpriseId", description = "企业编号", example = "1", required = true),
-            @Parameter(name = "userId", description = "企业编号", example = "2", required = true),
-            @Parameter(name = "balance", description = "余额", example = "2", required = true),
-    })
-    CommonResult<Boolean> updateBalance(
-            @RequestParam("enterpriseId") Long enterpriseId,
-            @RequestParam("userId") Long userId,
-            @RequestParam("balance") BigDecimal balance);
-
-    @PermitAll
-    @PostMapping(PREFIX + "/create/point/record")
-    @Operation(summary = "创建企业账户积分变动记录")
-    CommonResult<Boolean> createPointRecord(@RequestBody AccountRecordSaveReqDTO dto);
-
-    @PermitAll
-    @PostMapping(PREFIX + "/create/balance/record")
-    @Operation(summary = "创建企业账户余额变动记录")
-    CommonResult<Boolean> createBalanceRecord(@RequestBody AccountRecordSaveReqDTO dto);
-
-
-    @GetMapping(PREFIX + "/get/point/count")
-    @Operation(summary = "获取一段时间内的企业账户积分变动获得的数量")
-    @Parameters({
-            @Parameter(name = "enterpriseId", description = "企业号", example = "2", required = true),
-            @Parameter(name = "userId", description = "用户编号", example = "2", required = true),
-            @Parameter(name = "url", description = "事件地址", example = "2", required = false),
-            @Parameter(name = "startDate", description = "开始时间", example = "2", required = false),
-            @Parameter(name = "endDate", description = "结束时间", example = "2", required = false)
-    })
-    CommonResult<Integer> getPointCount(
-            @RequestParam("enterpriseId") Long enterpriseId,
-            @RequestParam("userId") Long userId,
-            @RequestParam(value = "url", required = false) String url,
-            @RequestParam(value = "startDate", required = false) LocalDateTime startDate,
-            @RequestParam(value = "endDate", required = false) LocalDateTime endDate);
-
-
-}

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

@@ -1,82 +0,0 @@
-package com.citu.module.menduner.system.api.account;
-
-import com.citu.framework.common.pojo.CommonResult;
-import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseAccountDO;
-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.enterprise.account.EnterpriseAccountService;
-import com.citu.module.menduner.system.service.record.EnterpriseAccountRecordService;
-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;
-
-@RestController // 提供 RESTful API 接口，给 Feign 调用
-@Validated
-public class EnterpriseAccountApiImpl implements EnterpriseAccountApi {
-
-    @Resource
-    private EnterpriseAccountService service;
-
-    @Resource
-    private EnterpriseAccountRecordService accountRecordService;
-
-    @Override
-    public CommonResult<AccountRespDTO> createEnterpriseAccountIfAbsent(Long enterpriseId, Long userId) {
-        EnterpriseAccountDO accountDO = service.createEnterpriseAccountIfAbsent(enterpriseId, userId);
-        AccountRespDTO dto = new AccountRespDTO();
-        dto.setPoint(accountDO.getPoint());
-        dto.setBalance(accountDO.getBalance());
-        return success(dto);
-    }
-
-    @Override
-    public CommonResult<Boolean> updatePoint(Long enterpriseId, Long userId, Integer point) {
-        return success(service.updatePoint(enterpriseId, userId, point));
-    }
-
-    @Override
-    public CommonResult<Boolean> updateBalance(Long enterpriseId, Long userId, BigDecimal balance) {
-        return success(service.updateBalance(enterpriseId, userId, balance));
-    }
-
-    @Override
-    public CommonResult<Boolean> createPointRecord(AccountRecordSaveReqDTO dto) {
-        accountRecordService.createPointRecord(dto.getEnterpriseId(),
-                dto.getUserId(),
-                dto.getTitle(),
-                MathOperationEnum.from(dto.getOperation()),
-                dto.getPoint(),
-                PointBizTypeEnum.from(dto.getPointBizType()),
-                dto.getBizId()
-        );
-        return success(true);
-    }
-
-    @Override
-    public CommonResult<Boolean> createBalanceRecord(AccountRecordSaveReqDTO dto) {
-        accountRecordService.createBalanceRecord(dto.getEnterpriseId(),
-                dto.getUserId(),
-                dto.getTitle(),
-                MathOperationEnum.from(dto.getOperation()),
-                dto.getBalance(),
-                BalanceBizTypeEnum.from(dto.getBalanceBizType()),
-                dto.getBizId()
-        );
-        return success(true);
-    }
-
-    @Override
-    public CommonResult<Integer> getPointCount(Long enterpriseId,
-                                               Long userId,
-                                               String url,
-                                               LocalDateTime startDate,
-                                               LocalDateTime endDate) {
-        return success(accountRecordService.getPointCount(enterpriseId, userId, url, startDate, endDate));
-    }
-}

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

@@ -1,104 +0,0 @@
-package com.citu.module.menduner.system.controller.admin.enterprise;
-
-
-import com.citu.framework.apilog.core.annotation.ApiAccessLog;
-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.excel.core.util.ExcelUtils;
-import com.citu.module.menduner.system.controller.admin.enterprise.vo.EnterpriseAccountPageRespVO;
-import com.citu.module.menduner.system.controller.base.account.AccountBalanceUpdateReqVO;
-import com.citu.module.menduner.system.controller.base.account.AccountPointUpdateReqVO;
-import com.citu.module.menduner.system.controller.base.enterprise.account.EnterpriseAccountPageReqVO;
-import com.citu.module.menduner.system.controller.base.enterprise.account.EnterpriseAccountRespVO;
-import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseAccountDO;
-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.enterprise.account.EnterpriseAccountService;
-import com.citu.module.menduner.system.service.record.EnterpriseAccountRecordService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-import java.io.IOException;
-import java.util.List;
-
-import static com.citu.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
-import static com.citu.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "管理后台 - 企业账户")
-@RestController
-@RequestMapping("/menduner/system/enterprise-account")
-@Validated
-public class EnterpriseAccountController {
-
-    @Resource
-    private EnterpriseAccountService enterpriseAccountService;
-
-    @Resource
-    private EnterpriseAccountRecordService service;
-    
-    @GetMapping("/page")
-    @Operation(summary = "获得企业账户分页")
-    @PreAuthorize("@ss.hasPermission('menduner:system:enterprise-account:query')")
-    public CommonResult<PageResult<EnterpriseAccountPageRespVO>> getEnterpriseAccountPage
-            (@Valid EnterpriseAccountPageReqVO pageReqVO) {
-        PageResult<EnterpriseAccountPageRespVO> pageResult = enterpriseAccountService.page2(pageReqVO);
-        return success(pageResult);
-    }
-
-    @GetMapping("/export-excel")
-    @Operation(summary = "导出企业账户 Excel")
-    @PreAuthorize("@ss.hasPermission('menduner:system:enterprise-account:export')")
-    @ApiAccessLog(operateType = EXPORT)
-    public void exportEnterpriseAccountExcel(@Valid EnterpriseAccountPageReqVO pageReqVO,
-                                             HttpServletResponse response) throws IOException {
-        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<EnterpriseAccountDO> list = enterpriseAccountService.page(pageReqVO).getList();
-        // 导出 Excel
-        ExcelUtils.write(response, "企业账户.xls", "数据", EnterpriseAccountRespVO.class,
-                BeanUtils.toBean(list, EnterpriseAccountRespVO.class));
-    }
-
- 
-
-    @PutMapping("/update-point")
-    @Operation(summary = "修改账户的积分")
-    @PreAuthorize("@ss.hasPermission('menduner:system:enterprise-point:update')")
-    public CommonResult<Boolean> updateUserPoint(@Valid @RequestBody AccountPointUpdateReqVO updateReqVO) {
-        service.createPointRecord(
-                updateReqVO.getEnterpriseId(),
-                updateReqVO.getUserId(),
-                null,
-                MathOperationEnum.ADD.getOperator().equals(updateReqVO.getOperation())
-                        ? MathOperationEnum.ADD : MathOperationEnum.SUBTRACT,
-                updateReqVO.getPoint(),
-                PointBizTypeEnum.ADMIN,
-                String.valueOf(updateReqVO.getUserId()));
-        return success(true);
-    }
-
-    @PutMapping("/update-balance")
-    @Operation(summary = "修改账户余额")
-    @PreAuthorize("@ss.hasPermission('menduner:system:enterprise-balance:update')")
-    public CommonResult<Boolean> updateBalance(@Valid @RequestBody AccountBalanceUpdateReqVO updateReqVO) {
-        service.createBalanceRecord(
-                updateReqVO.getEnterpriseId(),
-                updateReqVO.getUserId(),
-                null,
-                MathOperationEnum.ADD.getOperator().equals(updateReqVO.getOperation())
-                        ? MathOperationEnum.ADD : MathOperationEnum.SUBTRACT,
-                updateReqVO.getBalance(),
-                BalanceBizTypeEnum.ADMIN,
-                String.valueOf(updateReqVO.getUserId()));
-        return success(true);
-    }
-
-}

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

@@ -1,37 +0,0 @@
-package com.citu.module.menduner.system.controller.admin.enterprise.vo;
-
-import com.citu.module.menduner.system.controller.base.enterprise.account.EnterpriseAccountRespVO;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-@Schema(description = "管理后台 - 企业账户分页 Response VO")
-@Data
-public class EnterpriseAccountPageRespVO extends EnterpriseAccountRespVO {
-
-    // ========== 企业信息 ==========
-    @Schema(description = "企业全称", example = "广州xx科技")
-    private String enterpriseName;
-
-    @Schema(description = "企业别称", example = "xx科技")
-    private String anotherName;
-
-    @Schema(description = "logo图片地址", example = "https://www.iocoder.cn")
-    private String logoUrl;
-
-    // ========== 用户信息 ==========
-
-    @Schema(description = "名称", example = "x女士")
-    private String userName;
-
-    @Schema(description = "用户性别")
-    private String sex;
-
-    @Schema(description = "头像地址")
-    private String avatar;
-
-    @Schema(description = "邮箱")
-    private String email;
-
-    @Schema(description = "手机号")
-    private String phone;
-}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/record/EnterpriseAccountRecordController.java

@@ -1,45 +0,0 @@
-package com.citu.module.menduner.system.controller.admin.record;
-
-import com.citu.framework.common.pojo.CommonResult;
-import com.citu.framework.common.pojo.PageResult;
-import com.citu.module.menduner.system.controller.base.account.record.EnterpriseAccountRecordPageReqVO;
-import com.citu.module.menduner.system.controller.base.account.record.EnterpriseAccountRecordRespVO;
-
-import com.citu.module.menduner.system.convert.EnterpriseAccountRecordConvert;
-import com.citu.module.menduner.system.dal.dataobject.record.EnterpriseAccountRecordDO;
-import com.citu.module.menduner.system.service.record.EnterpriseAccountRecordService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-
-import static com.citu.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "管理后台 - 企业账户变动记录")
-@RestController
-@RequestMapping("/menduner/system/enterprise/account/record")
-@Validated
-public class EnterpriseAccountRecordController {
-
-    @Resource
-    private EnterpriseAccountRecordService service;
-
-    @GetMapping("/page")
-    @Operation(summary = "分页")
-    @PreAuthorize("@ss.hasPermission('menduner:system:enterprise-account-record:query')")
-    public CommonResult<PageResult<EnterpriseAccountRecordRespVO>> page
-            (@Valid EnterpriseAccountRecordPageReqVO pageVO) {
-        // 执行分页查询
-        PageResult<EnterpriseAccountRecordDO> pageResult = service.page(pageVO);
-        return success(EnterpriseAccountRecordConvert.INSTANCE.convertPage(pageResult));
-    }
-
-
-
-}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/appadmin/record/AppAdminAccountRecordController.java

@@ -3,16 +3,14 @@ package com.citu.module.menduner.system.controller.appadmin.record;
 import com.citu.framework.common.pojo.CommonResult;
 import com.citu.framework.common.pojo.PageResult;
 import com.citu.framework.security.core.annotations.PreAuthenticated;
+import com.citu.module.menduner.common.util.LoginUserContext;
 import com.citu.module.menduner.system.controller.appadmin.record.vo.AppAdminAccountRecordPageReqVO;
 import com.citu.module.menduner.system.controller.appadmin.record.vo.AppAdminAccountRecordRespVO;
-import com.citu.module.menduner.system.controller.base.account.record.EnterpriseAccountRecordPageReqVO;
-import com.citu.module.menduner.system.controller.base.account.record.EnterpriseAccountRecordRespVO;
-import com.citu.module.menduner.system.convert.EnterpriseAccountRecordConvert;
-import com.citu.module.menduner.system.dal.dataobject.record.EnterpriseAccountRecordDO;
-import com.citu.module.menduner.system.service.record.EnterpriseAccountRecordService;
+import com.citu.module.menduner.system.convert.UserAccountRecordConvert;
+import com.citu.module.menduner.system.dal.dataobject.record.UserAccountRecordDO;
+import com.citu.module.menduner.system.service.record.UserAccountRecordService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -30,16 +28,17 @@ import static com.citu.framework.common.pojo.CommonResult.success;
 public class AppAdminAccountRecordController {
 
     @Resource
-    private EnterpriseAccountRecordService service;
+    private UserAccountRecordService service;
 
     @GetMapping("/page")
     @PreAuthenticated
     @Operation(summary = "分页")
     public CommonResult<PageResult<AppAdminAccountRecordRespVO>> page
             (@Valid AppAdminAccountRecordPageReqVO pageVO) {
-        return success(service.page(pageVO));
+        PageResult<UserAccountRecordDO> pageResult = service
+                .page(LoginUserContext.getUserId(), pageVO.getType(), pageVO);
+        return success(UserAccountRecordConvert.INSTANCE.convertPage3(pageResult));
     }
 
 
-
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/appadmin/record/vo/AppAdminAccountRecordPageReqVO.java

@@ -10,12 +10,6 @@ import lombok.ToString;
 @ToString(callSuper = true)
 public class AppAdminAccountRecordPageReqVO extends PageParam {
 
-    @Schema(description = "业务类型", example = "1")
-    private Integer bizType;
-
-    @Schema(description = "积分标题", example = "呵呵")
-    private String title;
-
     @Schema(description = "记录类型(0 变动积分 | 1 变动余额)")
     private String type;
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/appadmin/user/AppAdminUserController.java

@@ -4,14 +4,13 @@ import com.citu.framework.common.pojo.CommonResult;
 import com.citu.framework.common.pojo.PageResult;
 import com.citu.framework.common.util.string.StrUtils;
 import com.citu.framework.security.core.annotations.PreAuthenticated;
-import com.citu.module.menduner.system.controller.appadmin.user.vo.AppAdminEnterpriseAccountRespVO;
+import com.citu.module.menduner.system.controller.appadmin.user.vo.AppAdminAccountRespVO;
 import com.citu.module.menduner.system.controller.appadmin.user.vo.AppAdminUserPageReqVO;
 import com.citu.module.menduner.system.controller.appadmin.user.vo.AppAdminUserRespVO;
 import com.citu.module.menduner.system.controller.appadmin.user.vo.AppAdminUserSaveReqVO;
 import com.citu.module.menduner.system.convert.EnterpriseConvert;
-import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseAccountDO;
-import com.citu.module.menduner.system.service.enterprise.account.EnterpriseAccountService;
 import com.citu.module.menduner.system.service.enterprise.bind.EnterpriseUserBindService;
+import com.citu.module.menduner.system.service.user.UserAccountService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.validation.annotation.Validated;
@@ -32,7 +31,7 @@ public class AppAdminUserController {
     private EnterpriseUserBindService service;
 
     @Resource
-    private EnterpriseAccountService enterpriseAccountService;
+    private UserAccountService accountService;
 
     @PreAuthenticated
     @GetMapping("/get")
@@ -45,9 +44,8 @@ public class AppAdminUserController {
     @GetMapping("/get/account")
     @Operation(summary = "获得企业账户信息")
     @PreAuthenticated
-    public CommonResult<AppAdminEnterpriseAccountRespVO> getAccount() {
-        EnterpriseAccountDO accountDO = enterpriseAccountService.get();
-        return success(EnterpriseConvert.INSTANCE.convert16(accountDO));
+    public CommonResult<AppAdminAccountRespVO> getAccount() {
+        return success(EnterpriseConvert.INSTANCE.convert16(accountService.get()));
     }
 
     @PreAuthenticated

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/appadmin/user/vo/AppAdminEnterpriseAccountRespVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/appadmin/user/vo/AppAdminAccountRespVO.java

@@ -1,10 +1,10 @@
 package com.citu.module.menduner.system.controller.appadmin.user.vo;
 
-import com.citu.module.menduner.system.controller.base.enterprise.account.EnterpriseAccountRespVO;
+import com.citu.module.menduner.system.controller.base.user.account.UserAccountRespVO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 @Schema(description = "menduner - 企业账户 Response VO")
 @Data
-public class AppAdminEnterpriseAccountRespVO extends EnterpriseAccountRespVO {
+public class AppAdminAccountRespVO extends UserAccountRespVO {
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/enterprise/account/EnterpriseAccountPageReqVO.java

@@ -1,44 +0,0 @@
-package com.citu.module.menduner.system.controller.base.enterprise.account;
-
-
-import com.citu.framework.common.pojo.PageParam;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-import static com.citu.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
-
-@Schema(description = "管理后台 - 企业账户分页 Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class EnterpriseAccountPageReqVO extends PageParam {
-
-    @Schema(description = "企业id", requiredMode = Schema.RequiredMode.REQUIRED, example = "616")
-    private Long enterpriseId;
-
-    @Schema(description = "用户id", example = "19716")
-    private Long userId;
-
-    @Schema(description = "名称", example = "x女士")
-    private String userName;
-
-    @Schema(description = "手机号码")
-    private String phone;
-
-    @Schema(description = "邮箱")
-    private String email;
-
-    @Schema(description = "用户性别")
-    private String sex;
-
-    @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/controller/base/enterprise/account/EnterpriseAccountRespVO.java

@@ -1,41 +0,0 @@
-package com.citu.module.menduner.system.controller.base.enterprise.account;
-
-
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-@Schema(description = "管理后台 - 企业账户 Response VO")
-@Data
-@ExcelIgnoreUnannotated
-public class EnterpriseAccountRespVO {
-
-    @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "31789")
-    @ExcelProperty("id")
-    private Long id;
-
-    @ExcelProperty("企业id")
-    @Schema(description = "企业id", requiredMode = Schema.RequiredMode.REQUIRED, example = "616")
-    private Long enterpriseId;
-
-    @Schema(description = "用户id", requiredMode = Schema.RequiredMode.REQUIRED, example = "19716")
-    @ExcelProperty("用户id")
-    private Long userId;
-
-    @Schema(description = "账户余额")
-    @ExcelProperty("账户余额")
-    private BigDecimal balance;
-
-    @Schema(description = "积分数量")
-    @ExcelProperty("积分数量")
-    private Integer point;
-
-    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("创建时间")
-    private LocalDateTime createTime;
-
-}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/enterprise/account/EnterpriseAccountSaveReqVO.java

@@ -1,30 +0,0 @@
-package com.citu.module.menduner.system.controller.base.enterprise.account;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-import java.math.BigDecimal;
-
-@Schema(description = "管理后台 - 企业账户新增/修改 Request VO")
-@Data
-public class EnterpriseAccountSaveReqVO {
-
-    @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "31789")
-    private Long id;
-
-    @Schema(description = "企业id", requiredMode = Schema.RequiredMode.REQUIRED, example = "616")
-    private Long enterpriseId;
-
-    @Schema(description = "用户id", requiredMode = Schema.RequiredMode.REQUIRED, example = "19716")
-    @NotEmpty(message = "{1_099_000_006}")
-    private Long userId;
-
-    @Schema(description = "账户余额")
-    private BigDecimal balance;
-
-    @Schema(description = "积分数量")
-    private Integer point;
-
-}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/order/TradeOrderCreateReqVO.java

@@ -14,7 +14,7 @@ public class TradeOrderCreateReqVO {
 
 
     @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @NotEmpty(message = "{1_099_000_006}")
+    @NotNull(message = "{1_099_000_006}")
     private Long userId;
 
     @Schema(description = "订单类型 0平台订单|1求职端订单|2招聘端订单", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/convert/EnterpriseAccountRecordConvert.java

@@ -1,16 +0,0 @@
-package com.citu.module.menduner.system.convert;
-
-import com.citu.framework.common.pojo.PageResult;
-import com.citu.module.menduner.system.controller.base.account.record.EnterpriseAccountRecordRespVO;
-import com.citu.module.menduner.system.dal.dataobject.record.EnterpriseAccountRecordDO;
-import org.mapstruct.Mapper;
-import org.mapstruct.factory.Mappers;
-
-@Mapper
-public interface EnterpriseAccountRecordConvert {
-
-    EnterpriseAccountRecordConvert INSTANCE = Mappers.getMapper(EnterpriseAccountRecordConvert.class);
-
-    PageResult<EnterpriseAccountRecordRespVO> convertPage(PageResult<EnterpriseAccountRecordDO> page);
-
-}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/convert/EnterpriseConvert.java

@@ -8,11 +8,12 @@ import com.citu.module.menduner.system.controller.app.enterprise.vo.register.App
 import com.citu.module.menduner.system.controller.app.enterprise.vo.register.AppEnterpriseRegisterRespVO;
 import com.citu.module.menduner.system.controller.appadmin.enterprise.auth.AppAdminEnterpriseAuthRespVO;
 import com.citu.module.menduner.system.controller.appadmin.enterprise.vo.*;
-import com.citu.module.menduner.system.controller.appadmin.user.vo.AppAdminEnterpriseAccountRespVO;
+import com.citu.module.menduner.system.controller.appadmin.user.vo.AppAdminAccountRespVO;
 import com.citu.module.menduner.system.controller.appadmin.user.vo.AppAdminUserRespVO;
 import com.citu.module.menduner.system.controller.base.contact.EnterpriseUserContactRespVO;
 import com.citu.module.menduner.system.controller.base.enterprise.vo.EnterpriseBaseSimpleRespVO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.*;
+import com.citu.module.menduner.system.dal.dataobject.user.UserAccountDO;
 import com.citu.module.menduner.system.dal.es.job.ESJobAdvertisedMergeDO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
@@ -58,7 +59,7 @@ public interface EnterpriseConvert {
 
     AppAdminEnterpriseBusinessRespVO convert15(EnterpriseBusinessDO bean);
 
-    AppAdminEnterpriseAccountRespVO convert16(EnterpriseAccountDO bean);
+    AppAdminAccountRespVO convert16(UserAccountDO bean);
 
     AppAdminEnterpriseTreeRespVO convert17(EnterpriseDO bean);
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/convert/UserAccountRecordConvert.java

@@ -3,6 +3,8 @@ package com.citu.module.menduner.system.convert;
 import com.citu.framework.common.pojo.PageResult;
 
 import com.citu.module.menduner.system.controller.app.record.vo.AppUserAccountRecordRespVO;
+import com.citu.module.menduner.system.controller.appadmin.record.vo.AppAdminAccountRecordRespVO;
+import com.citu.module.menduner.system.controller.base.account.record.EnterpriseAccountRecordRespVO;
 import com.citu.module.menduner.system.controller.base.account.record.UserAccountRecordRespVO;
 import com.citu.module.menduner.system.dal.dataobject.record.UserAccountRecordDO;
 import org.mapstruct.Mapper;
@@ -19,4 +21,6 @@ public interface UserAccountRecordConvert {
 
     PageResult<AppUserAccountRecordRespVO> convertPage2(PageResult<UserAccountRecordDO> pageResult);
 
+    PageResult<AppAdminAccountRecordRespVO> convertPage3(PageResult<UserAccountRecordDO> page);
+
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/enterprise/EnterpriseAccountDO.java

@@ -1,49 +0,0 @@
-package com.citu.module.menduner.system.dal.dataobject.enterprise;
-
-
-import com.baomidou.mybatisplus.annotation.KeySequence;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.citu.framework.mybatis.core.dataobject.BaseDO;
-import lombok.*;
-
-import java.math.BigDecimal;
-
-/**
- * 企业账户 DO
- *
- * @author Rayson
- */
-@TableName("mde_enterprise_account")
-@KeySequence("mde_enterprise_account_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class EnterpriseAccountDO extends BaseDO {
-
-    /**
-     * id
-     */
-    @TableId
-    private Long id;
-    /**
-     * 企业id
-     */
-    private Long enterpriseId;
-    /**
-     * 用户id
-     */
-    private Long userId;
-    /**
-     * 账户余额
-     */
-    private BigDecimal balance;
-    /**
-     * 积分数量
-     */
-    private Integer point;
-
-}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/record/EnterpriseAccountRecordDO.java

@@ -1,92 +0,0 @@
-package com.citu.module.menduner.system.dal.dataobject.record;
-
-import com.baomidou.mybatisplus.annotation.KeySequence;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.citu.framework.mybatis.core.dataobject.BaseDO;
-import lombok.*;
-
-import java.math.BigDecimal;
-
-/**
- * 企业账户变动记录 DO
- *
- * @author Rayson
- */
-@TableName("mde_enterprise_account_record")
-@KeySequence("mde_enterprise_account_record_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class EnterpriseAccountRecordDO extends BaseDO {
-
-    /**
-     * 自增主键
-     */
-    @TableId
-    private Long id;
-    /**
-     * 企业编号
-     */
-    private Long enterpriseId;
-    /**
-     * 用户编号
-     */
-    private Long userId;
-    /**
-     * 记录类型(0 变动积分 | 1 变动余额)
-     */
-    private String type;
-
-    /**
-     * 业务编码
-     */
-    private String bizId;
-    /**
-     * 业务类型
-     */
-    private Integer bizType;
-
-    /**
-     * 积分标题
-     */
-    private String title;
-    /**
-     * 积分描述
-     */
-    private String description;
-
-    /**
-     * 数学运算符 + | -
-     */
-    private String operation;
-
-    /**
-     * 变动积分
-     * <p>
-     * 1、正数表示获得积分
-     * 2、负数表示消耗积分
-     */
-    private Integer point;
-
-    /**
-     * 变动后的积分
-     */
-    private Integer totalPoint;
-
-    /**
-     * 变动余额
-     * <p>
-     * 1、正数表示获得余额
-     * 2、负数表示消耗余额
-     */
-    private BigDecimal balance;
-    /**
-     * 变动后的余额
-     */
-    private BigDecimal totalBalance;
-
-}

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

@@ -1,153 +0,0 @@
-package com.citu.module.menduner.system.dal.mysql.enterprise;
-
-
-import cn.hutool.core.lang.Assert;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-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.framework.mybatis.core.query.MPJLambdaWrapperX;
-import com.citu.module.menduner.system.controller.admin.enterprise.vo.EnterpriseAccountPageRespVO;
-import com.citu.module.menduner.system.controller.admin.user.vo.UserAccountPageRespVO;
-import com.citu.module.menduner.system.controller.base.enterprise.account.EnterpriseAccountPageReqVO;
-import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseAccountDO;
-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.person.PersonInfoDO;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.math.BigDecimal;
-
-/**
- * 企业账户 Mapper
- *
- * @author Rayson
- */
-@Mapper
-public interface EnterpriseAccountMapper extends BaseMapperX<EnterpriseAccountDO> {
-
-    default PageResult<EnterpriseAccountDO> selectPage(EnterpriseAccountPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<EnterpriseAccountDO>()
-                .eqIfPresent(EnterpriseAccountDO::getEnterpriseId, reqVO.getEnterpriseId())
-                .eqIfPresent(EnterpriseAccountDO::getUserId, reqVO.getUserId())
-                .betweenIfPresent(EnterpriseAccountDO::getCreateTime, reqVO.getCreateTime())
-                .orderByDesc(EnterpriseAccountDO::getId));
-    }
-
-    default PageResult<EnterpriseAccountPageRespVO> page(EnterpriseAccountPageReqVO reqVO) {
-        MPJLambdaWrapperX<EnterpriseAccountDO> query = new MPJLambdaWrapperX<>();
-        query.selectAll(EnterpriseAccountDO.class);
-        query.selectAs(EnterpriseDO::getName, EnterpriseAccountPageRespVO::getEnterpriseName);
-        query.selectAs(EnterpriseDO::getAnotherName, EnterpriseAccountPageRespVO::getAnotherName);
-        query.selectAs(EnterpriseDO::getLogoUrl, EnterpriseAccountPageRespVO::getLogoUrl);
-
-        query.selectAs(EnterpriseUserBindDO::getName, EnterpriseAccountPageRespVO::getUserName);
-        query.selectAs(EnterpriseUserBindDO::getSex, EnterpriseAccountPageRespVO::getSex);
-        query.selectAs(EnterpriseUserBindDO::getAvatar, EnterpriseAccountPageRespVO::getAvatar);
-        query.selectAs(EnterpriseUserBindDO::getPhone, EnterpriseAccountPageRespVO::getPhone);
-        query.selectAs(EnterpriseUserBindDO::getEmail, EnterpriseAccountPageRespVO::getEmail);
-
-        query.innerJoin(EnterpriseDO.class, EnterpriseDO::getId, EnterpriseAccountDO::getEnterpriseId);
-        query.innerJoin(EnterpriseUserBindDO.class, on ->
-                on.eq(EnterpriseUserBindDO::getEnterpriseId, EnterpriseAccountDO::getEnterpriseId)
-                        .eq(EnterpriseUserBindDO::getUserId, EnterpriseAccountDO::getUserId)
-        );
-        query.eqIfPresent(EnterpriseAccountDO::getEnterpriseId, reqVO.getEnterpriseId())
-                .eqIfPresent(EnterpriseAccountDO::getUserId, reqVO.getUserId())
-                .likeIfExists(EnterpriseUserBindDO::getName, reqVO.getUserName())
-                .eqIfExists(EnterpriseUserBindDO::getSex, reqVO.getSex())
-                .likeIfExists(EnterpriseUserBindDO::getPhone, reqVO.getPhone())
-                .likeIfExists(EnterpriseUserBindDO::getEmail, reqVO.getEmail());
-
-        query.betweenIfPresent(EnterpriseAccountDO::getCreateTime, reqVO.getCreateTime())
-                .orderByDesc(EnterpriseAccountDO::getUpdateTime);
-
-
-        return selectJoinPage(reqVO, EnterpriseAccountPageRespVO.class, query);
-    }
-
-    default EnterpriseAccountDO selectByEnterpriseId(Long enterpriseId, Long userId) {
-        return selectOne(new LambdaQueryWrapperX<EnterpriseAccountDO>()
-                .eq(EnterpriseAccountDO::getEnterpriseId, enterpriseId)
-                .eq(EnterpriseAccountDO::getUserId, userId)
-
-        );
-    }
-
-
-    /**
-     * 更新用户积分（增加）
-     *
-     * @param enterpriseId 企业编号
-     * @param userId       用户编号
-     * @param incrCount    增加积分（正数）
-     */
-    default void updatePointIncr(Long enterpriseId, Long userId, Integer incrCount) {
-        Assert.isTrue(incrCount > 0);
-        LambdaUpdateWrapper<EnterpriseAccountDO> lambdaUpdateWrapper = new LambdaUpdateWrapper<EnterpriseAccountDO>()
-                .setSql(" point = point + " + incrCount)
-                .eq(EnterpriseAccountDO::getEnterpriseId, enterpriseId)
-                .eq(EnterpriseAccountDO::getUserId, userId);
-        update(null, lambdaUpdateWrapper);
-    }
-
-    /**
-     * 更新用户积分（减少）
-     *
-     * @param enterpriseId 企业编号
-     * @param userId       用户编号
-     * @param incrCount    增加积分（负数）
-     * @return 更新行数
-     */
-    default int updatePointDecr(Long enterpriseId, Long userId, Integer incrCount) {
-        Assert.isTrue(incrCount < 0);
-        LambdaUpdateWrapper<EnterpriseAccountDO> lambdaUpdateWrapper = new LambdaUpdateWrapper<EnterpriseAccountDO>()
-                .setSql(" point = point + " + incrCount) // 负数，所以使用 + 号
-                .eq(EnterpriseAccountDO::getEnterpriseId, enterpriseId)
-                .eq(EnterpriseAccountDO::getUserId, userId);
-        return update(null, lambdaUpdateWrapper);
-    }
-
-    /**
-     * 更新用户余额（增加）
-     *
-     * @param enterpriseId 企业编号
-     * @param userId       用户编号
-     * @param incrCount    增加余额（正数）
-     */
-    default void updateBalanceIncr(Long enterpriseId, Long userId, BigDecimal incrCount) {
-        Assert.isTrue(incrCount.compareTo(BigDecimal.ZERO) > 0);
-        LambdaUpdateWrapper<EnterpriseAccountDO> lambdaUpdateWrapper = new LambdaUpdateWrapper<EnterpriseAccountDO>()
-                .setSql(" balance = balance + " + incrCount)
-                .eq(EnterpriseAccountDO::getEnterpriseId, enterpriseId)
-                .eq(EnterpriseAccountDO::getUserId, userId);
-        update(null, lambdaUpdateWrapper);
-    }
-
-    /**
-     * 更新用户余额（减少）
-     *
-     * @param enterpriseId 企业编号
-     * @param userId       用户编号
-     * @param incrCount    增加余额（负数）
-     * @return 更新行数
-     */
-    default int updateBalanceDecr(Long enterpriseId, Long userId, BigDecimal incrCount) {
-        Assert.isTrue(incrCount.compareTo(BigDecimal.ZERO) < 0);
-        LambdaUpdateWrapper<EnterpriseAccountDO> lambdaUpdateWrapper = new LambdaUpdateWrapper<EnterpriseAccountDO>()
-                .setSql(" balance = balance + " + incrCount) // 负数，所以使用 + 号
-                .eq(EnterpriseAccountDO::getEnterpriseId, enterpriseId)
-                .eq(EnterpriseAccountDO::getUserId, userId);
-        return update(null, lambdaUpdateWrapper);
-    }
-
-
-    default EnterpriseAccountDO checkBalance(Long enterpriseId, Long userId, BigDecimal balance) {
-        return selectOne(new LambdaQueryWrapper<EnterpriseAccountDO>()
-                .eq(EnterpriseAccountDO::getEnterpriseId, enterpriseId)
-                .eq(EnterpriseAccountDO::getUserId, userId)
-                .gt(EnterpriseAccountDO::getBalance, balance)
-        );
-    }
-}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/record/EnterpriseAccountRecordMapper.java

@@ -1,100 +0,0 @@
-package com.citu.module.menduner.system.dal.mysql.record;
-
-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.menduner.system.controller.appadmin.record.vo.AppAdminAccountRecordPageReqVO;
-import com.citu.module.menduner.system.controller.appadmin.record.vo.AppAdminAccountRecordRespVO;
-import com.citu.module.menduner.system.controller.base.account.record.EnterpriseAccountRecordPageReqVO;
-import com.citu.module.menduner.system.dal.dataobject.record.EnterpriseAccountRecordDO;
-import com.citu.module.menduner.system.enums.account.AccountRecordTypeEnum;
-import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.time.LocalDateTime;
-import java.util.List;
-
-/**
- * 企业账户变动记录 Mapper
- *
- * @author Rayson
- */
-@Mapper
-public interface EnterpriseAccountRecordMapper extends BaseMapperX<EnterpriseAccountRecordDO> {
-
-    default PageResult<EnterpriseAccountRecordDO> selectPage(EnterpriseAccountRecordPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<EnterpriseAccountRecordDO>()
-                .eqIfPresent(EnterpriseAccountRecordDO::getEnterpriseId, reqVO.getEnterpriseId())
-                .eqIfPresent(EnterpriseAccountRecordDO::getUserId, reqVO.getUserId())
-                .eqIfPresent(EnterpriseAccountRecordDO::getType, reqVO.getType())
-                .eqIfPresent(EnterpriseAccountRecordDO::getBizType, reqVO.getBizType())
-                .likeIfPresent(EnterpriseAccountRecordDO::getTitle, reqVO.getTitle())
-                .orderByDesc(EnterpriseAccountRecordDO::getCreateTime));
-    }
-
-    /**
-     * 获取一定时间范围内的企业积分记录
-     *
-     * @param enterpriseId 企业id
-     * @param userId       用户id
-     * @param startDate    开始时间
-     * @param endDate      结束时间
-     * @return List<EnterpriseAccountRecordDO>
-     **/
-    default List<EnterpriseAccountRecordDO> getEnterprisePointList(
-            Long enterpriseId,
-            Long userId,
-            LocalDateTime startDate,
-            LocalDateTime endDate) {
-        LambdaQueryWrapperX<EnterpriseAccountRecordDO> wrapperX = new LambdaQueryWrapperX<EnterpriseAccountRecordDO>();
-        wrapperX.eq(EnterpriseAccountRecordDO::getEnterpriseId, enterpriseId);
-        wrapperX.eq(EnterpriseAccountRecordDO::getUserId, userId);
-        wrapperX.eq(EnterpriseAccountRecordDO::getType, AccountRecordTypeEnum.POINT.getType());
-        if (null != startDate) {
-            wrapperX.ge(EnterpriseAccountRecordDO::getCreateTime, startDate);
-        }
-
-        if (null != endDate) {
-            wrapperX.le(EnterpriseAccountRecordDO::getCreateTime, endDate);
-        }
-
-        return selectList(wrapperX);
-    }
-
-    default Integer sumPoint(Long enterpriseId,
-                             Long userId,
-                             LocalDateTime startDate,
-                             LocalDateTime endDate) {
-        MPJLambdaWrapper<EnterpriseAccountRecordDO> wrapperX = new MPJLambdaWrapper<EnterpriseAccountRecordDO>();
-        wrapperX.selectSum(EnterpriseAccountRecordDO::getPoint);
-        wrapperX.eq(EnterpriseAccountRecordDO::getEnterpriseId, enterpriseId);
-        wrapperX.eq(EnterpriseAccountRecordDO::getUserId, userId);
-        wrapperX.eq(EnterpriseAccountRecordDO::getType, AccountRecordTypeEnum.POINT.getType());
-        if (null != startDate) {
-            wrapperX.ge(EnterpriseAccountRecordDO::getCreateTime, startDate);
-        }
-
-        if (null != endDate) {
-            wrapperX.le(EnterpriseAccountRecordDO::getCreateTime, endDate);
-        }
-
-        return selectJoinOne(Integer.class, wrapperX);
-    }
-
-
-    default PageResult<AppAdminAccountRecordRespVO> page
-            (AppAdminAccountRecordPageReqVO reqVO,
-             Long enterpriseId,
-             Long userId) {
-        MPJLambdaWrapper<EnterpriseAccountRecordDO> query = new MPJLambdaWrapper<>();
-        query.selectAll(EnterpriseAccountRecordDO.class);
-        query.eqIfExists(EnterpriseAccountRecordDO::getType, reqVO.getType());
-        query.eqIfExists(EnterpriseAccountRecordDO::getBizType, reqVO.getBizType());
-        query.likeIfExists(EnterpriseAccountRecordDO::getTitle, reqVO.getTitle());
-        query.eq(EnterpriseAccountRecordDO::getEnterpriseId, enterpriseId);
-        query.eq(EnterpriseAccountRecordDO::getUserId, userId);
-        query.orderByDesc(EnterpriseAccountRecordDO::getUpdateTime);
-        return selectJoinPage(reqVO, AppAdminAccountRecordRespVO.class, query);
-    }
-
-}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/user/UserAccountMapper.java

@@ -9,7 +9,6 @@ import com.citu.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.citu.framework.mybatis.core.query.MPJLambdaWrapperX;
 import com.citu.module.menduner.system.controller.admin.user.vo.UserAccountPageRespVO;
 import com.citu.module.menduner.system.controller.base.user.account.UserAccountPageReqVO;
-import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseAccountDO;
 import com.citu.module.menduner.system.dal.dataobject.person.PersonInfoDO;
 import com.citu.module.menduner.system.dal.dataobject.user.UserAccountDO;
 import org.apache.ibatis.annotations.Mapper;

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

@@ -1,82 +0,0 @@
-package com.citu.module.menduner.system.service.enterprise.account;
-
-import com.citu.framework.common.pojo.PageResult;
-import com.citu.module.menduner.system.controller.admin.enterprise.vo.EnterpriseAccountPageRespVO;
-import com.citu.module.menduner.system.controller.base.enterprise.account.EnterpriseAccountPageReqVO;
-import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseAccountDO;
-
-import java.math.BigDecimal;
-
-/**
- * 企业账户 Service 接口
- *
- * @author Rayson
- */
-public interface EnterpriseAccountService {
-
-    /**
-     * 获得企业账户分页
-     *
-     * @param pageReqVO 分页查询
-     * @return 企业账户分页
-     */
-    PageResult<EnterpriseAccountDO> page(EnterpriseAccountPageReqVO pageReqVO);
-
-    /**
-     * 获得企业账户分页
-     *
-     * @param pageReqVO 分页查询
-     * @return 企业账户分页
-     */
-    PageResult<EnterpriseAccountPageRespVO> page2(EnterpriseAccountPageReqVO pageReqVO);
-
-    /**
-     * 更新用户的积分
-     *
-     * @param enterpriseId 企业编号
-     * @param userId       用户编号
-     * @param point        积分数量
-     * @return 更新结果
-     */
-    boolean updatePoint(Long enterpriseId, Long userId, Integer point);
-
-    /**
-     * 更新企业的余额
-     *
-     * @param enterpriseId 企业编号
-     * @param userId       用户编号
-     * @param balance      余额数量
-     * @return 更新结果
-     */
-    boolean updateBalance(Long enterpriseId, Long userId, BigDecimal balance);
-
-    /**
-     * 如果企业账户不存在，则创建
-     *
-     * @param enterpriseId 企业编号
-     * @param userId       用户编号
-     * @return 账户对象
-     */
-    EnterpriseAccountDO createEnterpriseAccountIfAbsent(Long enterpriseId, Long userId);
-
-    /**
-     * 效验额度是否充足
-     *
-     * @param enterpriseId 企业编号
-     * @param userId       用户编号
-     * @param balance      余额
-     * @return 是否充足 ,false 不足| true 足够
-     **/
-    boolean checkBalance(Long enterpriseId, Long userId, BigDecimal balance);
-
-
-    // ========== 招聘端 ==========
-
-    /**
-     * 获取企业账户信息
-     *
-     * @return 账户对象
-     */
-    EnterpriseAccountDO get();
-
-}

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

@@ -1,102 +0,0 @@
-package com.citu.module.menduner.system.service.enterprise.account;
-
-import com.baomidou.dynamic.datasource.annotation.DSTransactional;
-import com.citu.framework.common.pojo.PageResult;
-import com.citu.framework.security.core.LoginUser;
-import com.citu.module.menduner.common.util.LoginUserContext;
-import com.citu.module.menduner.system.controller.admin.enterprise.vo.EnterpriseAccountPageRespVO;
-import com.citu.module.menduner.system.controller.base.enterprise.account.EnterpriseAccountPageReqVO;
-import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseAccountDO;
-import com.citu.module.menduner.system.dal.mysql.enterprise.EnterpriseAccountMapper;
-import org.springframework.stereotype.Service;
-import org.springframework.validation.annotation.Validated;
-
-import javax.annotation.Resource;
-import java.math.BigDecimal;
-
-/**
- * 企业账户 Service 实现类
- *
- * @author Rayson
- */
-@Service
-@Validated
-public class EnterpriseAccountServiceImpl implements EnterpriseAccountService {
-
-    @Resource
-    private EnterpriseAccountMapper enterpriseAccountMapper;
-
-    @Override
-    public PageResult<EnterpriseAccountDO> page(EnterpriseAccountPageReqVO pageReqVO) {
-        return enterpriseAccountMapper.selectPage(pageReqVO);
-    }
-
-    @Override
-    public PageResult<EnterpriseAccountPageRespVO> page2(EnterpriseAccountPageReqVO pageReqVO) {
-        return enterpriseAccountMapper.page(pageReqVO);
-    }
-
-
-    @Override
-    public boolean updatePoint(Long enterpriseId, Long userId, Integer point) {
-        if (point > 0) {
-            enterpriseAccountMapper.updatePointIncr(enterpriseId, userId, point);
-        } else if (point < 0) {
-            return enterpriseAccountMapper.updatePointDecr(enterpriseId, userId, point) > 0;
-        }
-        return true;
-    }
-
-    @Override
-    public boolean updateBalance(Long enterpriseId, Long userId, BigDecimal balance) {
-        if (balance.compareTo(BigDecimal.ZERO) > 0) {
-            // 当余额为正数时，增加余额
-            enterpriseAccountMapper.updateBalanceIncr(enterpriseId, userId, balance);
-        } else if (balance.compareTo(BigDecimal.ZERO) < 0) {
-            // 当余额为负数时，减少余额
-            return enterpriseAccountMapper.updateBalanceDecr(enterpriseId, userId, balance) > 0;
-
-        }
-        return true;
-    }
-
-    @Override
-    @DSTransactional
-    public EnterpriseAccountDO createEnterpriseAccountIfAbsent(Long enterpriseId, Long userId) {
-        EnterpriseAccountDO accountDO = enterpriseAccountMapper.selectByEnterpriseId(enterpriseId, userId);
-        if (null != accountDO) {
-            return accountDO;
-        }
-        EnterpriseAccountDO entity = EnterpriseAccountDO.builder()
-                .enterpriseId(enterpriseId)
-                .userId(userId).balance(BigDecimal.ZERO).point(0).build();
-        enterpriseAccountMapper.insert(entity);
-        return entity;
-    }
-
-    @Override
-    public EnterpriseAccountDO get() {
-        LoginUser loginUser = LoginUserContext.get();
-        return createEnterpriseAccountIfAbsent(
-                LoginUserContext.getEnterpriseId(loginUser),
-                LoginUserContext.getUserId(loginUser)
-        );
-    }
-
-    @Override
-    public boolean checkBalance(Long enterpriseId, Long userId, BigDecimal balance) {
-        EnterpriseAccountDO accountDO = enterpriseAccountMapper.checkBalance(enterpriseId,
-                userId,
-                balance);
-        if (null != accountDO) {
-            return false;
-        }
-        if (null == accountDO.getBalance()) {
-            return false;
-        }
-        // 判断  accountDO.getBalance() 是否大于等于balance
-        return accountDO.getBalance().compareTo(balance) >= 0;
-    }
-
-
-}

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

@@ -27,7 +27,6 @@ import com.citu.module.menduner.system.enums.interview.InterviewInviteStatusEnum
 import com.citu.module.menduner.system.service.enterprise.bind.EnterpriseUserBindService;
 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.EnterpriseAccountRecordService;
 import com.citu.module.menduner.system.service.record.UserAccountRecordService;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
@@ -35,7 +34,6 @@ import org.springframework.validation.annotation.Validated;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.util.Collections;
 import java.util.List;
 
 import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -62,13 +60,9 @@ public class InterviewInviteServiceImpl implements InterviewInviteService {
     @Resource
     private JobCvRelService jobCvRelService;
 
-
     @Resource
     private UserAccountRecordService userAccountRecordService;
 
-    @Resource
-    private EnterpriseAccountRecordService enterpriseAccountRecordService;
-
     @Resource
     private JobAdvertisedMapper jobAdvertisedMapper;
 
@@ -330,8 +324,7 @@ public class InterviewInviteServiceImpl implements InterviewInviteService {
 
         // 猎头 （平台自己）
         if (headhuntPrice.compareTo(BigDecimal.ZERO) > 0) {
-            enterpriseAccountRecordService.createBalanceRecord(
-                    1L,
+            userAccountRecordService.createBalanceRecord(
                     1L,
                     BalanceBizTypeEnum.PLATFORM_COMMISSION.getName(),
                     MathOperationEnum.ADD,
@@ -343,8 +336,7 @@ public class InterviewInviteServiceImpl implements InterviewInviteService {
 
         // 如果推荐人ID为空，则将推荐人的佣金也给到猎头
         if (null == cv.getRecommendUserId()) {
-            enterpriseAccountRecordService.createBalanceRecord(
-                    1L,
+            userAccountRecordService.createBalanceRecord(
                     1L,
                     BalanceBizTypeEnum.NOT_RECOMMENDED.getName(),
                     MathOperationEnum.ADD,
@@ -409,9 +401,9 @@ public class InterviewInviteServiceImpl implements InterviewInviteService {
 
         // 猎头 （平台自己）
         if (headhuntPoint > 0) {
-            enterpriseAccountRecordService.createPointRecord(
-                    1L,
+            userAccountRecordService.createPointRecord(
                     1L,
+                    "",
                     PointBizTypeEnum.PLATFORM_COMMISSION.getName(),
                     MathOperationEnum.ADD,
                     headhuntPoint,
@@ -422,9 +414,9 @@ public class InterviewInviteServiceImpl implements InterviewInviteService {
 
         // 如果推荐人ID为空，则将推荐人的佣金也给到猎头
         if (null == cv.getRecommendUserId()) {
-            enterpriseAccountRecordService.createPointRecord(
-                    1L,
+            userAccountRecordService.createPointRecord(
                     1L,
+                    "",
                     PointBizTypeEnum.NOT_RECOMMENDED.getName(),
                     MathOperationEnum.ADD,
                     recommendPoint,

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

@@ -23,11 +23,5 @@ public interface HireJobIntegrationService {
      **/
     PageResult<AppAdminHireJobCvRelRespVO> page(AppAdminHireJobCvRelPageReqVO reqVO);
 
-    /**
-     * 结算
-     *
-     * @param id 投递简历id
-     */
-    boolean settlement(Long id);
 
 }

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

@@ -9,13 +9,11 @@ import com.citu.module.menduner.system.dal.dataobject.interview.InterviewInviteD
 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.mysql.job.JobAdvertisedMapper;
-import com.citu.module.menduner.system.dal.mysql.job.JobCvRelMapper;
 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.hire.HireCommissionRatioService;
 import com.citu.module.menduner.system.service.interview.InterviewInviteService;
-import com.citu.module.menduner.system.service.record.EnterpriseAccountRecordService;
 import com.citu.module.menduner.system.service.record.UserAccountRecordService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -26,7 +24,6 @@ import java.math.BigDecimal;
 import java.math.RoundingMode;
 
 import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.citu.module.menduner.system.enums.ErrorCodeConstants.HIRE_JOB_CV_REL_NOT_EXISTS;
 
 @Slf4j
 @Service
@@ -48,169 +45,10 @@ public class HireJobIntegrationServiceImpl implements HireJobIntegrationService
     @Resource
     private UserAccountRecordService userAccountRecordService;
 
-    @Resource
-    private EnterpriseAccountRecordService enterpriseAccountRecordService;
-
 
     @Override
     public PageResult<AppAdminHireJobCvRelRespVO> page(AppAdminHireJobCvRelPageReqVO reqVO) {
         return jobCvRelService.page(reqVO);
     }
 
-    @Override
-    @DSTransactional
-    public boolean settlement(Long id) {
-
-        InterviewInviteDO interviewInvite = interviewInviteService.getInterviewInvite(id);
-
-        // 标记结算
-        interviewInviteService.settlement(id);
-
-        // 获取 面试的求职者投递的简历信息
-        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);
-        }
-
-        if (null != job.getHirePoint()) {
-            // 积分结算
-            pointSettlement(job, ratio, cv);
-        }
-        return true;
-    }
-
-    /**
-     * 余额结算
-     *
-     * @param job   职位信息
-     * @param ratio 佣金比例
-     * @param cv    投递信息
-     **/
-    public void priceSettlement(JobAdvertisedDO job, HireCommissionRatioDO ratio, JobCvRelDO cv) {
-        BigDecimal hirePrice = job.getHirePrice();
-        // 总比例
-        BigDecimal totalRate = BigDecimal.valueOf(100);
-        // 猎头佣金
-        BigDecimal headhuntPrice = hirePrice.multiply(ratio.getHeadhuntRate())
-                .divide(totalRate, 2, RoundingMode.HALF_UP);
-        // 推荐人佣金
-        BigDecimal recommendPrice = hirePrice.multiply(ratio.getRecommendRate())
-                .divide(totalRate, 2, RoundingMode.HALF_UP);
-        // 投递人佣金
-        BigDecimal cvPrice = hirePrice.multiply(ratio.getCvRate())
-                .divide(totalRate, 2, RoundingMode.HALF_UP);
-
-        // 猎头 （平台自己）
-        if (headhuntPrice.compareTo(BigDecimal.ZERO) > 0) {
-            enterpriseAccountRecordService.createBalanceRecord(
-                    1L,
-                    1L,
-                    BalanceBizTypeEnum.PLATFORM_COMMISSION.getName(),
-                    MathOperationEnum.ADD,
-                    headhuntPrice,
-                    BalanceBizTypeEnum.PLATFORM_COMMISSION,
-                    String.valueOf(job.getId())
-            );
-        }
-
-        // 推荐人
-        if (headhuntPrice.compareTo(BigDecimal.ZERO) > 0) {
-            userAccountRecordService.createBalanceRecord(
-                    cv.getRecommendUserId(),
-                    BalanceBizTypeEnum.RECOMMENDED_POSITIONS.getName(),
-                    MathOperationEnum.ADD,
-                    recommendPrice,
-                    BalanceBizTypeEnum.RECOMMENDED_POSITIONS,
-                    String.valueOf(job.getId())
-            );
-        }
-
-        // 投递人
-        if (headhuntPrice.compareTo(BigDecimal.ZERO) > 0) {
-            userAccountRecordService.createBalanceRecord(
-                    cv.getUserId(),
-                    BalanceBizTypeEnum.DELIVERY_PERSON.getName(),
-                    MathOperationEnum.ADD,
-                    cvPrice,
-                    BalanceBizTypeEnum.DELIVERY_PERSON,
-                    String.valueOf(job.getId())
-            );
-        }
-    }
-
-    /**
-     * 积分结算
-     *
-     * @param job   职位信息
-     * @param ratio 佣金比例
-     * @param cv    投递信息
-     **/
-    public void pointSettlement(JobAdvertisedDO job, HireCommissionRatioDO ratio, JobCvRelDO cv) {
-        Integer hirePoint = job.getHirePoint();
-        int totalRate = 100; // 总比例
-
-        // 猎头佣金
-        int headhuntPoint = (int) (hirePoint * ratio.getHeadhuntRate().intValue() / (long) totalRate);
-
-        // 推荐人佣金
-        int recommendPoint = (int) (hirePoint * ratio.getRecommendRate().intValue() / (long) totalRate);
-
-        // 投递人佣金
-        int cvPoint = (int) (hirePoint * ratio.getCvRate().intValue() / (long) totalRate);
-
-        // 由于比例之和可能不等于100%，剩余的点数可能需要进行分配或处理
-        int remainingPoint = hirePoint - (headhuntPoint + recommendPoint + cvPoint);
-
-        // 这里你可以选择将剩余点数分配给任意一方，或者按照比例再次分配
-        // 将剩余点数全部分配给猎头
-        headhuntPoint += remainingPoint;
-
-        // 猎头 （平台自己）
-        if (headhuntPoint > 0) {
-            enterpriseAccountRecordService.createPointRecord(
-                    1L,
-                    1L,
-                    PointBizTypeEnum.PLATFORM_COMMISSION.getName(),
-                    MathOperationEnum.ADD,
-                    headhuntPoint,
-                    PointBizTypeEnum.PLATFORM_COMMISSION,
-                    String.valueOf(job.getId())
-            );
-        }
-
-        // 推荐人
-        if (headhuntPoint > 0) {
-            userAccountRecordService.createPointRecord(
-                    cv.getRecommendUserId(),
-                    "",
-                    PointBizTypeEnum.RECOMMENDED_POSITIONS.getName(),
-                    MathOperationEnum.ADD,
-                    recommendPoint,
-                    PointBizTypeEnum.RECOMMENDED_POSITIONS,
-                    String.valueOf(job.getId())
-            );
-        }
-
-        // 投递人
-        if (headhuntPoint > 0) {
-            userAccountRecordService.createPointRecord(
-                    cv.getUserId(),
-                    "",
-                    PointBizTypeEnum.DELIVERY_PERSON.getName(),
-                    MathOperationEnum.ADD,
-                    cvPoint,
-                    PointBizTypeEnum.DELIVERY_PERSON,
-                    String.valueOf(job.getId())
-            );
-        }
-    }
 }

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

@@ -31,7 +31,7 @@ import com.citu.module.menduner.system.enums.account.PointBizTypeEnum;
 import com.citu.module.menduner.system.mq.producer.ESProducer;
 import com.citu.module.menduner.system.service.enterprise.EnterpriseService;
 import com.citu.module.menduner.system.service.enterprise.bind.EnterpriseUserBindService;
-import com.citu.module.menduner.system.service.record.EnterpriseAccountRecordService;
+import com.citu.module.menduner.system.service.record.UserAccountRecordService;
 import com.citu.module.menduner.system.util.ESOperateEnum;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -70,7 +70,7 @@ public class JobAdvertisedServiceImpl implements JobAdvertisedService {
     private EnterpriseUserBindService userBindService;
 
     @Resource
-    private EnterpriseAccountRecordService accountRecordService;
+    private UserAccountRecordService accountRecordService;
 
     @Resource
     private ESProducer esProducer;
@@ -130,7 +130,7 @@ public class JobAdvertisedServiceImpl implements JobAdvertisedService {
         if (null == userId) {
             // 未登录
             PageResult<AppJobAdvertisedHomeRespVO> result = jobAdvertisedMapper.selectPage(pageReqVO);
-            if(CollUtil.isEmpty(result.getList())) {
+            if (CollUtil.isEmpty(result.getList())) {
                 // 没有数据, 再算一遍
                 pageReqVO.setTop(null);
                 return jobAdvertisedMapper.selectPage(pageReqVO);
@@ -139,7 +139,7 @@ public class JobAdvertisedServiceImpl implements JobAdvertisedService {
 
         // 基于求职意向计算
         List<JobInterestedDO> interestList = jobInterestedMapper.selectByUserIdList(userId);
-        if(CollUtil.isEmpty(interestList)) {
+        if (CollUtil.isEmpty(interestList)) {
             return jobAdvertisedMapper.selectPage(pageReqVO);
         }
         // 感兴趣的职位
@@ -405,7 +405,7 @@ public class JobAdvertisedServiceImpl implements JobAdvertisedService {
 //            }
             // TODO 暂时不给改，不清楚逻辑
             if (null != reqVO.getHirePrice()) {
-                if (entity.getHirePrice().compareTo(reqVO.getHirePrice())!=0) {
+                if (entity.getHirePrice().compareTo(reqVO.getHirePrice()) != 0) {
                     throw exception(MDE_JOB_ADVERTISED_BALANCE_UPDATE);
                 }
             }
@@ -517,7 +517,6 @@ public class JobAdvertisedServiceImpl implements JobAdvertisedService {
             if (null != job.getHirePrice()) {
                 // 创建记录 并扣除余额
                 accountRecordService.createBalanceRecord(
-                        enterpriseId,
                         userId,
                         BalanceBizTypeEnum.PUBLISH.getName(),
                         MathOperationEnum.SUBTRACT,
@@ -528,8 +527,8 @@ public class JobAdvertisedServiceImpl implements JobAdvertisedService {
             if (null != job.getHirePoint()) {
                 // 创建记录 并扣除积分
                 accountRecordService.createPointRecord(
-                        enterpriseId,
                         userId,
+                        "",
                         PointBizTypeEnum.PUBLISH.getName(),
                         MathOperationEnum.SUBTRACT,
                         job.getHirePoint(),

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

@@ -1,103 +0,0 @@
-package com.citu.module.menduner.system.service.record;
-
-import com.citu.framework.common.pojo.PageParam;
-import com.citu.framework.common.pojo.PageResult;
-import com.citu.module.menduner.system.controller.appadmin.record.vo.AppAdminAccountRecordPageReqVO;
-import com.citu.module.menduner.system.controller.appadmin.record.vo.AppAdminAccountRecordRespVO;
-import com.citu.module.menduner.system.controller.base.account.record.EnterpriseAccountRecordPageReqVO;
-import com.citu.module.menduner.system.dal.dataobject.record.EnterpriseAccountRecordDO;
-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;
-
-
-/**
- * 企业账户变动记录 Service 接口
- *
- * @author Rayson
- */
-public interface EnterpriseAccountRecordService {
-
-    /**
-     * 【管理员】获得积分记录分页
-     *
-     * @param pageReqVO 分页查询
-     * @return 签到记录分页
-     */
-    PageResult<EnterpriseAccountRecordDO> page(
-            EnterpriseAccountRecordPageReqVO pageReqVO);
-
-
-    /**
-     * 创建企业账户变动记录
-     *
-     * @param enterpriseId 企业id
-     * @param userId       用户id
-     * @param title        规则标题
-     * @param operation    操作
-     * @param point        变动积分
-     * @param bizType      业务类型
-     * @param bizId        业务编号
-     */
-    void createPointRecord(
-            Long enterpriseId,
-            Long userId,
-            String title,
-            MathOperationEnum operation,
-            Integer point,
-            PointBizTypeEnum bizType,
-            String bizId);
-
-    /**
-     * 创建企业账户变动记录
-     *
-     * @param enterpriseId 企业id
-     * @param userId       用户id
-     * @param title        规则标题
-     * @param operation    操作
-     * @param balance      变动余额
-     * @param bizType      业务类型
-     * @param bizId        业务编号
-     */
-    void createBalanceRecord(
-            Long enterpriseId,
-            Long userId,
-            String title,
-            MathOperationEnum operation,
-            BigDecimal balance,
-            BalanceBizTypeEnum bizType,
-            String bizId);
-
-
-    /**
-     * 获取一段时间内的企业账户积分变动获得的数量
-     *
-     * @param enterpriseId 企业id
-     * @param userId       用户id
-     * @param url          事件地址
-     * @param startDate    开始时间
-     * @param endDate      结束时间
-     * @return Integer
-     * @author Rayson
-     * @date 2024/6/28 上午10:06
-     **/
-    Integer getPointCount(Long enterpriseId,
-                          Long userId,
-                          String url,
-                          LocalDateTime startDate,
-                          LocalDateTime endDate
-    );
-
-    // ========== 招聘端 ==========
-
-    /**
-     * 分页获取当前企业账户余额变动记录
-     *
-     * @param reqVO reqVO 查询参数
-     * @return PageResult<PointRecordDO>
-     **/
-    PageResult<AppAdminAccountRecordRespVO> page(AppAdminAccountRecordPageReqVO reqVO);
-}

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

@@ -1,188 +0,0 @@
-package com.citu.module.menduner.system.service.record;
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.dynamic.datasource.annotation.DSTransactional;
-import com.citu.framework.common.exception.util.ServiceExceptionUtil;
-import com.citu.framework.common.pojo.PageResult;
-import com.citu.framework.security.core.LoginUser;
-import com.citu.module.menduner.common.util.LoginUserContext;
-import com.citu.module.menduner.system.controller.appadmin.record.vo.AppAdminAccountRecordPageReqVO;
-import com.citu.module.menduner.system.controller.appadmin.record.vo.AppAdminAccountRecordRespVO;
-import com.citu.module.menduner.system.controller.base.account.record.EnterpriseAccountRecordPageReqVO;
-import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseAccountDO;
-import com.citu.module.menduner.system.dal.dataobject.record.EnterpriseAccountRecordDO;
-import com.citu.module.menduner.system.dal.mysql.record.EnterpriseAccountRecordMapper;
-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.enterprise.account.EnterpriseAccountService;
-import lombok.extern.slf4j.Slf4j;
-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;
-
-/**
- * 企业账户变动 Service 实现类
- *
- * @author Rayson
- */
-@Slf4j
-@Service
-@Validated
-public class EnterpriseAccountRecordServiceImpl implements EnterpriseAccountRecordService {
-
-    @Resource
-    private EnterpriseAccountRecordMapper mapper;
-
-    @Resource
-    private EnterpriseAccountService enterpriseAccountService;
-
-    @Override
-    public PageResult<EnterpriseAccountRecordDO> page(EnterpriseAccountRecordPageReqVO pageReqVO) {
-        return mapper.selectPage(pageReqVO);
-    }
-
-    @Override
-    @DSTransactional
-    public void createPointRecord(Long enterpriseId,
-                                  Long userId,
-                                  String title,
-                                  MathOperationEnum operation,
-                                  Integer point,
-                                  PointBizTypeEnum bizType,
-                                  String bizId) {
-        if (0 == point) {
-            return;
-        }
-        // 1. 校验用户积分余额
-        EnterpriseAccountDO enterpriseAccount = enterpriseAccountService
-                .createEnterpriseAccountIfAbsent(enterpriseId, userId);
-        Integer userPoint = ObjectUtil.defaultIfNull(enterpriseAccount.getPoint(), 0);
-        int totalPoint = userPoint + point; // 用户变动后的积分
-        if (totalPoint < 0) {
-            throw ServiceExceptionUtil.exception(USER_POINT_NOT_ENOUGH);
-        }
-
-        if (MathOperationEnum.SUBTRACT.equals(operation)) {
-            if (userPoint - point < 0) {
-                throw ServiceExceptionUtil.exception(USER_POINT_NOT_ENOUGH);
-            }
-            totalPoint = userPoint - point;
-            // 减法
-            point = -Math.abs(point);
-
-        }
-
-        // 2. 更新用户积分
-        boolean success = enterpriseAccountService.updatePoint(enterpriseId, userId, point);
-        if (!success) {
-            throw ServiceExceptionUtil.exception(USER_POINT_NOT_ENOUGH);
-        }
-
-        // 3. 增加用户账户变动
-        EnterpriseAccountRecordDO record = new EnterpriseAccountRecordDO()
-                .setEnterpriseId(enterpriseId)
-                .setUserId(userId)
-                .setType(AccountRecordTypeEnum.POINT.getType())
-                .setBizId(bizId)
-                .setBizType(bizType.getType())
-                .setTitle(bizType.getName())
-                .setOperation(operation.getOperator())
-                .setDescription(StrUtil.format(bizType.getDescription(), point))
-                .setPoint(point).setTotalPoint(totalPoint);
-
-        if (PointBizTypeEnum.EVENT.equals(bizType)) {
-            if (MathOperationEnum.SUBTRACT.equals(operation)) {
-                record.setDescription(StrUtil.format(bizType.getDescription(), title, point));
-            } else {
-                record.setDescription(StrUtil.format(bizType.getDescription(), title, operation.getOperator(), point));
-            }
-        }
-        mapper.insert(record);
-    }
-
-    @Override
-    @DSTransactional
-    public void createBalanceRecord(Long enterpriseId,
-                                    Long userId,
-                                    String title,
-                                    MathOperationEnum operation,
-                                    BigDecimal balance,
-                                    BalanceBizTypeEnum bizType,
-                                    String bizId) {
-        if (0 == balance.compareTo(BigDecimal.ZERO)) {
-            return;
-        }
-
-        // 1. 校验用户余额
-        EnterpriseAccountDO enterpriseAccount = enterpriseAccountService.
-                createEnterpriseAccountIfAbsent(enterpriseId, userId);
-
-        BigDecimal userBalance = ObjectUtil.defaultIfNull(enterpriseAccount.getBalance(), BigDecimal.ZERO);
-        BigDecimal totalBalance = userBalance.add(balance);
-
-        if (totalBalance.compareTo(BigDecimal.ZERO) < 0) {
-            throw ServiceExceptionUtil.exception(USER_BALANCE_NOT_ENOUGH);
-        }
-
-        if (MathOperationEnum.SUBTRACT.equals(operation)) {
-            if (userBalance.subtract(balance).compareTo(BigDecimal.ZERO) < 0) {
-                throw ServiceExceptionUtil.exception(USER_BALANCE_NOT_ENOUGH);
-            }
-            totalBalance = userBalance.subtract(balance);
-            balance = balance.negate();
-            // 标记操作为减少
-            operation = MathOperationEnum.SUBTRACT;
-        }
-
-        // 2. 更新用户余额
-        boolean success = enterpriseAccountService.updateBalance(enterpriseId, userId, balance);
-        if (!success) {
-            throw ServiceExceptionUtil.exception(USER_BALANCE_NOT_ENOUGH);
-        }
-
-        // 3. 增加用户账户变动
-        EnterpriseAccountRecordDO record = new EnterpriseAccountRecordDO()
-                .setEnterpriseId(enterpriseId)
-                .setUserId(userId)
-                .setType(AccountRecordTypeEnum.BALANCE.getType())
-                .setBizId(bizId)
-                .setBizType(bizType.getType())
-                .setTitle(bizType.getName())
-                .setOperation(operation.getOperator())
-                .setDescription(StrUtil.format(bizType.getDescription(), balance))
-                .setBalance(balance)
-                .setTotalBalance(totalBalance);
-
-        mapper.insert(record);
-    }
-
-    @Override
-    public Integer getPointCount(Long enterpriseId,
-                                 Long userId,
-                                 String url,
-                                 LocalDateTime startDate,
-                                 LocalDateTime endDate) {
-        Integer pointCount = mapper.sumPoint(enterpriseId, userId, startDate, endDate);
-        if (null == pointCount) {
-            return 0;
-        }
-        return pointCount;
-    }
-
-    @Override
-    public PageResult<AppAdminAccountRecordRespVO> page(AppAdminAccountRecordPageReqVO reqVO) {
-        LoginUser loginUser = LoginUserContext.get();
-        return mapper.page(reqVO,
-                LoginUserContext.getEnterpriseId(loginUser),
-                LoginUserContext.getUserId(loginUser));
-    }
-}