【询价单明细上传】增加明细上传消息提醒；修改询价提醒短信发送模版id

src/main/java/com/uas/platform/b2b/erp/service/impl/InquiryServiceImpl.java

@@ -1,6 +1,7 @@
 package com.uas.platform.b2b.erp.service.impl;
 
 import com.uas.account.util.AccountUtils;
+import com.uas.platform.b2b.core.util.ContextUtils;
 import com.uas.platform.b2b.dao.*;
 import com.uas.platform.b2b.erp.model.Inquiry;
 import com.uas.platform.b2b.erp.model.InquiryDecide;
@@ -8,6 +9,7 @@ import com.uas.platform.b2b.erp.model.InquiryDetail;
 import com.uas.platform.b2b.erp.model.InquiryDetailDet;
 import com.uas.platform.b2b.erp.service.InquiryService;
 import com.uas.platform.b2b.erp.support.ErpBufferedLogger;
+import com.uas.platform.b2b.event.PurchaseInquiryItemSaveReleaseEvent;
 import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.temporary.model.PartnershipRecord;
@@ -19,9 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.BeanPropertyRowMapper;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 @Service
 public class InquiryServiceImpl implements InquiryService {
@@ -229,6 +229,8 @@ public class InquiryServiceImpl implements InquiryService {
     @Override
     public void save(List<InquiryDetail> details) {
         if(!CollectionUtils.isEmpty(details)) {
+        	Set<String> codes = new HashSet<>();
+        	List<PurchaseInquiryItem> items = new ArrayList<>();
             for(InquiryDetail detail : details) {
                 //先查询已经上传的询价单主表信息
                 Inquiry inquiry = getInquiry(detail.getIn_code(), detail.getId_id());
@@ -252,8 +254,17 @@ public class InquiryServiceImpl implements InquiryService {
                             logger.log("自动询价明细上传", "新增了自动询价的明细（" + id + "）", 1);
                         }
                     }
+                    // 产生消息
+					PurchaseInquiryItem inquiryItem = detail.convert();
+                    if (!codes.contains(detail.getIn_code())) {
+                    	codes.add(detail.getIn_code());
+                    	items.add(inquiryItem);
+					}
                 }
             }
+            if (!CollectionUtils.isEmpty(items)) {
+				ContextUtils.publishEvent(new PurchaseInquiryItemSaveReleaseEvent(items));
+			}
         }
     }
 

src/main/java/com/uas/platform/b2b/service/impl/PurchaseInquiryServiceImpl.java

@@ -246,9 +246,9 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
 									" on ur.role_id = sr.role_id where sr.role_desc = '业务员' and us.user_email is not null " +
 									" and sr.role_enuu = " + inquiryItem.getVendUU();
 							List<String> userEmails = commonDao.query(userEmailSql, String.class);
-							String userTelSql = "select distinct us.user_email useremail from sec$users us " +
+							String userTelSql = "select distinct us.user_tel usertel from sec$users us " +
 									" left join sec$userrole ur on us.user_uu = ur.user_uu left join sec$roles sr " +
-									" on ur.role_id = sr.role_id where sr.role_desc = '业务员' and us.user_email is not null " +
+									" on ur.role_id = sr.role_id where sr.role_desc = '业务员' and us.user_tel is not null " +
 									" and sr.role_enuu = " + inquiryItem.getVendUU();
 							List<String> userTels = commonDao.query(userTelSql, String.class);
 							// 发邮件
@@ -263,7 +263,7 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
 							model.put("custname", inquiry.getEnterprise().getEnName());
 							model.put("date", DateFormatUtils.DATE_FORMAT.format(new Date()));
 							for (String userEmail : userEmails) {
-								String emailRegex = "[\\w!#$%&'*+/=?^_`{|}~-]+(?:\\.[\\w!#$%&'*+/=?^_`{|}~-]+)*@(?:[\\w](?:[\\w-]*[\\w])?\\.)+[\\w](?:[\\w-]*[\\w])?";
+								String emailRegex = "\\w[-\\w.+]*@([A-Za-z0-9][-A-Za-z0-9]+\\.)+[A-Za-z]{2,14}";
 								if (Pattern.matches(emailRegex, userEmail)) {
 									try {
 										mailService.send(messageConf.getTplInquiryForB2B(), userEmail, model);

src/main/resources/dev/message.properties

@@ -7,5 +7,5 @@ msgInvitationForERP=5081e29f-47af-4556-a560-9213af11753f
 
 ## messageConfig
 tplInquiryForB2B=bc60d592-9651-4ca1-9305-0852fc7c4101
-msgInquiryForB2B=72cc98e4-0c2b-4d16-944b-2e0515048b8d
+msgInquiryForB2B=629edeb3-a87e-4a40-a5e5-51d9ae734f1b
 messageUrl=http://message.ubtob.com/sms/send

src/main/resources/prod/message.properties

@@ -7,5 +7,5 @@ msgInvitationForERP=5081e29f-47af-4556-a560-9213af11753f
 
 ## messageConfig
 tplInquiryForB2B=bc60d592-9651-4ca1-9305-0852fc7c4101
-msgInquiryForB2B=72cc98e4-0c2b-4d16-944b-2e0515048b8d
+msgInquiryForB2B=629edeb3-a87e-4a40-a5e5-51d9ae734f1b
 messageUrl=http://message.ubtob.com/sms/send

src/main/resources/test/message.properties

@@ -7,5 +7,5 @@ msgInvitationForERP=5081e29f-47af-4556-a560-9213af11753f
 
 ## messageConfig
 tplInquiryForB2B=bc60d592-9651-4ca1-9305-0852fc7c4101
-msgInquiryForB2B=72cc98e4-0c2b-4d16-944b-2e0515048b8d
+msgInquiryForB2B=629edeb3-a87e-4a40-a5e5-51d9ae734f1b
 messageUrl=http://message.ubtob.com/sms/send