Merge remote-tracking branch 'origin/MVP1.5' into MVP1.5

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/SalaryUploadServiceImpl.java

@@ -1777,14 +1777,14 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 		} else {
 			// 2个人承担全部
 			//个人承担全部税费，实发要变为应发，推算出实发、个税
-			nowTaxY = getNowTax(actualSalarySum);
+			nowTaxY = getNowTaxNew(actualSalarySum);
 			if (sumOtherTax.compareTo(BigDecimal.ZERO) != 0) {
 				//历史应发税费
 				nowTaxY = BigDecimalUtils.safeSubtract(false,nowTaxY, sumOtherTax).setScale(SalaryConstants.PLACES, RoundingMode.HALF_UP);
 			}
 			//公司应发和个人实收
-			relaySalary = BigDecimalUtils.safeSubtract(false,actualSalarySumNow, nowTaxY).setScale(SalaryConstants.PLACES, RoundingMode.HALF_UP);
-			a.setActualSalary(relaySalary);
+			relaySalary = actualSalarySumNow;
+			a.setActualSalary(BigDecimalUtils.safeSubtract(false,actualSalarySumNow, nowTaxY).setScale(SalaryConstants.PLACES, RoundingMode.HALF_UP));
 			a.setSalaryTax(nowTaxY);
 		}
 		a.setRelaySalaryUnit(relaySalary);