修改支付信息

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/service/ConfirmOrderService.java

@@ -66,7 +66,6 @@ public class ConfirmOrderService {
 		ConfirmOrderInfoVo confirmOrderInfoVo = new ConfirmOrderInfoVo();
 		confirmOrderInfoVo.setType(confirmOrderDto.getType());
 		confirmOrderInfoVo.setIds(confirmOrderDto.getIds());
-		confirmOrderInfoVo.setNumber(confirmOrderDto.getNumber());
 		switch (OrderTypeEnum.getByCode(confirmOrderDto.getType())) {
 			//标准数据
 			case STANDARD_DATA:
@@ -78,9 +77,9 @@ public class ConfirmOrderService {
 				if (industryApplicationInfoList != null && industryApplicationInfoList.size() > 0) {
 					confirmOrderInfoVo.setIndustryApplicationInfoList(industryApplicationInfoList);
 					//总数量
-					Integer totalNumber = confirmOrderInfoVo.getNumber();
-					BigDecimal totalAmount = industryApplicationInfoList.get(0).getPrice().multiply(new BigDecimal(totalNumber));
-					confirmOrderInfoVo.setTotalAmount(totalAmount);
+					Double amount = industryApplicationInfoList.stream().mapToDouble(e->e.getPrice().doubleValue()).reduce(0, Double::sum);
+					confirmOrderInfoVo.setTotalAmount(new BigDecimal(amount));
+					confirmOrderInfoVo.setNumber(industryApplicationInfoList.size());
 				}
 				break;
 				//影像图库
@@ -97,9 +96,9 @@ public class ConfirmOrderService {
 						});
 						confirmOrderInfoVo.setImageImgStorageList(imageImgStorageList);
 						//总数量
-						Integer totalNumber = confirmOrderInfoVo.getNumber();
-						BigDecimal totalAmount = imageInfoRelationList.get(0).getPrice().multiply(new BigDecimal(totalNumber));
-						confirmOrderInfoVo.setTotalAmount(totalAmount);
+						confirmOrderInfoVo.setNumber(imageInfoRelationList.size());
+						Double amount = imageInfoRelationList.stream().mapToDouble(e->e.getPrice().doubleValue()).reduce(0, Double::sum);
+						confirmOrderInfoVo.setTotalAmount(new BigDecimal(amount));
 					}
 				}
 				break;