.

SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/controller/XiaoJuController.java

@@ -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);
     }
 

SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/service/XiaoJuService.java

@@ -361,14 +361,14 @@ public class XiaoJuService {
 
 
     // 取消订单
-    public void cancelOrder(String orderNo) {
+    public void cancelOrder(String orderNo,String xjOrderId) {
         MiniCancelOrderStatusRequest cancelOrderStatusRequest = new MiniCancelOrderStatusRequest();
         cancelOrderStatusRequest.setOutOrderId(orderNo);
-        cancelOrderStatusRequest.setXjOrderId("3476783454861722785");
+        cancelOrderStatusRequest.setXjOrderId(xjOrderId);
         QueryClient queryClient = QueryClientFactory.create(oilConfig);
         queryClient.apiMini().cancelOrder(cancelOrderStatusRequest);
         ApiLog apiLog = new ApiLog();
-        apiLog.setService("queryNewOrder");
+        apiLog.setService("cancelOrder");
         apiLog.setRequest(JSONUtil.toJsonStr(cancelOrderStatusRequest));
         apiLog.setSystem("xiaoju");
         apiLog.setResponse(null);