|
@@ -97,7 +97,7 @@ public class KuaiDiNiaoServiceImpl implements KuaiDiNiaoService {
|
|
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
- public String kdShip(PreOrderModel preOrderModel, Long orderId, AddressDTO addressDTO) {
|
|
|
|
|
|
+ public String kdShip(PreOrderModelDTO preOrderModel, Long orderId, AddressDTO addressDTO) {
|
|
fillParam(preOrderModel);
|
|
fillParam(preOrderModel);
|
|
String kdnCode = sendUrl(JSONUtil.toJsonStr(preOrderModel));
|
|
String kdnCode = sendUrl(JSONUtil.toJsonStr(preOrderModel));
|
|
if (StrUtil.isNotEmpty(kdnCode)) {
|
|
if (StrUtil.isNotEmpty(kdnCode)) {
|
|
@@ -191,43 +191,38 @@ public class KuaiDiNiaoServiceImpl implements KuaiDiNiaoService {
|
|
|
|
|
|
/**
|
|
/**
|
|
* 订阅就行了,订阅成功与否均不影响货物的正常派发
|
|
* 订阅就行了,订阅成功与否均不影响货物的正常派发
|
|
- *
|
|
|
|
- * @param logistics
|
|
|
|
- * @param logisticsType
|
|
|
|
- * @param userPhone
|
|
|
|
*/
|
|
*/
|
|
@Override
|
|
@Override
|
|
- public void queryLogistics(String logistics, String logisticsType, String userPhone) {
|
|
|
|
- Map<String, Object> map = new HashMap<>();
|
|
|
|
- map.put("ShipperCode", logisticsType);
|
|
|
|
- map.put("LogisticCode", logistics);
|
|
|
|
- map.put("CustomerName", userPhone);
|
|
|
|
- String design = null;
|
|
|
|
|
|
+ public void queryLogistics(LogisyicsTopic logisyicsTopic) {
|
|
try {
|
|
try {
|
|
- design = URLEncoder.encode(Base64.encode(DigestUtil.md5Hex(JSONUtil.toJsonStr(map) + apiKey)), "UTF-8");
|
|
|
|
-
|
|
|
|
|
|
+ String design = URLEncoder.encode(Base64.encode(DigestUtil.md5Hex(JSONUtil.toJsonStr(logisyicsTopic) + kuaiDiKey)), "UTF-8");
|
|
|
|
+ Map<String, Object> paramMap = new HashMap<>();
|
|
|
|
+ paramMap.put("RequestData", JSONUtil.toJsonStr(logisyicsTopic));
|
|
|
|
+ paramMap.put("DataType", 2);
|
|
|
|
+ paramMap.put("EBusinessID", kuaiDiId);
|
|
|
|
+ paramMap.put("DataSign", design);
|
|
|
|
+ paramMap.put("RequestType", KdConstants.orderLogistics);
|
|
|
|
+ String res = HttpUtil.post(kuaiDiUrl, paramMap);
|
|
|
|
+ log.info(logisyicsTopic.getLogisticCode() + "快递鸟轨迹订阅" + res);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
|
|
|
|
}
|
|
}
|
|
- Map<String, Object> paramMap = new HashMap<>();
|
|
|
|
- paramMap.put("RequestData", map);
|
|
|
|
- paramMap.put("DataType", 2);
|
|
|
|
- paramMap.put("EBusinessID", kuaiDiId);
|
|
|
|
- paramMap.put("DataSign", design);
|
|
|
|
- paramMap.put("RequestType", KdConstants.orderLogistics);
|
|
|
|
- //发请求
|
|
|
|
- String res = HttpUtil.post(kuaiDiUrl, paramMap);
|
|
|
|
- log.info(logistics + "快递鸟轨迹订阅" + res);
|
|
|
|
|
|
+
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
- public void kdnReturnBackLogistics(Map map) {
|
|
|
|
- OrderSendDO sendDO = orderSendManager.getOne(new LambdaQueryWrapper<OrderSendDO>().eq(OrderSendDO::getLogisticsCode, map.get("LogisticCode").toString()).last("limit 1"));
|
|
|
|
- if (ObjectUtil.isNotNull(sendDO)) {
|
|
|
|
- List<Map> maps = JSON.parseArray(JSON.toJSONString(map.get("Traces")), Map.class);
|
|
|
|
- sendDO.setLogistics(maps);
|
|
|
|
|
|
+ public Boolean kdnReturnBackLogistics(Map map) {
|
|
|
|
+ try {
|
|
|
|
+ OrderSendDO sendDO = orderSendManager.getOne(new LambdaQueryWrapper<OrderSendDO>().eq(OrderSendDO::getLogisticsCode, map.get("LogisticCode").toString()).last("limit 1"));
|
|
|
|
+ if (ObjectUtil.isNotNull(sendDO)) {
|
|
|
|
+ List<Map> maps = JSON.parseArray(JSON.toJSONString(map.get("Traces")), Map.class);
|
|
|
|
+ sendDO.setLogistics(maps);
|
|
|
|
+ }
|
|
|
|
+ orderSendManager.updateById(sendDO);
|
|
|
|
+ return true;
|
|
|
|
+ }catch (Exception e){
|
|
|
|
+ return false;
|
|
}
|
|
}
|
|
- orderSendManager.updateById(sendDO);
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|