|
@@ -8,6 +8,7 @@ import com.xiaoju.open.oil.commons.OilRequest;
|
|
|
import com.xiaoju.open.oil.core.executor.ResponseDTO;
|
|
|
import com.xiaoju.open.oil.interfaces.domain.AllowancePromotionInfo;
|
|
|
import com.xiaoju.open.oil.interfaces.domain.GenPromotionInfo;
|
|
|
+import com.xiaoju.open.oil.interfaces.request.QueryApiOrderListRequest;
|
|
|
import com.xiaoju.open.oil.interfaces.request.QueryGetPromotionRequest;
|
|
|
import com.xiaoju.open.oil.interfaces.response.*;
|
|
|
import com.zswl.cloud.springBatch.client.model.request.*;
|
|
@@ -94,10 +95,17 @@ public class XiaoJuController {
|
|
|
}
|
|
|
|
|
|
@ApiOperation("取消订单")
|
|
|
- @RequestMapping(value = "cancelOrder/{orderNo}", method = RequestMethod.POST)
|
|
|
+ @RequestMapping(value = "cancelOrder", method = RequestMethod.POST)
|
|
|
@ResourceAuth(value = "user", type = AuthType.User)
|
|
|
- public ResultContent cancelOrder(@PathVariable("orderNo") String orderNo) {
|
|
|
- xiaoJuService.cancelOrder(orderNo);
|
|
|
+ public ResultContent cancelOrder(@RequestBody QueryNewOrderResponse queryNewOrderResponse) {
|
|
|
+ xiaoJuService.cancelOrder(queryNewOrderResponse.getOutOrderId(), queryNewOrderResponse.getXjOrderId());
|
|
|
+ return ResultContent.build(ResultState.Success);
|
|
|
+ }
|
|
|
+ @ApiOperation("查询订单列表")
|
|
|
+ @RequestMapping(value = "queryOrderList", method = RequestMethod.POST)
|
|
|
+ @ResourceAuth(value = "user", type = AuthType.User)
|
|
|
+ public ResultContent queryOrderList(@RequestBody QueryApiOrderListRequest queryApiOrderListRequest) {
|
|
|
+ xiaoJuService.queryOrderList(queryApiOrderListRequest);
|
|
|
return ResultContent.build(ResultState.Success);
|
|
|
}
|
|
|
|