소스 검색

Merge branch 'test'

anderx 3 년 전
부모
커밋
bf40012518
2개의 변경된 파일2개의 추가작업 그리고 2개의 파일을 삭제
  1. 1 1
      src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java
  2. 1 1
      src/main/resources/props/config_test.properties

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

@@ -974,7 +974,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 				t.getOrderStatus()==OrderNewState.DQD.getCode()||t.getOrderStatus()==OrderNewState.QDSHJJ.getCode()) {
 			t.setOrderNo(orderNo);
 			t.setDeleteSign(1);//作废
-			contractNoReplace(orderNo, t.getContractNo(),t.getOrderDep());
+			if(t.getContractNo()!=null)contractNoReplace(orderNo, t.getContractNo(),t.getOrderDep());
 			t.setContractNo("");
 			return tOrderNewMapper.updateByPrimaryKeySelective(t);
 		}

+ 1 - 1
src/main/resources/props/config_test.properties

@@ -43,7 +43,7 @@ user_remind_days=15
 #提前提醒天数
 user_channel_days=90
 
-static.host=//static.jishutao.com/1.2.14
+static.host=//static.jishutao.com/1.2.15
 portal.host=//static.jishutao.com/portal/2.0.6
 avatar.host=//static.jishutao.com
 avatar.upload.host=//static.jishutao.com/upload