|
|
@@ -1057,6 +1057,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
return releaseList;
|
|
|
}
|
|
|
|
|
|
+ @SuppressWarnings("unused")
|
|
|
private void lockProject(TOrder tOrder){
|
|
|
List<TOrderDetail> list = tOrderMapper.selectOrderCommodity(tOrder.getOrderNo());
|
|
|
UserLockRelease ulr = null;
|
|
|
@@ -1075,6 +1076,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ @SuppressWarnings("unused")
|
|
|
private void releaseProject(List<LockingReleaseBo> releaseList){
|
|
|
if(releaseList != null && releaseList.size()>0){
|
|
|
UserLockRelease ulr = null;
|
|
|
@@ -1534,10 +1536,33 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
}
|
|
|
tOrderMapper.updateByPrimaryKeySelective(tOrder);
|
|
|
//如果支付后订单符合待立项,系统自动立项 2018-4-10
|
|
|
- if(tOrder.getProjectStage() == ProjectStage.WAIT_SET_UP.getCode())
|
|
|
+ if(tOrder.getProjectStage() == ProjectStage.WAIT_SET_UP.getCode());
|
|
|
+ String regex = "^(1[1-9][0-9])\\d{8}$";
|
|
|
+ Pattern p = Pattern.compile(regex);
|
|
|
+ String mobile="";
|
|
|
updateSetUpProject(tOrder.getOrderNo(),DEFUALT_SET_UP_COMMENT);
|
|
|
+ Admin a=adminMapper.selectByPrimaryKey(tOrder.getSalesmanId());
|
|
|
+ if (null!=a.getContactMobile()) {
|
|
|
+ Matcher m = p.matcher(a.getContactMobile());
|
|
|
+ if ( m.matches()) {
|
|
|
+ mobile=a.getContactMobile();
|
|
|
+ }
|
|
|
+ sendMessage(tOrder,mobile,OrderFlowState.TPCL.getDesc());
|
|
|
+ }
|
|
|
return 1;
|
|
|
}
|
|
|
+
|
|
|
+ public void sendMessage(TOrder tOrder, String mobile, String type) {
|
|
|
+
|
|
|
+ String userName=tOrderMapper.selectByUserName(tOrder.getOrderNo());
|
|
|
+ //String message=noticeType.getDesc() + ": 订单编号-" + tOrder.getOrderNo() + ",变更内容:"+noticeComment+",操作人-" + TokenManager.getAdminToken().getName();
|
|
|
+ String paramString = "{\"number\":\"" + tOrder.getOrderNo()
|
|
|
+ + "\",\"operator\":\"" + TokenManager.getAdminToken().getName()
|
|
|
+ + "\",\"name\":\"" + userName
|
|
|
+ + "\",\"type\":\"" + type +
|
|
|
+ "\"}";
|
|
|
+ MobileMessageUtils.sendMessage(mobileRemindCodeTemplate, paramString, mobile, accessKey, accessSecret);
|
|
|
+ }
|
|
|
|
|
|
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@@ -1599,6 +1624,20 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
contract.setSignComment(signComment);
|
|
|
contract.setTaskDistribution(TaskDistributionState.NOT_DISTRIBUTION.getCode());
|
|
|
contractMapper.insert(contract);
|
|
|
+ //流水确认
|
|
|
+ if(tOrder.getProjectStage() == ProjectStage.WAIT_SET_UP.getCode());
|
|
|
+ String regex = "^(1[1-9][0-9])\\d{8}$";
|
|
|
+ Pattern p = Pattern.compile(regex);
|
|
|
+ String mobile="";
|
|
|
+ updateSetUpProject(tOrder.getOrderNo(),DEFUALT_SET_UP_COMMENT);
|
|
|
+ Admin a=adminMapper.selectByPrimaryKey(tOrder.getSalesmanId());
|
|
|
+ if (null!=a.getContactMobile()) {
|
|
|
+ Matcher m = p.matcher(a.getContactMobile());
|
|
|
+ if ( m.matches()) {
|
|
|
+ mobile=a.getContactMobile();
|
|
|
+ }
|
|
|
+ sendMessage(tOrder,mobile,OrderFlowState.DDBG.getDesc());
|
|
|
+ }
|
|
|
for(TOrderDetail orderDetail: detailList){
|
|
|
Admin aa=adminMapper.selectAdminName(AFTConstants.DEFAULT_INITIATOR);
|
|
|
Admin ab=adminMapper.selectAdminName(AFTConstants.CONSULTANT_MANAGER);
|
|
|
@@ -1938,30 +1977,25 @@ 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);
|
|
|
- }
|
|
|
- String regex = "^(1[1-9][0-9])\\d{8}$";
|
|
|
- Pattern p = Pattern.compile(regex);
|
|
|
- String mobile="";
|
|
|
- for (String s : targetIds) {
|
|
|
- Admin a=adminMapper.selectByPrimaryKey(s);
|
|
|
- if (null!=a.getContactMobile()) {
|
|
|
- Matcher m = p.matcher(a.getContactMobile());
|
|
|
- if ( m.matches()) {
|
|
|
- mobile+=a.getContactMobile()+",";
|
|
|
+ List<String> l= contractTaskMapper.slectbyOrderNo(tOrder.getOrderNo());
|
|
|
+ for (String s : l) {
|
|
|
+ if(!targetIds.contains(s))
|
|
|
+ targetIds.add(s);
|
|
|
+ }
|
|
|
+ String regex = "^(1[1-9][0-9])\\d{8}$";
|
|
|
+ Pattern p = Pattern.compile(regex);
|
|
|
+ String mobile="";
|
|
|
+ for (String s : targetIds) {
|
|
|
+ Admin a=adminMapper.selectByPrimaryKey(s);
|
|
|
+ if (null!=a.getContactMobile()) {
|
|
|
+ Matcher m = p.matcher(a.getContactMobile());
|
|
|
+ if ( m.matches()) {
|
|
|
+ mobile+=a.getContactMobile()+",";
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
- }
|
|
|
- mobile=mobile.substring(0, mobile.length()-1);
|
|
|
- //String message=noticeType.getDesc() + ": 订单编号-" + tOrder.getOrderNo() + ",变更内容:"+noticeComment+",操作人-" + TokenManager.getAdminToken().getName();
|
|
|
- String paramString = "{\"number\":\"" + tOrder.getOrderNo()
|
|
|
- + "\",\"operator\":\"" + TokenManager.getAdminToken().getName()
|
|
|
- + "\",\"type\":\"" + OrderFlowState.DDBG.getDesc() +
|
|
|
- "\"}";
|
|
|
- MobileMessageUtils.sendMessage(mobileRemindCodeTemplate, paramString, mobile, accessKey, accessSecret);
|
|
|
+ mobile=mobile.substring(0, mobile.length()-1);
|
|
|
+ sendMessage(tOrder,mobile,OrderFlowState.DDBG.getDesc());
|
|
|
|
|
|
}
|
|
|
}
|