xuhy
2026-02-06 d782bff0762c1f821ef98f610bd37ccc49c8f285
云仓对接物流信息查询
3个文件已修改
35 ■■■■■ 已修改文件
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmClinicCloudWarehouseController.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpProcurementController.java 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/yuncang/api/basic/LogisticsQuery.java 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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();
    }
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpProcurementController.java
@@ -2,6 +2,8 @@
import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.lkl.laop.sdk.request.V3LabsTransPreorderRequest;
@@ -28,6 +30,7 @@
import com.ruoyi.common.utils.WebUtils;
import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.entity.ExportParams;
import com.ruoyi.web.controller.yuncang.api.basic.LogisticsQuery;
import io.swagger.annotations.ApiParam;
import org.apache.poi.ss.usermodel.Workbook;
import com.ruoyi.web.core.config.LakalaConfig;
@@ -83,13 +86,14 @@
    private final TErpProcurementCommissionService erpProcurementCommissionService;
    private final TCrmWarehouseService crmWarehouseService;
    private final ISysUserService sysUserService;
    private final TSysCloudConfigService sysCloudConfigService;
    @Autowired
    public TErpProcurementController(TErpProcurementService erpProcurementService, TokenService tokenService, TCrmClinicService crmClinicService, TErpProcurementGoodsService erpProcurementGoodsService
    , TErpGoodsService erpGoodsService, TErpClinicWarehousingService erpClinicWarehousingService, TErpClinicWarehousingBatchService erpClinicWarehousingBatchService,
                                     TCrmSupplierService crmSupplierService, TErpMaintenanceReminderService erpMaintenanceReminderService, TSysOtherConfigService sysOtherConfigService, TCrmClinicPointsService crmClinicPointsService, TCrmChangePointsService crmChangePointsService, TCrmBranchService crmBranchService, TCrmSalespersonService crmSalespersonService, TErpProcurementCommissionService erpProcurementCommissionService, TCrmWarehouseService crmWarehouseService, ISysUserService sysUserService) {
                                     TCrmSupplierService crmSupplierService, TErpMaintenanceReminderService erpMaintenanceReminderService, TSysOtherConfigService sysOtherConfigService, TCrmClinicPointsService crmClinicPointsService, TCrmChangePointsService crmChangePointsService, TCrmBranchService crmBranchService, TCrmSalespersonService crmSalespersonService, TErpProcurementCommissionService erpProcurementCommissionService, TCrmWarehouseService crmWarehouseService, ISysUserService sysUserService, TSysCloudConfigService sysCloudConfigService) {
        this.erpProcurementService = erpProcurementService;
        this.tokenService = tokenService;
        this.crmClinicService = crmClinicService;
@@ -109,6 +113,7 @@
        this.crmWarehouseService = crmWarehouseService;
        this.sysUserService = sysUserService;
        this.sysCloudConfigService = sysCloudConfigService;
    }
@@ -587,7 +592,19 @@
    @ApiOperation(value = "查询云仓物流信息[20260202]")
    @GetMapping(value = "/queryLogisticsInfo")
    public R<JSONArray> queryLogisticsInfo(@RequestParam String logisticsNo) {
        TSysCloudConfig sysCloudConfig = sysCloudConfigService.getOne(Wrappers.lambdaQuery(TSysCloudConfig.class)
                .eq(TSysCloudConfig::getCloudWarehouse, 1)
                .last("LIMIT 1"));
        JSONObject jsonObject = LogisticsQuery.logisticsQuery(sysCloudConfig.getSid(), sysCloudConfig.getAppKey(), sysCloudConfig.getAppSecret(), sysCloudConfig.getUrl(), logisticsNo);
        if (Objects.nonNull(jsonObject)){
            JSONArray logisticsList = jsonObject.getJSONArray("logistics_list");
            return R.ok(logisticsList);
        }
        return R.ok();
    }
ruoyi-admin/src/main/java/com/ruoyi/web/controller/yuncang/api/basic/LogisticsQuery.java
@@ -1,7 +1,7 @@
package com.ruoyi.web.controller.yuncang.api.basic;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson2.JSONObject;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.web.controller.yuncang.utils.WdtClient;
import lombok.extern.slf4j.Slf4j;
@@ -22,7 +22,7 @@
     * @param logistics_no     物流单号
     * @return
     */
    public static JSONObject logisticsQuery(String sid, String appkey, String appsecret,String url, String logistics_no) {
    public static JSONObject logisticsQuery(String sid, String appkey, String appsecret, String url, String logistics_no) {
        WdtClient client = new WdtClient(sid, appkey, appsecret, url);
        Map<String, String> params = new HashMap<String, String>();
        params.put("logistics_no", logistics_no);