Просмотр исходного кода

供应商邀请注册去掉在平台的判断,增加日志记录

hejq 8 лет назад
Родитель
Сommit
d2b50b060e

+ 10 - 4
src/main/java/com/uas/platform/b2b/erp/service/impl/VendorServiceImpl.java

@@ -9,12 +9,14 @@ import com.uas.platform.b2b.dao.VendorDao;
 import com.uas.platform.b2b.erp.model.ErpInviteRecord;
 import com.uas.platform.b2b.erp.model.InquiryVendorInfo;
 import com.uas.platform.b2b.erp.service.VendorService;
+import com.uas.platform.b2b.erp.support.ErpBufferedLogger;
 import com.uas.platform.b2b.model.InvitationRecord;
 import com.uas.platform.b2b.model.Vendor;
 import com.uas.platform.b2b.support.MessageConf;
 import com.uas.platform.b2b.support.SysConf;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.temporary.model.SmsMessage;
+import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.Status;
 import com.uas.platform.core.util.HttpUtil;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
@@ -73,6 +75,8 @@ public class VendorServiceImpl implements VendorService{
      */
     private static final String ENGLISH_REGEXP = "^[A-Za-z]+$";
 
+    private final static ErpBufferedLogger logger = BufferedLoggerManager.getLogger(ErpBufferedLogger.class);
+
     @Override
     public void saveInvitation(List<InquiryVendorInfo> infos) {
         if(!CollectionUtils.isEmpty(infos)) {
@@ -82,9 +86,9 @@ public class VendorServiceImpl implements VendorService{
                 InvitationRecord record = invitationRecordDao.findByEnuuAndVendname(SystemSession.getUser().getEnterprise().getUu(), info.getVe_name());
                 if(null == record || Status.NOT_UPLOAD.value() == record.getStatus()) {
                     record = info.covert();
-                    //发送邮件前先进行判断,每天每个供应商只发送一封邮件
-                    List<ErpInviteRecord> inviteRecords = getRecord(record.getVendname());
-                    if(inviteRecords.size() == 0) {
+                    //发送邮件前先进行判断,每天每个供应商只发送一封邮件(判断在erp已经做了,这边暂时不判断)
+//                    List<ErpInviteRecord> inviteRecords = getRecord(record.getVendname());
+//                    if(inviteRecords.size() == 0) {
                         // 发送邮件或短信成功才进行保存
                         if(record.getVenduseremail() != null && record.getVenduseremail().contains("@") && !record.getVenduseremail().matches(CHINESE_REGEXP)) {
                             Map<String, Object> model = new HashMap<String, Object>();
@@ -102,6 +106,7 @@ public class VendorServiceImpl implements VendorService{
                                 mailService.send(messageConf.getTplInvitationForERP(), record.getVenduseremail(), model);
                                 record.setStatus(Status.DOWNLOADED.value());
                                 tplstatus = true;
+                                logger.log("erp邀请供应商注册", "邮件邀请:" + record.getVenduseremail(), 1);
                             } catch (Exception e) {
                                 record.setStatus(Status.NOT_UPLOAD.value());
                                 e.printStackTrace();
@@ -120,6 +125,7 @@ public class VendorServiceImpl implements VendorService{
                                 HttpUtil.sendPost(messageUrl, FlexJsonUtils.toJsonDeep(sms));
                                 record.setStatus(Status.DOWNLOADED.value());
                                 msgstatus = true;
+                                logger.log("erp邀请供应商注册", "短信邀请:" + record.getVendusertel(), 1);
                             } catch (Exception e) {
                                 e.printStackTrace();
                             }
@@ -142,7 +148,7 @@ public class VendorServiceImpl implements VendorService{
                                 e.printStackTrace();
                             }
                         }
-                    }
+//                    }
                 }
             }
         }