|
@@ -505,7 +505,9 @@ public class WmPayOffController {
|
|
|
totalSettleAmount = totalSettleAmount.add(actualAmount);
|
|
|
packageDetail.setSubjectLocation(settleNotes.get(0).getSubjectLocation().getDescription());
|
|
|
packageDetail.setSettleAmount(String.valueOf(settleAmount));
|
|
|
- packageDetail.setActualAmount(String.valueOf(actualAmount));
|
|
|
+ if (actualAmount.compareTo(BigDecimal.ZERO) > 0) {
|
|
|
+ packageDetail.setActualAmount(String.valueOf(actualAmount));
|
|
|
+ }
|
|
|
packageDetailList.add(packageDetail);
|
|
|
}
|
|
|
SettlementProofModel settlementProofModel = new SettlementProofModel();
|
|
@@ -538,10 +540,12 @@ public class WmPayOffController {
|
|
|
new HashMap<String, Object>() {{
|
|
|
// 积分包列表
|
|
|
put("package_list", settlementProofModel.getPackageList());
|
|
|
- // 实际到账金额
|
|
|
- put("total_settle_amount", String.valueOf(finalTotalSettleAmount));
|
|
|
- // 实际结算金额
|
|
|
- put("total_settle_amount_cn", AmountToCNUtil.number2CNMontrayUnit(finalTotalSettleAmount));
|
|
|
+ if (finalTotalSettleAmount.compareTo(BigDecimal.ZERO) > 0) {
|
|
|
+ // 实际到账金额
|
|
|
+ put("total_settle_amount", String.valueOf(finalTotalSettleAmount));
|
|
|
+ // 实际结算金额
|
|
|
+ put("total_settle_amount_cn", AmountToCNUtil.number2CNMontrayUnit(finalTotalSettleAmount));
|
|
|
+ }
|
|
|
// put("collection_name", finalCollectionName);
|
|
|
// put("collection_account", finalCollectionAccount);
|
|
|
// put("collection_bank_name", finalCollectionBankName);
|