Browse Source

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

anderx 4 years ago
parent
commit
a819fb4817

+ 3 - 2
src/main/java/com/goafanti/common/mapper/TOrderMidMapper.xml

@@ -310,8 +310,9 @@
     set m.invoice_amount=b.amount where m.order_no= #{orderNo} and  m.order_no=b.order_no
   </update>
   <update id="addOrderReceivables">
-    update t_order_mid  set order_receivables=order_receivables+#{money},
-                            order_arrears=order_arrears+#{money}
+    update t_order_mid
+    set order_receivables=order_receivables+#{money},
+        order_arrears=order_arrears+#{money}
     where order_no=#{orderNo}
   </update>
   <select id="selectDepNameByDepid" resultType="java.lang.String">

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

@@ -357,17 +357,17 @@ public class OrderDunTask {
 			tOrderMidMapper.updateByPrimaryKeySelective(tm);
 		}
 		newOrderDunService.updateDun(o);
-			TArrearsDun td=new TArrearsDun();
-			td.setOrderArrears(tm.getOrderArrears());
-			td.setOrderReceivables(tm.getOrderReceivables());
-			if (tArrearsDunMapper.checkOrderNo(t.getOrderNo(),null)<1) {
-				td.setOrderNo(t.getOrderNo());
-				tArrearsDunMapper.insertSelective(td);
-			}else if(tArrearsDunMapper.checkOrderNo(t.getOrderNo(),0)>0){
-				Integer i=tArrearsDunMapper.selectByStatus(t.getOrderNo(), 0);
-				td.setId(i);
-				tArrearsDunMapper.updateByPrimaryKeySelective(td);
-			}
+		TArrearsDun td=new TArrearsDun();
+		td.setOrderArrears(tm.getOrderArrears());
+		td.setOrderReceivables(tm.getOrderReceivables());
+		if (tArrearsDunMapper.checkOrderNo(t.getOrderNo(),null)<1) {
+			td.setOrderNo(t.getOrderNo());
+			tArrearsDunMapper.insertSelective(td);
+		}else if(tArrearsDunMapper.checkOrderNo(t.getOrderNo(),0)>0){
+			Integer i=tArrearsDunMapper.selectByStatus(t.getOrderNo(), 0);
+			td.setId(i);
+			tArrearsDunMapper.updateByPrimaryKeySelective(td);
+		}
 		TOrderNew t2=tOrderNewMapper.selectByPrimaryKey(t.getOrderNo());
 		orderNewService.addTimingTaskNewDunNoticAndSendEmail(t2, t);
 	}

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

@@ -690,6 +690,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 					newOrderDunMapper.updateByPrimaryKeySelective(o);
 					TOrderMid tm=tOrderMidMapper.selectByOrderNo(orderNo);
 					tm.setOrderArrears(tm.getOrderArrears().add(o.getMoney()));
+					tm.setOrderReceivables(tm.getOrderReceivables().add(o.getMoney()));
 					if (tm.getDunStartTime()==null)tm.setDunStartTime(date);
 					tOrderMidMapper.updateByPrimaryKeySelective(tm);
 					TArrearsDun t=new TArrearsDun();

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

@@ -143,6 +143,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	Logger							logger	= LoggerFactory.getLogger(OrderProjectServiceImpl.class);
 	
 	@Override
+	@Transactional
 	public int updateProjectDistribution(Integer taskId, String taskReceiverId,String remarks,Integer type) {
 		TOrderTask t=tOrderTaskMapper.selectByPrimaryKey(taskId);
 		TOrderNew tn=checkDeleteSign(t.getOrderNo());
@@ -566,6 +567,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 					//如果启动催款,则新增欠款与应收款
 						TOrderMid tm=tOrderMidMapper.selectByOrderNo(task2.getOrderNo());
 						tm.setOrderArrears(tm.getOrderArrears().add(ob.getMoney()));
+						tm.setOrderReceivables(tm.getOrderReceivables().add(ob.getMoney()));
 						if (tm.getDunStartTime()==null)tm.setDunStartTime(new Date());
 						tOrderMidMapper.updateByPrimaryKeySelective(tm);
 						TArrearsDun td=new TArrearsDun();