b1383a4dcd8c1b228174e28fb8331ee078115cb8..48a40ea665ed42713e472d429cf7e311c52d86a5
4 天以前 peng
update 解决商户端无法查看物流信息的问题
48a40e 对比 | 目录
4 天以前 xiangpei
cos配置使用绿满筐提供的
ab76e7 对比 | 目录
2个文件已修改
40 ■■■■ 已修改文件
config/application.yml 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderPackageServiceImpl.java 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
config/application.yml
@@ -319,29 +319,34 @@
# 腾讯cos-sts配置
cos:
  secretId: AKIDYyBCzb1FOPGx0fCXfdOwJVWM1TjqmW3N  # 腾讯ARM用户的secretId
  secretKey: DD1b1LWVIvPlusAOYjnfKm150jO0NYWH  # 腾讯ARM用户的secretKey
  secretId: AKID6zd07yZtwjFVVGkxvc2C5h26uTmpc9QQ  # 腾讯ARM用户的secretId
  secretKey: lFTcV6RVIo43lCMFsEKAk36tRjlVzC8n  # 腾讯ARM用户的secretKey
  durationSeconds: 1800  # STS临时访问凭证有效期,单位秒,默认1800s,主账号最长2小时,子账号(ARM用户)36小时
  bucket: lmk-1308069279
  bucket: lmk-1356772813
  region: ap-chengdu
  endpoint: https://lmk-1308069279.cos.ap-chengdu.myqcloud.com  # 访问域名
  endpoint: https://lmk-1356772813.cos.ap-chengdu.myqcloud.com  # 访问域名
  urlExpireMinute: 360  # 预签名url有效时间(分钟)
  actions:  # sts的权限
    - cos:ListMultipartUploads
    - cos:GetBucket
    - cos:GetBucketACL
    - cos:GetObject
    - cos:GetObjectACL
    - cos:GetObjectTagging
    - cos:GetSymlink
    - cos:HeadObject
    - cos:ListMultipartUploads
    - cos:ListParts
    - cos:AbortMultipartUpload
    - cos:AppendObject
    - cos:CompleteMultipartUpload
    - cos:DeleteMultipleObjects
    - cos:DeleteObject
    - cos:InitiateMultipartUpload
    - cos:PostObject
    - cos:PutObject
    - cos:UploadPart
    - cos:DeleteObject
    - cos:PutObjectACL
    - cos:PutObjectCopy
    - cos:PutObjectTagging
    - cos:RenameObject
    - cos:UploadPart
    - cos:UploadPartCopy
  resources: # 能操作哪些资源
    - qcs::cos:ap-chengdu:uid/1308069279:lmk-1308069279/*
    - qcs::cos::uid/1356772813:lmk-1356772813/*
framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderPackageServiceImpl.java
@@ -1,5 +1,6 @@
package cn.lili.modules.order.order.serviceimpl;
import cn.hutool.core.util.ArrayUtil;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.modules.order.order.entity.dos.OrderPackage;
@@ -8,9 +9,11 @@
import cn.lili.modules.order.order.mapper.OrderPackageMapper;
import cn.lili.modules.order.order.service.OrderPackageItemService;
import cn.lili.modules.order.order.service.OrderPackageService;
import cn.lili.modules.system.entity.dos.Logistics;
import cn.lili.modules.system.entity.vo.Traces;
import cn.lili.modules.system.service.LogisticsService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -54,8 +57,16 @@
            orderPackageVO.setOrderPackageItemList(orderPackageItemList);
            String str = orderPackage.getConsigneeMobile();
            str = str.substring(str.length() - 4);
//            Traces traces = logisticsService.getLogisticTrack(orderPackage.getLogisticsCode(), orderPackage.getLogisticsNo(), str);
//            orderPackageVO.setTraces(traces);
            //不需要取是否打开的可能存在现在不发送快递需要查询物流信息
            List<Logistics> list = logisticsService.list(Wrappers.<Logistics>lambdaQuery()
                    .eq(Logistics::getCode,
                            orderPackage.getLogisticsCode()));
            String logisticsId = orderPackage.getLogisticsCode();
            if (ArrayUtil.isNotEmpty(list)) {
                logisticsId = list.get(0).getId();
            }
            Traces traces = logisticsService.getLogisticTrack(logisticsId, orderPackage.getLogisticsNo(), str);
            orderPackageVO.setTraces(traces);
            orderPackageVOS.add(orderPackageVO);
        });