|
@@ -202,7 +202,8 @@ public class YWBasicService extends YiWangService implements BasicService {
|
|
|
|
|
|
|
|
YWCommRes<Object> res = sendToUrl(req, "/gd/openapi/fenxiao/prov/openAcount/qryorderLogistics");
|
|
YWCommRes<Object> res = sendToUrl(req, "/gd/openapi/fenxiao/prov/openAcount/qryorderLogistics");
|
|
|
JSONObject entries = JSONUtil.parseObj(res.getResult().toString());
|
|
JSONObject entries = JSONUtil.parseObj(res.getResult().toString());
|
|
|
- return JSONUtil.toBean(entries.getStr("data"), new TypeReference<>() {}, true);
|
|
|
|
|
|
|
+
|
|
|
|
|
+ return JSONUtil.toBean(entries.getStr("data"), QueryLogisticsRes.class);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
@@ -230,6 +231,7 @@ public class YWBasicService extends YiWangService implements BasicService {
|
|
|
}
|
|
}
|
|
|
updateWrapper.set(LhbOrder::getOutStatus, "3");
|
|
updateWrapper.set(LhbOrder::getOutStatus, "3");
|
|
|
updateWrapper.set(LhbOrder::getRemark, entries.getStr("orderActName"));
|
|
updateWrapper.set(LhbOrder::getRemark, entries.getStr("orderActName"));
|
|
|
|
|
+ updateWrapper.set(LhbOrder::getResult, entries.getStr("orderActName"));
|
|
|
}else{
|
|
}else{
|
|
|
//4-配送中,不可取消订单 2-订单成功结束
|
|
//4-配送中,不可取消订单 2-订单成功结束
|
|
|
orderService.sendToOrder(order, "2".equals(outStatus) ? NotifyStatusEnum.ACT : NotifyStatusEnum.DISTRIBUTION);
|
|
orderService.sendToOrder(order, "2".equals(outStatus) ? NotifyStatusEnum.ACT : NotifyStatusEnum.DISTRIBUTION);
|