修改订单列表bug

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/CancelOrderDTO.java

@@ -7,4 +7,7 @@ import lombok.Data;
 public class CancelOrderDTO {
     @ApiModelProperty(value = "取消原因")
     private String cancelReason;
+
+    @ApiModelProperty(value = "app用户id")
+    private String appUserId;
 }
\ No newline at end of file

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java

@@ -249,6 +249,24 @@ public class BaseOrderController extends CommonBaseController implements UserRes
         if (StringUtils.isBlank(BaseContextHandler.getUserID())) {
             throw new BaseException(ResultCode.AJAX_WECHAT_NOTEXIST_CODE);
         }
+        cancelCommon(no, cancelOrderDto, BaseContextHandler.getUserID());
+        return ObjectRestResponse.succ();
+    }
+
+    @RequestMapping(value = "/back-stage/cancel/{no}", method = RequestMethod.POST)
+    @ResponseBody
+    @ApiOperation(value = "取消订单")
+    @IgnoreClientToken
+    public ObjectRestResponse bgCancel(@PathVariable String no, @RequestBody CancelOrderDTO cancelOrderDto) {
+        //查询列表数据
+        if (StringUtils.isBlank(cancelOrderDto.getAppUserId())) {
+            throw new BaseException(ResultCode.AJAX_WECHAT_NOTEXIST_CODE);
+        }
+        cancelCommon(no, cancelOrderDto, cancelOrderDto.getAppUserId());
+        return ObjectRestResponse.succ();
+    }
+
+    private void cancelCommon(String no, CancelOrderDTO cancelOrderDto, String userId) {
         BaseOrder dbBaseOrder = baseOrderBiz.selectOne(new BaseOrder() {{
             setNo(no);
         }});
@@ -258,7 +276,6 @@ public class BaseOrderController extends CommonBaseController implements UserRes
         }
         dbBaseOrder.setCancelReason(cancelOrderDto.getCancelReason());
         orderCancelBiz.cancel(dbBaseOrder);
-        return ObjectRestResponse.succ();
     }
 
     @RequestMapping(value = "/app/unauth/notifyUrl", method = RequestMethod.GET)