anderx лет назад: 4
Родитель
Сommit
50f946d0d0

+ 8 - 1
src/main/java/com/goafanti/common/dao/TOrderTaskMapper.java

@@ -65,4 +65,11 @@ public interface TOrderTaskMapper {
 
 
     List<OutHighNewRetrialList> highNewRetrialList(@Param("province") String province, @Param("depId") String depId, @Param("aid") String aid,
     List<OutHighNewRetrialList> highNewRetrialList(@Param("province") String province, @Param("depId") String depId, @Param("aid") String aid,
                                                    @Param("sort") Integer sort, @Param("startDate") String startDate, @Param("endDate") String endDate);
                                                    @Param("sort") Integer sort, @Param("startDate") String startDate, @Param("endDate") String endDate);
-}
+
+    /**
+     * 获取项目的分类,目前主要用于判断是否为会员催款
+     * @param tid
+     * @return
+     */
+    Integer getProjectType(Integer tid);
+}

+ 11 - 4
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -829,11 +829,12 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
   </select>
   </select>
   <!-- 通过订单编号获得订单的负责人(营销员) -->
   <!-- 通过订单编号获得订单的负责人(营销员) -->
   <select id="getSaleIdByOno" parameterType="java.lang.String" resultType="com.goafanti.order.bo.TOrderNewBo">
   <select id="getSaleIdByOno" parameterType="java.lang.String" resultType="com.goafanti.order.bo.TOrderNewBo">
-    select order_no orderNo ,salesman_id as salesmanId, a.name as salesmanName,
-           o.contract_no contractNo,a.email ,u.nickname as userName,o.order_dep orderDep,
-           d.name departmentName,d.finance_id  financeId
+    select o.order_no orderNo ,o.salesman_id as salesmanId, a.name as salesmanName,
+           o.contract_no contractNo,a.email ,u.nickname as userName,o.order_dep orderDep,d.name departmentName,
+           d.finance_id  financeId
     from t_order_new o left join admin a on o.salesman_id = a.id left join `user` u on u.id = o.buyer_id
     from t_order_new o left join admin a on o.salesman_id = a.id left join `user` u on u.id = o.buyer_id
-    left join department d on o.order_dep=d.id where order_no = #{_parameter,jdbcType=VARCHAR}
+    left join department d on o.order_dep=d.id
+    where order_no = #{_parameter,jdbcType=VARCHAR}
   </select>
   </select>
 
 
   <select id="selectOrderNewListByPage" resultType="com.goafanti.order.bo.TOrderNewBo">
   <select id="selectOrderNewListByPage" resultType="com.goafanti.order.bo.TOrderNewBo">
@@ -933,6 +934,9 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
   	<if test="name != null">
   	<if test="name != null">
   	and b.nickname like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
   	and b.nickname like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
   	</if>
   	</if>
+    <if test="projectType != null">
+      and c.project_type = #{projectType}
+    </if>
   	<if test="orderNo != null">
   	<if test="orderNo != null">
   	and a.order_no like CONCAT('%',#{orderNo,jdbcType=VARCHAR},'%')
   	and a.order_no like CONCAT('%',#{orderNo,jdbcType=VARCHAR},'%')
   	</if>
   	</if>
@@ -1064,6 +1068,9 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
   	<if test="name != null">
   	<if test="name != null">
   	and b.nickname like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
   	and b.nickname like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
   	</if>
   	</if>
+     <if test="projectType != null">
+       and c.project_type = #{projectType}
+     </if>
   	<if test="orderNo != null">
   	<if test="orderNo != null">
   	and a.order_no like CONCAT('%',#{orderNo,jdbcType=VARCHAR},'%')
   	and a.order_no like CONCAT('%',#{orderNo,jdbcType=VARCHAR},'%')
   	</if>
   	</if>

+ 6 - 0
src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml

@@ -2106,4 +2106,10 @@
     </if>
     </if>
     desc
     desc
   </select>
   </select>
+    <select id="getProjectType" resultType="java.lang.Integer">
+      select b.sort from t_order_task a
+       left join business_project bp on a.commodity_id =bp.id
+       left join business_category bc on bp.cid =bc.id
+      where  a.id= #{tid}
+      </select>
 </mapper>
 </mapper>

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

@@ -5,7 +5,10 @@ import java.math.BigDecimal;
 import java.util.*;
 import java.util.*;
 
 
 
 
+import com.goafanti.admin.bo.AdminListBo;
 import com.goafanti.common.bo.ErrorDunListBo;
 import com.goafanti.common.bo.ErrorDunListBo;
+import com.goafanti.common.dao.*;
+import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.order.bo.*;
 import com.goafanti.order.bo.*;
 import com.goafanti.order.service.LegalAffairsService;
 import com.goafanti.order.service.LegalAffairsService;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
@@ -18,10 +21,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 
 import com.goafanti.common.bo.EmailBo;
 import com.goafanti.common.bo.EmailBo;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.constant.AFTConstants;
-import com.goafanti.common.dao.PaymentNodeMapper;
-import com.goafanti.common.dao.TArrearsDunMapper;
-import com.goafanti.common.dao.TOrderMidMapper;
-import com.goafanti.common.dao.TOrderNewMapper;
 import com.goafanti.common.enums.NoticeStatus;
 import com.goafanti.common.enums.NoticeStatus;
 import com.goafanti.common.model.Notice;
 import com.goafanti.common.model.Notice;
 import com.goafanti.common.model.PaymentNode;
 import com.goafanti.common.model.PaymentNode;
@@ -35,6 +34,8 @@ import com.goafanti.order.service.NewOrderDunService;
 import com.goafanti.order.service.OrderNewService;
 import com.goafanti.order.service.OrderNewService;
 import com.goafanti.order.service.OrderProjectService;
 import com.goafanti.order.service.OrderProjectService;
 import com.goafanti.organization.bo.OutPaymentNode;
 import com.goafanti.organization.bo.OutPaymentNode;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 
 
 
 
 @Component
 @Component
@@ -50,6 +51,8 @@ public class OrderDunTask {
 	@Autowired
 	@Autowired
 	private TOrderMidMapper	tOrderMidMapper;
 	private TOrderMidMapper	tOrderMidMapper;
 	@Autowired
 	@Autowired
+	private AdminMapper adminMapper;
+	@Autowired
 	private PaymentNodeMapper	paymentNodeMapper;
 	private PaymentNodeMapper	paymentNodeMapper;
 	@Autowired
 	@Autowired
 	private OrderProjectService	orderProjectService;
 	private OrderProjectService	orderProjectService;
@@ -217,7 +220,7 @@ public class OrderDunTask {
 	*
 	*
 	*/
 	*/
 	@Scheduled(cron = "0 0 4 1 * ?")
 	@Scheduled(cron = "0 0 4 1 * ?")
-//	@RequestMapping(value = "/open/pushOrderArrearsDun", method = RequestMethod.GET)
+	@RequestMapping(value = "/open/pushOrderArrearsDun", method = RequestMethod.GET)
 	public void pushOrderArrearsDun(){
 	public void pushOrderArrearsDun(){
 		try {
 		try {
 			LoggerUtils.debug(logger, "======================欠款催款启动===================");
 			LoggerUtils.debug(logger, "======================欠款催款启动===================");
@@ -227,16 +230,17 @@ public class OrderDunTask {
 			List<TArrearsDun> list2=tArrearsDunMapper.selectStatusAll(1);
 			List<TArrearsDun> list2=tArrearsDunMapper.selectStatusAll(1);
 			List<TArrearsDun> list3=tArrearsDunMapper.selectStatusAndAmount(2);
 			List<TArrearsDun> list3=tArrearsDunMapper.selectStatusAndAmount(2);
 			for (TArrearsDun td : list) {
 			for (TArrearsDun td : list) {
+				TOrderNewBo b  = tOrderNewMapper.getSaleIdByOno(td.getOrderNo());
+				AdminListBo a = adminMapper.getDeptNameByAid(TokenManager.getAdminId()==null?"1":TokenManager.getAdminId());
+
 				TOrderMid tm=tOrderMidMapper.selectByOrderNo(td.getOrderNo());
 				TOrderMid tm=tOrderMidMapper.selectByOrderNo(td.getOrderNo());
 				//如果欠款大于0则需要触发邮件
 				//如果欠款大于0则需要触发邮件
-				System.out.println(tm.toString());
-				System.out.println(tm.getOrderArrears());
 				if (tm.getOrderArrears().compareTo(new BigDecimal(0))>0) {
 				if (tm.getOrderArrears().compareTo(new BigDecimal(0))>0) {
 					td.setDunStatus(1);
 					td.setDunStatus(1);
 					td.setStartTime(date);
 					td.setStartTime(date);
 					td.setOrderArrears(tm.getOrderArrears());
 					td.setOrderArrears(tm.getOrderArrears());
 					td.setOrderReceivables(tm.getOrderReceivables());
 					td.setOrderReceivables(tm.getOrderReceivables());
-					addNotic(td.getOrderNo(),td,NoticeStatus.ORDER_ARREARS_DUN.getCode());
+					orderNewService.addNotic(NoticeStatus.ORDER_ARREARS_DUN.getCode(),a,b,0);
 					tArrearsDunMapper.updateByPrimaryKeySelective(td);
 					tArrearsDunMapper.updateByPrimaryKeySelective(td);
 				}else if(tm.getOrderArrears().compareTo(new BigDecimal(0))<1) {
 				}else if(tm.getOrderArrears().compareTo(new BigDecimal(0))<1) {
 					td.setDunStatus(2);
 					td.setDunStatus(2);
@@ -248,6 +252,8 @@ public class OrderDunTask {
 			}
 			}
 			for (TArrearsDun ta : list2) {
 			for (TArrearsDun ta : list2) {
 				TOrderMid tm=tOrderMidMapper.selectByOrderNo(ta.getOrderNo());
 				TOrderMid tm=tOrderMidMapper.selectByOrderNo(ta.getOrderNo());
+				TOrderNewBo b  = tOrderNewMapper.getSaleIdByOno(ta.getOrderNo());
+				AdminListBo a = adminMapper.getDeptNameByAid(TokenManager.getAdminId()==null?"1":TokenManager.getAdminId());
 				//如果欠款大于0则需要触发邮件
 				//如果欠款大于0则需要触发邮件
 				if (tm.getOrderArrears().compareTo(new BigDecimal(0))>0) {
 				if (tm.getOrderArrears().compareTo(new BigDecimal(0))>0) {
 					ta.setDunStatus(3);
 					ta.setDunStatus(3);
@@ -258,7 +264,7 @@ public class OrderDunTask {
 					ta.setOrderArrears(tm.getOrderArrears());
 					ta.setOrderArrears(tm.getOrderArrears());
 					ta.setOrderReceivables(tm.getOrderReceivables());
 					ta.setOrderReceivables(tm.getOrderReceivables());
 					tArrearsDunMapper.insertSelective(ta);
 					tArrearsDunMapper.insertSelective(ta);
-					addNotic(ta.getOrderNo(),ta,NoticeStatus.ORDER_ARREARS_DUN.getCode());
+					orderNewService.addNotic(NoticeStatus.ORDER_ARREARS_DUN.getCode(),a,b,0);
 				}else if(tm.getOrderArrears().compareTo(new BigDecimal(0))<1) {
 				}else if(tm.getOrderArrears().compareTo(new BigDecimal(0))<1) {
 					ta.setDunStatus(2);
 					ta.setDunStatus(2);
 					ta.setOrderArrears(tm.getOrderArrears());
 					ta.setOrderArrears(tm.getOrderArrears());
@@ -269,6 +275,9 @@ public class OrderDunTask {
 			}
 			}
 			for (TArrearsDun ta : list3) {
 			for (TArrearsDun ta : list3) {
 				TOrderMid tm=tOrderMidMapper.selectByOrderNo(ta.getOrderNo());
 				TOrderMid tm=tOrderMidMapper.selectByOrderNo(ta.getOrderNo());
+				TOrderNewBo b  = tOrderNewMapper.getSaleIdByOno(ta.getOrderNo());
+				AdminListBo a = adminMapper.getDeptNameByAid(TokenManager.getAdminId()==null?"1":TokenManager.getAdminId());
+
 				//如果欠款大于0则需要触发邮件
 				//如果欠款大于0则需要触发邮件
 				if (tm.getOrderArrears().compareTo(new BigDecimal(0))>0) {
 				if (tm.getOrderArrears().compareTo(new BigDecimal(0))>0) {
 					ta.setDunStatus(3);
 					ta.setDunStatus(3);
@@ -279,7 +288,7 @@ public class OrderDunTask {
 					ta.setOrderArrears(tm.getOrderArrears());
 					ta.setOrderArrears(tm.getOrderArrears());
 					ta.setOrderReceivables(tm.getOrderReceivables());
 					ta.setOrderReceivables(tm.getOrderReceivables());
 					tArrearsDunMapper.insertSelective(ta);
 					tArrearsDunMapper.insertSelective(ta);
-					addNotic(ta.getOrderNo(),ta,NoticeStatus.ORDER_ARREARS_DUN.getCode());
+					orderNewService.addNotic(NoticeStatus.ORDER_ARREARS_DUN.getCode(),a,b,0);
 				}else if(tm.getOrderArrears().compareTo(new BigDecimal(0))<1) {
 				}else if(tm.getOrderArrears().compareTo(new BigDecimal(0))<1) {
 					ta.setDunStatus(2);
 					ta.setDunStatus(2);
 					ta.setOrderReceivables(tm.getOrderReceivables());
 					ta.setOrderReceivables(tm.getOrderReceivables());
@@ -381,20 +390,4 @@ public class OrderDunTask {
 	}
 	}
 
 
 
 
-
-
-	private void addNotic(String orderNo, TArrearsDun td, Integer code) {
-		TOrderNewBo b  = tOrderNewMapper.getSaleIdByOno(orderNo);
-		StringBuffer str =new StringBuffer().append(b.getUserName()).append(", 合同编号-").append(b.getContractNo())
-				.append(", 订单编号-").append(orderNo).append(", 操作人: ").append(b.getSalesmanName()).append("。");
-		Notice n =new Notice();
-		n.setId(UUID.randomUUID().toString());
-		n.setAid(b.getSalesmanId());
-		n.setNoticeType(code);
-		n.setContent(str.toString());
-		n.setReaded(0);//未读
-		asyncUtils.addNotice(n);
-	}
-
-
 }
 }

+ 33 - 33
src/main/java/com/goafanti/order/controller/AdminNewOrderApiController.java

@@ -34,7 +34,7 @@ import com.goafanti.order.service.OrderNewService;
 @RestController
 @RestController
 @RequestMapping(value = "/api/admin/newOrder")
 @RequestMapping(value = "/api/admin/newOrder")
 public class AdminNewOrderApiController extends CertifyApiController {
 public class AdminNewOrderApiController extends CertifyApiController {
-	
+
 	@Autowired
 	@Autowired
 	private OrderNewService orderNewService;
 	private OrderNewService orderNewService;
 	@Autowired
 	@Autowired
@@ -97,11 +97,11 @@ public class AdminNewOrderApiController extends CertifyApiController {
 		}
 		}
 		return res.data(orderNewService.updateOrderTask(t));
 		return res.data(orderNewService.updateOrderTask(t));
 	}
 	}
-	
-	
 
 
-	
-	
+
+
+
+
 	/**
 	/**
 	 * 删除订单项目
 	 * 删除订单项目
 	 * @return
 	 * @return
@@ -133,7 +133,7 @@ public class AdminNewOrderApiController extends CertifyApiController {
 		}
 		}
 		return res.data(i);
 		return res.data(i);
 	}
 	}
-	
+
 	/**
 	/**
 	 * 获取订单项目信息
 	 * 获取订单项目信息
 	 * @param orderNo
 	 * @param orderNo
@@ -147,7 +147,7 @@ public class AdminNewOrderApiController extends CertifyApiController {
 			return res;
 			return res;
 		}
 		}
 		res.setData(orderNewService.selectOrderTask(orderNo));
 		res.setData(orderNewService.selectOrderTask(orderNo));
-		
+
 		return res;
 		return res;
 	}
 	}
 	/**
 	/**
@@ -195,8 +195,8 @@ public class AdminNewOrderApiController extends CertifyApiController {
 		res.setData(orderNewService.updateServiceOrder(t,i));
 		res.setData(orderNewService.updateServiceOrder(t,i));
 		return res;
 		return res;
 	}
 	}
-	
-	/** 
+
+	/**
 	 * 订单详情
 	 * 订单详情
 	 * @param orderNo
 	 * @param orderNo
 	 * @return
 	 * @return
@@ -239,7 +239,7 @@ public class AdminNewOrderApiController extends CertifyApiController {
 	}
 	}
 	/**
 	/**
 	 * 订单列表
 	 * 订单列表
-	 * 
+	 *
 	 *specially  0 个人 1 营销员管理 2 驳回 3 特批 4 咨询师管理 5部门订单查询 6客服查询 7统计签单订单 8客户订单列表 9 复审订单
 	 *specially  0 个人 1 营销员管理 2 驳回 3 特批 4 咨询师管理 5部门订单查询 6客服查询 7统计签单订单 8客户订单列表 9 复审订单
 	 *distribution	(咨询师管理列表 0 未分配 1部分 2全部
 	 *distribution	(咨询师管理列表 0 未分配 1部分 2全部
 	 *amountStatus 0 10万元以下 1 10万~20万 2 20万~30万 3 30万~40万  4 40万以上
 	 *amountStatus 0 10万元以下 1 10万~20万 2 20万~30万 3 30万~40万  4 40万以上
@@ -247,14 +247,14 @@ public class AdminNewOrderApiController extends CertifyApiController {
 	@RequestMapping(value="/orderNewList", method = RequestMethod.GET)
 	@RequestMapping(value="/orderNewList", method = RequestMethod.GET)
 	public Result orderNewList(String aid,String name,String orderNo,String starTime,String endTime ,Integer specially ,Integer approval,
 	public Result orderNewList(String aid,String name,String orderNo,String starTime,String endTime ,Integer specially ,Integer approval,
 			Integer distribution,String depId,String contractNo,Integer outsource,Integer liquidationStatus,Integer amountStatus,
 			Integer distribution,String depId,String contractNo,Integer outsource,Integer liquidationStatus,Integer amountStatus,
-							   String contractStart,String contractEnd,String uid,Integer pageNo,Integer pageSize){
+							   String contractStart,String contractEnd,String uid,Integer projectType,Integer pageNo,Integer pageSize){
 		Result res=new Result();
 		Result res=new Result();
 		res.data(orderNewService.orderNewList(aid,name, orderNo, starTime, endTime, specially ,approval, distribution,depId,
 		res.data(orderNewService.orderNewList(aid,name, orderNo, starTime, endTime, specially ,approval, distribution,depId,
-				contractNo,outsource, liquidationStatus,amountStatus,contractStart, contractEnd,uid,pageNo, pageSize));
+				contractNo,outsource, liquidationStatus,amountStatus,contractStart, contractEnd,uid, projectType,pageNo, pageSize));
 		return res;
 		return res;
 	}
 	}
-	
-	
+
+
 	/**
 	/**
 	 * 订单审核
 	 * 订单审核
 	 */
 	 */
@@ -276,8 +276,8 @@ public class AdminNewOrderApiController extends CertifyApiController {
 		}
 		}
 		return res.data(orderNewService.updateOrderNew(orderNo,orderStatus,reason,0,null));
 		return res.data(orderNewService.updateOrderNew(orderNo,orderStatus,reason,0,null));
 	}
 	}
-	
-	
+
+
 	/**
 	/**
 	 * 催款统计列表
 	 * 催款统计列表
 	 * @param newStatus 0旧催款 1新催款
 	 * @param newStatus 0旧催款 1新催款
@@ -290,7 +290,7 @@ public class AdminNewOrderApiController extends CertifyApiController {
 		res.data(orderNewService.dunOrderNewList(name, orderNo,contractNo, starTime, endTime,specially,aid,  adminName, depId,newStatus,pageNo, pageSize));
 		res.data(orderNewService.dunOrderNewList(name, orderNo,contractNo, starTime, endTime,specially,aid,  adminName, depId,newStatus,pageNo, pageSize));
 		return res;
 		return res;
 	}
 	}
-	
+
 	/**
 	/**
 	 * 催款统计列表
 	 * 催款统计列表
 	 */
 	 */
@@ -420,11 +420,11 @@ public class AdminNewOrderApiController extends CertifyApiController {
 		res.data(orderNewService.orderRefundList(name, orderNo, starTime, endTime,specially, pageNo, pageSize));
 		res.data(orderNewService.orderRefundList(name, orderNo, starTime, endTime,specially, pageNo, pageSize));
 		return res;
 		return res;
 	}
 	}
-	
-	
-	
-	
-	
+
+
+
+
+
 	/**
 	/**
 	 * 订单结单
 	 * 订单结单
 	 */
 	 */
@@ -465,7 +465,7 @@ public class AdminNewOrderApiController extends CertifyApiController {
 		orderNewService.updateFinance( orderNo, newFinance);
 		orderNewService.updateFinance( orderNo, newFinance);
 		return res;
 		return res;
 	}
 	}
-	
+
 	/**
 	/**
 	 * 查看订单日志
 	 * 查看订单日志
 	 */
 	 */
@@ -479,7 +479,7 @@ public class AdminNewOrderApiController extends CertifyApiController {
 		res.data(orderNewService.selectOrderLog(orderNo));
 		res.data(orderNewService.selectOrderLog(orderNo));
 		return res;
 		return res;
 	}
 	}
-	
+
 	/** 退单文件上传 **/
 	/** 退单文件上传 **/
 	@RequestMapping(value = "/uploadRefundOrderFile", method = RequestMethod.POST)
 	@RequestMapping(value = "/uploadRefundOrderFile", method = RequestMethod.POST)
 	public Result uploadRefundOrderFile(HttpServletRequest req,String sign){
 	public Result uploadRefundOrderFile(HttpServletRequest req,String sign){
@@ -503,14 +503,14 @@ public class AdminNewOrderApiController extends CertifyApiController {
 		}
 		}
 		return res;
 		return res;
 	}
 	}
-	
-	
 
 
-	
-	
+
+
+
+
 	/**
 	/**
-	 * 催款列表下载 
-	 * @throws IOException 
+	 * 催款列表下载
+	 * @throws IOException
 	 */
 	 */
 	@RequestMapping(value = "/exportOrderDunData", method = RequestMethod.GET)
 	@RequestMapping(value = "/exportOrderDunData", method = RequestMethod.GET)
 	public Result exportOrderDunData(String name,String orderNo,String contractNo,String starTime,String endTime,Integer specially, String aid,String adminName,
 	public Result exportOrderDunData(String name,String orderNo,String contractNo,String starTime,String endTime,Integer specially, String aid,String adminName,
@@ -525,8 +525,8 @@ public class AdminNewOrderApiController extends CertifyApiController {
  		return res;
  		return res;
 	}
 	}
 	/**
 	/**
-	 * 	项目列表下载 
-	 * @throws IOException 
+	 * 	项目列表下载
+	 * @throws IOException
 	 */
 	 */
 	@RequestMapping(value = "/exportOrderTaskData", method = RequestMethod.GET)
 	@RequestMapping(value = "/exportOrderTaskData", method = RequestMethod.GET)
 	public Result exportOrderTaskData(String orderNo,HttpServletResponse response){
 	public Result exportOrderTaskData(String orderNo,HttpServletResponse response){
@@ -537,7 +537,7 @@ public class AdminNewOrderApiController extends CertifyApiController {
 
 
 
 
 	/**
 	/**
-	 * 	催款信息下载 
+	 * 	催款信息下载
 	 * @throws IOException
 	 * @throws IOException
 	 */
 	 */
 	@RequestMapping(value = "/exportArrearsDunListData", method = RequestMethod.GET)
 	@RequestMapping(value = "/exportArrearsDunListData", method = RequestMethod.GET)

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

@@ -9,6 +9,7 @@ import javax.mail.MessagingException;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
 
 
 
 
+import com.goafanti.admin.bo.AdminListBo;
 import com.goafanti.common.model.*;
 import com.goafanti.common.model.*;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.order.bo.*;
 import com.goafanti.order.bo.*;
@@ -70,7 +71,7 @@ public interface OrderNewService {
 	 */
 	 */
 	Pagination<TOrderNewBo> orderNewList(String aid,String name, String orderNo, String starTime, String endTime,Integer specially ,
 	Pagination<TOrderNewBo> orderNewList(String aid,String name, String orderNo, String starTime, String endTime,Integer specially ,
 										 Integer approval,Integer distribution,String depId,String contractNo,Integer outsource,Integer liquidationStatus, Integer amountStatus,
 										 Integer approval,Integer distribution,String depId,String contractNo,Integer outsource,Integer liquidationStatus, Integer amountStatus,
-										 String contractStart, String contractEnd,String uid, Integer pageNo, Integer pageSize);
+										 String contractStart, String contractEnd,String uid,Integer projectType, Integer pageNo, Integer pageSize);
 	/**
 	/**
 	 * 订单审核
 	 * 订单审核
 	 * @param orderNo
 	 * @param orderNo
@@ -151,12 +152,6 @@ public interface OrderNewService {
 
 
 	int updatetechnicianBackOrder(String orderNo, String reason);
 	int updatetechnicianBackOrder(String orderNo, String reason);
 
 
-	List<OrderDunTaskBo> selectAllOrderDun();
-
-	void updateOrderDun(TOrderDun tDun);
-
-	void addNoticAndSendEmail(String orderNo, OrderDunTaskBo t, Integer code)throws UnsupportedEncodingException, MessagingException;
-
 	void addNewDunNoticAndSendEmail(String orderNo, OutNewOrderDunBo o);
 	void addNewDunNoticAndSendEmail(String orderNo, OutNewOrderDunBo o);
 
 
 	void addTimingTaskNewDunNoticAndSendEmail(TOrderNew t2, OutNewOrderDunBo o);
 	void addTimingTaskNewDunNoticAndSendEmail(TOrderNew t2, OutNewOrderDunBo o);
@@ -203,4 +198,13 @@ public interface OrderNewService {
 	 */
 	 */
 	TOrderMid pushOrderMidDun(String orderNo, BigDecimal settlementAmount, Date date, OutNewOrderDunBo o);
 	TOrderMid pushOrderMidDun(String orderNo, BigDecimal settlementAmount, Date date, OutNewOrderDunBo o);
 
 
+
+	/**
+	 *  发送邮件
+	 * @param type 消息类型
+	 * @param a  发送人信息
+	 * @param b 订单信息
+	 * @param projectType 项目类型 判断是否是会员
+	 */
+	void addNotic(Integer type, AdminListBo a, TOrderNewBo b,Integer projectType);
 }
 }

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

@@ -23,6 +23,7 @@ import javax.servlet.http.HttpServletResponse;
 import com.goafanti.common.dao.*;
 import com.goafanti.common.dao.*;
 import com.goafanti.common.model.*;
 import com.goafanti.common.model.*;
 import com.goafanti.order.bo.*;
 import com.goafanti.order.bo.*;
+import com.goafanti.order.enums.*;
 import com.goafanti.organization.bo.*;
 import com.goafanti.organization.bo.*;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.common.utils.StringUtils;
 import groovy.transform.Synchronized;
 import groovy.transform.Synchronized;
@@ -57,16 +58,6 @@ import com.goafanti.core.mybatis.JDBCIdGenerator;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.customer.bo.LockingReleaseBo;
 import com.goafanti.customer.bo.LockingReleaseBo;
-import com.goafanti.order.enums.ActiveState;
-import com.goafanti.order.enums.ApprovalNewState;
-import com.goafanti.order.enums.LiquidationNewState;
-import com.goafanti.order.enums.NewOrderDunType;
-import com.goafanti.order.enums.NewProjectStatus;
-import com.goafanti.order.enums.OrderDunSubject;
-import com.goafanti.order.enums.OrderNewState;
-import com.goafanti.order.enums.ProcessStatus;
-import com.goafanti.order.enums.TaskState;
-import com.goafanti.order.enums.refundState;
 import com.goafanti.order.service.OrderNewService;
 import com.goafanti.order.service.OrderNewService;
 import com.goafanti.order.service.OrderService;
 import com.goafanti.order.service.OrderService;
 import com.goafanti.patent.service.PatentNewService;
 import com.goafanti.patent.service.PatentNewService;
@@ -550,7 +541,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	@Override
 	@Override
 	public Pagination<TOrderNewBo> orderNewList(String aid,String name, String orderNo, String starTime, String endTime,Integer specially,Integer approval,
 	public Pagination<TOrderNewBo> orderNewList(String aid,String name, String orderNo, String starTime, String endTime,Integer specially,Integer approval,
 			Integer distribution,String depId,String contractNo,Integer outsource,Integer liquidationStatus, Integer amountStatus,
 			Integer distribution,String depId,String contractNo,Integer outsource,Integer liquidationStatus, Integer amountStatus,
-												String contractStart, String contractEnd,String uid,  Integer pageNo, Integer pageSize) {
+												String contractStart, String contractEnd,String uid,Integer projectType,  Integer pageNo, Integer pageSize) {
 		Map<String, Object> params = new HashMap<String, Object>();
 		Map<String, Object> params = new HashMap<String, Object>();
 		if(pageSize==null||pageSize<0)pageSize=10;
 		if(pageSize==null||pageSize<0)pageSize=10;
 		if(pageNo==null||pageNo<0)pageNo=1;
 		if(pageNo==null||pageNo<0)pageNo=1;
@@ -584,6 +575,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		if (StringUtils.isNotBlank(endTime)) params.put("endTime", endTime+" 23:59:59");
 		if (StringUtils.isNotBlank(endTime)) params.put("endTime", endTime+" 23:59:59");
 		if (StringUtils.isNotBlank(contractStart)) params.put("contractStart", contractStart);
 		if (StringUtils.isNotBlank(contractStart)) params.put("contractStart", contractStart);
 		if (StringUtils.isNotBlank(contractEnd)) params.put("contractEnd", contractEnd+" 23:59:59");
 		if (StringUtils.isNotBlank(contractEnd)) params.put("contractEnd", contractEnd+" 23:59:59");
+		if(null != projectType)params.put("projectType",projectType);
 		params.put("outsource", outsource);
 		params.put("outsource", outsource);
 		Pagination<TOrderNewBo> p = (Pagination<TOrderNewBo>)findPage("selectOrderNewListByPage", "selectOrderNewListCount", params, pageNo, pageSize);
 		Pagination<TOrderNewBo> p = (Pagination<TOrderNewBo>)findPage("selectOrderNewListByPage", "selectOrderNewListCount", params, pageNo, pageSize);
 		return p;
 		return p;
@@ -717,7 +709,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	public void addNewDunNoticAndSendEmail(String  orderNo, OutNewOrderDunBo o) {
 	public void addNewDunNoticAndSendEmail(String  orderNo, OutNewOrderDunBo o) {
 		AdminListBo a = adminMapper.getDeptNameByAid(TokenManager.getAdminId()==null?"1":TokenManager.getAdminId());
 		AdminListBo a = adminMapper.getDeptNameByAid(TokenManager.getAdminId()==null?"1":TokenManager.getAdminId());
 		TOrderNewBo b  = tOrderNewMapper.getSaleIdByOno(orderNo);
 		TOrderNewBo b  = tOrderNewMapper.getSaleIdByOno(orderNo);
-		addNotic(NoticeStatus.ORDER_DUN.getCode(),a, b);
+		Integer  projectType=tOrderTaskMapper.getProjectType(o.getTid());
+		addNotic(NoticeStatus.ORDER_DUN.getCode(),a, b,projectType);
 		try {
 		try {
 			NewDunsendEmail(orderNo,o.getId(), a, b);
 			NewDunsendEmail(orderNo,o.getId(), a, b);
 		} catch (UnsupportedEncodingException | MessagingException e) {
 		} catch (UnsupportedEncodingException | MessagingException e) {
@@ -728,7 +721,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	public void addTimingTaskNewDunNoticAndSendEmail(TOrderNew t2, OutNewOrderDunBo o) {
 	public void addTimingTaskNewDunNoticAndSendEmail(TOrderNew t2, OutNewOrderDunBo o) {
 		AdminListBo a = adminMapper.getDeptNameByAid("1");
 		AdminListBo a = adminMapper.getDeptNameByAid("1");
 		TOrderNewBo b  = tOrderNewMapper.getSaleIdByOno(t2.getOrderNo());
 		TOrderNewBo b  = tOrderNewMapper.getSaleIdByOno(t2.getOrderNo());
-		addNotic(NoticeStatus.ORDER_DUN.getCode(),a, b);
+		Integer  projectType=tOrderTaskMapper.getProjectType(o.getTid());
+		addNotic(NoticeStatus.ORDER_DUN.getCode(),a, b,projectType);
 		try {
 		try {
 			NewDunsendEmail(t2.getOrderNo(),o.getId(), a, b);
 			NewDunsendEmail(t2.getOrderNo(),o.getId(), a, b);
 		} catch (UnsupportedEncodingException | MessagingException e) {
 		} catch (UnsupportedEncodingException | MessagingException e) {
@@ -1152,34 +1146,17 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		return t;
 		return t;
 	}
 	}
 
 
-	@Override
-	public List<OrderDunTaskBo> selectAllOrderDun() {
-		return tOrderDunMapper.getTaskAllOrderDun();
-	}
 
 
-	@Override
-	public void updateOrderDun(TOrderDun tDun) {
-		 tOrderDunMapper.updateByPrimaryKeySelective(tDun);
-	}
 
 
 	@Override
 	@Override
-	public void addNoticAndSendEmail(String orderNo,OrderDunTaskBo t,Integer type)
-			throws UnsupportedEncodingException, MessagingException {
-		TOrderNewBo b  = tOrderNewMapper.getSaleIdByOno(type==NoticeStatus.ORDER_DUN.getCode()?t.getOrderNo():orderNo);
-		 String id="1";
-		if (type==NoticeStatus.ORDER_DUN.getCode())  id=b.getSalesmanId();
-		if (type==NoticeStatus.ORDER_BACK.getCode())  id=TokenManager.getAdminId()==null?"1":TokenManager.getAdminId();
-		if (type==NoticeStatus.ORDER_APPROVA_NO.getCode())  id=TokenManager.getAdminId()==null?"1":TokenManager.getAdminId();
-		AdminListBo a = adminMapper.getDeptNameByAid(id);
-		 sendEmail( t==null?null:t.getId(), a, b);
-
-		 addNotic(type,a, b);
-	}
-
-	public void addNotic(Integer type,AdminListBo a,TOrderNewBo b) {
+	public void addNotic(Integer type, AdminListBo a, TOrderNewBo b,Integer projectType) {
 		StringBuffer sb=new StringBuffer();
 		StringBuffer sb=new StringBuffer();
-		sb=sb.append("客户名称[").append(b.getUserName()).append("], 合同编号[").append(b.getContractNo())
-				.append("] 订单编号[").append(b.getOrderNo()).append("] 操作人: ").append(a.getDepartmentName()).append("-").append(a.getName()).append("。");
+		if(projectType==6){
+			sb=sb.append("客户名称[").append(b.getUserName()).append("],按时触发应收款欠款,请按时催款,并及时增减项目,以免项目延期等问题。");
+		}else {
+			sb=sb.append("客户名称[").append(b.getUserName()).append("], 合同编号[").append(b.getContractNo())
+					.append("] 订单编号[").append(b.getOrderNo()).append("] 操作人: ").append(a.getDepartmentName()).append("-").append(a.getName()).append("。");
+		}
 		Notice n =new Notice();
 		Notice n =new Notice();
 		n.setId(UUID.randomUUID().toString());
 		n.setId(UUID.randomUUID().toString());
 		n.setAid(b.getSalesmanId());
 		n.setAid(b.getSalesmanId());

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

@@ -642,14 +642,10 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 
 
 	public void addNoticAndEmail(OutPaymentNode pn,Integer type) {
 	public void addNoticAndEmail(OutPaymentNode pn,Integer type) {
 		paymentNodeEmailBo pnb=paymentNodeMapper.selectBytidGetEmail(pn.getTid());
 		paymentNodeEmailBo pnb=paymentNodeMapper.selectBytidGetEmail(pn.getTid());
-		String str=NoticeStatus.getValueByCode(type)+": 订单编号 -"+pnb.getOrderNo()+", 操作人:平台超管中心-管理员。";
-		Notice n =new Notice();
-		n.setId(UUID.randomUUID().toString());
-		n.setAid(pnb.getSalesmanId());
-		n.setNoticeType(type);
-		n.setContent(str);
-		n.setReaded(0);//未读
-		asyncUtils.addNotice(n);
+		TOrderNewBo b  = tOrderNewMapper.getSaleIdByOno(pnb.getOrderNo());
+		AdminListBo a = adminMapper.getDeptNameByAid(TokenManager.getAdminId()==null?"1":TokenManager.getAdminId());
+		Integer  projectType=tOrderTaskMapper.getProjectType(pn.getTid());
+		orderNewService.addNotic(type,a,b,projectType);
 		pn.setDunStatus(1);
 		pn.setDunStatus(1);
 		paymentNodeMapper.updateByPrimaryKeySelective(pn);
 		paymentNodeMapper.updateByPrimaryKeySelective(pn);
 		//营销员名称、邮箱、订单编号、客户名称
 		//营销员名称、邮箱、订单编号、客户名称