|
|
@@ -41,6 +41,7 @@ import com.goafanti.common.dao.TOrderMapper;
|
|
|
import com.goafanti.common.dao.TmpTableMapper;
|
|
|
import com.goafanti.common.dao.UserLockReleaseMapper;
|
|
|
import com.goafanti.common.dao.UserMapper;
|
|
|
+import com.goafanti.common.dao.UserRoleMapper;
|
|
|
import com.goafanti.common.enums.DeleteStatus;
|
|
|
import com.goafanti.common.enums.NoticeReadStatus;
|
|
|
import com.goafanti.common.enums.NoticeStatus;
|
|
|
@@ -60,6 +61,7 @@ import com.goafanti.common.model.TOrderDetail;
|
|
|
import com.goafanti.common.model.TmpTable;
|
|
|
import com.goafanti.common.model.User;
|
|
|
import com.goafanti.common.model.UserLockRelease;
|
|
|
+import com.goafanti.common.model.UserRole;
|
|
|
import com.goafanti.common.utils.BeanUtilsExt;
|
|
|
import com.goafanti.common.utils.DateUtils;
|
|
|
import com.goafanti.common.utils.MobileMessageUtils;
|
|
|
@@ -125,10 +127,12 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
private NoticeMapper noticeMapper;
|
|
|
@Autowired
|
|
|
private ContractTaskLogMapper contractTaskLogMapper;
|
|
|
- @Resource
|
|
|
+ @Autowired
|
|
|
private BusinessProjectMapper businessProjectMapper;
|
|
|
- @Resource
|
|
|
+ @Autowired
|
|
|
private UserLockReleaseMapper userLockReleaseMapper;
|
|
|
+ @Autowired
|
|
|
+ UserRoleMapper userRoleMapper;
|
|
|
|
|
|
@Value(value = "${mobileRemindCodeTemplate}")
|
|
|
private String mobileRemindCodeTemplate = null;
|
|
|
@@ -1977,10 +1981,9 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
MobileNotice( targetIds, tOrder);
|
|
|
noticeMapper.insertBatch(noticeList);
|
|
|
//触发短信提醒
|
|
|
- List<String> l= contractTaskMapper.slectbyOrderNo(tOrder.getOrderNo());
|
|
|
- for (String s : l) {
|
|
|
- if(!targetIds.contains(s))
|
|
|
- targetIds.add(s);
|
|
|
+ List<UserRole> list=userRoleMapper. selectAdminRole(AFTConstants.CONSULTANT_MANAGER);
|
|
|
+ for (UserRole u : list) {
|
|
|
+ targetIds.add(u.getUid());
|
|
|
}
|
|
|
String regex = "^(1[1-9][0-9])\\d{8}$";
|
|
|
Pattern p = Pattern.compile(regex);
|