Browse Source

上传图片,删除图片修改

anderx 3 years ago
parent
commit
4e1fdd7abf

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

@@ -180,7 +180,7 @@ public interface OrderNewService {
 	/**
 	 * 	非特批触发订单催款
 	 */
-	void pushOrderDun(String orderNo);
+	void pushOrderDun(TOrderNew t);
 	boolean checkOfficialType(TOrderOutsource o);
 	void updateOrderCostAmount(Integer tid,Integer type);
 

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

@@ -998,33 +998,31 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	}
 	/**
 	 *  订单分配触发
-	 * @param orderNo
 	 */
 	@Override
-	public void pushOrderDun(String orderNo) {
-		TOrderNew b=tOrderNewMapper.selectByPrimaryKey(orderNo);
+	public void pushOrderDun(TOrderNew b) {
 		if(b.getApproval()==0){
 			Date date = new Date();
-			List<OutNewOrderDunBo> list=newOrderDunMapper.selectListNewOrderDun(orderNo,0);
+			List<OutNewOrderDunBo> list=newOrderDunMapper.selectListNewOrderDun(b.getOrderNo(),0);
 			for (OutNewOrderDunBo o : list) {
 				if (o.getDunType()==1) {
 					o.setStatus(1);
 					o.setStartTime(date);
 					newOrderDunMapper.updateByPrimaryKeySelective(o);
 					//催款统计算
-					TOrderMid tm = pushOrderMidDun(orderNo, b.getSettlementAmount(), date);
+					TOrderMid tm = pushOrderMidDun(b.getOrderNo(), b.getSettlementAmount(), date);
 					TArrearsDun t=new TArrearsDun();
 					t.setOrderArrears(tm.getOrderArrears());
 					t.setOrderReceivables(tm.getOrderReceivables());
-					if (tArrearsDunMapper.checkOrderNo(orderNo,null)<1) {
-						t.setOrderNo(orderNo);
+					if (tArrearsDunMapper.checkOrderNo(b.getOrderNo(),null)<1) {
+						t.setOrderNo(b.getOrderNo());
 						tArrearsDunMapper.insertSelective(t);
-					}else if(tArrearsDunMapper.checkOrderNo(orderNo,0)>0){
-						Integer i=tArrearsDunMapper.selectByStatus(orderNo, 0);
+					}else if(tArrearsDunMapper.checkOrderNo(b.getOrderNo(),0)>0){
+						Integer i=tArrearsDunMapper.selectByStatus(b.getOrderNo(), 0);
 						t.setId(i);
 						tArrearsDunMapper.updateByPrimaryKeySelective(t);
 					}
-					addNewDunNoticAndSendEmail(orderNo,o);
+					addNewDunNoticAndSendEmail(b.getOrderNo(),o);
 				}
 			}
 		}

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

@@ -149,7 +149,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 			t.setManagerId(taskReceiverId);
 			t.setConsultantId(null);
 			//设置催款触发
-			orderNewService.pushOrderDun(t.getOrderNo());
+			orderNewService.pushOrderDun(tn);
 			//未锁定客户就锁定客户
 			pushUser(t, tn, date);
 			//处理客户已派项目