修改开票合计金额为价税的合计相加

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java

@@ -192,8 +192,7 @@ public class InvoiceServiceImpl implements InvoiceService {
                 //成品油和非成品油混合
                 PageOrderInfo cpyPageOrderInfo = new PageOrderInfo();
                 BeanUtils.copyProperties(commonOrderInfo.getOrderInfo(),cpyPageOrderInfo);
-                cpyPageOrderInfo.setKphjje(cpyOrderItems.stream().map(m->new BigDecimal(m.getJshj())).reduce(BigDecimal.ZERO, BigDecimal::add).toString());
-                List<PageOrderItemInfo> cpyOrderItemInfo = new ArrayList<PageOrderItemInfo>();
+                cpyPageOrderInfo.setKphjje(cpyOrderItems.stream().map(m->new BigDecimal(m.getSe()).add(new BigDecimal(m.getXmje()))).reduce(BigDecimal.ZERO, BigDecimal::add).toString());                List<PageOrderItemInfo> cpyOrderItemInfo = new ArrayList<PageOrderItemInfo>();
                 for (OrderItemInfo cpyOrderItem : cpyOrderItems) {
                     PageOrderItemInfo pageOrderItemInfo = new PageOrderItemInfo();
                     BeanUtils.copyProperties(cpyOrderItem,cpyOrderItemInfo);
@@ -207,8 +206,7 @@ public class InvoiceServiceImpl implements InvoiceService {
                 //成品油和非成品油混合
                 PageOrderInfo nocpyPageOrderInfo = new PageOrderInfo();
                 BeanUtils.copyProperties(commonOrderInfo.getOrderInfo(),nocpyPageOrderInfo);
-                nocpyPageOrderInfo.setKphjje(nocpyOrderItems.stream().map(m->new BigDecimal(m.getJshj())).reduce(BigDecimal.ZERO, BigDecimal::add).toString());
-                List<PageOrderItemInfo> nocpyOrderItemInfo = new ArrayList<PageOrderItemInfo>();
+                nocpyPageOrderInfo.setKphjje(nocpyOrderItems.stream().map(m->new BigDecimal(m.getSe()).add(new BigDecimal(m.getXmje()))).reduce(BigDecimal.ZERO, BigDecimal::add).toString());                List<PageOrderItemInfo> nocpyOrderItemInfo = new ArrayList<PageOrderItemInfo>();
                 for (OrderItemInfo nocpyOrderItem : nocpyOrderItems) {
                     PageOrderItemInfo pageOrderItemInfo = new PageOrderItemInfo();
                     BeanUtils.copyProperties(nocpyOrderItem,nocpyOrderItemInfo);