Browse Source

变更催款修改

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

+ 4 - 0
src/main/java/com/goafanti/common/dao/TChangeDunMapper.java

@@ -78,4 +78,8 @@ public interface TChangeDunMapper {
 	void insertSelectiveList(@Param("list")List<TChangeDun> list);
 
 	List<TChangeDunOut> selectByCid(Integer id);
+
+	int updateByTid(@Param("tid")Integer tid,@Param("type")Integer type);
+
+	int deleteByTid(Integer tid);
 }

+ 7 - 0
src/main/java/com/goafanti/common/mapper/TChangeDunMapper.xml

@@ -497,4 +497,11 @@
   	  from t_change_dun a left join t_order_task b on a.tid=b.id left join t_change_task c on a.ctid=c.id
     	where a.cid= #{id} order by a.id
   </select>
+  <update id="updateByTid">
+  		update t_change_dun set type= #{type} where tid= #{tid};
+  </update>
+  
+  <update id="deleteByTid">
+  		delete from t_change_dun where tid= #{tid};
+  </update>
 </mapper>

+ 13 - 0
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -759,6 +759,19 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 
 			@Override
 			public int updateChangeTask(TChangeTask t) {
+				//有tid是订单复制项目
+				if(t.getTid()!=null) {
+					//type 0正常 1新增 2修改 3删除
+					if (t.getType()==3) {
+						TChangeDunMapper.updateByTid(t.getTid(),3);
+					}else if(t.getType()==2){
+						TChangeDunMapper.updateByTid(t.getTid(),2);
+					}
+				}else {
+					if (t.getType()==3) {
+						TChangeDunMapper.deleteByTid(t.getTid());
+					}
+				}
 				return TChangeTaskMapper.updateByPrimaryKeySelective(t);
 			}
 

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

@@ -649,11 +649,10 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		ob.setBackStatus(0);//待处理
 		ob.setInitiate(TokenManager.getAdminId()==null?"1":TokenManager.getAdminId());
 		ob.setAccept(tOrder.getSalesmanId());
-		/*try {
-			addNoticAndSendEmail(orderNo, null, NoticeStatus.ORDER_BACK.getCode());
-		} catch (UnsupportedEncodingException | MessagingException e) {
-			LoggerUtils.error(getClass(), "发送邮件失败", e);
-		}*/
+		TOrderLog tl=new TOrderLog();
+		tl.setOrderNo(orderNo);
+		tl.setProcess(OrderLogProcess.BH.getCode());
+		addOrderLog(tl,null);
 		tOrderBackMapper.insertSelective(ob);
 	}