From a0373d6b939d71878ccfcc067cbb4efa6d803830 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 28 三月 2020 00:16:24 +0800
Subject: [PATCH] Merge branch 'back' of https://github.com/java110/MicroCommunity into back
---
Api/src/main/java/com/java110/api/listener/purchaseApply/ListPurchaseApplysListener.java | 41 +++++++++++++----------------------------
1 files changed, 13 insertions(+), 28 deletions(-)
diff --git a/Api/src/main/java/com/java110/api/listener/purchaseApply/ListPurchaseApplysListener.java b/Api/src/main/java/com/java110/api/listener/purchaseApply/ListPurchaseApplysListener.java
index d7b3933..4799ab9 100644
--- a/Api/src/main/java/com/java110/api/listener/purchaseApply/ListPurchaseApplysListener.java
+++ b/Api/src/main/java/com/java110/api/listener/purchaseApply/ListPurchaseApplysListener.java
@@ -73,37 +73,22 @@
List<ApiPurchaseApplyDataVo> purchaseApplys = null;
if (count > 0) {
- purchaseApplys = BeanConvertUtil.covertBeanList(purchaseApplyInnerServiceSMOImpl.queryPurchaseApplys(purchaseApplyDto), ApiPurchaseApplyDataVo.class);
- List<String> orderIds = new ArrayList<>();
- for( ApiPurchaseApplyDataVo apiPurchaseApplyDataVo : purchaseApplys){
- orderIds.add(apiPurchaseApplyDataVo.getApplyOrderId());
- }
- //鏄庣粏鍒楄〃
- PurchaseApplyDetailDto purchaseApplyDetailDto = new PurchaseApplyDetailDto();
- purchaseApplyDetailDto.setApplyOrderIds(orderIds);
- List<PurchaseApplyDetailVo> purchaseApplyDetailVos = BeanConvertUtil.covertBeanList(purchaseApplyInnerServiceSMOImpl.queryPurchaseApplyDetails(purchaseApplyDetailDto), PurchaseApplyDetailVo.class);
-
- for( ApiPurchaseApplyDataVo apiPurchaseApplyDataVo : purchaseApplys){
- List<PurchaseApplyDetailVo> applyDetailList = new ArrayList<>();
- for( PurchaseApplyDetailVo purchaseApplyDetailVo : purchaseApplyDetailVos){
- if(apiPurchaseApplyDataVo.getApplyOrderId().equals(purchaseApplyDetailVo.getApplyOrderId())){
- applyDetailList.add(purchaseApplyDetailVo);
- }
- }
- apiPurchaseApplyDataVo.setPurchaseApplyDetailVo(applyDetailList);
- }
+ List<PurchaseApplyDto> purchaseApplyDtos = purchaseApplyInnerServiceSMOImpl.queryPurchaseApplyAndDetails(purchaseApplyDto);
+ purchaseApplys = BeanConvertUtil.covertBeanList(purchaseApplyDtos, ApiPurchaseApplyDataVo.class);
for( ApiPurchaseApplyDataVo apiPurchaseApplyDataVo : purchaseApplys){
List<PurchaseApplyDetailVo> applyDetailList = apiPurchaseApplyDataVo.getPurchaseApplyDetailVo();
- StringBuffer resNames = new StringBuffer();
- BigDecimal totalPrice = new BigDecimal(0);
- for( PurchaseApplyDetailVo purchaseApplyDetailVo : applyDetailList){
- resNames.append(purchaseApplyDetailVo.getResName()+";");
- BigDecimal price = new BigDecimal(purchaseApplyDetailVo.getPrice());
- BigDecimal quantity = new BigDecimal(purchaseApplyDetailVo.getQuantity());
- totalPrice = totalPrice.add(price.multiply(quantity));
+ if(applyDetailList.size() > 0){
+ StringBuffer resNames = new StringBuffer();
+ BigDecimal totalPrice = new BigDecimal(0);
+ for( PurchaseApplyDetailVo purchaseApplyDetailVo : applyDetailList){
+ resNames.append(purchaseApplyDetailVo.getResName()+";");
+ BigDecimal price = new BigDecimal(purchaseApplyDetailVo.getPrice());
+ BigDecimal quantity = new BigDecimal(purchaseApplyDetailVo.getQuantity());
+ totalPrice = totalPrice.add(price.multiply(quantity));
+ }
+ apiPurchaseApplyDataVo.setResourceNames(resNames.toString());
+ apiPurchaseApplyDataVo.setTotalPrice(totalPrice.toString());
}
- apiPurchaseApplyDataVo.setResourceNames(resNames.toString());
- apiPurchaseApplyDataVo.setTotalPrice(totalPrice.toString());
}
} else {
purchaseApplys = new ArrayList<>();
--
Gitblit v1.8.0