luminghui
/
sdny-order
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

添加日志

Browse Source
release
wangrangrang 2 years ago
parent bf3e247f17
commit 1e7f4fa3b7
1 changed files with 3 additions and 2 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 5
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java

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

@ -145,6 +145,7 @@ public class InvoiceServiceImpl implements InvoiceService {
List<PageInvoiceItem> pageInvoiceItemList = pageInvoiceReq.getPageInvoiceItemList(); List<PageInvoiceItem> pageInvoiceItemList = pageInvoiceReq.getPageInvoiceItemList();
//查询数据列表 //查询数据列表
List<CommonOrderInfo> commonOrderInfos = orderInfoService.batchQueryOrderInfoByOrderIdsAndNsrsbh(pageInvoiceItemList); List<CommonOrderInfo> commonOrderInfos = orderInfoService.batchQueryOrderInfoByOrderIdsAndNsrsbh(pageInvoiceItemList);
log.info("commonOrderInfos---->batch query order info"+JSON.toJSONString(commonOrderInfos));
List<CommonOrderInfo> commonOrderInfoList=new ArrayList<CommonOrderInfo>(); List<CommonOrderInfo> commonOrderInfoList=new ArrayList<CommonOrderInfo>();
//购方是否为空、税编是否为空校验、成品油校验 //购方是否为空、税编是否为空校验、成品油校验
for(CommonOrderInfo commonOrderInfo:commonOrderInfos){ for(CommonOrderInfo commonOrderInfo:commonOrderInfos){
@ -191,7 +192,7 @@ public class InvoiceServiceImpl implements InvoiceService {
//成品油和非成品油混合 //成品油和非成品油混合
OrderInfo cpyOrderInfo = new OrderInfo(); OrderInfo cpyOrderInfo = new OrderInfo();
BeanUtils.copyProperties(commonOrderInfo.getOrderInfo(),cpyOrderInfo); 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.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)); cpyOrderInfo.setDdh(commonOrderInfo.getOrderInfo().getDdh() + CF + DECIMAL_FORMAT.format(1));
CommonOrderInfo cpyCommonOrderInfo = new CommonOrderInfo(); CommonOrderInfo cpyCommonOrderInfo = new CommonOrderInfo();
@ -203,7 +204,7 @@ public class InvoiceServiceImpl implements InvoiceService {
OrderInfo nocpyOrderInfo = new OrderInfo(); OrderInfo nocpyOrderInfo = new OrderInfo();
BeanUtils.copyProperties(commonOrderInfo.getOrderInfo(),nocpyOrderInfo); 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.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)); nocpyOrderInfo.setDdh(commonOrderInfo.getOrderInfo().getDdh() + CF + DECIMAL_FORMAT.format(2));
CommonOrderInfo nocpyCommonOrderInfo = new CommonOrderInfo(); CommonOrderInfo nocpyCommonOrderInfo = new CommonOrderInfo();

Write Preview
Loading…
Cancel
Save