From d2648f1e0deed78a0d623bde719c556853b0614e Mon Sep 17 00:00:00 2001 From: zt Date: Thu, 2 Jan 2025 15:51:06 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A6=BB=E7=BA=BF=E6=A0=B8=E9=94=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member/controller/admin/screen/vo/GoodsVO.java | 2 +- .../app/storeorder/AppStoreOrderController.java | 7 ++++--- .../controller/app/storeorder/dto/completeListDto.java | 10 ++++++++++ 3 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/storeorder/dto/completeListDto.java diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/screen/vo/GoodsVO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/screen/vo/GoodsVO.java index bfa3e527..b22ff80f 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/screen/vo/GoodsVO.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/screen/vo/GoodsVO.java @@ -9,7 +9,7 @@ public class GoodsVO { /** * 单价 */ - private Double customPrice; + private Double price; /** * 数量 */ diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/storeorder/AppStoreOrderController.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/storeorder/AppStoreOrderController.java index 384944e0..e6ae4d18 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/storeorder/AppStoreOrderController.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/storeorder/AppStoreOrderController.java @@ -9,6 +9,7 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.member.controller.admin.storegoodsinventory.vo.AddReqVO; import cn.iocoder.yudao.module.member.controller.admin.storeorder.vo.StoreOrderPageReqVO; import cn.iocoder.yudao.module.member.controller.admin.storeorder.vo.StoreOrderRespVO; +import cn.iocoder.yudao.module.member.controller.app.storeorder.dto.completeListDto; import cn.iocoder.yudao.module.member.controller.app.storeorder.vo.AppStoreOrderDetailVo; import cn.iocoder.yudao.module.member.controller.app.storeorder.vo.AppStoreOrderVO; import cn.iocoder.yudao.module.member.controller.app.storeorder.vo.CardDto; @@ -160,10 +161,10 @@ public class AppStoreOrderController { } - @GetMapping("/completeList") + @PostMapping("/completeList") @Operation(summary = "离线核销") - public CommonResult complete(@RequestBody List orderIds) { - storeOrderService.completeList(orderIds); + public CommonResult complete(@RequestBody completeListDto dto) { + storeOrderService.completeList(dto.getOrderIds()); return success(true); } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/storeorder/dto/completeListDto.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/storeorder/dto/completeListDto.java new file mode 100644 index 00000000..cb1d5717 --- /dev/null +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/storeorder/dto/completeListDto.java @@ -0,0 +1,10 @@ +package cn.iocoder.yudao.module.member.controller.app.storeorder.dto; + +import lombok.Data; + +import java.util.List; + +@Data +public class completeListDto { + private List orderIds; +}