closeOrder(update)

src/main/java/com/mmc/oms/controller/RentalOrdersController.java

@@ -88,6 +88,25 @@ public class RentalOrdersController extends BaseController {
     }
 
 
+    @ApiOperation(value = "关闭/取消订单-用户操作")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = OrderInfoDTO.class)})
+    @GetMapping("closeOrder")
+    public ResultBody closeOrder(HttpServletRequest request,
+                                 @ApiParam(value = "订单Id") @RequestParam(required = true) Integer orderInfoId,
+                                 @ApiParam(value = "取消原因") @RequestParam(required = true) String shutReason) {
+        return rentalOrdersService.closeSelfOrder(orderInfoId, shutReason);
+    }
+
+    @ApiOperation(value = "后台管理关闭订单")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = OrderInfoDTO.class)})
+    @GetMapping("platFormCloseOrder")
+    public ResultBody platFormCloseOrder(HttpServletRequest request,
+                                         @ApiParam(value = "订单Id") @RequestParam(required = true) Integer orderInfoId,
+                                         @ApiParam(value = "取消原因") @RequestParam(required = true) String shutReason) {
+        return rentalOrdersService.platFormCloseOrder(orderInfoId, shutReason);
+    }
+
+
     @ApiIgnore
     @ApiOperation(value = "前端不使用 订单状态的变更")
     @GetMapping("orderStatusChanges")

src/main/java/com/mmc/oms/service/Impl/RentalOrdersServiceImpl.java

@@ -564,6 +564,44 @@ public class RentalOrdersServiceImpl implements RentalOrdersService {
     }
 
     @Override
+    @Transactional
+    public ResultBody platFormCloseOrder(Integer orderInfoId, String shutReason) {
+        OrderInfoDO order = rentalOrdersDao.getOrderInfo(orderInfoId);
+        OrderInfoDO upOrder = new OrderInfoDO();
+        upOrder.setId(orderInfoId);
+        upOrder.setTranStatus(TranStatusDic.CLOSE.getStatus());
+        upOrder.setShutReason(shutReason);
+        rentalOrdersDao.updateOrderInfo(upOrder);
+        return ResultBody.success();
+    }
+
+    @Override
+    @Transactional
+    public ResultBody closeSelfOrder(Integer orderInfoId, String shutReason) {
+        OrderInfoDO order = rentalOrdersDao.getOrderInfo(orderInfoId);
+        if (order == null) {
+            return ResultBody.error(ResultEnum.ORDER_POWER_ERROR);
+        }
+        if (!TranStatusDic.INIT.getStatus().equals(order.getTranStatus())) {
+            return ResultBody.error(ResultEnum.ORDER_STATUS_ERROR);
+        }
+        OrderInfoDO upOrder = new OrderInfoDO();
+        upOrder.setId(orderInfoId);
+        upOrder.setTranStatus(TranStatusDic.CLOSE.getStatus());
+        upOrder.setShutReason(shutReason);
+        rentalOrdersDao.updateOrderInfo(upOrder);
+
+        /*if (WarePayStatus.BEFORE.getStatus().equals(order.getExWare().toString())) {
+            OrderInfoVO stock = OrderInfoVO.builder().wareInfoId(order.getWareInfoId()).skuInfoId(order.getSkuInfoId())
+                    .addStock(order.getWareNum()).build();
+            ResultBody stockResult = wareServletClient.feignOrderNum(stock);
+            return stockResult;
+        }*/
+        return ResultBody.success();
+    }
+
+
+    @Override
     public ResultBody pfConfirmOrderWare(BaseAccountDTO cuser, OrderVcuVO param) {
         // 密码认证
         ResultBody body = passwordAuthentication(cuser, param.getAuthPwd());

src/main/java/com/mmc/oms/service/RentalOrdersService.java

@@ -40,4 +40,8 @@ public interface RentalOrdersService {
     ResultBody pfConfirmOrderWare(BaseAccountDTO currentAccount, OrderVcuVO param);
 
     List<TranStatusDicDTO> listTranStatus();
+
+    ResultBody platFormCloseOrder(Integer orderInfoId, String shutReason);
+
+    ResultBody closeSelfOrder(Integer orderInfoId, String shutReason);
 }