Browse Source

update

Signed-off-by: anderx <312518615@qq.com>
anderx 5 years ago
parent
commit
b14be15b04

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

@@ -1601,7 +1601,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 	public List<userDaysBo> selectUserDays(String id) {
 		Integer x=30,y=270;
 		x=x-USER_REMIND_DAYS;
-		y=x-USER_REMIND_DAYS;
+		y=y-USER_REMIND_DAYS;
 		List<userDaysBo> list=userLockReleaseMapper.selectUserDays(id,x,y);
 		return list;
 	}

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

@@ -1207,20 +1207,18 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			Admin admin = adminMapper.selectAllByid(string);
 			if(admin!=null&&SendEmailUtil.isEmail(admin.getEmail().trim()))adminIds+=admin.getEmail()+",";
 		}
-		if (nlist.isEmpty()||StringUtils.isBlank(adminIds)) {
-			throw new BusinessException(new Error( "邮件发送失败,对方设置邮箱错误","邮件发送失败,对方设置邮箱错误")); 
-		}
-			noticeMapper.insertBatch(nlist);
+		noticeMapper.insertBatch(nlist);
+		if (!nlist.isEmpty()&&StringUtils.isNotBlank(adminIds)) {
 			adminIds=adminIds.substring(0, adminIds.length()-1);
 			EmailBo bo = new EmailBo(NoticeStatus.getValueByCode(type), adminIds, a.getDepartmentName(), a.getName(), "请登录查看"
 					,null,null,null,null,null,0,approval);
-				try {
-					//使用专利邮件模板
-					SendEmailUtil.getInstance().patentSend(bo);
-				} catch (UnsupportedEncodingException | MessagingException e) {
-					throw new BusinessException(new Error( "邮件发送错误","邮件发送错误"));
-				}
-		
+			try {
+				//使用专利邮件模板
+				SendEmailUtil.getInstance().patentSend(bo);
+			} catch (UnsupportedEncodingException | MessagingException e) {
+				throw new BusinessException(new Error( "邮件发送错误","邮件发送错误"));
+			}
+		}
 	}
     
 

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

@@ -1,13 +1,13 @@
 #Driver
 jdbc.driverClassName=com.mysql.jdbc.Driver
 #本地
-jdbc.url=jdbc\:mysql\://localhost\:3306/aft?useUnicode\=true&characterEncoding\=UTF-8&autoReconnect\=true&useSSL\=false
-jdbc.username=dev
-jdbc.password=123456
+#jdbc.url=jdbc\:mysql\://localhost\:3306/aft?useUnicode\=true&characterEncoding\=UTF-8&autoReconnect\=true&useSSL\=false
+#jdbc.username=dev
+#jdbc.password=123456
 #测试
-#jdbc.url=jdbc:mysql://101.37.32.31:3306/aft20200511?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
-#jdbc.username=root
-#jdbc.password=aftdev
+jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+jdbc.username=root
+jdbc.password=aftdev
 #\u68c0\u6d4b\u6570\u636e\u5e93\u94fe\u63a5\u662f\u5426\u6709\u6548\uff0c\u5fc5\u987b\u914d\u7f6e
 jdbc.validationQuery=SELECT 'x'
 #\u521d\u59cb\u8fde\u63a5\u6570
@@ -64,12 +64,12 @@ user_remind_days=15
 portal.host=//sf.jishutao.com/portal/2.0.6
 avatar.upload.host=//sb.jishutao.com/upload
 #连接开发
-static.host=//sb.jishutao.com:3000/1.1.49
-avatar.host=//sb.jishutao.com
+#static.host=//sb.jishutao.com:3000/1.1.49
+#avatar.host=//sb.jishutao.com
 
 #连测试
-#avatar.host=//static.jishutao.com
-#static.host=//static.jishutao.com/1.1.49
+avatar.host=//static.jishutao.com
+static.host=//static.jishutao.com/1.1.49
 
 upload.path=F:/data/public/upload
 upload.private.path=F:/data/private/upload