|
|
@@ -154,7 +154,6 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
|
|
|
//获取总金额
|
|
|
TOrderNewBo t=tOrderNewMapper.getOrderNewDetail(tr.getOrderNo());
|
|
|
//订单匹配不到
|
|
|
-
|
|
|
if(t==null||t.getOrderNo()==null) {
|
|
|
tr.setStatus(ReceivablesStatus.DCYC.getCode());
|
|
|
temporaryReceivablesMapper.updateByPrimaryKeySelective(tr);
|
|
|
@@ -163,11 +162,13 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
|
|
|
tr.setStatus(ReceivablesStatus.MCYC.getCode());
|
|
|
temporaryReceivablesMapper.updateByPrimaryKeySelective(tr);
|
|
|
continue;
|
|
|
+ }else if(temporaryReceivablesMapper.selectReceivablesNumberRepeats(tr)>0) {
|
|
|
+ tr.setStatus(ReceivablesStatus.YSK.getCode());
|
|
|
+ temporaryReceivablesMapper.updateByPrimaryKeySelective(tr);
|
|
|
+ continue;
|
|
|
}
|
|
|
-
|
|
|
//计算收款结果
|
|
|
BigDecimal bd = bill.add(tr.getAmount().abs());
|
|
|
-
|
|
|
//判断表中数据
|
|
|
BigDecimal count = new BigDecimal(0).add(bd);
|
|
|
for (TOrderBillNew tBill : listBull) {
|