From c6d4a425a780af5093cba83726a9d097eb4c57b6 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Mon, 29 Jul 2024 15:20:18 +0800 Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../aggregation/SmsSalesBillRest.java | 117 +++++++++--------- .../func/smssalesbill/SmsSalesBillQuery.java | 3 +- .../smssalesbill/SmsSalesBillService.java | 4 + .../biz/func/smssalesbill/SmsSalesBillVo.java | 3 +- .../sales/smssalesbill/SmsSalesBillFeign.java | 4 + .../SmsSalesBillFeignFallback.java | 5 + 6 files changed, 78 insertions(+), 58 deletions(-) diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SmsSalesBillRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SmsSalesBillRest.java index f5a8f08..1f95b6d 100644 --- a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SmsSalesBillRest.java +++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SmsSalesBillRest.java @@ -53,68 +53,73 @@ import org.springframework.web.bind.annotation.*; @RequestMapping("v1/smssalesbill") public class SmsSalesBillRest { - @Autowired - private SmsSalesBillService smsSalesBillService; + @Autowired + private SmsSalesBillService smsSalesBillService; - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq){ - return smsSalesBillService.listPage(pq); - } + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + return smsSalesBillService.listPage(pq); + } - @ApiOperation("新增或修改") - @PostMapping("/save") - public ResultBean save(@RequestBody SmsSalesBillDto dto){ - return smsSalesBillService.saveOrUpdateDto(dto); - } + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody SmsSalesBillDto dto) { + return smsSalesBillService.saveOrUpdateDto(dto); + } + @ApiOperation("提交") + @PostMapping("/submit") + public ResultBean submit(@RequestBody SmsSalesBillDto dto) { + return smsSalesBillService.submit(dto); + } - @ApiOperation("根据sid批量删除") + @ApiOperation("根据sid批量删除") @DeleteMapping("/delBySids") - public ResultBean delBySids(@RequestBody String[] sids){ - return smsSalesBillService.deleteBySids(sids); - } + public ResultBean delBySids(@RequestBody String[] sids) { + return smsSalesBillService.deleteBySids(sids); + } - @ApiOperation("根据SID获取一条记录") + @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ - return smsSalesBillService.fetchDetailsVoBySid(sid); - } - - @ApiOperation("销售订单审核列表") - @PostMapping("/reviewListPage") - public ResultBean> reviewListPage(@RequestBody PagerQuery pq){ - return smsSalesBillService.reviewListPage(pq); - } - - @ApiOperation("销售订单审核详情") - @GetMapping("/reviewDetails") - public ResultBean reviewDetails(@RequestParam("sid") String sid){ - return smsSalesBillService.reviewDetails(sid); - } - - @ApiOperation("收货地址保存") - @PostMapping("/saveShipper") - public ResultBean saveShipper(@RequestBody ReviewDetailsVo dto){ - return smsSalesBillService.saveShipper(dto); - } - - @ApiOperation("发票信息保存") - @PostMapping("/saveInvoice") - public ResultBean saveInvoice(@RequestBody ReviewDetailsVo dto){ - return smsSalesBillService.saveInvoice(dto); - } - - @ApiOperation("分页列表单条保存") - @PostMapping("/saveOneListData") - public ResultBean saveOneListData(@RequestBody OrderReviewVo dto){ - return smsSalesBillService.saveOneListData(dto); - } - - @ApiOperation("审核确认") - @PostMapping("/reviewConfirm") - public ResultBean reviewConfirm(@RequestBody ReviewConfirmDto dto){ - return smsSalesBillService.reviewConfirm(dto); - } + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid) { + return smsSalesBillService.fetchDetailsVoBySid(sid); + } + + @ApiOperation("销售订单审核列表") + @PostMapping("/reviewListPage") + public ResultBean> reviewListPage(@RequestBody PagerQuery pq) { + return smsSalesBillService.reviewListPage(pq); + } + + @ApiOperation("销售订单审核详情") + @GetMapping("/reviewDetails") + public ResultBean reviewDetails(@RequestParam("sid") String sid) { + return smsSalesBillService.reviewDetails(sid); + } + + @ApiOperation("收货地址保存") + @PostMapping("/saveShipper") + public ResultBean saveShipper(@RequestBody ReviewDetailsVo dto) { + return smsSalesBillService.saveShipper(dto); + } + + @ApiOperation("发票信息保存") + @PostMapping("/saveInvoice") + public ResultBean saveInvoice(@RequestBody ReviewDetailsVo dto) { + return smsSalesBillService.saveInvoice(dto); + } + + @ApiOperation("分页列表单条保存") + @PostMapping("/saveOneListData") + public ResultBean saveOneListData(@RequestBody OrderReviewVo dto) { + return smsSalesBillService.saveOneListData(dto); + } + + @ApiOperation("审核确认") + @PostMapping("/reviewConfirm") + public ResultBean reviewConfirm(@RequestBody ReviewConfirmDto dto) { + return smsSalesBillService.reviewConfirm(dto); + } } diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillQuery.java index 559d559..25c3f20 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillQuery.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillQuery.java @@ -72,5 +72,6 @@ public class SmsSalesBillQuery implements Query { private String useOrgSid; // 使用组织sid @ApiModelProperty("创建组织sid") private String createOrgSid; // 创建组织sid - + @ApiModelProperty("审核状态") + private String state; // 审核状态 } diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillService.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillService.java index 1014aa0..3666912 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillService.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillService.java @@ -133,4 +133,8 @@ public class SmsSalesBillService extends MybatisBaseService