Merge remote-tracking branch 'origin/main'

weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/finance/controller/FinanceBillController.java

@@ -0,0 +1,98 @@
+package com.wjbl.weightlosscamp.service.api.module.finance.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.wjbl.weightlosscamp.api.base.core.ApiResult;
+import com.wjbl.weightlosscamp.api.base.core.IdParam;
+import com.wjbl.weightlosscamp.api.base.core.PageParam;
+import com.wjbl.weightlosscamp.service.api.module.finance.dto.FinanceBillDTO;
+import com.wjbl.weightlosscamp.service.api.module.finance.service.FinanceBillService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 账单信息控制器
+ */
+@Tag(name = "账单信息")
+@RestController
+@RequestMapping("finance-bill")
+@RequiredArgsConstructor
+@Slf4j
+public class FinanceBillController {
+
+    private FinanceBillService financeBillService;
+
+    @Operation(summary = "新增账单")
+    @PostMapping("/add")
+    public ApiResult<Void> add(@Valid @RequestBody FinanceBillDTO dto) {
+        return financeBillService.add(dto);
+    }
+
+    @Operation(summary = "修改账单")
+    @PostMapping("/edit")
+    public ApiResult<Void> edit(@Valid @RequestBody FinanceBillDTO dto) {
+        return financeBillService.edit(dto);
+    }
+
+    @Operation(summary = "作废账单")
+    @PostMapping("/cancel")
+    public ApiResult<Void> cancel(@Valid @RequestBody IdParam param) {
+        return financeBillService.cancel(param);
+    }
+
+    @Operation(summary = "获取账单详情")
+    @PostMapping("/detail")
+    public ApiResult<FinanceBillDTO> detail(@Valid @RequestBody IdParam param) {
+        return financeBillService.detail(param);
+    }
+
+    @Operation(summary = "分页查询账单")
+    @PostMapping("/list")
+    public ApiResult<Page<FinanceBillDTO>> list(@Valid @RequestBody PageParam<FinanceBillDTO> param) {
+        return financeBillService.list(param);
+    }
+
+
+    @Operation(summary = "账单备注新增")
+    @PostMapping("remark/add")
+    public ApiResult<Void> addRemark(@Valid @RequestBody IdParam param) {
+        return financeBillService.addRemark(param);
+    }
+
+    @Operation(summary = "账单备注列表")
+    @PostMapping("remark/list")
+    public ApiResult<Void> listRemark(@Valid @RequestBody IdParam param) {
+        return financeBillService.listRemark(param);
+    }
+
+    @Operation(summary = "账单核销")
+    @PostMapping("write-off")
+    public ApiResult<Void> writeOff(@Valid @RequestBody IdParam param) {
+        return financeBillService.writeOff(param);
+    }
+
+    @Operation(summary = "账单取消核销")
+    @PostMapping("write-off/cancel")
+    public ApiResult<Void> cancelWriteOff(@Valid @RequestBody IdParam param) {
+        return financeBillService.cancelWriteOff(param);
+    }
+
+    @Operation(summary = "账单发起支付")
+    @PostMapping("pay")
+    public ApiResult<Void> pay(@Valid @RequestBody IdParam param) {
+        return financeBillService.pay(param);
+    }
+    @Operation(summary = "账单支付回调")
+    @PostMapping("pay/callback")
+    public ApiResult<Void> payCallback(@Valid @RequestBody IdParam param) {
+        return financeBillService.payCallback(param);
+    }
+
+
+}

weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/finance/controller/FinanceFlowController.java

@@ -0,0 +1,53 @@
+package com.wjbl.weightlosscamp.service.api.module.finance.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.wjbl.weightlosscamp.api.base.core.ApiResult;
+import com.wjbl.weightlosscamp.api.base.core.IdParam;
+import com.wjbl.weightlosscamp.api.base.core.PageParam;
+import com.wjbl.weightlosscamp.service.api.module.finance.dto.FinanceBillDTO;
+import com.wjbl.weightlosscamp.service.api.module.finance.dto.FinanceFlowDTO;
+import com.wjbl.weightlosscamp.service.api.module.finance.service.FinanceFlowService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 账单信息控制器
+ */
+@Tag(name = "账单信息")
+@RestController
+@RequestMapping("finance-flow")
+@RequiredArgsConstructor
+@Slf4j
+public class FinanceFlowController {
+
+    private FinanceFlowService financeFlowService;
+
+
+    @Operation(summary = "流水详情")
+    @PostMapping("detail")
+    public ApiResult<FinanceBillDTO> detail(@Valid @RequestBody IdParam param) {
+        return financeFlowService.detail(param);
+    }
+
+    @Operation(summary = "分页查询流水")
+    @PostMapping("/list")
+    public ApiResult<Page<FinanceFlowDTO>> list(@Valid @RequestBody PageParam<FinanceFlowDTO> param) {
+        return financeFlowService.list(param);
+    }
+
+
+    @Operation(summary = "流水审核")
+    @PostMapping("audit")
+    public ApiResult<Void> audit(@Valid @RequestBody IdParam param) {
+        return financeFlowService.audit(param);
+    }
+
+
+}

weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/finance/controller/FinanceStatisticsController.java

@@ -0,0 +1,41 @@
+package com.wjbl.weightlosscamp.service.api.module.finance.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.wjbl.weightlosscamp.api.base.core.ApiResult;
+import com.wjbl.weightlosscamp.api.base.core.IdParam;
+import com.wjbl.weightlosscamp.api.base.core.PageParam;
+import com.wjbl.weightlosscamp.service.api.module.finance.dto.FinanceBillDTO;
+import com.wjbl.weightlosscamp.service.api.module.finance.dto.FinanceFlowDTO;
+import com.wjbl.weightlosscamp.service.api.module.finance.service.FinanceFlowService;
+import com.wjbl.weightlosscamp.service.api.module.finance.service.FinanceStatisticsService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 账单信息控制器
+ */
+@Tag(name = "流水统计")
+@RestController
+@RequestMapping("finance-statistics")
+@RequiredArgsConstructor
+@Slf4j
+public class FinanceStatisticsController {
+
+    private FinanceStatisticsService financeStatisticsService;
+
+
+    @Operation(summary = "统计查询")
+    @PostMapping("detail")
+    public ApiResult<Void> statistics(@Valid @RequestBody IdParam param) {
+        return financeStatisticsService.statistics(param);
+    }
+
+
+}

weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/finance/dto/FinanceBillDTO.java

@@ -0,0 +1,4 @@
+package com.wjbl.weightlosscamp.service.api.module.finance.dto;
+
+public class FinanceBillDTO {
+}

weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/finance/dto/FinanceFlowDTO.java

@@ -0,0 +1,4 @@
+package com.wjbl.weightlosscamp.service.api.module.finance.dto;
+
+public class FinanceFlowDTO {
+}

weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/finance/service/FinanceBillService.java

@@ -0,0 +1,34 @@
+package com.wjbl.weightlosscamp.service.api.module.finance.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.wjbl.weightlosscamp.api.base.core.ApiResult;
+import com.wjbl.weightlosscamp.api.base.core.IdParam;
+import com.wjbl.weightlosscamp.api.base.core.PageParam;
+import com.wjbl.weightlosscamp.service.api.module.finance.dto.FinanceBillDTO;
+import jakarta.validation.Valid;
+
+public interface FinanceBillService {
+    ApiResult<Void> add(@Valid FinanceBillDTO dto);
+
+    ApiResult<Void> edit(@Valid FinanceBillDTO dto);
+
+    ApiResult<Void> delete(@Valid IdParam param);
+
+    ApiResult<FinanceBillDTO> detail(@Valid IdParam param);
+
+    ApiResult<Page<FinanceBillDTO>> list(@Valid PageParam<FinanceBillDTO> param);
+
+    ApiResult<Void> cancel(@Valid IdParam param);
+
+    ApiResult<Void> addRemark(@Valid IdParam param);
+
+    ApiResult<Void> listRemark(@Valid IdParam param);
+
+    ApiResult<Void> writeOff(@Valid IdParam param);
+
+    ApiResult<Void> cancelWriteOff(@Valid IdParam param);
+
+    ApiResult<Void> pay(@Valid IdParam param);
+
+    ApiResult<Void> payCallback(@Valid IdParam param);
+}

weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/finance/service/FinanceFlowService.java

@@ -0,0 +1,17 @@
+package com.wjbl.weightlosscamp.service.api.module.finance.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.wjbl.weightlosscamp.api.base.core.ApiResult;
+import com.wjbl.weightlosscamp.api.base.core.IdParam;
+import com.wjbl.weightlosscamp.api.base.core.PageParam;
+import com.wjbl.weightlosscamp.service.api.module.finance.dto.FinanceBillDTO;
+import com.wjbl.weightlosscamp.service.api.module.finance.dto.FinanceFlowDTO;
+import jakarta.validation.Valid;
+
+public interface FinanceFlowService {
+    ApiResult<FinanceBillDTO> detail(@Valid IdParam param);
+
+    ApiResult<Page<FinanceFlowDTO>> list(@Valid PageParam<FinanceFlowDTO> param);
+
+    ApiResult<Void> audit(@Valid IdParam param);
+}

weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/finance/service/FinanceStatisticsService.java

@@ -0,0 +1,9 @@
+package com.wjbl.weightlosscamp.service.api.module.finance.service;
+
+import com.wjbl.weightlosscamp.api.base.core.ApiResult;
+import com.wjbl.weightlosscamp.api.base.core.IdParam;
+import jakarta.validation.Valid;
+
+public interface FinanceStatisticsService {
+    ApiResult<Void> statistics(@Valid IdParam param);
+}

weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/finance/service/impl/FinanceBillServiceImpl.java

@@ -0,0 +1,147 @@
+package com.wjbl.weightlosscamp.service.api.module.finance.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.wjbl.weightlosscamp.api.base.core.ApiResult;
+import com.wjbl.weightlosscamp.api.base.core.IdParam;
+import com.wjbl.weightlosscamp.api.base.core.PageParam;
+import com.wjbl.weightlosscamp.service.api.module.finance.dto.FinanceBillDTO;
+import com.wjbl.weightlosscamp.service.api.module.finance.service.FinanceBillService;
+
+/**
+ * 账单服务实现类
+ */
+public class FinanceBillServiceImpl implements FinanceBillService {
+    /**
+     * 添加账单
+     *
+     * @param dto
+     * @return
+     */
+    @Override
+    public ApiResult<Void> add(FinanceBillDTO dto) {
+        // 添加账单信息
+        // 添加流水信息
+        return null;
+    }
+
+    /**
+     * 修改账单
+     *
+     * @param dto
+     * @return
+     */
+    @Override
+    public ApiResult<Void> edit(FinanceBillDTO dto) {
+        return null;
+    }
+
+    /**
+     * 删除账单
+     *
+     * @param param
+     * @return
+     */
+    @Override
+    public ApiResult<Void> delete(IdParam param) {
+        return null;
+    }
+
+    /**
+     * 账单详情
+     *
+     * @param param
+     * @return
+     */
+    @Override
+    public ApiResult<FinanceBillDTO> detail(IdParam param) {
+        return null;
+    }
+
+    /**
+     * 账单分页查询列表
+     *
+     * @param param
+     * @return
+     */
+    @Override
+    public ApiResult<Page<FinanceBillDTO>> list(PageParam<FinanceBillDTO> param) {
+        return null;
+    }
+
+    /**
+     * 作废账单
+     *
+     * @param param
+     * @return
+     */
+    @Override
+    public ApiResult<Void> cancel(IdParam param) {
+        return null;
+    }
+
+    /**
+     * 添加账单备注
+     *
+     * @param param
+     * @return
+     */
+    @Override
+    public ApiResult<Void> addRemark(IdParam param) {
+        return null;
+    }
+
+    /**
+     * 账单备注列表
+     *
+     * @param param
+     * @return
+     */
+    @Override
+    public ApiResult<Void> listRemark(IdParam param) {
+        return null;
+    }
+
+    /**
+     * 账单核销
+     *
+     * @param param
+     * @return
+     */
+    @Override
+    public ApiResult<Void> writeOff(IdParam param) {
+        return null;
+    }
+
+    /**
+     * 取消核销
+     *
+     * @param param
+     * @return
+     */
+    @Override
+    public ApiResult<Void> cancelWriteOff(IdParam param) {
+        return null;
+    }
+
+    /**
+     * 发起支付
+     *
+     * @param param
+     * @return
+     */
+    @Override
+    public ApiResult<Void> pay(IdParam param) {
+        return null;
+    }
+
+    /**
+     * 账单支付回调
+     *
+     * @param param
+     * @return
+     */
+    @Override
+    public ApiResult<Void> payCallback(IdParam param) {
+        return null;
+    }
+}

weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/finance/service/impl/FinanceFlowServiceImpl.java

@@ -0,0 +1,44 @@
+package com.wjbl.weightlosscamp.service.api.module.finance.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.wjbl.weightlosscamp.api.base.core.ApiResult;
+import com.wjbl.weightlosscamp.api.base.core.IdParam;
+import com.wjbl.weightlosscamp.api.base.core.PageParam;
+import com.wjbl.weightlosscamp.service.api.module.finance.dto.FinanceBillDTO;
+import com.wjbl.weightlosscamp.service.api.module.finance.dto.FinanceFlowDTO;
+import com.wjbl.weightlosscamp.service.api.module.finance.service.FinanceFlowService;
+
+public class FinanceFlowServiceImpl implements FinanceFlowService {
+    /**
+     * 流水详情
+     *
+     * @param param
+     * @return
+     */
+    @Override
+    public ApiResult<FinanceBillDTO> detail(IdParam param) {
+        return null;
+    }
+
+    /**
+     * 流水列表
+     *
+     * @param param
+     * @return
+     */
+    @Override
+    public ApiResult<Page<FinanceFlowDTO>> list(PageParam<FinanceFlowDTO> param) {
+        return null;
+    }
+
+    /**
+     * 流水审核
+     *
+     * @param param
+     * @return
+     */
+    @Override
+    public ApiResult<Void> audit(IdParam param) {
+        return null;
+    }
+}

weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/finance/service/impl/FinanceStatisticsServiceImpl.java

@@ -0,0 +1,18 @@
+package com.wjbl.weightlosscamp.service.api.module.finance.service.impl;
+
+import com.wjbl.weightlosscamp.api.base.core.ApiResult;
+import com.wjbl.weightlosscamp.api.base.core.IdParam;
+import com.wjbl.weightlosscamp.service.api.module.finance.service.FinanceStatisticsService;
+
+public class FinanceStatisticsServiceImpl implements FinanceStatisticsService {
+    /**
+     * 流水统计（对账功能）
+     *
+     * @param param
+     * @return
+     */
+    @Override
+    public ApiResult<Void> statistics(IdParam param) {
+        return null;
+    }
+}

weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/sys/controller/SysOrgController.java

@@ -35,9 +35,9 @@ public class SysOrgController {
     }
 
     @Operation(summary = "修改组织")
-    @PostMapping("/update")
+    @PostMapping("/edit")
-    public ApiResult<Void> update(@Valid @RequestBody OrgDTO dto) {
+    public ApiResult<Void> edit(@Valid @RequestBody OrgDTO dto) {
-        return sysOrgService.update(dto);
+        return sysOrgService.edit(dto);
     }
 
     @Operation(summary = "删除组织")

weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/sys/controller/SysRoleController.java

@@ -36,8 +36,8 @@ public class SysRoleController {
 
     @Operation(summary = "修改角色")
     @PostMapping("/update")
-    public ApiResult<Void> update(@Valid @RequestBody RoleDTO dto) {
+    public ApiResult<Void> edit(@Valid @RequestBody RoleDTO dto) {
-        return sysRoleService.update(dto);
+        return sysRoleService.edit(dto);
     }
 
     @Operation(summary = "删除角色")
@@ -47,7 +47,7 @@ public class SysRoleController {
     }
 
     @Operation(summary = "获取角色详情")
-    @PostMapping("/get")
+    @PostMapping("/detail")
     public ApiResult<RoleDTO> detail(@Valid @RequestBody IdParam param) {
         return sysRoleService.detail(param);
     }

weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/sys/service/SysOrgService.java

@@ -10,13 +10,13 @@ import jakarta.validation.Valid;
 public interface SysOrgService {
     ApiResult<Void> add(@Valid OrgDTO dto);
 
-    ApiResult<Void> update(@Valid OrgDTO dto);
+    ApiResult<Void> edit(@Valid OrgDTO dto);
 
     ApiResult<Void> delete(@Valid IdParam param);
 
     ApiResult<OrgDTO> detail(@Valid IdParam param);
 
-    ApiResult<Page<OrgDTO>> page(@Valid PageParam<OrgDTO> param);
+    ApiResult<Page<OrgDTO>> list(@Valid PageParam<OrgDTO> param);
 
     ApiResult<Page<OrgDTO>> memberList(@Valid PageParam<OrgDTO> param);
 }

weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/sys/service/SysRoleService.java

@@ -11,11 +11,13 @@ import jakarta.validation.Valid;
 public interface SysRoleService {
     ApiResult<Void> add(@Valid RoleDTO dto);
 
-    ApiResult<Void> update(@Valid RoleDTO dto);
+    ApiResult<Void> edit(@Valid RoleDTO dto);
 
     ApiResult<Void> delete(@Valid IdParam param);
 
-    ApiResult<OrgDTO> detail(@Valid IdParam param);
+    ApiResult<RoleDTO> detail(@Valid IdParam param);
 
-    ApiResult<Page<OrgDTO>> page(@Valid PageParam<RoleDTO> param);
+    ApiResult<Page<RoleDTO>> list(@Valid PageParam<RoleDTO> param);
+
+    ApiResult<Page<RoleDTO>> memberList(@Valid PageParam<RoleDTO> param);
 }

weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/sys/service/impl/SysOrgServiceImpl.java

@@ -18,7 +18,7 @@ public class SysOrgServiceImpl implements SysOrgService {
     }
 
     @Override
-    public ApiResult<Void> update(OrgDTO dto) {
+    public ApiResult<Void> edit(OrgDTO dto) {
         return null;
     }
 
@@ -33,7 +33,7 @@ public class SysOrgServiceImpl implements SysOrgService {
     }
 
     @Override
-    public ApiResult<Page<OrgDTO>> page(PageParam<OrgDTO> param) {
+    public ApiResult<Page<OrgDTO>> list(PageParam<OrgDTO> param) {
         return null;
     }
 

weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/sys/service/impl/SysRoleServiceImpl.java

@@ -15,7 +15,7 @@ public class SysRoleServiceImpl implements SysRoleService {
     }
 
     @Override
-    public ApiResult<Void> update(RoleDTO dto) {
+    public ApiResult<Void> edit(RoleDTO dto) {
         return null;
     }
 
@@ -25,12 +25,17 @@ public class SysRoleServiceImpl implements SysRoleService {
     }
 
     @Override
-    public ApiResult<OrgDTO> detail(IdParam param) {
+    public ApiResult<RoleDTO> detail(IdParam param) {
         return null;
     }
 
     @Override
-    public ApiResult<Page<OrgDTO>> page(PageParam<RoleDTO> param) {
+    public ApiResult<Page<RoleDTO>> list(PageParam<RoleDTO> param) {
+        return null;
+    }
+
+    @Override
+    public ApiResult<Page<RoleDTO>> memberList(PageParam<RoleDTO> param) {
         return null;
     }
 }