From b08f0e2cd7ca9cb56f78e318e6f2a9f887236e8d Mon Sep 17 00:00:00 2001 From: seesaw Date: Thu, 31 Oct 2024 14:51:17 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/order/OrderController.java | 4 ++-- .../member/service/order/OrderService.java | 2 +- .../member/service/order/OrderServiceImpl.java | 16 +++++++++++++++- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/order/OrderController.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/order/OrderController.java index b3adddeb..de2ef748 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/order/OrderController.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/order/OrderController.java @@ -136,8 +136,8 @@ public class OrderController { @GetMapping("/customize") @Operation(summary = "自定义") - public CommonResult customize(String mobile, BigDecimal money,Long carteenId,String type){ - orderService.customize(mobile,money,carteenId,type); + public CommonResult customize(String mobile, BigDecimal money,Long carteenId,String type,String date){ + orderService.customize(mobile,money,carteenId,type,date); return CommonResult.success(true); } } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/order/OrderService.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/order/OrderService.java index 11e63cc2..4784cfd8 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/order/OrderService.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/order/OrderService.java @@ -126,5 +126,5 @@ public interface OrderService { void reduction(Long orderId,BigDecimal money); - void customize(String mobile, BigDecimal money,Long carteenId,String type); + void customize(String mobile, BigDecimal money,Long carteenId,String type,String date); } \ No newline at end of file diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/order/OrderServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/order/OrderServiceImpl.java index 45be4b50..367a5545 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/order/OrderServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/order/OrderServiceImpl.java @@ -483,12 +483,25 @@ public class OrderServiceImpl implements OrderService { } @Override - public void customize(String mobile, BigDecimal money, Long carteenId, String type) { + @Transactional(rollbackFor = Exception.class) + public void customize(String mobile, BigDecimal money, Long carteenId, String type, String date) { //订单处理 MemberUserDO memberUserDO = memberUserMapper.selectOne(Wrappers.lambdaQuery().eq(MemberUserDO::getMobile, mobile)); if (memberUserDO == null) { throw exception(USER_NOT_EXISTS); } + + if(CostTypeEnum.MORNING.getCode().equals(type)){ + date = date+" 08:00:00"; + }else if (CostTypeEnum.NOON.getCode().equals(type)){ + date = date+" 12:00:00"; + }else if (CostTypeEnum.NIGHT.getCode().equals(type)){ + date = date+" 17:00:00"; + } + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + LocalDateTime now = LocalDateTime.parse(date, formatter); + + DishOrderDO dishOrderDO = new DishOrderDO(); dishOrderDO.setStoreId(carteenId); dishOrderDO.setOrderStatus(DishOrderDO.COMPLETE); @@ -498,6 +511,7 @@ public class OrderServiceImpl implements OrderService { dishOrderDO.setDiningPlatesNum("000001"); dishOrderDO.setCashAmount(money); dishOrderDO.setRefundAmount(money); + dishOrderDO.setCreateTime(now); dishOrderMapper.insert(dishOrderDO); //订单详情处理