|
@@ -148,6 +148,12 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
|
|
|
BigDecimal bill = tOrderBillNewMapper.getAmountByOid(tr.getOrderNo());
|
|
BigDecimal bill = tOrderBillNewMapper.getAmountByOid(tr.getOrderNo());
|
|
|
//获取总金额
|
|
//获取总金额
|
|
|
TOrderNew t=tOrderNewMapper.selectByPrimaryKey(tr.getOrderNo());
|
|
TOrderNew t=tOrderNewMapper.selectByPrimaryKey(tr.getOrderNo());
|
|
|
|
|
+ //如果订单不是自己的则也不允许收款
|
|
|
|
|
+ if(t==null||t.getOrderNo()==null||!t.getFinanceId().equals(TokenManager.getAdminId())) {
|
|
|
|
|
+ tr.setStatus(2);
|
|
|
|
|
+ temporaryReceivablesMapper.updateByPrimaryKeySelective(tr);
|
|
|
|
|
+ continue;
|
|
|
|
|
+ }
|
|
|
//计算收款结果
|
|
//计算收款结果
|
|
|
BigDecimal bd = bill.add(tr.getAmount().abs());
|
|
BigDecimal bd = bill.add(tr.getAmount().abs());
|
|
|
|
|
|
|
@@ -223,6 +229,7 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
|
|
|
tbn.setDeleteSign((new Byte("0")));
|
|
tbn.setDeleteSign((new Byte("0")));
|
|
|
tbn.setFinancialPayTime(tr.getReceivablesTime());
|
|
tbn.setFinancialPayTime(tr.getReceivablesTime());
|
|
|
tbn.setFinancialPayNo(tr.getFinancialPayNo());
|
|
tbn.setFinancialPayNo(tr.getFinancialPayNo());
|
|
|
|
|
+ tbn.setRemarks(tr.getRemarks());
|
|
|
//修改订单结算金额和结算状态
|
|
//修改订单结算金额和结算状态
|
|
|
//如果已经首付并且流程状态是没有派给咨询师的修改流程状态为4
|
|
//如果已经首付并且流程状态是没有派给咨询师的修改流程状态为4
|
|
|
TOrderNew orderNew = new TOrderNew();
|
|
TOrderNew orderNew = new TOrderNew();
|
|
@@ -352,7 +359,7 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
|
|
|
trb.setCorporateName(getCellValue(cell));
|
|
trb.setCorporateName(getCellValue(cell));
|
|
|
break;
|
|
break;
|
|
|
case 3:
|
|
case 3:
|
|
|
- trb.setAmount(new BigDecimal(getCellValue(cell)));
|
|
|
|
|
|
|
+ trb.setAmount(new BigDecimal((null==getCellValue(cell)?"0":getCellValue(cell))));
|
|
|
break;
|
|
break;
|
|
|
case 4:
|
|
case 4:
|
|
|
trb.setReceivablesTime(DateUtils.StringToDate(getCellValue(cell), AFTConstants.YYYYMMDD));
|
|
trb.setReceivablesTime(DateUtils.StringToDate(getCellValue(cell), AFTConstants.YYYYMMDD));
|