Skip to content

GitLab

Q
qk_backend
Commit 08883d84 authored by shiyu's avatar shiyu
Browse files
Options

中转单为空的情况排除

parent bb187b22
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/SysDistributionOrderServiceImpl.java
View file @ 08883d84
...@@ -110,8 +110,10 @@ public class SysDistributionOrderServiceImpl implements SysDistributionOrderServ ...@@ -110,8 +110,10 @@ public class SysDistributionOrderServiceImpl implements SysDistributionOrderServ
EntityMapper.copyAttribute(distributionOrder, distributionOrderVo); EntityMapper.copyAttribute(distributionOrder, distributionOrderVo);
//查询藏家退货地址 //查询藏家退货地址
IdentifyOrder identifyOrder = identifyOrderDao.findByDistributionOrderId(distributionOrder.getDistributionOrderId()); IdentifyOrder identifyOrder = identifyOrderDao.findByDistributionOrderId(distributionOrder.getDistributionOrderId());
String returnInfo = identifyOrder.getReturnName() + "," + identifyOrder.getReturnPhone() + "," + identifyOrder.getReturnAddress(); if (identifyOrder != null) {
distributionOrderVo.setReturnAddress(returnInfo); String returnInfo = identifyOrder.getReturnName() + "," + identifyOrder.getReturnPhone() + "," + identifyOrder.getReturnAddress();
distributionOrderVo.setReturnAddress(returnInfo);
}
SupplierItem supplierItem = supplierItemDao.findById(distributionOrder.getItemId()); SupplierItem supplierItem = supplierItemDao.findById(distributionOrder.getItemId());
distributionOrderVo.setItemName(supplierItem.getName()); distributionOrderVo.setItemName(supplierItem.getName());
long itemPrice = distributionOrder.getAmount() / distributionOrder.getItemNum(); long itemPrice = distributionOrder.getAmount() / distributionOrder.getItemNum();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment