Merge branch 'dev'

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopOldOrderServiceImpl.java

@@ -353,12 +353,12 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
         if (CollectionUtils.isNotEmpty(fromLogs)){
             BigDecimal invoiceTotal = BigDecimal.ZERO;
             for (TopNuoMplatformLog fromLog : fromLogs) {
-                OrderInvoiceBo invoiceBo = JSONObject.parseObject(fromLog.getContent(), OrderInvoiceBo.class);
+                OrderInvoiceHostBo invoiceBo = JSONObject.parseObject(fromLog.getContent(), OrderInvoiceHostBo.class);
                 if (ObjectUtils.isNotNull(invoiceBo)){
-                    BigDecimal price = invoiceBo.getInvoiceDetail().getPrice();
+                    BigDecimal price = invoiceBo.getOrder().getInvoiceDetail().getPrice();
                     invoiceTotal = invoiceTotal.add(price);
                 }
-                orderVo.setInvoiceDate(invoiceBo.getInvoiceDate());
+                orderVo.setInvoiceDate(invoiceBo.getOrder().getInvoiceDate());
             }
             orderVo.setInvoiceMoney(invoiceTotal);
             orderVo.setInvoiceStatus(1);