Merge branch 'test' of http://192.168.12.182/invoice/sims-order into test

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

@@ -145,6 +145,7 @@ public class InvoiceServiceImpl implements InvoiceService {
         List<PageInvoiceItem> pageInvoiceItemList = pageInvoiceReq.getPageInvoiceItemList();
         //查询数据列表
         List<CommonOrderInfo> commonOrderInfos = orderInfoService.batchQueryOrderInfoByOrderIdsAndNsrsbh(pageInvoiceItemList);
+        log.info("commonOrderInfos---->batch query order info"+JSON.toJSONString(commonOrderInfos));
         List<CommonOrderInfo> commonOrderInfoList=new ArrayList<CommonOrderInfo>();
         //购方是否为空、税编是否为空校验、成品油校验
         for(CommonOrderInfo commonOrderInfo:commonOrderInfos){
@@ -186,10 +187,12 @@ public class InvoiceServiceImpl implements InvoiceService {
                 commonOrderInfo.setOrderItemInfo(CollectionUtils.isEmpty(cpyOrderItems)?nocpyOrderItems:nocpyOrderItems);
                 commonOrderInfoList.add(commonOrderInfo);
             }else {
+                log.info("cpyOrderItems》》》》》》》》"+JSON.toJSONString(cpyOrderItems));
+                log.info("nocpyOrderItems》》》》》》》》"+JSON.toJSONString(nocpyOrderItems));
                 //成品油和非成品油混合
                 OrderInfo cpyOrderInfo = new OrderInfo();
                 BeanUtils.copyProperties(commonOrderInfo.getOrderInfo(),cpyOrderInfo);
-                cpyOrderInfo.setKphjje(cpyOrderItems.stream().map(m->new BigDecimal(m.getJshj())).reduce(BigDecimal.ZERO, BigDecimal::add).toString());
+                cpyOrderInfo.setHjbhsje(cpyOrderItems.stream().map(m->new BigDecimal(m.getXmje())).reduce(BigDecimal.ZERO, BigDecimal::add).toString());
                 cpyOrderInfo.setHjse(cpyOrderItems.stream().map(m->new BigDecimal(m.getSe())).reduce(BigDecimal.ZERO, BigDecimal::add).toString());
                 cpyOrderInfo.setDdh(commonOrderInfo.getOrderInfo().getDdh() + CF + DECIMAL_FORMAT.format(1));
                 CommonOrderInfo cpyCommonOrderInfo = new CommonOrderInfo();
@@ -201,7 +204,7 @@ public class InvoiceServiceImpl implements InvoiceService {
 
                 OrderInfo nocpyOrderInfo = new OrderInfo();
                 BeanUtils.copyProperties(commonOrderInfo.getOrderInfo(),nocpyOrderInfo);
-                nocpyOrderInfo.setKphjje(nocpyOrderItems.stream().map(m->new BigDecimal(m.getJshj())).reduce(BigDecimal.ZERO, BigDecimal::add).toString());
+                nocpyOrderInfo.setHjbhsje(nocpyOrderItems.stream().map(m->new BigDecimal(m.getXmje())).reduce(BigDecimal.ZERO, BigDecimal::add).toString());
                 nocpyOrderInfo.setHjse(nocpyOrderItems.stream().map(m->new BigDecimal(m.getSe())).reduce(BigDecimal.ZERO, BigDecimal::add).toString());
                 nocpyOrderInfo.setDdh(commonOrderInfo.getOrderInfo().getDdh() + CF + DECIMAL_FORMAT.format(2));
                 CommonOrderInfo nocpyCommonOrderInfo = new CommonOrderInfo();