oying-system/src/main/java/com/oying/modules/sh/domain/vo/OrderInfo.java
@@ -1,5 +1,6 @@ package com.oying.modules.sh.domain.vo; import com.oying.modules.pc.store.domain.Store; import com.oying.modules.sh.domain.UserAddress; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; @@ -17,6 +18,8 @@ @Setter public class OrderInfo { @ApiModelProperty(value = "门店信息") private Store store; @ApiModelProperty(value = "商品信息列") private List<ProductInfo> products; @ApiModelProperty(value = "用户地址信息") oying-system/src/main/java/com/oying/modules/sh/rest/OrderController.java
@@ -100,11 +100,11 @@ return new ResponseEntity<>(R.success(), HttpStatus.OK); } @Log("关闭订单") @ApiOperation("关闭订单") @PostMapping(value = "/closeOrder") public ResponseEntity<Object> closeOrder(@RequestParam String orderNum) { orderService.closeOrder(orderNum); @Log("用户取消订单") @ApiOperation("用户取消订单") @PostMapping(value = "/cancel") public ResponseEntity<Object> cancel(@RequestParam String orderNum) { orderService.cancel(orderNum); return new ResponseEntity<>(R.success(), HttpStatus.OK); } oying-system/src/main/java/com/oying/modules/sh/service/OrderService.java
@@ -83,7 +83,7 @@ */ void download(List<Order> all, HttpServletResponse response) throws IOException; void closeOrder(String orderNum); void cancel(String orderNum); void statusOrder(StatusOrder statusOrder); } oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderOperationLogServiceImpl.java
@@ -54,6 +54,7 @@ @Transactional(rollbackFor = Exception.class) public void create(OrderResponse response, OrderStatusEnum statusEnum, String cardName) { String userType = ConstantsKey.BUYER; String username = null; switch (statusEnum) { case ZERO: case ONE: @@ -62,6 +63,7 @@ userType = ConstantsKey.BUYER; break; case TWO: username = response.getOrder().getUsername(); case FOUR: userType = ConstantsKey.MERCHANT; break; @@ -74,7 +76,9 @@ break; default: } String username = SecurityUtils.getCurrentUsername(); if (username == null) { username = SecurityUtils.getCurrentUsername(); } Timestamp time = new Timestamp(System.currentTimeMillis()); OrderOperationLog resources = new OrderOperationLog(); resources.setOrderNum(response.getOrder().getOrderNum());