anderx 4 år sedan
förälder
incheckning
177b589460

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

@@ -67,6 +67,8 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 	private Integer USER_RECEIVE_MAX = null;
 	@Value(value = "${user_remind_days}")
 	private Integer USER_REMIND_DAYS = null;
+	@Value(value = "${user_channel_days}")
+	private Integer USER_CHANNEL_DAYS= null;
 	@Resource
 	private UserFollowMapper userFollowMapper;
 	@Resource
@@ -2034,7 +2036,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 
 	@Override
 	public List<userDaysBo> selectReleaseUserDays(String id) {
-		Integer x = 270, y = 90;
+		Integer x = 270, y = USER_CHANNEL_DAYS;
 		x = x - USER_REMIND_DAYS;
 		y = y - USER_REMIND_DAYS;
 		List<userDaysBo> list = userLockReleaseMapper.selectUserDays(id, x, y);
@@ -2043,8 +2045,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 
 	@Override
 	public List<userDaysBo> selectChannelUserDays(String id) {
-		Integer days = 90;
-		return userLockReleaseMapper.selectChannelUserDays(days,id);
+		return userLockReleaseMapper.selectChannelUserDays(USER_CHANNEL_DAYS,id);
 	}
 
 	@Override

+ 2 - 5
src/main/java/com/goafanti/order/service/impl/LegalAffairsServiceImpl.java

@@ -141,13 +141,10 @@ public class LegalAffairsServiceImpl extends BaseMybatisDao<TOrderMidMapper> imp
         log.setOrderNo(in.getOrderNo());
         log.setId(UUID.randomUUID().toString());
         log.setType(1);
+        log.setRemarks(in.getRemarks());
         log.setAttachmentUrl(in.getAttUrl());
         log.setDumBy(TokenManager.getAdminId());
-        try {
-            log.setDumTime(DateUtils.parseDate(in.getDate(),AFTConstants.YYYYMMDD));
-        } catch (ParseException e) {
-            e.printStackTrace();
-        }
+        log.setDumTime(DateUtils.StringToDate(in.getDate(),AFTConstants.YYYYMMDD));
         return tDunLogMapper.insertSelective(log);
     }
 

+ 3 - 0
src/main/resources/props/config_local.properties

@@ -39,7 +39,10 @@ app.name=AFT
 template.cacheable=false
 user.receive.max=10
 user.private.max=1000
+#提前提醒天数
 user_remind_days=15
+#提前提醒天数
+user_channel_days=90
 
 portal.host=//sf.jishutao.com/portal/2.0.6
 avatar.upload.host=//sb.jishutao.com/upload

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

@@ -38,8 +38,10 @@ app.name=AFT
 template.cacheable=false
 user.receive.max=10
 user.private.max=1000
-#客户释放提醒
+#提前提醒天数
 user_remind_days=15
+#提前提醒天数
+user_channel_days=90
 
 static.host=//static.jishutao.com/1.1.97
 portal.host=//static.jishutao.com/portal/2.0.6