From 75d5f513d5d865336fca916b6d4a5edb49b8a702 Mon Sep 17 00:00:00 2001 From: seesaw Date: Thu, 31 Oct 2024 17:02:42 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=B7=BB=E5=8A=A0=E7=8A=B6?= =?UTF-8?q?=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/storeorder/vo/StoreOrderPageVO.java | 3 ++ .../app/store/AppStoreController.java | 3 +- .../dataobject/storeorder/StoreOrderDO.java | 5 ++++ .../member/enums/StoreOrderStatusEnum.java | 29 +++++++++++++++++++ .../service/storeorder/StoreOrderService.java | 2 +- .../storeorder/StoreOrderServiceImpl.java | 8 +++-- .../mapper/storeorder/StoreOrderMapper.xml | 2 +- 7 files changed, 46 insertions(+), 6 deletions(-) create mode 100644 yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/enums/StoreOrderStatusEnum.java diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/storeorder/vo/StoreOrderPageVO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/storeorder/vo/StoreOrderPageVO.java index fc61e865..c8a2895e 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/storeorder/vo/StoreOrderPageVO.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/storeorder/vo/StoreOrderPageVO.java @@ -44,4 +44,7 @@ public class StoreOrderPageVO extends PageParam { @Schema(description = "门店", example = "1722") private Long carteenId; + + @Schema(description = "订单状态", example = "1722") + private Integer status; } \ No newline at end of file diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/store/AppStoreController.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/store/AppStoreController.java index e1bb923c..be2bb22a 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/store/AppStoreController.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/store/AppStoreController.java @@ -18,6 +18,7 @@ import cn.iocoder.yudao.module.member.controller.app.store.vo.UserInfoVo; import cn.iocoder.yudao.module.member.dal.dataobject.storegoods.StoreGoodsDO; import cn.iocoder.yudao.module.member.dal.dataobject.storegoodstype.StoreGoodsTypeDO; import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO; +import cn.iocoder.yudao.module.member.enums.StoreOrderStatusEnum; import cn.iocoder.yudao.module.member.service.storegoods.StoreGoodsService; import cn.iocoder.yudao.module.member.service.storegoodstype.StoreGoodsTypeService; import cn.iocoder.yudao.module.member.service.storeorder.StoreOrderService; @@ -127,7 +128,7 @@ public class AppStoreController { @PostMapping("/mgcr/order/paymentCodePayOrder") @Operation(summary = "创建刷脸支付订单") public String paymentCodePayOrder(@RequestBody StoreOrderDto dto) { - Integer order = orderService.createOrder(dto).getOrderId(); + Integer order = orderService.createOrder(dto, StoreOrderStatusEnum.TO_PAY.getCode()).getOrderId(); HashMap map = new HashMap<>(); map.put("orderId", order); return JsonUtils.toJsonString(StoreResult.success(map)); diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/storeorder/StoreOrderDO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/storeorder/StoreOrderDO.java index 6a1b53aa..4979ece2 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/storeorder/StoreOrderDO.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/storeorder/StoreOrderDO.java @@ -64,4 +64,9 @@ public class StoreOrderDO extends BaseDO { */ private Long carteenId; + /** + * （1-已支付，2-已完成，3-已取消，4-已退款） + */ + private Integer status; + } \ No newline at end of file diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/enums/StoreOrderStatusEnum.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/enums/StoreOrderStatusEnum.java new file mode 100644 index 00000000..9f28705d --- /dev/null +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/enums/StoreOrderStatusEnum.java @@ -0,0 +1,29 @@ +package cn.iocoder.yudao.module.member.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * 代码生成的场景枚举 + * + * @author 芋道源码 + */ +@AllArgsConstructor +@Getter +public enum StoreOrderStatusEnum { + TO_PAY(0,"待支付"), + PAY(1, "已支付"), + COMPLETE(2, "已完成"), + CANCEL(3, "已取消"), + REFUND(4, "已退款"), + ; + + /** + * 编码 + */ + private final Integer code; + /** + * 类型 + */ + private final String name; +} diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/storeorder/StoreOrderService.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/storeorder/StoreOrderService.java index d1d8448a..0e861810 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/storeorder/StoreOrderService.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/storeorder/StoreOrderService.java @@ -58,7 +58,7 @@ public interface StoreOrderService { */ PageResult getStoreOrderPage(StoreOrderPageReqVO pageReqVO); - StoreOrderDO createOrder(StoreOrderDto dto); + StoreOrderDO createOrder(StoreOrderDto dto,Integer status); UserInfoVo facePay(FacePayDto dto); diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/storeorder/StoreOrderServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/storeorder/StoreOrderServiceImpl.java index f9fcaed3..1da38894 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/storeorder/StoreOrderServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/storeorder/StoreOrderServiceImpl.java @@ -21,6 +21,7 @@ import cn.iocoder.yudao.module.member.dal.dataobject.storeorderdetail.StoreOrder import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO; import cn.iocoder.yudao.module.member.dal.mysql.storeorder.StoreOrderMapper; import cn.iocoder.yudao.module.member.enums.CostTypeEnum; +import cn.iocoder.yudao.module.member.enums.StoreOrderStatusEnum; import cn.iocoder.yudao.module.member.enums.TimePeriodEnum; import cn.iocoder.yudao.module.member.service.amount.DeductionService; import cn.iocoder.yudao.module.member.service.card.CardService; @@ -124,7 +125,7 @@ public class StoreOrderServiceImpl implements StoreOrderService { @Override @Transactional(rollbackFor = Exception.class) - public StoreOrderDO createOrder(StoreOrderDto dto) { + public StoreOrderDO createOrder(StoreOrderDto dto,Integer status) { StoreOrderDO storeOrderDO = new StoreOrderDO(); Long storeId = cashregisterinfoApi.getStoreId(dto.getEquipmentCode()); BeanUtil.copyProperties(dto, storeOrderDO); @@ -132,6 +133,7 @@ public class StoreOrderServiceImpl implements StoreOrderService { double sum = equipmentGoodsCustoms.stream() .mapToDouble(StoreGoodsDto::getTotalPrice) .sum(); + storeOrderDO.setStatus(status); storeOrderDO.setTotalPrice(sum); storeOrderDO.setCarteenId(storeId); storeOrderMapper.insert(storeOrderDO); @@ -171,7 +173,7 @@ public class StoreOrderServiceImpl implements StoreOrderService { return "该卡未绑定用户"; } dto.setUserId(userDO.getId()); - Double totalPrice = createOrder(dto).getTotalPrice(); + Double totalPrice = createOrder(dto, StoreOrderStatusEnum.COMPLETE.getCode()).getTotalPrice(); BigDecimal total = BigDecimal.valueOf(totalPrice).setScale(2, RoundingMode.HALF_UP); BigDecimal compute = compute(total, userDO.getId()); @@ -192,7 +194,7 @@ public class StoreOrderServiceImpl implements StoreOrderService { } MemberUserDO user = userService.getUser(Long.valueOf(s)); dto.setUserId(user.getId()); - StoreOrderDO order = createOrder(dto); + StoreOrderDO order = createOrder(dto,StoreOrderStatusEnum.COMPLETE.getCode()); Double totalPrice = order.getTotalPrice(); BigDecimal total = BigDecimal.valueOf(totalPrice).setScale(2, RoundingMode.HALF_UP); diff --git a/yudao-module-member/yudao-module-member-biz/src/main/resources/mapper/storeorder/StoreOrderMapper.xml b/yudao-module-member/yudao-module-member-biz/src/main/resources/mapper/storeorder/StoreOrderMapper.xml index 867f19e7..782ceaa1 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/resources/mapper/storeorder/StoreOrderMapper.xml +++ b/yudao-module-member/yudao-module-member-biz/src/main/resources/mapper/storeorder/StoreOrderMapper.xml @@ -11,7 +11,7 @@