Переглянути джерело

新增客户日志BUG修复

anderx 5 роки тому
батько
коміт
7db0d5eafa

+ 1 - 0
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -367,6 +367,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 			uList=Arrays.asList(uid.split(","));
 		}
 		addUserLock(uid, TokenManager.getAdminId(), now,uList);
+		addUserTransferLog(uid,TokenManager.getAdminId(),0,null,now,uList);
 		return 1;
 	}
 

+ 1 - 4
src/main/java/com/goafanti/order/controller/AdminNewOrderApiController.java

@@ -174,10 +174,7 @@ public class AdminNewOrderApiController extends CertifyApiController {
 				res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "主项目"));
 				return res;
 			}
-			if (orderNewService.checkORderDun(t.getOrderNo())) {
-				res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "催款信息"));
-				return res;
-			}
+			
 		}
 		
 		if (StringUtils.isNotBlank(signDate)) {

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

@@ -191,7 +191,6 @@ public interface OrderNewService {
 	
 	void addTimingTaskNewDunNoticAndSendEmail(TOrderNew t2, OutNewOrderDunBo o);
 	
-	boolean checkORderDun(String orderNo);
 	
 	int updateFinance(String orderNo, String newFinance);
 	List<TOrderLogBo> selectOrderLog(String orderNo);

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

@@ -973,16 +973,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		}
 		return true;
 	}
-	@Override
-	public boolean checkORderDun(String orderNo) {
-		List<OutNewOrderDunBo> list=newOrderDunMapper.selectListNewOrderDun(orderNo, null, null);
-		if (list==null||list.size()<1) {
-			return true;
-		}else {
-			return false;
-		}
-		
-	}
+	
 	
 
 

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

@@ -68,7 +68,7 @@ avatar.upload.host=//sb.jishutao.com/upload
 #avatar.host=//sb.jishutao.com
 
 #连测试
-avatar.host=//static.jishutao.com
+avatar.host=//ss.andex.com:3000/public
 static.host=//static.jishutao.com/1.1.60
 
 upload.path=F:/data/public/upload