|
|
@@ -3,6 +3,7 @@ package com.goafanti.order.service.impl;
|
|
|
import java.lang.reflect.InvocationTargetException;
|
|
|
import java.math.BigDecimal;
|
|
|
import java.text.ParseException;
|
|
|
+import java.text.SimpleDateFormat;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.Calendar;
|
|
|
import java.util.Date;
|
|
|
@@ -1498,6 +1499,17 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
bill.setConfirmSign(AuditState.AUDIT_FAIL.getCode());
|
|
|
bill.setDeleteSign(Boolean.TRUE);
|
|
|
}
|
|
|
+ String regex = "^(1[1-9][0-9])\\d{8}$";
|
|
|
+ Pattern p = Pattern.compile(regex);
|
|
|
+ String mobile="";
|
|
|
+ Admin a=adminMapper.selectByPrimaryKey(order.getSalesmanId());
|
|
|
+ if (null!=a.getContactMobile()) {
|
|
|
+ Matcher m = p.matcher(a.getContactMobile());
|
|
|
+ if ( m.matches()) {
|
|
|
+ mobile=a.getContactMobile();
|
|
|
+ }
|
|
|
+ sendMessage(order,mobile,OrderFlowState.LSQR.getDesc());
|
|
|
+ }
|
|
|
tOrderBillMapper.updateByPrimaryKeySelective(bill);
|
|
|
}
|
|
|
return 1;
|
|
|
@@ -1537,10 +1549,10 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
tOrderMapper.updateByPrimaryKeySelective(tOrder);
|
|
|
//如果支付后订单符合待立项,系统自动立项 2018-4-10
|
|
|
if(tOrder.getProjectStage() == ProjectStage.WAIT_SET_UP.getCode());
|
|
|
+ updateSetUpProject(tOrder.getOrderNo(),DEFUALT_SET_UP_COMMENT);
|
|
|
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());
|
|
|
@@ -1553,12 +1565,13 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
}
|
|
|
|
|
|
public void sendMessage(TOrder tOrder, String mobile, String type) {
|
|
|
-
|
|
|
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
|
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
|
|
|
+ + "\",\"name\":\"" + userName
|
|
|
+ + "\",\"time\":\"" + sdf.format(new Date())
|
|
|
+ "\",\"type\":\"" + type +
|
|
|
"\"}";
|
|
|
MobileMessageUtils.sendMessage(mobileRemindCodeTemplate, paramString, mobile, accessKey, accessSecret);
|
|
|
@@ -1625,19 +1638,6 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
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);
|