消息生成站内信调整

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

@@ -74,6 +74,19 @@ public class MessageModel {
      */
     private String name;
 
+    /**
+     * 型号
+     */
+    private String cmpCode;
+
+    public String getCmpCode() {
+        return cmpCode;
+    }
+
+    public void setCmpCode(String cmpCode) {
+        this.cmpCode = cmpCode;
+    }
+
     public String getName() {
         return name;
     }

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

@@ -252,15 +252,16 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
                                 User u = userDao.findOne(null != item.getInquiry().getRecorderUU() ? item.getInquiry().getRecorderUU() : 0L);
                                 Enterprise e = enterpriseDao.findOne(item.getInquiry().getEnUU());
                                 String cmp = cmpCode.length() > 10 ? cmpCode.substring(0, 10).concat("...") : cmpCode;
-                                String content = "关于型号：" + cmp + "的公共询价信息，邀请您参与报价。";
+                                String content = "发布关于“型号：" + cmp + "”的公共询价信息，邀请您参与报价。";
                                 MessageModel model = new MessageModel();
                                 if (null != e) {
-//                                    content = e.getEnName() + content;
+                                    content = e.getEnName() + content;
                                     model.setName(e.getEnName());
                                 } else if (null != u) {
-//                                    content = u.getUserName() + content;
+                                    content = u.getUserName() + content;
                                     model.setName(u.getUserName());
                                 }
+                                model.setCmpCode(cmpCode);
                                 model.setType(INQUIRY_TYPE);
                                 model.setType(INQUIRY_TYPE_SELLER_MALL);
                                 model.setProducerApp(sourceApp);
@@ -278,14 +279,14 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
                                     Enterprise enterprise = enterpriseDao.findOne(item.getInquiry().getEnUU());
                                     model.setSenderUu(null != enterprise ? enterprise.getAdminUU() : 0L);
                                 }
-                                model.setSmsType(SMS_TYPE);
+                                model.setSmsType("DONT_SEND");
                                 model.setMailTemplate(MAIL_TEMP_ID);
                                 model.setSmTemplate(SMS_TEMP_ID);
                                 models.add(model);
                                 logger.log("公共询价产生消息", "根据物料型号【" + cmpCode + "】查询接收人", "关联询价单明细【" + item.getId() + "】", user.getUseruu(), user.getEnuu(), InquirySource.ERP.name());
                             }
                             if (!CollectionUtils.isEmpty(models) && USOFTMALL_URL.equals("https://www.usoftmall.com/")) {
-                                // sendMessage(models);
+                                sendMessage(models);
                                 sendWechatMessage(models);
                             }
                         }