藏馆订单显示藏家地址

ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/SysDistributionOrderServiceImpl.java

@@ -16,9 +16,11 @@ import com.wwdz.ch.core.util.PriceUtil;
 import com.wwdz.ch.core.util.RegexUtil;
 import com.wwdz.ch.db.dao.UserDao;
 import com.wwdz.ch.db.dao.distribution.DistributionOrderDao;
+import com.wwdz.ch.db.dao.distribution.IdentifyOrderDao;
 import com.wwdz.ch.db.dao.distribution.SupplierItemDao;
 import com.wwdz.ch.db.domain.User;
 import com.wwdz.ch.db.domain.distribution.DistributionOrder;
+import com.wwdz.ch.db.domain.distribution.IdentifyOrder;
 import com.wwdz.ch.db.domain.distribution.SupplierItem;
 import com.wwdz.ch.db.dto.request.distribution.DistributionOrderRequestDto;
 import com.wwdz.ch.db.dto.request.distribution.SupplierItemRequestDto;
@@ -59,6 +61,9 @@ public class SysDistributionOrderServiceImpl implements SysDistributionOrderServ
     @Autowired
     SendMsgService sendMsgService;
 
+    @Autowired
+    IdentifyOrderDao identifyOrderDao;
+
     @Override
     public Result findList(DistributionOrderRequestDto dto) {
         try {
@@ -103,6 +108,10 @@ public class SysDistributionOrderServiceImpl implements SysDistributionOrderServ
             distributionOrderList.forEach(distributionOrder -> {
                 SysDistributionOrderVo distributionOrderVo = new SysDistributionOrderVo();
                 EntityMapper.copyAttribute(distributionOrder, distributionOrderVo);
+                //查询藏家退货地址
+                IdentifyOrder identifyOrder = identifyOrderDao.findByDistributionOrderId(distributionOrder.getDistributionOrderId());
+                String returnInfo = identifyOrder.getReturnName() + "," + identifyOrder.getReturnPhone() + "," + identifyOrder.getReturnAddress();
+                distributionOrderVo.setReturnAddress(returnInfo);
                 SupplierItem supplierItem = supplierItemDao.findById(distributionOrder.getItemId());
                 distributionOrderVo.setItemName(supplierItem.getName());
                 long itemPrice = distributionOrder.getAmount() / distributionOrder.getItemNum();