diff --git a/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/finance/controller/FinanceBillController.java b/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/finance/controller/FinanceBillController.java new file mode 100644 index 0000000..194f13f --- /dev/null +++ b/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 add(@Valid @RequestBody FinanceBillDTO dto) { + return financeBillService.add(dto); + } + + @Operation(summary = "修改账单") + @PostMapping("/edit") + public ApiResult edit(@Valid @RequestBody FinanceBillDTO dto) { + return financeBillService.edit(dto); + } + + @Operation(summary = "作废账单") + @PostMapping("/cancel") + public ApiResult cancel(@Valid @RequestBody IdParam param) { + return financeBillService.cancel(param); + } + + @Operation(summary = "获取账单详情") + @PostMapping("/detail") + public ApiResult detail(@Valid @RequestBody IdParam param) { + return financeBillService.detail(param); + } + + @Operation(summary = "分页查询账单") + @PostMapping("/list") + public ApiResult> list(@Valid @RequestBody PageParam param) { + return financeBillService.list(param); + } + + + @Operation(summary = "账单备注新增") + @PostMapping("remark/add") + public ApiResult addRemark(@Valid @RequestBody IdParam param) { + return financeBillService.addRemark(param); + } + + @Operation(summary = "账单备注列表") + @PostMapping("remark/list") + public ApiResult listRemark(@Valid @RequestBody IdParam param) { + return financeBillService.listRemark(param); + } + + @Operation(summary = "账单核销") + @PostMapping("write-off") + public ApiResult writeOff(@Valid @RequestBody IdParam param) { + return financeBillService.writeOff(param); + } + + @Operation(summary = "账单取消核销") + @PostMapping("write-off/cancel") + public ApiResult cancelWriteOff(@Valid @RequestBody IdParam param) { + return financeBillService.cancelWriteOff(param); + } + + @Operation(summary = "账单发起支付") + @PostMapping("pay") + public ApiResult pay(@Valid @RequestBody IdParam param) { + return financeBillService.pay(param); + } + @Operation(summary = "账单支付回调") + @PostMapping("pay/callback") + public ApiResult payCallback(@Valid @RequestBody IdParam param) { + return financeBillService.payCallback(param); + } + + +} \ No newline at end of file diff --git a/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/finance/dto/FinanceBillDTO.java b/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/finance/dto/FinanceBillDTO.java new file mode 100644 index 0000000..0e394d7 --- /dev/null +++ b/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 { +} diff --git a/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/finance/service/FinanceBillService.java b/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/finance/service/FinanceBillService.java new file mode 100644 index 0000000..60b85ba --- /dev/null +++ b/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 add(@Valid FinanceBillDTO dto); + + ApiResult edit(@Valid FinanceBillDTO dto); + + ApiResult delete(@Valid IdParam param); + + ApiResult detail(@Valid IdParam param); + + ApiResult> list(@Valid PageParam param); + + ApiResult cancel(@Valid IdParam param); + + ApiResult addRemark(@Valid IdParam param); + + ApiResult listRemark(@Valid IdParam param); + + ApiResult writeOff(@Valid IdParam param); + + ApiResult cancelWriteOff(@Valid IdParam param); + + ApiResult pay(@Valid IdParam param); + + ApiResult payCallback(@Valid IdParam param); +} diff --git a/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/finance/service/impl/FinanceBillServiceImpl.java b/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/finance/service/impl/FinanceBillServiceImpl.java new file mode 100644 index 0000000..465a94c --- /dev/null +++ b/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 add(FinanceBillDTO dto) { + // 添加账单信息 + // 添加流水信息 + return null; + } + + /** + * 修改账单 + * + * @param dto + * @return + */ + @Override + public ApiResult edit(FinanceBillDTO dto) { + return null; + } + + /** + * 删除账单 + * + * @param param + * @return + */ + @Override + public ApiResult delete(IdParam param) { + return null; + } + + /** + * 账单详情 + * + * @param param + * @return + */ + @Override + public ApiResult detail(IdParam param) { + return null; + } + + /** + * 账单分页查询列表 + * + * @param param + * @return + */ + @Override + public ApiResult> list(PageParam param) { + return null; + } + + /** + * 作废账单 + * + * @param param + * @return + */ + @Override + public ApiResult cancel(IdParam param) { + return null; + } + + /** + * 添加账单备注 + * + * @param param + * @return + */ + @Override + public ApiResult addRemark(IdParam param) { + return null; + } + + /** + * 账单备注列表 + * + * @param param + * @return + */ + @Override + public ApiResult listRemark(IdParam param) { + return null; + } + + /** + * 账单核销 + * + * @param param + * @return + */ + @Override + public ApiResult writeOff(IdParam param) { + return null; + } + + /** + * 取消核销 + * + * @param param + * @return + */ + @Override + public ApiResult cancelWriteOff(IdParam param) { + return null; + } + + /** + * 发起支付 + * + * @param param + * @return + */ + @Override + public ApiResult pay(IdParam param) { + return null; + } + + /** + * 账单支付回调 + * + * @param param + * @return + */ + @Override + public ApiResult payCallback(IdParam param) { + return null; + } +} diff --git a/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/sys/controller/SysOrgController.java b/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/sys/controller/SysOrgController.java index 8713dda..38f0f68 100644 --- a/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/sys/controller/SysOrgController.java +++ b/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") - public ApiResult update(@Valid @RequestBody OrgDTO dto) { - return sysOrgService.update(dto); + @PostMapping("/edit") + public ApiResult edit(@Valid @RequestBody OrgDTO dto) { + return sysOrgService.edit(dto); } @Operation(summary = "删除组织") diff --git a/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/sys/controller/SysRoleController.java b/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/sys/controller/SysRoleController.java index f165696..4388452 100644 --- a/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/sys/controller/SysRoleController.java +++ b/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 update(@Valid @RequestBody RoleDTO dto) { - return sysRoleService.update(dto); + public ApiResult edit(@Valid @RequestBody RoleDTO dto) { + return sysRoleService.edit(dto); } @Operation(summary = "删除角色") @@ -47,7 +47,7 @@ public class SysRoleController { } @Operation(summary = "获取角色详情") - @PostMapping("/get") + @PostMapping("/detail") public ApiResult detail(@Valid @RequestBody IdParam param) { return sysRoleService.detail(param); } diff --git a/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/sys/service/SysOrgService.java b/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/sys/service/SysOrgService.java index 4ea0e64..95c83de 100644 --- a/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/sys/service/SysOrgService.java +++ b/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 add(@Valid OrgDTO dto); - ApiResult update(@Valid OrgDTO dto); + ApiResult edit(@Valid OrgDTO dto); ApiResult delete(@Valid IdParam param); ApiResult detail(@Valid IdParam param); - ApiResult> page(@Valid PageParam param); + ApiResult> list(@Valid PageParam param); ApiResult> memberList(@Valid PageParam param); } diff --git a/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/sys/service/SysRoleService.java b/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/sys/service/SysRoleService.java index 270295a..c2229ef 100644 --- a/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/sys/service/SysRoleService.java +++ b/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 add(@Valid RoleDTO dto); - ApiResult update(@Valid RoleDTO dto); + ApiResult edit(@Valid RoleDTO dto); ApiResult delete(@Valid IdParam param); - ApiResult detail(@Valid IdParam param); + ApiResult detail(@Valid IdParam param); - ApiResult> page(@Valid PageParam param); + ApiResult> list(@Valid PageParam param); + + ApiResult> memberList(@Valid PageParam param); } diff --git a/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/sys/service/impl/SysOrgServiceImpl.java b/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/sys/service/impl/SysOrgServiceImpl.java index 57fe564..008f032 100644 --- a/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/sys/service/impl/SysOrgServiceImpl.java +++ b/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/sys/service/impl/SysOrgServiceImpl.java @@ -14,7 +14,7 @@ public class SysOrgServiceImpl implements SysOrgService { } @Override - public ApiResult update(OrgDTO dto) { + public ApiResult edit(OrgDTO dto) { return null; } @@ -29,7 +29,7 @@ public class SysOrgServiceImpl implements SysOrgService { } @Override - public ApiResult> page(PageParam param) { + public ApiResult> list(PageParam param) { return null; } diff --git a/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/sys/service/impl/SysRoleServiceImpl.java b/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/sys/service/impl/SysRoleServiceImpl.java index 2d7262b..1d68125 100644 --- a/weight-loss-camp-service-api/src/main/java/com/wjbl/weightlosscamp/service/api/module/sys/service/impl/SysRoleServiceImpl.java +++ b/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 update(RoleDTO dto) { + public ApiResult edit(RoleDTO dto) { return null; } @@ -25,12 +25,17 @@ public class SysRoleServiceImpl implements SysRoleService { } @Override - public ApiResult detail(IdParam param) { + public ApiResult detail(IdParam param) { return null; } @Override - public ApiResult> page(PageParam param) { + public ApiResult> list(PageParam param) { + return null; + } + + @Override + public ApiResult> memberList(PageParam param) { return null; } }