海运进出口保存，amend保存，报表打印接口汇率转换逻辑修改

blade-service/blade-los/src/main/java/org/springblade/los/business/aea/service/impl/AeaBillsServiceImpl.java

@@ -305,14 +305,6 @@ public class AeaBillsServiceImpl extends ServiceImpl<AeaBillsMapper, AeaBills> i
 			}
 		}
 		this.saveOrUpdate(aeaBills);
-		Date date;
-		if ("AE".equals(aeaBills.getBusinessType())) {
-			date = aeaBills.getEtd();
-		} else {
-			date = aeaBills.getEta();
-		}
-		BigDecimal exrateD = bCurrencyService.getCnyExrate(date, "USD", "D", "1");
-		BigDecimal exrateC = bCurrencyService.getCnyExrate(date, "USD", "C", "1");
 		/**-------------费用计算---------*/
 		BigDecimal amountDr = new BigDecimal("0.00");
 		BigDecimal amountCr = new BigDecimal("0.00");
@@ -359,11 +351,14 @@ public class AeaBillsServiceImpl extends ServiceImpl<AeaBillsMapper, AeaBills> i
 				item.setRefno(aeaBills.getRefno());
 				if ("USD".equals(item.getCurCode())) {
 					amountCrUsd = amountCrUsd.add(item.getAmount());
+					amountCrLoc = amountCrLoc.add(item.getExrate().multiply(item.getAmount()));
 				} else if ("CNY".equals(item.getCurCode())) {
 					amountCr = amountCr.add(item.getAmount());
+					amountCrLoc = amountCrLoc.add(item.getAmount());
 				} else {
-					BigDecimal usd = exrateC.multiply(item.getAmount());
+					BigDecimal usd = item.getExrate().multiply(item.getAmount());
 					amountCrUsd = amountCrUsd.add(usd);
+					amountCrLoc = amountCrLoc.add(usd);
 				}
 			}
 			feeCenterService.submitList(aeaBills.getFeeCenterListC());
@@ -404,11 +399,14 @@ public class AeaBillsServiceImpl extends ServiceImpl<AeaBillsMapper, AeaBills> i
 				item.setRefno(aeaBills.getRefno());
 				if ("USD".equals(item.getCurCode())) {
 					amountDrUsd = amountDrUsd.add(item.getAmount());
+					amountDrLoc = amountDrLoc.add(item.getExrate().multiply(item.getAmount()));
 				} else if ("CNY".equals(item.getCurCode())) {
 					amountDr = amountDr.add(item.getAmount());
+					amountDrLoc = amountDrLoc.add(item.getAmount());
 				} else {
-					BigDecimal usd = exrateD.multiply(item.getAmount());
+					BigDecimal usd = item.getExrate().multiply(item.getAmount());
 					amountDrUsd = amountDrUsd.add(usd);
+					amountDrLoc = amountDrLoc.add(usd);
 				}
 			}
 			feeCenterService.submitList(aeaBills.getFeeCenterListD());
@@ -467,20 +465,26 @@ public class AeaBillsServiceImpl extends ServiceImpl<AeaBillsMapper, AeaBills> i
 					if ("C".equals(item.getDc())) {
 						if ("USD".equals(item.getCurCode())) {
 							amountCrUsdM = amountCrUsdM.add(item.getAmount());
+							amountCrLocM = amountCrLocM.add(item.getExrate().multiply(item.getAmount()));
 						} else if ("CNY".equals(item.getCurCode())) {
 							amountCrM = amountCrM.add(item.getAmount());
+							amountCrLocM = amountCrLocM.add(item.getAmount());
 						} else {
-							BigDecimal usd = exrateC.multiply(item.getAmount());
+							BigDecimal usd = item.getExrate().multiply(item.getAmount());
 							amountCrUsdM = amountCrUsdM.add(usd);
+							amountCrLocM = amountCrLocM.add(usd);
 						}
 					} else {
 						if ("USD".equals(item.getCurCode())) {
 							amountDrUsdM = amountDrUsdM.add(item.getAmount());
+							amountDrLocM = amountDrLocM.add(item.getExrate().multiply(item.getAmount()));
 						} else if ("CNY".equals(item.getCurCode())) {
 							amountDrM = amountDrM.add(item.getAmount());
+							amountDrLocM = amountDrLocM.add(item.getAmount());
 						} else {
-							BigDecimal usd = exrateD.multiply(item.getAmount());
+							BigDecimal usd = item.getExrate().multiply(item.getAmount());
 							amountDrUsdM = amountDrUsdM.add(usd);
+							amountDrLocM = amountDrLocM.add(usd);
 						}
 					}
 				}
@@ -509,10 +513,6 @@ public class AeaBillsServiceImpl extends ServiceImpl<AeaBillsMapper, AeaBills> i
 				//利润 = 收 - 付
 				amountProfitM = amountDrM.subtract(amountCrM);
 				amountProfitUsdM = amountDrUsdM.subtract(amountCrUsdM);
-				amountDrUsdM = exrateD.multiply(amountDrUsdM);
-				amountDrLocM = amountDrLocM.add(amountDrUsdM).add(amountDrM);
-				amountCrUsdM = exrateC.multiply(amountCrUsdM);
-				amountCrLocM = amountCrLocM.add(amountCrUsdM).add(amountCrM);
 				amountProfitLocM = amountDrLocM.subtract(amountCrLocM);
 				details.setAmountDr(amountDrM);
 				details.setAmountCr(amountCrM);
@@ -532,10 +532,6 @@ public class AeaBillsServiceImpl extends ServiceImpl<AeaBillsMapper, AeaBills> i
 		//利润 = 收 - 付
 		amountProfit = amountDr.subtract(amountCr);
 		amountProfitUsd = amountDrUsd.subtract(amountCrUsd);
-		amountDrUsd = exrateD.multiply(amountDrUsd);
-		amountDrLoc = amountDrLoc.add(amountDrUsd).add(amountDr);
-		amountCrUsd = exrateC.multiply(amountCrUsd);
-		amountCrLoc = amountCrLoc.add(amountCrUsd).add(amountCr);
 		amountProfitLoc = amountDrLoc.subtract(amountCrLoc);
 		aeaBills.setAmountDr(amountDr);
 		aeaBills.setAmountCr(amountCr);

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/service/impl/BillsServiceImpl.java

@@ -594,14 +594,6 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 		BigDecimal amountCrLoc = new BigDecimal("0.00");
 		BigDecimal amountProfitLoc = new BigDecimal("0.00");
 		List<FeeCenter> feeCenterListAll = new ArrayList<>();
-		Date date = bills.getEtd();
-		if ("SE".equals(bills.getBusinessType())) {
-			date = bills.getEtd();
-		} else {
-			date = bills.getEta();
-		}
-		BigDecimal exrateD = bCurrencyService.getCnyExrate(date, "USD", "D", "1");
-		BigDecimal exrateC = bCurrencyService.getCnyExrate(date, "USD", "C", "1");
 		//应付
 		int statusC = 0;
 		if (ObjectUtils.isNotNull(bills.getFeeCenterListC())) {
@@ -646,11 +638,14 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 				item.setCntrNo(bills.getQuantityCntrTypesDescr());
 				if ("USD".equals(item.getCurCode())) {
 					amountCrUsd = amountCrUsd.add(item.getAmount());
+					amountCrLoc = amountCrLoc.add(item.getAmount().multiply(item.getExrate()));
 				} else if ("CNY".equals(item.getCurCode())) {
 					amountCr = amountCr.add(item.getAmount());
+					amountCrLoc = amountCrLoc.add(item.getAmount());
 				} else {
-					BigDecimal usd = item.getAmount().multiply(exrateC);
+					BigDecimal usd = item.getAmount().multiply(item.getExrate());
 					amountCrUsd = amountCrUsd.add(usd);
+					amountCrLoc = amountCrLoc.add(usd);
 				}
 				feeCenterListAll.add(item);
 			}
@@ -699,11 +694,14 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 				item.setCntrNo(bills.getQuantityCntrTypesDescr());
 				if ("USD".equals(item.getCurCode())) {
 					amountDrUsd = amountDrUsd.add(item.getAmount());
+					amountDrLoc = amountDrLoc.add(item.getAmount().multiply(item.getExrate()));
 				} else if ("CNY".equals(item.getCurCode())) {
 					amountDr = amountDr.add(item.getAmount());
+					amountDrLoc = amountDrLoc.add(item.getAmount());
 				} else {
-					BigDecimal usd = item.getAmount().multiply(exrateD);
+					BigDecimal usd = item.getAmount().multiply(item.getExrate());
 					amountDrUsd = amountDrUsd.add(usd);
+					amountDrLoc = amountDrLoc.add(usd);
 				}
 				feeCenterListAll.add(item);
 			}
@@ -772,20 +770,26 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 					if ("C".equals(item.getDc())) {
 						if ("USD".equals(item.getCurCode())) {
 							amountCrUsdM = amountCrUsdM.add(item.getAmount());
+							amountCrLocM = amountCrLocM.add(item.getAmount().multiply(item.getExrate()));
 						} else if ("CNY".equals(item.getCurCode())) {
 							amountCrM = amountCrM.add(item.getAmount());
+							amountCrLocM = amountCrLocM.add(item.getAmount());
 						} else {
-							BigDecimal usd = item.getAmount().multiply(exrateC);
+							BigDecimal usd = item.getAmount().multiply(item.getExrate());
 							amountCrUsdM = amountCrUsdM.add(usd);
+							amountCrLocM = amountCrLocM.add(usd);
 						}
 					} else {
 						if ("USD".equals(item.getCurCode())) {
 							amountDrUsdM = amountDrUsdM.add(item.getAmount());
+							amountDrLocM = amountDrLocM.add(item.getAmount().multiply(item.getExrate()));
 						} else if ("CNY".equals(item.getCurCode())) {
 							amountDrM = amountDrM.add(item.getAmount());
+							amountDrLocM = amountDrLocM.add(item.getAmount());
 						} else {
-							BigDecimal usd = item.getAmount().multiply(exrateD);
+							BigDecimal usd = item.getAmount().multiply(item.getExrate());
 							amountDrUsdM = amountDrUsdM.add(usd);
+							amountDrLocM = amountDrLocM.add(usd);
 						}
 					}
 				}
@@ -816,8 +820,6 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 				//利润 = 收 - 付
 				amountProfitM = amountDrM.subtract(amountCrM);
 				amountProfitUsdM = amountDrUsdM.subtract(amountCrUsdM);
-				amountDrLocM = amountDrLocM.add(amountDrUsdM.multiply(exrateD)).add(amountDrM);
-				amountCrLocM = amountCrLocM.add(amountCrUsdM.multiply(exrateC)).add(amountCrM);
 				amountProfitLocM = amountDrLocM.subtract(amountCrLocM);
 				details.setAmountDr(amountDrM);
 				details.setAmountCr(amountCrM);
@@ -837,16 +839,6 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 		//利润 = 收 - 付
 		amountProfit = amountDr.subtract(amountCr);
 		amountProfitUsd = amountDrUsd.subtract(amountCrUsd);
-		if (amountDrUsd.compareTo(new BigDecimal("0.00")) != 0) {
-			amountDrLoc = amountDrLoc.add(amountDrUsd.multiply(exrateD)).add(amountDr);
-		} else {
-			amountDrLoc = amountDrLoc.add(amountDr);
-		}
-		if (amountCrUsd.compareTo(new BigDecimal("0.00")) != 0) {
-			amountCrLoc = amountCrLoc.add(amountCrUsd.multiply(exrateC)).add(amountCr);
-		} else {
-			amountCrLoc = amountCrLoc.add(amountCr);
-		}
 		amountProfitLoc = amountDrLoc.subtract(amountCrLoc);
 		bills.setAmountDr(amountDr);
 		bills.setAmountCr(amountCr);

blade-service/blade-los/src/main/java/org/springblade/los/finance/fee/service/impl/FeeCenterServiceImpl.java

@@ -171,10 +171,10 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 			feeCenter.setAmountLoc(amount);
 			feeCenter.setAmountDiscountLoc(amount);
 		} else {
-			feeCenter.setAmountNetLoc(bCurrencyService.converterCny(feeCenter.getCurCode(), amountNet, "", "1"));
-			feeCenter.setAmountTaxLoc(bCurrencyService.converterCny(feeCenter.getCurCode(), amountTax, "", "1"));
-			feeCenter.setAmountLoc(bCurrencyService.converterCny(feeCenter.getCurCode(), amount, "", "1"));
-			feeCenter.setAmountDiscountLoc(bCurrencyService.converterCny(feeCenter.getCurCode(), amount, "", "1"));
+			feeCenter.setAmountNetLoc(amountNet.multiply(feeCenter.getExrate()));
+			feeCenter.setAmountTaxLoc(amountTax.multiply(feeCenter.getExrate()));
+			feeCenter.setAmountLoc(amount.multiply(feeCenter.getExrate()));
+			feeCenter.setAmountDiscountLoc(amount.multiply(feeCenter.getExrate()));
 		}
 		feeCenter.setAmountNet(amountNet);
 		feeCenter.setAmountTax(amountTax);
@@ -626,10 +626,10 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 					feeCenter.setAmountLoc(amount);
 					feeCenter.setAmountDiscountLoc(amount);
 				} else {
-					feeCenter.setAmountNetLoc(bCurrencyService.converterCny(feeCenter.getCurCode(), amountNet, "", "1"));
-					feeCenter.setAmountTaxLoc(bCurrencyService.converterCny(feeCenter.getCurCode(), amountTax, "", "1"));
-					feeCenter.setAmountLoc(bCurrencyService.converterCny(feeCenter.getCurCode(), amount, "", "1"));
-					feeCenter.setAmountDiscountLoc(bCurrencyService.converterCny(feeCenter.getCurCode(), amount, "", "1"));
+					feeCenter.setAmountNetLoc(feeCenter.getExrate().multiply(amountNet));
+					feeCenter.setAmountTaxLoc(feeCenter.getExrate().multiply(amountTax));
+					feeCenter.setAmountLoc(feeCenter.getExrate().multiply(amount));
+					feeCenter.setAmountDiscountLoc(feeCenter.getExrate().multiply(amount));
 				}
 				feeCenter.setAmountNet(amountNet);
 				feeCenter.setAmountTax(amountTax);
@@ -652,6 +652,8 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 			amountDrUsd = list.stream().filter(e -> "D".equals(e.getDc()) && "USD".equals(e.getCurCode())).map(FeeCenter::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
 			amountCr = list.stream().filter(e -> "C".equals(e.getDc()) && "CNY".equals(e.getCurCode())).map(FeeCenter::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
 			amountCrUsd = list.stream().filter(e -> "C".equals(e.getDc()) && "USD".equals(e.getCurCode())).map(FeeCenter::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+			amountDrLoc = list.stream().filter(e -> "D".equals(e.getDc()) ).map(FeeCenter::getAmountLoc).reduce(BigDecimal.ZERO, BigDecimal::add);
+			amountCrLoc = list.stream().filter(e -> "C".equals(e.getDc()) ).map(FeeCenter::getAmountLoc).reduce(BigDecimal.ZERO, BigDecimal::add);
 
 			if ("SE".equals(list.get(0).getBusinessType()) || "SI".equals(list.get(0).getBusinessType())) {
 				Bills bills = billsMapper.selectById(list.get(0).getPid());
@@ -694,20 +696,26 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 							if ("C".equals(item.getDc())) {
 								if ("USD".equals(item.getCurCode())) {
 									amountCrUsdM = amountCrUsdM.add(item.getAmount());
+									amountCrLocM = amountCrLocM.add(item.getAmount().multiply(item.getExrate()));
 								} else if ("CNY".equals(item.getCurCode())) {
 									amountCrM = amountCrM.add(item.getAmount());
+									amountCrLocM = amountCrLocM.add(item.getAmount());
 								} else {
-									BigDecimal usd = bCurrencyService.converter(item.getCurCode(), item.getAmount(), item.getDc(), "1");
+									BigDecimal usd = item.getAmount().multiply(item.getExrate());
 									amountCrUsdM = amountCrUsdM.add(usd);
+									amountCrLocM = amountCrLocM.add(item.getAmount().multiply(item.getExrate()));
 								}
 							} else {
 								if ("USD".equals(item.getCurCode())) {
 									amountDrUsdM = amountDrUsdM.add(item.getAmount());
+									amountDrLocM = amountDrLocM.add(item.getAmount().multiply(item.getExrate()));
 								} else if ("CNY".equals(item.getCurCode())) {
 									amountDrM = amountDrM.add(item.getAmount());
+									amountDrLocM = amountDrLocM.add(item.getAmount());
 								} else {
-									BigDecimal usd = bCurrencyService.converter(item.getCurCode(), item.getAmount(), item.getDc(), "1");
+									BigDecimal usd = item.getAmount().multiply(item.getExrate());
 									amountDrUsdM = amountDrUsdM.add(usd);
+									amountDrLocM = amountDrLocM.add(item.getAmount().multiply(item.getExrate()));
 								}
 							}
 						}
@@ -736,8 +744,6 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 						//利润 = 收 - 付
 						amountProfitM = amountDrM.subtract(amountCrM);
 						amountProfitUsdM = amountDrUsdM.subtract(amountCrUsdM);
-						amountDrLocM = amountDrLocM.add(bCurrencyService.converterCny("USD", amountDrUsdM, "D", "1")).add(amountDrM);
-						amountCrLocM = amountCrLocM.add(bCurrencyService.converterCny("USD", amountCrUsdM, "C", "1")).add(amountCrM);
 						amountProfitLocM = amountDrLocM.subtract(amountCrLocM);
 						details.setAmountDr(amountDrM);
 						details.setAmountCr(amountCrM);
@@ -757,8 +763,6 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 				//利润 = 收 - 付
 				amountProfit = amountDr.subtract(amountCr);
 				amountProfitUsd = amountDrUsd.subtract(amountCrUsd);
-				amountDrLoc = amountDrLoc.add(bCurrencyService.converterCny("USD", amountDrUsd, "D", "1")).add(amountDr);
-				amountCrLoc = amountCrLoc.add(bCurrencyService.converterCny("USD", amountCrUsd, "C", "1")).add(amountCr);
 				amountProfitLoc = amountDrLoc.subtract(amountCrLoc);
 				bills.setAmountDr(amountDr);
 				bills.setAmountCr(amountCr);
@@ -811,20 +815,26 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 							if ("C".equals(item.getDc())) {
 								if ("USD".equals(item.getCurCode())) {
 									amountCrUsdM = amountCrUsdM.add(item.getAmount());
+									amountCrLocM = amountCrLocM.add(item.getAmount().multiply(item.getExrate()));
 								} else if ("CNY".equals(item.getCurCode())) {
 									amountCrM = amountCrM.add(item.getAmount());
+									amountCrLocM = amountCrLocM.add(item.getAmount());
 								} else {
-									BigDecimal usd = bCurrencyService.converter(item.getCurCode(), item.getAmount(), item.getDc(), "1");
+									BigDecimal usd = item.getAmount().multiply(item.getExrate());
 									amountCrUsdM = amountCrUsdM.add(usd);
+									amountCrLocM = amountCrLocM.add(item.getAmount().multiply(item.getExrate()));
 								}
 							} else {
 								if ("USD".equals(item.getCurCode())) {
 									amountDrUsdM = amountDrUsdM.add(item.getAmount());
+									amountDrLocM = amountDrLocM.add(item.getAmount().multiply(item.getExrate()));
 								} else if ("CNY".equals(item.getCurCode())) {
 									amountDrM = amountDrM.add(item.getAmount());
+									amountDrLocM = amountDrLocM.add(item.getAmount());
 								} else {
-									BigDecimal usd = bCurrencyService.converter(item.getCurCode(), item.getAmount(), item.getDc(), "1");
+									BigDecimal usd = item.getAmount().multiply(item.getExrate());
 									amountDrUsdM = amountDrUsdM.add(usd);
+									amountDrLocM = amountDrLocM.add(item.getAmount().multiply(item.getExrate()));
 								}
 							}
 						}
@@ -853,8 +863,6 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 						//利润 = 收 - 付
 						amountProfitM = amountDrM.subtract(amountCrM);
 						amountProfitUsdM = amountDrUsdM.subtract(amountCrUsdM);
-						amountDrLocM = amountDrLocM.add(bCurrencyService.converterCny("USD", amountDrUsdM, "D", "1")).add(amountDrM);
-						amountCrLocM = amountCrLocM.add(bCurrencyService.converterCny("USD", amountCrUsdM, "C", "1")).add(amountCrM);
 						amountProfitLocM = amountDrLocM.subtract(amountCrLocM);
 						details.setAmountDr(amountDrM);
 						details.setAmountCr(amountCrM);
@@ -874,8 +882,6 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 				//利润 = 收 - 付
 				amountProfit = amountDr.subtract(amountCr);
 				amountProfitUsd = amountDrUsd.subtract(amountCrUsd);
-				amountDrLoc = amountDrLoc.add(bCurrencyService.converterCny("USD", amountDrUsd, "D", "1")).add(amountDr);
-				amountCrLoc = amountCrLoc.add(bCurrencyService.converterCny("USD", amountCrUsd, "C", "1")).add(amountCr);
 				amountProfitLoc = amountDrLoc.subtract(amountCrLoc);
 				aeaBills.setAmountDr(amountDr);
 				aeaBills.setAmountCr(amountCr);
@@ -893,8 +899,6 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 				//利润 = 收 - 付
 				amountProfit = amountDr.subtract(amountCr);
 				amountProfitUsd = amountDrUsd.subtract(amountCrUsd);
-				amountDrLoc = amountDrLoc.add(bCurrencyService.converterCny("USD", amountDrUsd, "D", "1")).add(amountDr);
-				amountCrLoc = amountCrLoc.add(bCurrencyService.converterCny("USD", amountCrUsd, "C", "1")).add(amountCr);
 				amountProfitLoc = amountDrLoc.subtract(amountCrLoc);
 				customsDeclaration.setAmountDr(amountDr);
 				customsDeclaration.setAmountCr(amountCr);

blade-service/blade-los/src/main/java/org/springblade/los/statisticAnalysis/service/impl/StatisticAnalysisServiceImpl.java

@@ -225,11 +225,9 @@ public class StatisticAnalysisServiceImpl implements IStatisticAnalysisService {
 						item.setRealAmountDrUsd(item.getRealAmountDrUsd().add(feeCentersUDReal));
 						item.setAmountDrLoc(item.getAmountDrLoc().add(feeCentersUDLoc));
 						item.setRealAmountDrLoc(item.getRealAmountDrLoc().add(feeCentersUDRealLoc));
-						item.setAmountProfitLoc(item.getAmountProfitLoc().add(item.getAmountDrLoc().subtract(item.getAmountCrLoc()).setScale(2, RoundingMode.HALF_UP)));
-						item.setRealAmountProfitLoc(item.getRealAmountProfitLoc().add(item.getRealAmountDrLoc().subtract(item.getRealAmountCrLoc()).setScale(2, RoundingMode.HALF_UP)));
+						item.setAmountProfitLoc(item.getAmountDrLoc().subtract(item.getAmountCrLoc()).setScale(2, RoundingMode.HALF_UP));
+						item.setRealAmountProfitLoc(item.getRealAmountDrLoc().subtract(item.getRealAmountCrLoc()).setScale(2, RoundingMode.HALF_UP));
 					}
-				} else {
-					item.setRealAmountProfitLoc(item.getRealAmountDrLoc().subtract(item.getRealAmountCrLoc()).setScale(2, RoundingMode.HALF_UP));
 				}
 			}
 		} else {
@@ -1115,8 +1113,8 @@ public class StatisticAnalysisServiceImpl implements IStatisticAnalysisService {
 						item.setRealAmountDrUsd(item.getRealAmountDrUsd().add(feeCentersUDReal));
 						item.setAmountDrLoc(item.getAmountDrLoc().add(feeCentersUDLoc));
 						item.setRealAmountDrLoc(item.getRealAmountDrLoc().add(feeCentersUDRealLoc));
-						item.setAmountProfitLoc(item.getAmountProfitLoc().add(item.getAmountDrLoc().subtract(item.getAmountCrLoc()).setScale(2, RoundingMode.HALF_UP)));
-						item.setRealAmountProfitLoc(item.getRealAmountProfitLoc().add(item.getRealAmountDrLoc().subtract(item.getRealAmountCrLoc()).setScale(2, RoundingMode.HALF_UP)));
+						item.setAmountProfitLoc(item.getAmountDrLoc().subtract(item.getAmountCrLoc()).setScale(2, RoundingMode.HALF_UP));
+						item.setRealAmountProfitLoc(item.getRealAmountDrLoc().subtract(item.getRealAmountCrLoc()).setScale(2, RoundingMode.HALF_UP));
 					}
 				} else {
 					item.setRealAmountProfitLoc(item.getRealAmountDrLoc().subtract(item.getRealAmountCrLoc()).setScale(2, RoundingMode.HALF_UP));
@@ -1279,8 +1277,8 @@ public class StatisticAnalysisServiceImpl implements IStatisticAnalysisService {
 						item.setRealAmountDrUsd(item.getRealAmountDrUsd().add(feeCentersUDReal));
 						item.setAmountDrLoc(item.getAmountDrLoc().add(feeCentersUDLoc));
 						item.setRealAmountDrLoc(item.getRealAmountDrLoc().add(feeCentersUDRealLoc));
-						item.setAmountProfitLoc(item.getAmountProfitLoc().add(item.getAmountDrLoc().subtract(item.getAmountCrLoc()).setScale(2, RoundingMode.HALF_UP)));
-						item.setRealAmountProfitLoc(item.getRealAmountProfitLoc().add(item.getRealAmountDrLoc().subtract(item.getRealAmountCrLoc()).setScale(2, RoundingMode.HALF_UP)));
+						item.setAmountProfitLoc(item.getAmountDrLoc().subtract(item.getAmountCrLoc()).setScale(2, RoundingMode.HALF_UP));
+						item.setRealAmountProfitLoc(item.getRealAmountDrLoc().subtract(item.getRealAmountCrLoc()).setScale(2, RoundingMode.HALF_UP));
 					}
 				} else {
 					item.setRealAmountProfitLoc(item.getRealAmountDrLoc().subtract(item.getRealAmountCrLoc()).setScale(2, RoundingMode.HALF_UP));