21

src/main/java/com/fdkankan/manage/service/impl/InvoiceServiceImpl.java

@@ -72,9 +72,9 @@ public class InvoiceServiceImpl extends ServiceImpl<IInvoiceMapper, Invoice> imp
         Set<Long> userids = invoiceVOPage.getRecords().stream().map(InvoiceVO::getUserId).collect(Collectors.toSet());
         HashMap<Long,ReceiverInfo> map = receiverInfoService.getByUserIds(userids);
         for (InvoiceVO record : invoiceVOPage.getRecords()) {
-            if(StringUtils.isBlank(record.getShipName()) && map.get(record.getUserId())!= null){
+            if(record.getType() == 3 && StringUtils.isBlank(record.getShipName()) && map.get(record.getUserId())!= null){
                 record.setShipName(map.get(record.getUserId()).getShipName());
-                record.setShipAddress(map.get(record.getUserId()).getShipAddress());
+                record.setShipAddress(map.get(record.getUserId()).getShipAreaPath() +map.get(record.getUserId()).getShipAddress());
                 record.setShipMobile(map.get(record.getUserId()).getShipMobile());
             }
         }