From 87609b7f0d849b8a1042068e047c9d4789ecfdad Mon Sep 17 00:00:00 2001 From: jameszow Date: Mon, 6 Nov 2023 19:24:01 +0800 Subject: [PATCH 1/2] Add refundDeleteByIds and refundUpdateStatus api --- .../com/wansenai/api/RetailController.java | 10 ++++++ .../service/receipt/ReceiptService.java | 25 ++++++++++++++ .../receipt/impl/ReceiptServiceImpl.java | 34 +++++++++++++++++++ 3 files changed, 69 insertions(+) diff --git a/core/api/src/main/java/com/wansenai/api/RetailController.java b/core/api/src/main/java/com/wansenai/api/RetailController.java index 52ee2305..8c935f1a 100644 --- a/core/api/src/main/java/com/wansenai/api/RetailController.java +++ b/core/api/src/main/java/com/wansenai/api/RetailController.java @@ -78,4 +78,14 @@ public Response refundAddOrUpdate(@RequestBody RetailRefundDTO refundDTO public Response refundDetail(@PathVariable("id") Long id) { return receiptService.getRetailRefundDetail(id); } + + @PostMapping("/refund/deleteByIds") + public Response refundDeleteByIds(@RequestParam("ids") List ids) { + return receiptService.deleteRetailRefund(ids); + } + + @PutMapping("/refund/updateStatus") + public Response refundUpdateStatus(@RequestParam("ids") List ids, @RequestParam("status") Integer status) { + return receiptService.updateRetailRefundStatus(ids, status); + } } diff --git a/core/service/src/main/java/com/wansenai/service/receipt/ReceiptService.java b/core/service/src/main/java/com/wansenai/service/receipt/ReceiptService.java index 52773970..964267c6 100644 --- a/core/service/src/main/java/com/wansenai/service/receipt/ReceiptService.java +++ b/core/service/src/main/java/com/wansenai/service/receipt/ReceiptService.java @@ -143,10 +143,35 @@ public interface ReceiptService extends IService { /** * Query retail return details based on ID * 根据id查询零售退货详情信息 + * * @param id Primary key id of retail shipment order * 零售退货单主键id * @return Returns retail return order data * 返回零售退货单数据 */ Response getRetailRefundDetail(Long id); + + /** + * Delete retail return document data based on ID + * 根据id删除零售退货单据数据 + * + * @param ids id Retail return order ID List + * 零售退货单主键id集合 + * @return Returns the result of the deletion + * 返回删除结果 + */ + Response deleteRetailRefund(List ids); + + /** + * Modify retail return document data based on ID and status + * 根据id和状态修改零售退货单据数据 + * + * @param ids id Retail return order ID List + * 零售退货单主键id集合 + * @param status Status + * 状态 + * @return Returns the result of the modification + * 返回修改结果 + */ + Response updateRetailRefundStatus(List ids, Integer status); } diff --git a/core/service/src/main/java/com/wansenai/service/receipt/impl/ReceiptServiceImpl.java b/core/service/src/main/java/com/wansenai/service/receipt/impl/ReceiptServiceImpl.java index 17f29134..20eea952 100644 --- a/core/service/src/main/java/com/wansenai/service/receipt/impl/ReceiptServiceImpl.java +++ b/core/service/src/main/java/com/wansenai/service/receipt/impl/ReceiptServiceImpl.java @@ -693,6 +693,7 @@ public Response addOrUpdateRetailRefund(RetailRefundDTO refundDTO) { .totalPrice(refundDTO.getReceiptAmount().negate()) .backAmount(refundDTO.getBackAmount().negate()) .remark(refundDTO.getRemark()) + .status(refundDTO.getStatus()) .fileId(fileIds) .status(refundDTO.getStatus()) .createBy(userId) @@ -843,4 +844,37 @@ public Response getRetailRefundDetail(Long id) { return Response.responseData(retailRefundDetailVO); } + @Override + public Response deleteRetailRefund(List ids) { + if (ids.isEmpty()) { + return Response.responseMsg(BaseCodeEnum.PARAMETER_NULL); + } + var updateResult = lambdaUpdate() + .in(ReceiptMain::getId, ids) + .set(ReceiptMain::getDeleteFlag, CommonConstants.DELETED) + .update(); + + if (updateResult) { + return Response.responseMsg(RetailCodeEnum.DELETE_RETAIL_REFUND_SUCCESS); + } else { + return Response.responseMsg(RetailCodeEnum.DELETE_RETAIL_REFUND_ERROR); + } + } + + @Override + public Response updateRetailRefundStatus(List ids, Integer status) { + if (ids.isEmpty() || status == null) { + return Response.responseMsg(BaseCodeEnum.PARAMETER_NULL); + } + var updateResult = lambdaUpdate() + .in(ReceiptMain::getId, ids) + .set(ReceiptMain::getStatus, status) + .update(); + if (updateResult) { + return Response.responseMsg(RetailCodeEnum.UPDATE_RETAIL_REFUND_SUCCESS); + } else { + return Response.responseMsg(RetailCodeEnum.UPDATE_RETAIL_REFUND_ERROR); + } + } + } From 6b40be49017e406e248d904f9889f984879cc323 Mon Sep 17 00:00:00 2001 From: jameszow Date: Mon, 6 Nov 2023 19:24:21 +0800 Subject: [PATCH 2/2] fix bug request api error --- web/src/api/retail/refund.ts | 18 ++++++++++++++++++ web/src/api/retail/shipments.ts | 1 - 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/web/src/api/retail/refund.ts b/web/src/api/retail/refund.ts index d7fdd12a..01e9c448 100644 --- a/web/src/api/retail/refund.ts +++ b/web/src/api/retail/refund.ts @@ -10,6 +10,8 @@ enum API { PageList = '/retail/refund/pageList', AddOrUpdate = '/retail/refund/addOrUpdate', GetDetail = '/retail/refund/detail', + UpdateStatus = '/retail/refund/updateStatus', + Delete = '/retail/refund/deleteByIds', } export function getRefundPageList(params: QueryShipmentsReq) { @@ -36,4 +38,20 @@ export function getRefundDetail(id: string) { url: `${API.GetDetail}/${id}`, } ); +} + +export function updateRefundStatus(ids: string[], status: number) { + return defHttp.put( + { + url: `${API.UpdateStatus}?ids=${ids}&status=${status}`, + } + ); +} + +export function deleteRefund(ids: string[]) { + return defHttp.post( + { + url: `${API.Delete}?ids=${ids}`, + } + ); } \ No newline at end of file diff --git a/web/src/api/retail/shipments.ts b/web/src/api/retail/shipments.ts index 9fc2d592..8139dce8 100644 --- a/web/src/api/retail/shipments.ts +++ b/web/src/api/retail/shipments.ts @@ -46,7 +46,6 @@ export function deleteShipments(ids: string[]) { return defHttp.post( { url: `${API.DeleteBatch}?ids=${ids}`, - params: ids, } ); }