提交 93b713dc 作者: xiaowang

修复

上级 a0f61c5d
......@@ -338,7 +338,7 @@ public class LeaseOrderServiceImpl implements LeaseOrderService {
// 判断订单状态是否是已归还状态
if (statusCode.compareTo(LeaseOrderStatus.WAITING_MERCHANT_CONFIRM.getCode()) >= 0) {
// 快递信息
KdnExpDTO returnKdnExpDTO = this.getReturnOrderExpInfo(leaseOrderExpressDO);
KdnExpDTO returnKdnExpDTO = this.getReturnOrderExpInfo(leaseOrderDO, leaseOrderExpressDO);
leaseOrderDTO.setReturnKdnExpDTO(returnKdnExpDTO);
}
// 设置确认收货信息
......@@ -392,10 +392,18 @@ public class LeaseOrderServiceImpl implements LeaseOrderService {
return kdn;
}
private KdnExpDTO getReturnOrderExpInfo(LeaseOrderExpressDO exp) throws Exception {
private KdnExpDTO getReturnOrderExpInfo(LeaseOrderDO leaseOrderDO, LeaseOrderExpressDO exp) throws Exception {
Integer leaseGoodsId = leaseOrderDO.getLeaseGoodsId();
ResultBody<LeaseGoodsVO> leaseGoodsVOResultBody = pmsAppApi.leaseGoodsDetails(leaseGoodsId);
if (!leaseGoodsVOResultBody.getCode().equals(ResultEnum.SUCCESS.getResultCode())) {
return null;
}
LeaseGoodsVO leaseGoodsVO = leaseGoodsVOResultBody.getResult();
Integer returnAddress = leaseGoodsVO.getReturnAddress();
UserAddressDO userAddressDO = userAddressDao.selectById(returnAddress);
String json = "";
if ("SF".equals(exp.getReturnExpCode())) {
json = KdnExpressUtil.SF("", exp.getReturnExpNo());
json = KdnExpressUtil.SF(userAddressDO.getTakePhone(), exp.getReturnExpNo());
} else if ("JD".equals(exp.getReturnExpCode())) {
json = KdnExpressUtil.JD("", exp.getReturnExpNo());
} else {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论