Browse Source

催款催款定时任务修改

anderx 7 months ago
parent
commit
e526f17046

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

@@ -1267,7 +1267,7 @@
     </select>
     <!-- 通过订单编号获得订单的负责人(营销员) -->
     <select id="getSaleIdByOno" parameterType="java.lang.String" resultType="com.goafanti.order.bo.TOrderNewBo">
-        select o.order_no orderNo ,o.salesman_id as salesmanId, a.name as salesmanName,e.name managerName,
+        select o.order_no orderNo ,o.salesman_id as salesmanId, a.name as salesmanName,e.name managerName,o.delete_sign deleteSign,
                o.contract_no contractNo,a.email ,u.nickname as userName,o.order_dep orderDep,d.name departmentName,
                d.finance_id  financeId,d.approval approvalStatus,d.approval_aid approvalAid,ad.name approvalName,
                d.operation_guarantee_id operationGuaranteeId,ad2.name operationGuaranteeName

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

@@ -254,10 +254,14 @@ public class OrderDunTask {
 			for (TArrearsDun td : list) {
 				TOrderNewBo b  = tOrderNewMapper.getSaleIdByOno(td.getOrderNo());
 
-
 				TOrderMid tm=tOrderMidMapper.selectByOrderNo(td.getOrderNo());
+				if (b==null||b.getDeleteSign()==null||b.getDeleteSign()==1){
+					td.setDunStatus(3);
+					td.setEndTime(date);
+					td.setOrderArrears(tm.getOrderArrears());
+					tArrearsDunMapper.updateByPrimaryKeySelective(td);
+				}else if (tm.getOrderArrears().compareTo(new BigDecimal(0))>0) {
 				//如果欠款大于0则需要触发邮件
-				if (tm.getOrderArrears().compareTo(new BigDecimal(0))>0) {
 					td.setDunStatus(1);
 					td.setStartTime(date);
 					td.setOrderArrears(tm.getOrderArrears());
@@ -275,8 +279,13 @@ public class OrderDunTask {
 			for (TArrearsDun ta : list2) {
 				TOrderMid tm=tOrderMidMapper.selectByOrderNo(ta.getOrderNo());
 				TOrderNewBo b  = tOrderNewMapper.getSaleIdByOno(ta.getOrderNo());
+				if (b==null||b.getDeleteSign()==null||b.getDeleteSign()==1){
+					ta.setDunStatus(3);
+					ta.setEndTime(date);
+					ta.setOrderArrears(tm.getOrderArrears());
+					tArrearsDunMapper.updateByPrimaryKeySelective(ta);
+				}else if (tm.getOrderArrears().compareTo(new BigDecimal(0))>0) {
 				//如果欠款大于0则需要触发邮件
-				if (tm.getOrderArrears().compareTo(new BigDecimal(0))>0) {
 					ta.setDunStatus(3);
 					tArrearsDunMapper.updateByPrimaryKeySelective(ta);
 					ta.setId(null);
@@ -298,9 +307,13 @@ public class OrderDunTask {
 				TOrderMid tm=tOrderMidMapper.selectByOrderNo(ta.getOrderNo());
 				TOrderNewBo b  = tOrderNewMapper.getSaleIdByOno(ta.getOrderNo());
 				AdminListBo a = adminMapper.getDeptNameByAid(TokenManager.getAdminId()==null?"1":TokenManager.getAdminId());
-
+				if (b==null||b.getDeleteSign()==null||b.getDeleteSign()==1){
+					ta.setDunStatus(3);
+					ta.setEndTime(date);
+					ta.setOrderArrears(tm.getOrderArrears());
+					tArrearsDunMapper.updateByPrimaryKeySelective(ta);
+				}else if (tm.getOrderArrears().compareTo(new BigDecimal(0))>0) {
 				//如果欠款大于0则需要触发邮件
-				if (tm.getOrderArrears().compareTo(new BigDecimal(0))>0) {
 					ta.setDunStatus(3);
 					tArrearsDunMapper.updateByPrimaryKeySelective(ta);
 					ta.setId(null);