|
|
|
@ -535,16 +535,18 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter { |
|
|
|
|
snDetailMap.put("tax", "0"); |
|
|
|
|
|
|
|
|
|
//如果是卷票计算合计金额
|
|
|
|
|
Float hjje = null; |
|
|
|
|
if (StringUtils.isNotEmpty(detail.getString("se")) && StringUtils.isNotEmpty(detail.getString("je"))) { |
|
|
|
|
Float je = Float.parseFloat(detail.getString("je")); |
|
|
|
|
Float se = Float.parseFloat(detail.getString("se")); |
|
|
|
|
hjje = je + se; |
|
|
|
|
String hjje = null; |
|
|
|
|
if (detail.getString("je") != null && detail.getString("se") != null) { |
|
|
|
|
BigDecimal je = new BigDecimal(detail.getString("je")); |
|
|
|
|
if (detail.getString("se") != null) { |
|
|
|
|
hjje = je.add(new BigDecimal(detail.getString("se"))).toPlainString(); |
|
|
|
|
} else { |
|
|
|
|
hjje = je.toPlainString(); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if (hjje != null) |
|
|
|
|
snDetailMap.put("amount", hjje.toString()); |
|
|
|
|
|
|
|
|
|
if (StringUtils.isNotBlank(hjje)) |
|
|
|
|
snDetailMap.put("amount", hjje); |
|
|
|
|
} else { |
|
|
|
|
snDetailMap.put("tax", "***".equals(detail.getString("se")) ? "0.00" : detail.getString("se")); |
|
|
|
|
snDetailMap.put("amount", detail.getString("je")); |
|
|
|
|