Browse Source

特批首期款开发

Signed-off-by: anderx <312518615@qq.com>
anderx 6 years ago
parent
commit
50efb3606f

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

@@ -2,7 +2,6 @@ package com.goafanti.common.task;
 
 
 import java.io.UnsupportedEncodingException;
-import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
@@ -14,29 +13,16 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.interceptor.TransactionAspectSupport;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 
-import com.goafanti.admin.bo.AdminListBo;
 import com.goafanti.common.dao.TOrderNewMapper;
-import com.goafanti.common.enums.NoticeStatus;
-import com.goafanti.common.model.NewOrderDun;
-import com.goafanti.common.model.TOrderDun;
 import com.goafanti.common.model.TOrderNew;
 import com.goafanti.common.utils.LoggerUtils;
-import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.order.bo.InputNewOrderDunBo;
-import com.goafanti.order.bo.OrderDunTaskBo;
 import com.goafanti.order.bo.OutNewOrderDunBo;
-import com.goafanti.order.bo.TOrderNewBo;
-import com.goafanti.order.enums.OrderNewState;
-import com.goafanti.order.enums.ProjectNewStage;
 import com.goafanti.order.service.NewOrderDunService;
 import com.goafanti.order.service.OrderNewService;
-import com.goafanti.order.service.impl.OrderNewServiceImpl;
+
 @Component
 //@Controller
 public class OrderDunTask {
@@ -84,14 +70,13 @@ public class OrderDunTask {
   	}
 	
 	private void updateOrderDun(OutNewOrderDunBo t) throws UnsupportedEncodingException, MessagingException {
-		LoggerUtils.debug(logger, "======================修改催款任务===================");
 		InputNewOrderDunBo o=new InputNewOrderDunBo();
 		o.setId(t.getId());
 		o.setStatus(1);
 		o.setStartTime(new Date());
 		newOrderDunService.updateDun(o);
 		TOrderNew t2=tOrderNewMapper.selectByPrimaryKey(t.getOrderNo());
-		orderNewService.newDunAddNoticAndSendEmail(t2, t);;
+		orderNewService.addNewDunNoticAndSendEmail(t2, t);;
 	}
 	
 	/**

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

@@ -172,7 +172,7 @@ public interface OrderNewService {
 	List<OrderDunTaskBo> selectAllOrderDun();
 	void updateOrderDun(TOrderDun tDun);
 	void addNoticAndSendEmail(String orderNo, OrderDunTaskBo t, Integer code)throws UnsupportedEncodingException, MessagingException;
-	void newDunAddNoticAndSendEmail(TOrderNew t2, OutNewOrderDunBo o);
+	void addNewDunNoticAndSendEmail(TOrderNew t2, OutNewOrderDunBo o);
 	boolean checkORderDun(String orderNo);
 	
 	int updateFinance(String orderNo, String newFinance);

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

@@ -538,7 +538,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 				if (o.getDunType()==1) {
 					o.setStatus(1);
 					newOrderDunMapper.updateByPrimaryKeySelective(o);
-					newDunAddNoticAndSendEmail(t2,o);
+					addNewDunNoticAndSendEmail(t2,o);
 				}
 			}
 		}
@@ -547,7 +547,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 
 
-	public void newDunAddNoticAndSendEmail(TOrderNew t2, OutNewOrderDunBo o) {
+	public void addNewDunNoticAndSendEmail(TOrderNew t2, OutNewOrderDunBo o) {
 		AdminListBo a = adminMapper.getDeptNameByAid(t2.getSalesmanId());
 		TOrderNewBo b  = tOrderNewMapper.getSaleIdByOno(t2.getOrderNo());
 		addNotic(t2.getOrderNo(),NoticeStatus.ORDER_DUN.getCode(),a, b);