Merge branch 'hotfix-wxmodel-liusw' into dev

src/main/java/com/uas/ps/inquiry/entity/MessageModel.java

@@ -72,27 +72,40 @@ public class MessageModel {
     /**
      * 询价方信息
      */
-    private String name;
+    private String buyerName;
+
+    /**
+     * 供应商信息
+     */
+    private String vendName;
 
     /**
      * 型号
      */
     private String cmpCode;
 
-    public String getCmpCode() {
-        return cmpCode;
+    public String getBuyerName() {
+        return buyerName;
     }
 
-    public void setCmpCode(String cmpCode) {
-        this.cmpCode = cmpCode;
+    public void setBuyerName(String buyerName) {
+        this.buyerName = buyerName;
     }
 
-    public String getName() {
-        return name;
+    public String getVendName() {
+        return vendName;
     }
 
-    public void setName(String name) {
-        this.name = name;
+    public void setVendName(String vendName) {
+        this.vendName = vendName;
+    }
+
+    public String getCmpCode() {
+        return cmpCode;
+    }
+
+    public void setCmpCode(String cmpCode) {
+        this.cmpCode = cmpCode;
     }
 
     public String getType() {

src/main/java/com/uas/ps/inquiry/service/impl/PublicInquiryServiceImpl.java

@@ -252,18 +252,27 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
                         if (!CollectionUtils.isEmpty(users)) {
                             List<MessageModel> models = new ArrayList<MessageModel>();
                             for (ProductUsers user : users) {
-                                User u = userDao.findOne(null != item.getInquiry().getRecorderUU() ? item.getInquiry().getRecorderUU() : 0L);
-                                Enterprise e = enterpriseDao.findOne(item.getInquiry().getEnUU());
+                                User buyerUser = userDao.findOne(null != item.getInquiry().getRecorderUU() ? item.getInquiry().getRecorderUU() : 0L);
+                                Enterprise buyerEnterprise = enterpriseDao.findOne(item.getInquiry().getEnUU());
                                 String cmp = cmpCode.length() > 10 ? cmpCode.substring(0, 10).concat("...") : cmpCode;
                                 String content = "发布关于“型号：" + cmp + "”的公共询价信息，邀请您参与报价。";
                                 MessageModel model = new MessageModel();
-                                if (null != e) {
-                                    content = e.getEnName() + content;
-                                    model.setName(e.getEnName());
-                                } else if (null != u) {
-                                    content = u.getUserName() + content;
-                                    model.setName(u.getUserName());
+
+                                if (null != buyerEnterprise) {
+                                    content = buyerEnterprise.getEnName() + content;
+                                    model.setBuyerName(buyerEnterprise.getEnName());
+                                } else if (null != buyerUser) {
+                                    content = buyerUser.getUserName() + content;
+                                    model.setBuyerName(buyerUser.getUserName());
+                                }
+                                // 询价方信息
+                                if (null != item.getUserUU() || null != item.getInquiry().getRecorderUU()) {
+                                    model.setSenderUu(item.getUserUU() != null ? item.getUserUU() : item.getInquiry().getRecorderUU());
+                                } else {
+                                    Enterprise enterprise = enterpriseDao.findOne(item.getInquiry().getEnUU());
+                                    model.setSenderUu(null != enterprise ? enterprise.getAdminUU() : 0L);
                                 }
+                                model.setSenderEnuu(item.getInquiry().getEnUU());
                                 model.setCmpCode(cmpCode);
                                 model.setType(INQUIRY_TYPE);
                                 model.setType(INQUIRY_TYPE_SELLER_MALL);
@@ -273,15 +282,13 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
                                 model.setContent(content);
                                 model.setRemark(String.valueOf(item.getInquiry().getId()));
                                 model.setSourceId(item.getId());
+                                // 供应商信息
+                                Enterprise vendEnterprise = enterpriseDao.findOne(user.getEnuu());
+                                if (vendEnterprise != null) {
+                                    model.setVendName(vendEnterprise.getEnName());
+                                }
                                 model.setReceiverEnuu(user.getEnuu());
                                 model.setReceiverUu(user.getUseruu());
-                                model.setSenderEnuu(item.getInquiry().getEnUU());
-                                if (null != item.getUserUU() || null != item.getInquiry().getRecorderUU()) {
-                                    model.setSenderUu(item.getUserUU() != null ? item.getUserUU() : item.getInquiry().getRecorderUU());
-                                } else {
-                                    Enterprise enterprise = enterpriseDao.findOne(item.getInquiry().getEnUU());
-                                    model.setSenderUu(null != enterprise ? enterprise.getAdminUU() : 0L);
-                                }
                                 model.setSmsType("DONT_SEND");
                                 model.setMailTemplate(MAIL_TEMP_ID);
                                 model.setSmTemplate(SMS_TEMP_ID);