Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve the API for modifying status and deleting #168

Merged
merged 2 commits into from
Nov 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions core/api/src/main/java/com/wansenai/api/RetailController.java
Original file line number Diff line number Diff line change
Expand Up @@ -78,4 +78,14 @@ public Response<String> refundAddOrUpdate(@RequestBody RetailRefundDTO refundDTO
public Response<RetailRefundDetailVO> refundDetail(@PathVariable("id") Long id) {
return receiptService.getRetailRefundDetail(id);
}

@PostMapping("/refund/deleteByIds")
public Response<String> refundDeleteByIds(@RequestParam("ids") List<Long> ids) {
return receiptService.deleteRetailRefund(ids);
}

@PutMapping("/refund/updateStatus")
public Response<String> refundUpdateStatus(@RequestParam("ids") List<Long> ids, @RequestParam("status") Integer status) {
return receiptService.updateRetailRefundStatus(ids, status);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,35 @@ public interface ReceiptService extends IService<ReceiptMain> {
/**
* 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<RetailRefundDetailVO> 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<String> deleteRetailRefund(List<Long> 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<String> updateRetailRefundStatus(List<Long> ids, Integer status);
}
Original file line number Diff line number Diff line change
Expand Up @@ -693,6 +693,7 @@ public Response<String> addOrUpdateRetailRefund(RetailRefundDTO refundDTO) {
.totalPrice(refundDTO.getReceiptAmount().negate())
.backAmount(refundDTO.getBackAmount().negate())
.remark(refundDTO.getRemark())
.status(refundDTO.getStatus())
.fileId(fileIds)
.status(refundDTO.getStatus())
.createBy(userId)
Expand Down Expand Up @@ -843,4 +844,37 @@ public Response<RetailRefundDetailVO> getRetailRefundDetail(Long id) {
return Response.responseData(retailRefundDetailVO);
}

@Override
public Response<String> deleteRetailRefund(List<Long> 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<String> updateRetailRefundStatus(List<Long> 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);
}
}

}
18 changes: 18 additions & 0 deletions web/src/api/retail/refund.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -36,4 +38,20 @@ export function getRefundDetail(id: string) {
url: `${API.GetDetail}/${id}`,
}
);
}

export function updateRefundStatus(ids: string[], status: number) {
return defHttp.put<BaseResp>(
{
url: `${API.UpdateStatus}?ids=${ids}&status=${status}`,
}
);
}

export function deleteRefund(ids: string[]) {
return defHttp.post<BaseResp>(
{
url: `${API.Delete}?ids=${ids}`,
}
);
}
1 change: 0 additions & 1 deletion web/src/api/retail/shipments.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ export function deleteShipments(ids: string[]) {
return defHttp.post<BaseResp>(
{
url: `${API.DeleteBatch}?ids=${ids}`,
params: ids,
}
);
}
Expand Down