Merge remote-tracking branch 'origin/dev' into authority

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

@@ -297,10 +297,10 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
 										System.out.println("发送邮件成功：" + JSON.toJSON(userEmail));
 										// 线程内无法访问Systemsession,会报nullPoint,采用存储过程
 //										usageLogger.log("询价发送邮件", "企业UU:" + inquiry.getEnUU() + ",单号：" +inquiry.getCode() +" 发送邮件成功", "询价发送邮件成功");
-										noticeDao.saveErpLog(userName, userIp, enUU, userUU, "发送询价单通知邮件", "发送成功，询价单号" + inquiry.getCode());
+										noticeDao.saveErpLog(userName, userIp, enUU, userUU, "发送询价单通知邮件", "发送成功，询价单号" + inquiry.getCode() + "，接收邮箱：" + userEmail.getEmemail());
 									} catch (Exception e) {
 //										usageLogger.log("询价发送邮件", "企业UU:" + inquiry.getEnUU() + ",单号：" +inquiry.getCode() +" 发送邮件失败", "询价发送邮件出错");
-										noticeDao.saveErpLog(userName, userIp, enUU, userUU, "发送询价单通知邮件", "发送失败，询价单号" + inquiry.getCode());
+										noticeDao.saveErpLog(userName, userIp, enUU, userUU, "发送询价单通知邮件", "发送失败，询价单号" + inquiry.getCode() + "，接收邮箱：" + userEmail.getEmemail());
 										e.printStackTrace();
 									}
 								}
@@ -314,9 +314,9 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
                                         HttpUtil.sendPost(messageConf.getMessageUrl(), FlexJsonUtils.toJsonDeep(sms));
 //										usageLogger.log("询价发送短信", "企业UU：" + inquiry.getEnUU() + ",单号：" +inquiry.getCode() +"短信发送成功", "询价发送短信成功");
 
-										noticeDao.saveErpLog(userName, userIp, enUU, userUU, "发送询价单通知短信", "发送成功，询价单号" + inquiry.getCode());
+										noticeDao.saveErpLog(userName, userIp, enUU, userUU, "发送询价单通知短信", "发送成功，询价单号" + inquiry.getCode() + "，接收手机：" + userTel.getEmphone());
                                     } catch (Exception e) {
-										noticeDao.saveErpLog(userName, userIp, enUU, userUU, "发送询价单通知短信", "发送失败，询价单号" + inquiry.getCode());
+										noticeDao.saveErpLog(userName, userIp, enUU, userUU, "发送询价单通知短信", "发送失败，询价单号" + inquiry.getCode() + "，接收手机：" + userTel.getEmphone());
 //                                        usageLogger.log("询价发送短信", "企业UU：" + inquiry.getEnUU() + ",单号：" +inquiry.getCode() +"短信发送失败", "询价发送短信出错");
 										e.printStackTrace();
                                     }