From d782bff0762c1f821ef98f610bd37ccc49c8f285 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 06 二月 2026 14:28:28 +0800
Subject: [PATCH] 云仓对接物流信息查询
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmClinicCloudWarehouseController.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmClinicCloudWarehouseController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmClinicCloudWarehouseController.java
index eda9f5a..05d5d4e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmClinicCloudWarehouseController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmClinicCloudWarehouseController.java
@@ -3,6 +3,7 @@
import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.entity.ExportParams;
+import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.core.domain.R;
@@ -25,6 +26,7 @@
import java.sql.Wrapper;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
/**
* <p>
@@ -51,13 +53,17 @@
@ApiOperation(value = "查询云仓仓库列表",notes = "cloudWarehouse:云仓类型 1=旺店通")
@GetMapping("/queryCloudWarehouseList")
- public R<JSONObject> queryCloudWarehouseList(@RequestParam Integer cloudWarehouse) {
+ public R<JSONArray> queryCloudWarehouseList(@RequestParam Integer cloudWarehouse) {
// 查询云仓配置
TSysCloudConfig sysCloudConfig = sysCloudConfigService.getOne(Wrappers.lambdaQuery(TSysCloudConfig.class)
.eq(TSysCloudConfig::getCloudWarehouse, cloudWarehouse)
.last("LIMIT 1"));
JSONObject jsonObject = WarehouseQuery.warehouseQuery(sysCloudConfig.getSid(), sysCloudConfig.getAppKey(), sysCloudConfig.getAppSecret(), sysCloudConfig.getUrl());
- return R.ok(jsonObject);
+ if (Objects.nonNull(jsonObject)){
+ JSONArray warehouses = jsonObject.getJSONArray("warehouses");
+ return R.ok(warehouses);
+ }
+ return R.ok();
}
--
Gitblit v1.7.1