|
|
@@ -126,11 +126,13 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
|
|
|
bonus.setOrderNo(tr.getOrderNo());
|
|
|
bonus.setGrantBy(TokenManager.getAdminId());
|
|
|
int lstaus = 0;//如果订单流水小于首付 lstaus 0
|
|
|
- if(count.compareTo(t.getTotalAmount()) == 1){//如果订单流水总额大于总金额 return -1
|
|
|
- tr.setStatus(ReceivablesStatus.JEYC.getCode());
|
|
|
- temporaryReceivablesMapper.updateByPrimaryKeySelective(tr);
|
|
|
- continue;
|
|
|
- }else if (count.compareTo(t.getTotalAmount()) == 0) {//等于总额
|
|
|
+ //允许输入大于
|
|
|
+// if(count.compareTo(t.getTotalAmount()) == 1){//如果订单流水总额大于总金额 return -1
|
|
|
+// tr.setStatus(ReceivablesStatus.JEYC.getCode());
|
|
|
+// temporaryReceivablesMapper.updateByPrimaryKeySelective(tr);
|
|
|
+// continue;
|
|
|
+// }else
|
|
|
+ if (count.compareTo(t.getTotalAmount()) > -1) {//等于总额
|
|
|
//付完款//如果订单流水等于于总金额 lstaus 2
|
|
|
lstaus = 2;
|
|
|
bonus.setBonusSubject(BonusSubject.WK.getCode());//12
|
|
|
@@ -150,12 +152,9 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- if(tr.getStatus()==2) {
|
|
|
- tr.setStatus(0);
|
|
|
- temporaryReceivablesMapper.updateByPrimaryKeySelective(tr);
|
|
|
- }
|
|
|
addOrderLog(tr.getOrderNo(), OrderLogProcess.CWQK.getCode());
|
|
|
- }else if (count.compareTo(t.getTotalAmount()) == -1) {//小于总额
|
|
|
+ }else if (count.compareTo(t.getTotalAmount()) == -1) {
|
|
|
+ //小于总额
|
|
|
//如果订单流水小于总金额
|
|
|
if(bd.compareTo(t.getFirstAmount()) == 0 || bd.compareTo(t.getFirstAmount()) == 1){//首付完成
|
|
|
//查看首付奖是否存在
|
|
|
@@ -170,14 +169,8 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
|
|
|
bonus.setBonusSubject(BonusSubject.SF.getCode());//11
|
|
|
}
|
|
|
lstaus = 1;
|
|
|
-
|
|
|
addOrderLog(tr.getOrderNo(), OrderLogProcess.CWSF.getCode());
|
|
|
}
|
|
|
-
|
|
|
- }
|
|
|
- if(tr.getStatus()==2) {
|
|
|
- tr.setStatus(0);
|
|
|
- temporaryReceivablesMapper.updateByPrimaryKeySelective(tr);
|
|
|
}
|
|
|
//否则新增流水信息
|
|
|
Date date=new Date();
|