Browse Source

修改财务完成退票通知营销员

anderx 4 years ago
parent
commit
41eb8060b3

+ 7 - 4
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -633,10 +633,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		//变更完成
 		changeAdopt(nb);
 		TOrderNew o=pushChange(nb);
-		List<String> alist = new ArrayList<>();
-		alist.add(o.getSalesmanId());
 		newOrderChangeMapper.updateByPrimaryKeySelective(nb);
-		orderNewService.pushGeneralSendNoticeAndEmail(alist,NoticeStatus.ORDER_CHANGE_END.getCode(), o.getOrderNo(), TokenManager.getAdminId(),0);
 		return 1;
 	}
 
@@ -644,7 +641,13 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 	@Override
 	public int pushCompleteRefund(NewOrderChangeBo nb) {
 		nb.setStatus(6);
-		return newOrderChangeMapper.updateByPrimaryKeySelective(nb);
+		NewOrderChangeBo nob=newOrderChangeMapper.selectById(nb.getId());
+		TOrderNew o=tOrderNewMapper.selectByPrimaryKey(nob.getOrderNo());
+		List<String> alist = new ArrayList<>();
+		alist.add(o.getSalesmanId());
+		newOrderChangeMapper.updateByPrimaryKeySelective(nb);
+		orderNewService.pushGeneralSendNoticeAndEmail(alist,NoticeStatus.ORDER_CHANGE_YES.getCode(), o.getOrderNo(), TokenManager.getAdminId(),0);
+		return 1;
 	}
 
 	/**