Browse Source

变更修改

anderx 3 years ago
parent
commit
27b5ccb66a

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

@@ -392,7 +392,7 @@ public class OrderDunTask {
 			o.setStartTime(date);
 			if (t.getMoney()==null)t.setMoney(new BigDecimal(0));
 			newOrderDunService.updateDun(o);
-			TOrderMid tm=orderNewService.pushOrderMidDun(t.getOrderNo(),orderNew.getSettlementAmount(),date,t);
+			TOrderMid tm=orderNewService.pushOrderMidDun(t.getOrderNo(),orderNew.getSettlementAmount(),date);
 			TArrearsDun td=new TArrearsDun();
 			td.setOrderArrears(tm.getOrderArrears());
 			td.setOrderReceivables(tm.getOrderReceivables());

+ 1 - 2
src/main/java/com/goafanti/order/service/OrderNewService.java

@@ -194,10 +194,9 @@ public interface OrderNewService {
 	 * @param orderNo 订单编号
 	 * @param settlementAmount 已收金额
 	 * @param date 日期
-	 * @param o	订单催款类实对线
 	 * @return
 	 */
-	TOrderMid pushOrderMidDun(String orderNo, BigDecimal settlementAmount, Date date, OutNewOrderDunBo o);
+	TOrderMid pushOrderMidDun(String orderNo, BigDecimal settlementAmount, Date date);
 
 
 	/**

+ 2 - 3
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -968,7 +968,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 					o.setStartTime(date);
 					newOrderDunMapper.updateByPrimaryKeySelective(o);
 					//催款统计算
-					TOrderMid tm = pushOrderMidDun(orderNo, b.getSettlementAmount(), date, o);
+					TOrderMid tm = pushOrderMidDun(orderNo, b.getSettlementAmount(), date);
 					TArrearsDun t=new TArrearsDun();
 					t.setOrderArrears(tm.getOrderArrears());
 					t.setOrderReceivables(tm.getOrderReceivables());
@@ -991,12 +991,11 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	 * @param orderNo 订单编号
 	 * @param settlementAmount 已收金额
 	 * @param date 日期
-	 * @param o	订单催款类实对线
 	 * @return
 	 */
 	@Override
 	@Synchronized
-	public TOrderMid pushOrderMidDun(String orderNo, BigDecimal settlementAmount, Date date, OutNewOrderDunBo o) {
+	public TOrderMid pushOrderMidDun(String orderNo, BigDecimal settlementAmount, Date date) {
 		TOrderMid tm=tOrderMidMapper.selectByOrderNo(orderNo);
 //		代码看不出异常,但是计算会出现重复,则修改方案,每一次触发,则重新统计
 //		tm.setOrderReceivables(tm.getOrderReceivables().add(o.getMoney()));

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

@@ -637,7 +637,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 						ob.setStatus(1);
 						ob.setStartTime(new Date());
 						newOrderDunMapper.updateByPrimaryKeySelective(ob);
-						TOrderMid tm=orderNewService.pushOrderMidDun(task2.getOrderNo(),tn.getSettlementAmount(),new Date(),ob);
+						TOrderMid tm=orderNewService.pushOrderMidDun(task2.getOrderNo(),tn.getSettlementAmount(),new Date());
 						TArrearsDun td=new TArrearsDun();
 						td.setOrderArrears(tm.getOrderArrears());
 						td.setOrderReceivables(tm.getOrderReceivables());