|
|
@@ -646,7 +646,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
TOrderNew b=tOrderNewMapper.selectByPrimaryKey(orderNo);
|
|
|
if(b.getApproval()==0){
|
|
|
Date date = new Date();
|
|
|
- List<OutNewOrderDunBo> list=newOrderDunMapper.selectListNewOrderDun(orderNo,null,0);
|
|
|
+ List<OutNewOrderDunBo> list=newOrderDunMapper.selectListNewOrderDun(orderNo,0);
|
|
|
for (OutNewOrderDunBo o : list) {
|
|
|
if (o.getDunType()==1) {
|
|
|
o.setStatus(1);
|
|
|
@@ -682,7 +682,14 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
@Synchronized
|
|
|
public TOrderMid pushOrderMidDun(String orderNo, BigDecimal settlementAmount, Date date, OutNewOrderDunBo o) {
|
|
|
TOrderMid tm=tOrderMidMapper.selectByOrderNo(orderNo);
|
|
|
- tm.setOrderReceivables(tm.getOrderReceivables().add(o.getMoney()));
|
|
|
+// 代码看不出异常,但是计算会出现重复,则修改方案,每一次触发,则重新统计
|
|
|
+// tm.setOrderReceivables(tm.getOrderReceivables().add(o.getMoney()));
|
|
|
+ List<OutNewOrderDunBo> list =newOrderDunMapper.selectListNewOrderDun(orderNo,1);
|
|
|
+ BigDecimal cout=new BigDecimal(0);
|
|
|
+ for (OutNewOrderDunBo bo : list) {
|
|
|
+ cout=cout.add(bo.getMoney());
|
|
|
+ }
|
|
|
+ tm.setOrderReceivables(cout);
|
|
|
BigDecimal sum=tm.getOrderReceivables().subtract(settlementAmount);
|
|
|
//如果金额大于欠款修改欠款为0
|
|
|
if (sum.compareTo(new BigDecimal(0))<0)sum=new BigDecimal(0);
|
|
|
@@ -995,7 +1002,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
}
|
|
|
@Override
|
|
|
public boolean checkORderDun(String orderNo) {
|
|
|
- List<OutNewOrderDunBo> list=newOrderDunMapper.selectListNewOrderDun(orderNo, null, null);
|
|
|
+ List<OutNewOrderDunBo> list=newOrderDunMapper.selectListNewOrderDun(orderNo, null);
|
|
|
if (list==null||list.size()<1) {
|
|
|
return true;
|
|
|
}else {
|