Przeglądaj źródła

短信提醒BUG修复

anderx 7 lat temu
rodzic
commit
2b82269740

+ 1 - 1
src/main/java/com/goafanti/common/dao/AdminMapper.java

@@ -134,7 +134,7 @@ public interface AdminMapper {
 	
 	List<String>selectRolesIdByUid(String id);
 	
-	String selectStatusByMobile(String mobile);
+	String selectStatusByMobile(@Param("mobile")String mobile);
 	
 	int deleteById(String id);
 

+ 3 - 2
src/main/java/com/goafanti/common/enums/OrderFlowState.java

@@ -8,8 +8,9 @@ import org.apache.commons.lang3.StringUtils;
 public enum OrderFlowState {
 	DDBG(0, "订单变更"), 
 	RWPD(1, "任务分派"),
-	TPCL(1, "特批处理"),
-	QT(1, "其他"),
+	TPCL(2, "特批处理"),
+	LSQR(3, "流水确认"),
+	QT(9, "其他"),
 	;
 
 	private OrderFlowState(Integer code, String desc) {

+ 1 - 1
src/main/java/com/goafanti/common/mapper/AdminMapper.xml

@@ -820,7 +820,7 @@
    	  status
     from admin 
     where 
-    mobile=#{mobile,jdbcType=VARCHAR}
+    mobile= #{mobile,jdbcType=VARCHAR}
   </select>
   <delete id="deleteById" parameterType="java.lang.String">
   	delete from admin

+ 1 - 1
src/main/java/com/goafanti/common/mapper/UserBusinessMapper.xml

@@ -462,7 +462,7 @@
 	left join business_project g on a.business_project_id = g.id
 	where a.id = #{ufbId,jdbcType=VARCHAR}
   </select>
-  <update id="updateDimissionTransfer" parameterMap="java.lang.String">
+  <update id="updateDimissionTransfer" parameterType="java.lang.String">
   update  user_business 
 	set aid= #{transferId,jdbcType=VARCHAR}
 	where aid= #{aid,jdbcType=VARCHAR}

+ 16 - 16
src/main/java/com/goafanti/order/service/impl/OrderServiceImpl.java

@@ -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);

+ 8 - 3
src/main/java/com/goafanti/techproject/service/impl/TechProjectServiceImpl.java

@@ -1,6 +1,7 @@
 package com.goafanti.techproject.service.impl;
 
 import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
@@ -442,12 +443,15 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
 		TaskDetailBo tb= contractTaskMapper.selectProjectTaskDetail(task.getId());
 		String regex = "^(1[1-9][0-9])\\d{8}$";
 		 Pattern p = Pattern.compile(regex);
+		  SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		if (null!=a.getContactMobile()) {
 			Matcher m = p.matcher(a.getContactMobile());
 			if ( m.matches()) {
 			String mobile=a.getContactMobile();
 			String paramString = "{\"number\":\"" + tb.getOrderNo() 
 			+ "\",\"operator\":\"" + TokenManager.getAdminToken().getName()
+			+ "\",\"time\":\"" +   sdf.format(new Date())
+			+ "\",\"name\":\"" +  tb.getBuyerName()
 			+ "\",\"type\":\"" +  OrderFlowState.RWPD.getDesc() +
 			"\"}";
 			MobileMessageUtils.sendMessage(mobileRemindCodeTemplate, paramString, mobile, accessKey, accessSecret);
@@ -586,7 +590,7 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
 				Matcher m = p.matcher(a.getContactMobile());
 			if ( m.matches()) {
 				mobile=a.getContactMobile();
-				sendMessage(t.getOrderNo(),mobile,OrderFlowState.DDBG.getDesc());
+				sendMessage(t.getOrderNo(),mobile,OrderFlowState.RWPD.getDesc());
 				}
 			}
 			return setTaskDistribution(task.getContractId());
@@ -596,12 +600,13 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
 	}
 
 	public void sendMessage(String orderNo, String mobile, String type) {
-		
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		String userName=tOrderMapper.selectByUserName(orderNo);
 		//String message=noticeType.getDesc() + ": 订单编号-" + tOrder.getOrderNo() + ",变更内容:"+noticeComment+",操作人-" + TokenManager.getAdminToken().getName();
 		String paramString = "{\"number\":\"" + orderNo 
 		+ "\",\"operator\":\"" + TokenManager.getAdminToken().getName()
-		+ "\",\"name\":\"" +  userName 
+		+ "\",\"name\":\"" +  userName
+		+ "\",\"time\":\"" +  sdf.format(new Date()) 
 		+ "\",\"type\":\"" +  type +
 		"\"}";
 		MobileMessageUtils.sendMessage(mobileRemindCodeTemplate, paramString, mobile, accessKey, accessSecret);

+ 1 - 1
src/main/resources/props/config_dev.properties

@@ -66,7 +66,7 @@ aesSecretKey=aft1234567890123
 template.cacheable=false
 
 mobileCodeTemplate=SMS_37845022
-mobileRemindCodeTemplate=SMS_137421819
+mobileRemindCodeTemplate=SMS_137421952
 
 portal.host=//afts.hnzhiming.com/portal/2.0.0
 

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

@@ -67,7 +67,7 @@ accessSecret=ICGuiUnqzaar7urw4zecVcJrJ1MHg9
 aesSecretKey=aft1234567890123
 
 mobileCodeTemplate=SMS_37845022
-mobileRemindCodeTemplate=SMS_137421819
+mobileRemindCodeTemplate=SMS_137421952
 patentTemplate=SMS_72005286
 
 easemob.client.url=https://a1.easemob.com/1117170814115609/jitao

+ 1 - 1
src/main/resources/props/config_prod.properties

@@ -56,7 +56,7 @@ static.host=//s.jishutao.com/1.0.41
 template.cacheable=true
 
 mobileCodeTemplate=SMS_37845022
-mobileRemindCodeTemplate=SMS_137421819
+mobileRemindCodeTemplate=SMS_137421952
 
 portal.host=//s.jishutao.com/portal/1.0.11
 

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

@@ -68,7 +68,7 @@ aesSecretKey=aft1234567890123
 
 mobileCodeTemplate=SMS_37845022
 patentTemplate=SMS_72005286
-mobileRemindCodeTemplate=SMS_137421819
+mobileRemindCodeTemplate=SMS_137421952
 
 easemob.client.url=https://a1.easemob.com/1117170814115609/jitao
 easemob.client.id=YXA6RUDGkIDSEeemq9_4PWzcNA