diff --git a/sky-server/src/main/java/com/sky/SkyApplication.java b/sky-server/src/main/java/com/sky/SkyApplication.java index 845d36b..5efc490 100644 --- a/sky-server/src/main/java/com/sky/SkyApplication.java +++ b/sky-server/src/main/java/com/sky/SkyApplication.java @@ -4,12 +4,14 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cache.annotation.EnableCaching; +import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.transaction.annotation.EnableTransactionManagement; @SpringBootApplication @EnableTransactionManagement //开启注解方式的事务管理 @Slf4j @EnableCaching +@EnableScheduling public class SkyApplication { public static void main(String[] args) { SpringApplication.run(SkyApplication.class, args); diff --git a/sky-server/src/main/java/com/sky/config/WebSocketConfiguration.java b/sky-server/src/main/java/com/sky/config/WebSocketConfiguration.java new file mode 100644 index 0000000..a46c2cb --- /dev/null +++ b/sky-server/src/main/java/com/sky/config/WebSocketConfiguration.java @@ -0,0 +1,18 @@ +package com.sky.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.socket.server.standard.ServerEndpointExporter; + +/** + * WebSocket配置类，用于注册WebSocket的Bean + */ +@Configuration +public class WebSocketConfiguration { + + @Bean + public ServerEndpointExporter serverEndpointExporter() { + return new ServerEndpointExporter(); + } + +} diff --git a/sky-server/src/main/java/com/sky/controller/user/OrderController.java b/sky-server/src/main/java/com/sky/controller/user/OrderController.java index 164ec36..893d099 100644 --- a/sky-server/src/main/java/com/sky/controller/user/OrderController.java +++ b/sky-server/src/main/java/com/sky/controller/user/OrderController.java @@ -2,10 +2,12 @@ package com.sky.controller.user; import com.sky.dto.OrdersPaymentDTO; import com.sky.dto.OrdersSubmitDTO; +import com.sky.result.PageResult; import com.sky.result.Result; import com.sky.service.OrderService; import com.sky.vo.OrderPaymentVO; import com.sky.vo.OrderSubmitVO; +import com.sky.vo.OrderVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -40,4 +42,36 @@ public class OrderController { orderService.paySuccess(ordersPaymentDTO.getOrderNumber()); return Result.success(orderPaymentVO); } + + @GetMapping("/historyOrders") + @ApiOperation("查询历史订单") + public Result page(int page,int pageSize,int status){ + PageResult pageResult = orderService.pageQuery4User(page, pageSize, status); + return Result.success(pageResult); + } + @GetMapping("/orderDetail/{id}") + @ApiOperation("查询订单详情") + public Result details(@PathVariable Integer id){ + OrderVO orderVO=orderService.details(id); + return Result.success(orderVO); + } + @PutMapping("/cancel/{id}") + @ApiOperation("取消订单") + public Result cancel(@PathVariable Integer id) throws Exception { + orderService.cancel(id); + return Result.success(); + } + /** + * 再来一单 + * + * @param id + * @return + */ + @PostMapping("/repetition/{id}") + @ApiOperation("再来一单") + public Result repetition(@PathVariable Long id) { + orderService.repetition(id); + return Result.success(); + } + } diff --git a/sky-server/src/main/java/com/sky/mapper/OrderDetailMapper.java b/sky-server/src/main/java/com/sky/mapper/OrderDetailMapper.java index e454065..0d9c64c 100644 --- a/sky-server/src/main/java/com/sky/mapper/OrderDetailMapper.java +++ b/sky-server/src/main/java/com/sky/mapper/OrderDetailMapper.java @@ -1,6 +1,7 @@ package com.sky.mapper; import com.sky.entity.OrderDetail; +import com.sky.vo.OrderVO; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -8,4 +9,8 @@ import java.util.List; @Mapper public interface OrderDetailMapper { void insertBatch(List orderDetailList); + + List getByOrderId(Long orderId); + + } diff --git a/sky-server/src/main/java/com/sky/mapper/OrderMapper.java b/sky-server/src/main/java/com/sky/mapper/OrderMapper.java index d049ec8..2ff168d 100644 --- a/sky-server/src/main/java/com/sky/mapper/OrderMapper.java +++ b/sky-server/src/main/java/com/sky/mapper/OrderMapper.java @@ -1,9 +1,15 @@ package com.sky.mapper; +import com.github.pagehelper.Page; +import com.sky.dto.OrdersPageQueryDTO; import com.sky.entity.Orders; +import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Select; +import java.time.LocalDateTime; +import java.util.List; + @Mapper public interface OrderMapper { void insert(Orders order); @@ -19,4 +25,13 @@ public interface OrderMapper { * @param orders */ void update(Orders orders); + + + List pageQuery(OrdersPageQueryDTO ordersPageQueryDTO); + @Select("select * from orders where id=#{id}") + Orders getById(Integer id); + @Delete("delete form orders where id=#{id}") + void deleteById(Integer id); + @Select("select * from orders where status = #{status} and order_time < #{orderTime}") + List getByStatusAndOrdertimeLT(Integer status, LocalDateTime orderTime); } diff --git a/sky-server/src/main/java/com/sky/mapper/ShoppingCartMapper.java b/sky-server/src/main/java/com/sky/mapper/ShoppingCartMapper.java index 4367c38..8f6af87 100644 --- a/sky-server/src/main/java/com/sky/mapper/ShoppingCartMapper.java +++ b/sky-server/src/main/java/com/sky/mapper/ShoppingCartMapper.java @@ -18,4 +18,6 @@ public interface ShoppingCartMapper { void deleteByUserId(Long currentId); @Delete("delete from shopping_cart where id = #{id}") void deleteById(Long id); + + void insertBatch(List shoppingCartList); } diff --git a/sky-server/src/main/java/com/sky/service/OrderService.java b/sky-server/src/main/java/com/sky/service/OrderService.java index b52bfe7..e7d5d6e 100644 --- a/sky-server/src/main/java/com/sky/service/OrderService.java +++ b/sky-server/src/main/java/com/sky/service/OrderService.java @@ -2,8 +2,10 @@ package com.sky.service; import com.sky.dto.OrdersPaymentDTO; import com.sky.dto.OrdersSubmitDTO; +import com.sky.result.PageResult; import com.sky.vo.OrderPaymentVO; import com.sky.vo.OrderSubmitVO; +import com.sky.vo.OrderVO; public interface OrderService { OrderSubmitVO submit(OrdersSubmitDTO ordersSubmitDTO); @@ -15,4 +17,12 @@ public interface OrderService { * @param outTradeNo */ void paySuccess(String outTradeNo); + + PageResult pageQuery4User(int page, int pageSize, int status); + + OrderVO details(Integer id); + + void cancel(Integer id) throws Exception; + + void repetition(Long id); } diff --git a/sky-server/src/main/java/com/sky/service/impl/OrderServiceImpl.java b/sky-server/src/main/java/com/sky/service/impl/OrderServiceImpl.java index 5cdcaed..52c3434 100644 --- a/sky-server/src/main/java/com/sky/service/impl/OrderServiceImpl.java +++ b/sky-server/src/main/java/com/sky/service/impl/OrderServiceImpl.java @@ -1,8 +1,12 @@ package com.sky.service.impl; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.github.pagehelper.Page; +import com.github.pagehelper.PageHelper; import com.sky.constant.MessageConstant; import com.sky.context.BaseContext; +import com.sky.dto.OrdersPageQueryDTO; import com.sky.dto.OrdersPaymentDTO; import com.sky.dto.OrdersSubmitDTO; import com.sky.entity.*; @@ -10,10 +14,13 @@ import com.sky.exception.AddressBookBusinessException; import com.sky.exception.OrderBusinessException; import com.sky.exception.ShoppingCartBusinessException; import com.sky.mapper.*; +import com.sky.result.PageResult; import com.sky.service.OrderService; import com.sky.utils.WeChatPayUtil; import com.sky.vo.OrderPaymentVO; import com.sky.vo.OrderSubmitVO; +import com.sky.vo.OrderVO; +import com.sky.websocket.WebSocketServer; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -22,7 +29,10 @@ import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; @Service public class OrderServiceImpl implements OrderService { @@ -38,6 +48,8 @@ public class OrderServiceImpl implements OrderService { private WeChatPayUtil weChatPayUtil; @Autowired private UserMapper userMapper; + @Autowired + private WebSocketServer webSocketServer; @Override @Transactional public OrderSubmitVO submit(OrdersSubmitDTO ordersSubmitDTO) { @@ -136,5 +148,125 @@ public class OrderServiceImpl implements OrderService { .build(); orderMapper.update(orders); + Map map=new HashMap(); + map.put("type",1); //1表示来单提醒 2表示客户催单 + map.put("orderId",ordersDB.getId()); + map.put("content","订单号:"+outTradeNo); + String json=JSON.toJSONString(map); + webSocketServer.sendToAllClient(json); } + + @Override + public PageResult pageQuery4User(int pageNum, int pageSize, int status) { + // 设置分页 + PageHelper.startPage(pageNum, pageSize); + + OrdersPageQueryDTO ordersPageQueryDTO = new OrdersPageQueryDTO(); + ordersPageQueryDTO.setUserId(BaseContext.getCurrentId()); + ordersPageQueryDTO.setStatus(status); + + // 分页条件查询 + // 执行分页查询 + List ordersList = orderMapper.pageQuery(ordersPageQueryDTO); + Page page= (Page) ordersList; + // 获取分页结果 +// Page page = orderMapper.pageQuery(ordersPageQueryDTO); + + List list = new ArrayList(); + + // 查询出订单明细，并封装入OrderVO进行响应 + if (page != null && page.getTotal() > 0) { + for (Orders orders : page) { + Long orderId = orders.getId();// 订单id + + // 查询订单明细 + List orderDetails = orderDetailMapper.getByOrderId(orderId); + + OrderVO orderVO = new OrderVO(); + BeanUtils.copyProperties(orders, orderVO); + orderVO.setOrderDetailList(orderDetails); + + list.add(orderVO); + } + } + return new PageResult(page.getTotal(), list); + } + + @Override + public OrderVO details(Integer id) { + // 根据id查询订单 + Orders orders = orderMapper.getById(id); + + // 查询该订单对应的菜品/套餐明细 + List orderDetailList = orderDetailMapper.getByOrderId(orders.getId()); + + // 将该订单及其详情封装到OrderVO并返回 + OrderVO orderVO = new OrderVO(); + BeanUtils.copyProperties(orders, orderVO); + orderVO.setOrderDetailList(orderDetailList); + + return orderVO; + } + + @Override + public void cancel(Integer id) throws Exception { + // 根据id查询订单 + Orders ordersDB = orderMapper.getById(id); + + // 校验订单是否存在 + if (ordersDB == null) { + throw new OrderBusinessException(MessageConstant.ORDER_NOT_FOUND); + } + + //订单状态 1待付款 2待接单 3已接单 4派送中 5已完成 6已取消 + if (ordersDB.getStatus() > 2) { + throw new OrderBusinessException(MessageConstant.ORDER_STATUS_ERROR); + } + Orders orders = new Orders(); + orders.setId(ordersDB.getId()); + + // 订单处于待接单状态下取消，需要进行退款 + if (ordersDB.getStatus().equals(Orders.TO_BE_CONFIRMED)) { + //调用微信支付退款接口 + weChatPayUtil.refund( + ordersDB.getNumber(), //商户订单号 + ordersDB.getNumber(), //商户退款单号 + new BigDecimal(0.01),//退款金额，单位 元 + new BigDecimal(0.01));//原订单金额 + + //支付状态修改为 退款 + orders.setPayStatus(Orders.REFUND); + } + //不是删除，而是更新状态为取消 + // 更新订单状态、取消原因、取消时间 + orders.setStatus(Orders.CANCELLED); + orders.setCancelReason("用户取消"); + orders.setCancelTime(LocalDateTime.now()); + orderMapper.update(orders); + } + + @Override + public void repetition(Long id) { +// 查询当前用户id + Long userId = BaseContext.getCurrentId(); + + // 根据订单id查询当前订单详情 + List orderDetailList = orderDetailMapper.getByOrderId(id); + + // 将订单详情对象转换为购物车对象 + List shoppingCartList = orderDetailList.stream().map(x -> { + ShoppingCart shoppingCart = new ShoppingCart(); + + // 将原订单详情里面的菜品信息重新复制到购物车对象中 + BeanUtils.copyProperties(x, shoppingCart, "id"); + shoppingCart.setUserId(userId); + shoppingCart.setCreateTime(LocalDateTime.now()); + + return shoppingCart; + }).collect(Collectors.toList()); + + // 将购物车对象批量添加到数据库 + shoppingCartMapper.insertBatch(shoppingCartList); + } + } diff --git a/sky-server/src/main/java/com/sky/task/MyTask.java b/sky-server/src/main/java/com/sky/task/MyTask.java new file mode 100644 index 0000000..4096704 --- /dev/null +++ b/sky-server/src/main/java/com/sky/task/MyTask.java @@ -0,0 +1,17 @@ +package com.sky.task; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +import java.util.Date; + +@Slf4j +@Component +public class MyTask { + @Scheduled(cron = "0/5 * * * * ?") + public void executed(){ + log.info("定時任務開始執行:{}",new Date()); + + } +} diff --git a/sky-server/src/main/java/com/sky/task/OrderTask.java b/sky-server/src/main/java/com/sky/task/OrderTask.java new file mode 100644 index 0000000..e098c6b --- /dev/null +++ b/sky-server/src/main/java/com/sky/task/OrderTask.java @@ -0,0 +1,53 @@ +package com.sky.task; + +import com.sky.entity.Orders; +import com.sky.mapper.OrderMapper; +import lombok.extern.java.Log; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +import java.time.LocalDateTime; +import java.util.Date; +import java.util.List; + +@Component +@Slf4j +public class OrderTask { + /** + * 处理下单之后未15分组内支付的超时订单 + */ + @Autowired + private OrderMapper orderMapper; + + @Scheduled(cron = "0 * * * * ? ") + public void processTimeoutOrder(){ + log.info("定时处理支付超时订单：{}", LocalDateTime.now()); + LocalDateTime time = LocalDateTime.now().plusMinutes(-15); + + // select * from orders where status = 1 and order_time < 当前时间-15分钟 + List ordersList = orderMapper.getByStatusAndOrdertimeLT(Orders.PENDING_PAYMENT, time); + if(ordersList != null && ordersList.size() > 0){ + ordersList.forEach(order -> { + order.setStatus(Orders.CANCELLED); + order.setCancelReason("支付超时，自动取消"); + order.setCancelTime(LocalDateTime.now()); + orderMapper.update(order); + }); + } + } + @Scheduled(cron = "0 0 1 * * ?") + public void processDeliveryOrder() { + log.info("处理派送中订单：{}", new Date()); + // select * from orders where status = 4 and order_time < 当前时间-1小时 + LocalDateTime time = LocalDateTime.now().plusMinutes(-60); + List ordersList = orderMapper.getByStatusAndOrdertimeLT(Orders.DELIVERY_IN_PROGRESS, time); + if (ordersList != null && ordersList.size() > 0) { + ordersList.forEach(order -> { + order.setStatus(Orders.COMPLETED); + orderMapper.update(order); + }); + } + } +} diff --git a/sky-server/src/main/java/com/sky/task/WebSocketTask.java b/sky-server/src/main/java/com/sky/task/WebSocketTask.java new file mode 100644 index 0000000..4d8223b --- /dev/null +++ b/sky-server/src/main/java/com/sky/task/WebSocketTask.java @@ -0,0 +1,22 @@ +package com.sky.task; + +import com.sky.websocket.WebSocketServer; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; + +@Component +public class WebSocketTask { + @Autowired + private WebSocketServer webSocketServer; + + /** + * 通过WebSocket每隔5秒向客户端发送消息 + */ + @Scheduled(cron = "0/5 * * * * ?") + public void sendMessageToClient() { + webSocketServer.sendToAllClient("这是来自服务端的消息：" + DateTimeFormatter.ofPattern("HH:mm:ss").format(LocalDateTime.now())); + } +} diff --git a/sky-server/src/main/java/com/sky/websocket/WebSocketServer.java b/sky-server/src/main/java/com/sky/websocket/WebSocketServer.java new file mode 100644 index 0000000..b9e53ae --- /dev/null +++ b/sky-server/src/main/java/com/sky/websocket/WebSocketServer.java @@ -0,0 +1,71 @@ +package com.sky.websocket; + +import org.springframework.stereotype.Component; +import javax.websocket.OnClose; +import javax.websocket.OnMessage; +import javax.websocket.OnOpen; +import javax.websocket.Session; +import javax.websocket.server.PathParam; +import javax.websocket.server.ServerEndpoint; +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; + +/** + * WebSocket服务 + */ +@Component +@ServerEndpoint("/ws/{sid}") +public class WebSocketServer { + + //存放会话对象 + private static Map sessionMap = new HashMap(); + + /** + * 连接建立成功调用的方法 + */ + @OnOpen + public void onOpen(Session session, @PathParam("sid") String sid) { + System.out.println("客户端：" + sid + "建立连接"); + sessionMap.put(sid, session); + } + + /** + * 收到客户端消息后调用的方法 + * + * @param message 客户端发送过来的消息 + */ + @OnMessage + public void onMessage(String message, @PathParam("sid") String sid) { + System.out.println("收到来自客户端：" + sid + "的信息:" + message); + } + + /** + * 连接关闭调用的方法 + * + * @param sid + */ + @OnClose + public void onClose(@PathParam("sid") String sid) { + System.out.println("连接断开:" + sid); + sessionMap.remove(sid); + } + + /** + * 群发 + * + * @param message + */ + public void sendToAllClient(String message) { + Collection sessions = sessionMap.values(); + for (Session session : sessions) { + try { + //服务器向客户端发送消息,这里客户端是指商家后台管理的浏览器界面 + session.getBasicRemote().sendText(message); + } catch (Exception e) { + e.printStackTrace(); + } + } + } + +} diff --git a/sky-server/src/main/resources/html/websocket.html b/sky-server/src/main/resources/html/websocket.html new file mode 100644 index 0000000..3a6693f --- /dev/null +++ b/sky-server/src/main/resources/html/websocket.html @@ -0,0 +1,68 @@ + + + + + WebSocket Demo + + + + + +
+
+ + + diff --git a/sky-server/src/main/resources/mapper/OrderDetailMapper.xml b/sky-server/src/main/resources/mapper/OrderDetailMapper.xml index 8151ed2..ef02146 100644 --- a/sky-server/src/main/resources/mapper/OrderDetailMapper.xml +++ b/sky-server/src/main/resources/mapper/OrderDetailMapper.xml @@ -12,4 +12,10 @@ #{od.number},#{od.amount},#{od.image}) + \ No newline at end of file diff --git a/sky-server/src/main/resources/mapper/OrderMapper.xml b/sky-server/src/main/resources/mapper/OrderMapper.xml index 5c820a5..5816b18 100644 --- a/sky-server/src/main/resources/mapper/OrderMapper.xml +++ b/sky-server/src/main/resources/mapper/OrderMapper.xml @@ -42,4 +42,28 @@ where id = #{id} + \ No newline at end of file diff --git a/sky-server/src/main/resources/mapper/ShoppingCartMapper.xml b/sky-server/src/main/resources/mapper/ShoppingCartMapper.xml index 1d4d1ab..0383683 100644 --- a/sky-server/src/main/resources/mapper/ShoppingCartMapper.xml +++ b/sky-server/src/main/resources/mapper/ShoppingCartMapper.xml @@ -6,6 +6,14 @@ insert into shopping_cart (name, user_id, dish_id, setmeal_id, dish_flavor, number, amount, image, create_time) values (#{name},#{userId},#{dishId},#{setmealId},#{dishFlavor},#{number},#{amount},#{image},#{createTime}) + + insert into shopping_cart + (name, image, user_id, dish_id, setmeal_id, dish_flavor, number, amount, create_time) + values + + (#{sc.name},#{sc.image},#{sc.userId},#{sc.dishId},#{sc.setmealId},#{sc.dishFlavor},#{sc.number},#{sc.amount},#{sc.createTime}) + + update shopping_cart set number = #{number} where id = #{id}