From 087cd794187727bf9a34fcef3027cd56f6dec436 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 10 Mar 2021 15:20:54 +0800
Subject: [PATCH] Merge branch 'api' of http://120.27.238.55:7000/r/beauty-erp into api
---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/impl/WxShopLogisticsQueryServiceImpl.java | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/impl/WxShopLogisticsQueryServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/impl/WxShopLogisticsQueryServiceImpl.java
index c5c1514..92cf088 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/impl/WxShopLogisticsQueryServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/impl/WxShopLogisticsQueryServiceImpl.java
@@ -1,20 +1,18 @@
package com.matrix.system.shopXcx.api.service.impl;
import com.alibaba.fastjson.JSON;
-import com.matrix.core.constance.SystemErrorCode;
+import com.matrix.component.tools.HttpCurlUtil;
import com.matrix.core.exception.GlobleException;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.tools.LogUtil;
import com.matrix.core.tools.StringUtils;
import com.matrix.system.common.constance.AppConstance;
+import com.matrix.system.shopXcx.api.service.WxShopLogisticsQueryService;
+import com.matrix.system.shopXcx.api.vo.LogisticsInfoVo;
import com.matrix.system.shopXcx.bean.ShopDeliveryInfo;
import com.matrix.system.shopXcx.bean.ShopLogisticsInfo;
import com.matrix.system.shopXcx.dao.ShopDeliveryInfoDao;
import com.matrix.system.shopXcx.dao.ShopLogisticsInfoDao;
-import com.matrix.component.tools.HttpCurlUtil;
-import com.matrix.system.shopXcx.api.service.WxShopLogisticsQueryService;
-import com.matrix.system.shopXcx.api.vo.LogisticsInfoVo;
-import com.matrix.system.shopXcx.api.vo.SfLogisticsInfoVo;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -145,12 +143,11 @@
}
}
} else {
- throw new GlobleException(SystemErrorCode.REQUEST_INVALID, logisticsInfoVo.getReason());
+ throw new GlobleException(logisticsInfoVo.getReason());
}
} catch (Exception e) {
- LogUtil.error("物流信息查询失败", e);
- throw new GlobleException(SystemErrorCode.REQUEST_INVALID);
+ throw new GlobleException("物流信息查询失败");
}
List<ShopLogisticsInfo> shopLogisticsInfos = shopLogisticsInfoDao.selectByDelieryId(shopDeliveryInfo.getId());
result.setStatus(AjaxResult.STATUS_SUCCESS);
--
Gitblit v1.9.1