Explorar el Código

专利提醒发送邮件逻辑调整

anderx hace 4 años
padre
commit
c161932e5d

+ 2 - 1
src/main/java/com/goafanti/common/task/PatentTask.java

@@ -1,5 +1,6 @@
 package com.goafanti.common.task;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -294,5 +295,5 @@ public class PatentTask {
             htmlStr = delHTMLTag(htmlStr);
             htmlStr = htmlStr.replaceAll(" ", "");
             return htmlStr;
-        }       
+        }
 }

+ 6 - 1
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -689,8 +689,11 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 					o.setStartTime(date);
 					newOrderDunMapper.updateByPrimaryKeySelective(o);
 					TOrderMid tm=tOrderMidMapper.selectByOrderNo(orderNo);
-					tm.setOrderArrears(tm.getOrderArrears().add(o.getMoney()));
 					tm.setOrderReceivables(tm.getOrderReceivables().add(o.getMoney()));
+					BigDecimal sum=tm.getOrderReceivables().subtract(b.getSettlementAmount());
+					//如果金额大于欠款修改欠款为0
+					if (sum.compareTo(new BigDecimal(0))<0)sum=new BigDecimal(0);
+					tm.setOrderArrears(sum);
 					if (tm.getDunStartTime()==null)tm.setDunStartTime(date);
 					tOrderMidMapper.updateByPrimaryKeySelective(tm);
 					TArrearsDun t=new TArrearsDun();
@@ -712,6 +715,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 
 
+
+
 	public void addNewDunNoticAndSendEmail(String  orderNo, OutNewOrderDunBo o) {
 		AdminListBo a = adminMapper.getDeptNameByAid(TokenManager.getAdminId()==null?"1":TokenManager.getAdminId());
 		TOrderNewBo b  = tOrderNewMapper.getSaleIdByOno(orderNo);