云仓对接修改bug

xuhy

2026-02-09 7e4ed5384c48c3ffc32df08c5c3bbd3897027589

云仓对接修改bug

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/TaskUtil.java

@@ -173,6 +173,7 @@
    /**
     * 每小时更新订单云物流状态
     */
    //    @Scheduled(fixedRate = 86460000)
    @Scheduled(cron = "0 0 * * * ?")
    public void hourUpdateOrderCloudLogisticsStatus() {
        try {

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/yuncang/api/basic/LogisticsQuery.java

@@ -44,7 +44,7 @@
    public static void main(String[] args) {
        WdtClient client = new WdtClient("apidevnew2", "hytycw02-test", "c7ae51196", "https://sandbox.wangdian.cn/openapi2/");
        Map<String, String> params = new HashMap<String, String>();
        params.put("logistics_no", "SF1519018370586");
        params.put("logistics_no", "SF001");

        try {
            String response = client.execute("logistics.php", params);

 ruoyi-system/src/main/java/com/ruoyi/system/model/TCrmClinic.java

@@ -117,8 +117,4 @@
    @TableField("district_code")
    private String districtCode;

    @ApiModelProperty(value = "详细地址")
    @TableField("address")
    private String address;

}

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCrmClinicServiceImpl.java

@@ -72,6 +72,10 @@

        List<TCrmClinicPoints> points = crmClinicPointsMapper.selectList(new LambdaQueryWrapper<TCrmClinicPoints>().in(TCrmClinicPoints::getClinicId, clinicIds).ge(TCrmClinicPoints::getExpireTime, new Date()).last(" and points > use_points ORDER BY create_time ASC"));

        // 查询诊所仓库
        List<TCrmClinicCloudWarehouse> crmClinicCloudWarehouses = crmClinicCloudWarehouseService.list(new LambdaQueryWrapper<TCrmClinicCloudWarehouse>()
                .in(TCrmClinicCloudWarehouse::getClinicId, clinicIds));

        for (TCrmClinicVO tCrmClinicVO : list) {
            List<TErpProcurement> procurementList = procurements.stream().filter(procurement -> procurement.getClinicId().equals(tCrmClinicVO.getId())).collect(Collectors.toList());
            if(!CollectionUtils.isEmpty(procurementList)){
@@ -87,6 +91,8 @@
            int userPoints = pointsList.stream().mapToInt(item -> item.getPoints() - item.getUsePoints()).sum();
            tCrmClinicVO.setUserPoints(userPoints);

            List<TCrmClinicCloudWarehouse> clinicCloudWarehouses = crmClinicCloudWarehouses.stream().filter(item -> tCrmClinicVO.getId().equals(item.getClinicId())).collect(Collectors.toList());
            tCrmClinicVO.setCrmClinicCloudWarehouses(clinicCloudWarehouses);
        }
        pageInfo.setRecords(list);
        return pageInfo;
@@ -96,6 +102,17 @@
    public PageInfo<TCrmClinicVO> pageAuditList(TCrmClinicQuery query) {
        PageInfo<TCrmClinicVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        List<TCrmClinicVO> list = this.baseMapper.pageAuditList(query,pageInfo);
        if(CollectionUtils.isEmpty(list)){
            return pageInfo;
        }
        List<String> clinicIds = list.stream().map(TCrmClinicVO::getId).collect(Collectors.toList());
        // 查询诊所仓库
        List<TCrmClinicCloudWarehouse> crmClinicCloudWarehouses = crmClinicCloudWarehouseService.list(new LambdaQueryWrapper<TCrmClinicCloudWarehouse>()
                .in(TCrmClinicCloudWarehouse::getClinicId, clinicIds));
        for (TCrmClinicVO tCrmClinicVO : list) {
            List<TCrmClinicCloudWarehouse> clinicCloudWarehouses = crmClinicCloudWarehouses.stream().filter(item -> tCrmClinicVO.getId().equals(item.getClinicId())).collect(Collectors.toList());
            tCrmClinicVO.setCrmClinicCloudWarehouses(clinicCloudWarehouses);
        }
        pageInfo.setRecords(list);
        return pageInfo;
    }

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCrmSupplierServiceImpl.java

@@ -56,7 +56,13 @@
        if(CollectionUtils.isEmpty(list)){
            return pageInfo;
        }
//        List<String> supplierIds = list.stream().map(TCrmSupplierVO::getId).collect(Collectors.toList());
        List<String> supplierIds = list.stream().map(TCrmSupplierVO::getId).collect(Collectors.toList());
        List<TCrmSupplierCloudShop> crmSupplierCloudShops = crmSupplierCloudShopService.list(Wrappers.lambdaQuery(TCrmSupplierCloudShop.class)
                .in(TCrmSupplierCloudShop::getSupplierId, supplierIds));
        for (TCrmSupplierVO crmSupplierVO : list) {
            List<TCrmSupplierCloudShop> supplierCloudShops = crmSupplierCloudShops.stream().filter(crmSupplierCloudShop -> crmSupplierVO.getId().equals(crmSupplierCloudShop.getSupplierId())).collect(Collectors.toList());
            crmSupplierVO.setCrmSupplierCloudShops(supplierCloudShops);
        }
//        List<TCrmSupplierToWarehouse> crmSupplierToWarehouses = crmSupplierToWarehouseService.list(Wrappers.lambdaQuery(TCrmSupplierToWarehouse.class)
//                .eq(TCrmSupplierToWarehouse::getSupplierId, supplierIds));
//        for (TCrmSupplierVO crmSupplierVO : list) {

 ruoyi-system/src/main/resources/mapper/system/TCrmClinicMapper.xml

@@ -20,7 +20,6 @@
        <result column="performance_count" property="performanceCount" />
        <result column="send_message_count" property="sendMessageCount" />
        <result column="qr_code" property="qrCode" />
        <result column="address" property="address" />
        <result column="create_time" property="createTime" />
        <result column="update_time" property="updateTime" />
        <result column="create_by" property="createBy" />

 ruoyi-system/src/main/resources/mapper/system/TErpProcurementMapper.xml

@@ -39,6 +39,7 @@
        t1.status,
        t1.supplier_money,
        t1.money as platformMoney,
        t1.logistics_no,
        t5.clinic_name
        from t_erp_procurement t1
        left JOIN t_erp_procurement_goods t2 on t1.id = t2.procurement_id