Browse Source

Merge remote-tracking branch 'origin/test' into dev

Conflicts:
	src/main/java/com/goafanti/common/task/OrderDunTask.java


Signed-off-by: anderx <312518615@qq.com>
anderx 5 years ago
parent
commit
762ce50fae

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

@@ -463,9 +463,9 @@
   <select id="selectAllOrderDun" resultType="com.goafanti.order.bo.OutNewOrderDunBo"> 
   select a.id, a.order_no orderNo, a.tid, a.project_type projectType, a.dun_type dunType, a.wait_day waitDay, 
   a.effective_count effectiveCount, a.aid, a.create_time createTime,b.approval,a.customize_time customizeTime
-  ,date_format(a.customize_time,'%Y-%m-%d') customizeTimes, a.customize_name customizeName
+  ,date_format(a.customize_time,'%Y-%m-%d') customizeTimes, a.customize_name customizeName,a.money 
   from new_order_dun a left join  t_order_new b on a.order_no=b.order_no
-  where 1=1 and a.status=0 and b.process_status &gt; 1
+  where 1=1 and a.status=0 and b.process_status &gt; 4
   </select>
   <select id="selectByTid" resultType="com.goafanti.order.bo.OutNewOrderDunBo">
     select a.id, a.order_no orderNo, a.tid, a.project_type projectType, a.dun_type dunType, a.wait_day waitDay, 

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

@@ -3,7 +3,6 @@ package com.goafanti.common.task;
 
 import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
@@ -11,7 +10,6 @@ import java.util.UUID;
 
 import javax.mail.MessagingException;
 
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -74,11 +72,11 @@ public class OrderDunTask {
 	
 	
 	/**
-	 * 每天凌晨2点轮询处理需要新催款的信息
+	 * 每天凌晨3点轮询处理需要新催款的信息
 	 */
 	@RequestMapping(value = "/open/updateNewOrderDun", method = RequestMethod.GET)
 	@ResponseBody
-	@Scheduled(cron = "0 0 2  * * ?")
+	@Scheduled(cron = "0 0 3  * * ?")
 	@Transactional(rollbackFor=Exception.class)
 	public void updateNewOrderDun(){
   		try {
@@ -86,10 +84,10 @@ public class OrderDunTask {
   		
   		List<OutNewOrderDunBo> list= newOrderDunService.selectAllOrderDun();
   		Calendar calendar=Calendar.getInstance();   
-  		calendar.setTime(new Date()); 
-  		Calendar calendar2=Calendar.getInstance();   
-  		
+  		Calendar calendar2=Calendar.getInstance();
+  		Date date =new Date();
   		for (OutNewOrderDunBo o : list) {
+  			calendar.setTime(date);
   			calendar2.setTime(o.getCreateTime());
   			if (o!=null&&o.getApproval()!=null&&o.getApproval()!=0&&o.getDunType()==1&&o.getWaitDay()!=null) {
   					calendar2.add(Calendar.DATE, o.getWaitDay());
@@ -210,6 +208,19 @@ public class OrderDunTask {
 		o.setStatus(1);
 		o.setStartTime(new Date());
 		newOrderDunService.updateDun(o);
+		tOrderMidMapper.addOrderReceivables(t.getOrderNo(),t.getMoney());
+		TOrderMid tm=tOrderMidMapper.selectByOrderNo(t.getOrderNo());
+			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);
 	}
@@ -291,7 +302,7 @@ public class OrderDunTask {
 			
 			}
 		} catch (Exception e) {
-			LoggerUtils.error(getClass(), "===========================欠款催款失败==========================", e);
+			LoggerUtils.error(getClass(), "===========================欠款催款失败==========================", e);
 		}
 	}
 	
@@ -313,10 +324,12 @@ public class OrderDunTask {
 	*
 	*
 	*/
-	@RequestMapping(value = "/open/updateOrderDun", method = RequestMethod.GET)
+//	@RequestMapping(value = "/open/updateOrderDun", method = RequestMethod.GET)
+	@Scheduled(cron = "0 0 2  * * ?") 
+  	@Transactional(rollbackFor=Exception.class)
 	public void updateorderDun(){
   		try {
-  			LoggerUtils.debug(logger, "======================催款任务轮询启动===================");
+  			LoggerUtils.debug(logger, "======================催款任务轮询启动===================");
   		List<OrderDunTaskBo> list=orderNewService.selectAllOrderDun();
   		for (OrderDunTaskBo t : list) {
 			if (t.getDunSubject()/10==1) {//1则为订单催款信息否则为项目催款信息
@@ -333,7 +346,7 @@ public class OrderDunTask {
 		}
   		} catch (Exception e) {
   			LoggerUtils.error(getClass(), "=============================================");
-			LoggerUtils.error(getClass(), "催款的信息处理失败", e);
+			LoggerUtils.error(getClass(), "催款的信息处理失败", e);
 			LoggerUtils.error(getClass(), "=============================================");
 		}
   		

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

@@ -187,7 +187,7 @@ public interface OrderNewService {
 	
 	void addNoticAndSendEmail(String orderNo, OrderDunTaskBo t, Integer code)throws UnsupportedEncodingException, MessagingException;
 	
-	void addNewDunNoticAndSendEmail(TOrderNew t2, OutNewOrderDunBo o);
+	void addNewDunNoticAndSendEmail(String orderNo, OutNewOrderDunBo o);
 	
 	void addTimingTaskNewDunNoticAndSendEmail(TOrderNew t2, OutNewOrderDunBo o);
 	
@@ -202,5 +202,6 @@ public interface OrderNewService {
 	int pushOutsourceProjectAudit(TOrderOutsource o);
 	Pagination<OutArrearsDunListBo> arrearsDunList(InputArrearsDunListBo in);
 	void exportArrearsDunListData(InputArrearsDunListBo in, HttpServletResponse response) throws IOException;
+	void pushOrderDun(String orderNo);
 	
 }

+ 13 - 14
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -604,7 +604,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 				//修改项目为外包项目
 				tOrderTaskMapper.updateByOutsourceToOrderNo(orderNo,1);
 			}
-			pushOrderDun(t2);
+//			pushOrderDun(t2);
 		}else if (orderStatus==OrderNewState.QDSHJJ.getCode()) {//如果不通过新增驳回
 				if (outsource==0) {//非外包
 				t.setProcessStatus(ProcessStatus.YPYXY.getCode());
@@ -624,39 +624,39 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 
 
-	public void pushOrderDun(TOrderNew t2) {
-			List<OutNewOrderDunBo> list=newOrderDunMapper.selectListNewOrderDun(t2.getOrderNo(),null,0);
+	public void pushOrderDun(String orderNo) {
+			List<OutNewOrderDunBo> list=newOrderDunMapper.selectListNewOrderDun(orderNo,null,0);
 			for (OutNewOrderDunBo o : list) {
 				if (o.getDunType()==1) {	
 					o.setStatus(1);
 					o.setStartTime(new Date());
 					newOrderDunMapper.updateByPrimaryKeySelective(o);
 					tOrderMidMapper.addOrderReceivables(o.getOrderNo(),o.getMoney());
-					TOrderMid tm=tOrderMidMapper.selectByOrderNo(t2.getOrderNo());
+					TOrderMid tm=tOrderMidMapper.selectByOrderNo(orderNo);
 						TArrearsDun t=new TArrearsDun();
 						t.setOrderArrears(tm.getOrderArrears());
 						t.setOrderReceivables(tm.getOrderReceivables());
-						if (tArrearsDunMapper.checkOrderNo(t2.getOrderNo(),null)<1) {
-							t.setOrderNo(t2.getOrderNo());
+						if (tArrearsDunMapper.checkOrderNo(orderNo,null)<1) {
+							t.setOrderNo(orderNo);
 							tArrearsDunMapper.insertSelective(t);
-						}else if(tArrearsDunMapper.checkOrderNo(t2.getOrderNo(),0)>0){
-							Integer i=tArrearsDunMapper.selectByStatus(t2.getOrderNo(), 0);
+						}else if(tArrearsDunMapper.checkOrderNo(orderNo,0)>0){
+							Integer i=tArrearsDunMapper.selectByStatus(orderNo, 0);
 							t.setId(i);
 							tArrearsDunMapper.updateByPrimaryKeySelective(t);
 						}
-					addNewDunNoticAndSendEmail(t2,o);
+					addNewDunNoticAndSendEmail(orderNo,o);
 				}
 			}
 	}
 
 
 
-	public void addNewDunNoticAndSendEmail(TOrderNew t2, OutNewOrderDunBo o) {
+	public void addNewDunNoticAndSendEmail(String  orderNo, OutNewOrderDunBo o) {
 		AdminListBo a = adminMapper.getDeptNameByAid(TokenManager.getAdminId()==null?"1":TokenManager.getAdminId());
-		TOrderNewBo b  = tOrderNewMapper.getSaleIdByOno(t2.getOrderNo());
-		addNotic(t2.getOrderNo(),NoticeStatus.ORDER_DUN.getCode(),a, b);
+		TOrderNewBo b  = tOrderNewMapper.getSaleIdByOno(orderNo);
+		addNotic(orderNo,NoticeStatus.ORDER_DUN.getCode(),a, b);
 		try {
-			NewDunsendEmail(t2.getOrderNo(),o.getId(), a, b);
+			NewDunsendEmail(orderNo,o.getId(), a, b);
 		} catch (UnsupportedEncodingException | MessagingException e) {
 			throw new BusinessException(new Error("邮件发送错误。"));
 		}
@@ -1434,6 +1434,5 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 
 
-
 	
 }

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

@@ -158,6 +158,9 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 			addOrderLog(t.getOrderNo(), OrderLogProcess.XMDDPD.getCode(),remarks);
 			t.setManagerId(taskReceiverId);
 			t.setConsultantId(null);
+			//设置催款触发
+			TOrderNew b=tOrderNewMapper.selectByPrimaryKey(t.getOrderNo());
+			if(b.getApproval()==0)orderNewService.pushOrderDun(t.getOrderNo());
 		}else if (specially==0) {
 			addOrderLog(t.getOrderNo(), OrderLogProcess.XMPD.getCode(),remarks);
 			t.setConsultantId(taskReceiverId);
@@ -172,6 +175,9 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		checkProjiectAllocation(t.getOrderNo());
 		return 1;
 	}
+	
+	
+	
 	public TOrderNew checkDeleteSign(String orderNo) {
 		TOrderNew t=tOrderNewMapper.selectByPrimaryKey(orderNo);
 		if(t.getDeleteSign()==2||t.getDeleteSign()==3) throw new BusinessException(new Error(ErrorConstants.ORDER_ALREADY_REVOKE, t.getOrderNo(),""));
@@ -454,7 +460,6 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 					}
 				} 
 					if(flag) {
-					TOrderNew tn=tOrderNewMapper.selectByPrimaryKey(t.getOrderNo());
 					//如果启动催款,则新增欠款与应收款
 					tOrderMidMapper.addOrderReceivables(t.getOrderNo(), ob.getMoney());
 					TOrderMid tm=tOrderMidMapper.selectByOrderNo(t.getOrderNo());
@@ -469,7 +474,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 							td.setId(i);
 							tArrearsDunMapper.updateByPrimaryKeySelective(td);
 						}
-					orderNewService.addNewDunNoticAndSendEmail(tn,ob);
+					orderNewService.addNewDunNoticAndSendEmail(t.getOrderNo(),ob);
 					ob.setStatus(1);
 					ob.setStartTime(new Date());
 					newOrderDunMapper.updateByPrimaryKeySelective(ob);

+ 0 - 67
src/main/resources/props/config_prod.properties

@@ -1,67 +0,0 @@
-#Driver
-jdbc.driverClassName=com.mysql.jdbc.Driver
-#\u6570\u636e\u5e93\u94fe\u63a5\uff0c
-jdbc.url=jdbc:mysql://123.57.207.214:3306/pro_aft_test?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true
-#\u5e10\u53f7
-jdbc.username=xiaolong
-#\u5bc6\u7801
-jdbc.password=!qaz2wsx
-#\u68c0\u6d4b\u6570\u636e\u5e93\u94fe\u63a5\u662f\u5426\u6709\u6548\uff0c\u5fc5\u987b\u914d\u7f6e
-jdbc.validationQuery=SELECT 'x'
-#\u521d\u59cb\u8fde\u63a5\u6570
-jdbc.initialSize=3
-#\u6700\u5927\u8fde\u63a5\u6c60\u6570\u91cf
-jdbc.maxActive=20
-#\u53bb\u6389\uff0c\u914d\u7f6e\u6587\u4ef6\u5bf9\u5e94\u53bb\u6389
-#jdbc.maxIdle=20
-#\u914d\u7f6e0,\u5f53\u7ebf\u7a0b\u6c60\u6570\u91cf\u4e0d\u8db3\uff0c\u81ea\u52a8\u8865\u5145\u3002
-jdbc.minIdle=0
-#\u83b7\u53d6\u94fe\u63a5\u8d85\u65f6\u65f6\u95f4\u4e3a1\u5206\u949f\uff0c\u5355\u4f4d\u4e3a\u6beb\u79d2\u3002
-jdbc.maxWait=120000
-#\u83b7\u53d6\u94fe\u63a5\u7684\u65f6\u5019\uff0c\u4e0d\u6821\u9a8c\u662f\u5426\u53ef\u7528\uff0c\u5f00\u542f\u4f1a\u6709\u635f\u6027\u80fd\u3002
-jdbc.testOnBorrow=false
-#\u5f52\u8fd8\u94fe\u63a5\u5230\u8fde\u63a5\u6c60\u7684\u65f6\u5019\u6821\u9a8c\u94fe\u63a5\u662f\u5426\u53ef\u7528\u3002
-jdbc.testOnReturn=false
-#\u6b64\u9879\u914d\u7f6e\u4e3atrue\u5373\u53ef\uff0c\u4e0d\u5f71\u54cd\u6027\u80fd\uff0c\u5e76\u4e14\u4fdd\u8bc1\u5b89\u5168\u6027\u3002\u610f\u4e49\u4e3a\uff1a\u7533\u8bf7\u8fde\u63a5\u7684\u65f6\u5019\u68c0\u6d4b\uff0c\u5982\u679c\u7a7a\u95f2\u65f6\u95f4\u5927\u4e8etimeBetweenEvictionRunsMillis\uff0c\u6267\u884cvalidationQuery\u68c0\u6d4b\u8fde\u63a5\u662f\u5426\u6709\u6548\u3002
-jdbc.testWhileIdle=true
-#1.Destroy\u7ebf\u7a0b\u4f1a\u68c0\u6d4b\u8fde\u63a5\u7684\u95f4\u9694\u65f6\u95f4
-#2.testWhileIdle\u7684\u5224\u65ad\u4f9d\u636e
-jdbc.timeBetweenEvictionRunsMillis=60000
-#\u4e00\u4e2a\u94fe\u63a5\u751f\u5b58\u7684\u65f6\u95f4\uff08\u4e4b\u524d\u7684\u503c\uff1a25200000\uff0c\u8fd9\u4e2a\u65f6\u95f4\u6709\u70b9BT\uff0c\u8fd9\u4e2a\u7ed3\u679c\u4e0d\u77e5\u9053\u662f\u600e\u4e48\u6765\u7684\uff0c\u6362\u7b97\u540e\u7684\u7ed3\u679c\u662f\uff1a25200000/1000/60/60 = 7\u4e2a\u5c0f\u65f6\uff09
-jdbc.minEvictableIdleTimeMillis=300000
-#\u94fe\u63a5\u4f7f\u7528\u8d85\u8fc7\u65f6\u95f4\u9650\u5236\u662f\u5426\u56de\u6536
-jdbc.removeAbandoned=true
-#\u8d85\u8fc7\u65f6\u95f4\u9650\u5236\u65f6\u95f4\uff08\u5355\u4f4d\u79d2\uff09\uff0c\u76ee\u524d\u4e3a5\u5206\u949f\uff0c\u5982\u679c\u6709\u4e1a\u52a1\u5904\u7406\u65f6\u95f4\u8d85\u8fc75\u5206\u949f\uff0c\u53ef\u4ee5\u9002\u5f53\u8c03\u6574\u3002
-jdbc.removeAbandonedTimeout=300
-#\u94fe\u63a5\u56de\u6536\u7684\u65f6\u5019\u63a7\u5236\u53f0\u6253\u5370\u4fe1\u606f\uff0c\u6d4b\u8bd5\u73af\u5883\u53ef\u4ee5\u52a0\u4e0atrue\uff0c\u7ebf\u4e0a\u73af\u5883false\u3002\u4f1a\u5f71\u54cd\u6027\u80fd\u3002
-jdbc.logAbandoned=true
-#\u7edf\u8ba1\u76d1\u63a7
-jdbc.filters=stat
-
-jedis.host=123.57.207.214
-jedis.port=6379
-jedis.timeout=5000
-jedis.password=aft@2016!redis$
-
-pwd.hash_algorithm_name=md5
-pwd.hash_iterations=2
-
-session.timeout=12000000
-session.validate.timespan=18000000
-
-app.name=AFT
-
-static.host=//s.jishutao.com/1.0.41
-
-template.cacheable=true
-
-mobileCodeTemplate=SMS_37845022
-mobileRemindCodeTemplate=SMS_137421952
-
-portal.host=//s.jishutao.com/portal/1.0.12
-
-patentTemplate=SMS_72005286
-
-avatar.host=//s.jishutao.com
-
-avatar.upload.host=//s.jishutao.com/upload